Changeset 5916:39c3ed2d8a40 in roaraudio for roard
- Timestamp:
- 09/09/13 13:12:31 (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/light.h
r5823 r5916 35 35 extern struct light_state { 36 36 unsigned int channels; 37 u nsigned char* state;38 u nsigned char* changes;37 uint8_t * state; 38 uint8_t * changes; 39 39 } g_light_state; 40 40 … … 55 55 // for plugins: 56 56 int light_dmxchannel_get(size_t index); 57 int light_dmxchannel_set(size_t index, u nsigned charval);57 int light_dmxchannel_set(size_t index, uint8_t val); 58 58 59 59 #endif -
roard/light.c
r5823 r5916 33 33 // // 34 34 35 static inline void __set_channel(size_t index, u nsigned charval) {35 static inline void __set_channel(size_t index, uint8_t val) { 36 36 g_light_state.changes[index] |= g_light_state.state[index] ^ val; 37 37 g_light_state.state[index] = val; … … 128 128 int i, c; 129 129 uint16_t channel; 130 u nsigned charvalue;130 uint8_t value; 131 131 132 132 if ( g_streams[id] == NULL ) … … 189 189 struct roar_stream * s; 190 190 struct roar_stream_server * ss; 191 u nsigned charbuf[512];192 register u nsigned char* bufptr;191 uint8_t buf[512]; 192 register uint8_t * bufptr; 193 193 struct roar_roardmx_message mes; 194 194 int i; … … 267 267 } 268 268 269 return (int)(unsigned int)(u nsigned char)g_light_state.state[index];270 } 271 272 int light_dmxchannel_set(size_t index, u nsigned charval) {269 return (int)(unsigned int)(uint8_t)g_light_state.state[index]; 270 } 271 272 int light_dmxchannel_set(size_t index, uint8_t val) { 273 273 if ( (size_t)g_light_state.channels <= index ) { 274 274 roar_err_set(ROAR_ERROR_NOENT);
Note: See TracChangeset
for help on using the changeset viewer.