Changeset 609:093b3891d709 in roaraudio
- Timestamp:
- 08/19/08 21:10:25 (16 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/codecfilter_celt.c
r608 r609 8 8 struct roar_codecfilter * filter) { 9 9 struct codecfilter_celt_inst * self = malloc(sizeof(struct codecfilter_celt_inst)); 10 struct roar_stream * s = (struct roar_stream *) info;10 struct roar_stream * s = ROAR_STREAM(info); 11 11 12 12 if ( !self ) -
roard/codecfilter_cmd.c
r223 r609 59 59 } 60 60 61 if ( lib_run_bg(cmd, ((struct roar_stream*)info)->fh, socks[1], ROAR_STDERR, socks, 2) == -1 )61 if ( lib_run_bg(cmd, ROAR_STREAM(info)->fh, socks[1], ROAR_STDERR, socks, 2) == -1 ) 62 62 return -1; 63 63 … … 69 69 g_clients[info->client]->fh = socks[0]; 70 70 } else { 71 close( ((struct roar_stream*)info)->fh);71 close(ROAR_STREAM(info)->fh); 72 72 } 73 73 } else { 74 close( ((struct roar_stream*)info)->fh);74 close(ROAR_STREAM(info)->fh); 75 75 } 76 76 } else { 77 close( ((struct roar_stream*)info)->fh);77 close(ROAR_STREAM(info)->fh); 78 78 } 79 79 80 ((struct roar_stream*)info)->fh = socks[0];81 ((struct roar_stream*)info)->info.codec = ROAR_CODEC_DEFAULT;80 ROAR_STREAM(info)->fh = socks[0]; 81 ROAR_STREAM(info)->info.codec = ROAR_CODEC_DEFAULT; 82 82 close(socks[1]); 83 83 -
roard/codecfilter_speex.c
r608 r609 8 8 struct roar_codecfilter * filter) { 9 9 struct codecfilter_speex_inst * self = malloc(sizeof(struct codecfilter_speex_inst)); 10 struct roar_stream * s = (struct roar_stream *) info;10 struct roar_stream * s = ROAR_STREAM(info); 11 11 12 12 *inst = NULL; -
roard/codecfilter_wave.c
r606 r609 7 7 struct roar_codecfilter * filter) { 8 8 struct codecfilter_wave_inst * self = malloc(sizeof(struct codecfilter_wave_inst)); 9 struct roar_stream * s = (struct roar_stream *) info;9 struct roar_stream * s = ROAR_STREAM(info); 10 10 11 11 if ( !self ) -
roard/streams.c
r603 r609 136 136 ROAR_DBG("streams_set_fh(id=%i): g_streams[id]->id=%i", id, ROAR_STREAM(g_streams[id])->id); 137 137 138 ((struct roar_stream *)g_streams[id])->fh = fh;138 ROAR_STREAM(g_streams[id])->fh = fh; 139 139 140 140 if ( codecfilter_open(&(g_streams[id]->codecfilter_inst), &(g_streams[id]->codecfilter), NULL, … … 163 163 return -1; 164 164 165 return ((struct roar_stream *)g_streams[id])->fh;165 return ROAR_STREAM(g_streams[id])->fh; 166 166 } 167 167 … … 408 408 */ 409 409 410 ((struct roar_stream*)g_streams[id])->pos =411 ROAR_MATH_OVERFLOW_ADD( ((struct roar_stream*)g_streams[id])->pos,410 ROAR_STREAM(g_streams[id])->pos = 411 ROAR_MATH_OVERFLOW_ADD(ROAR_STREAM(g_streams[id])->pos, 412 412 ROAR_OUTPUT_CALC_OUTBUFSAMP(info, needed-todo)); 413 413 //ROAR_WARN("stream=%i, pos=%u", id, ((struct roar_stream*)g_streams[id])->pos); … … 441 441 for (i = 0; i < ROAR_STREAMS_MAX; i++) { 442 442 if ( g_streams[i] != NULL ) { 443 if ( ((struct roar_stream *)g_streams[i])->dir != ROAR_DIR_PLAY )443 if ( ROAR_STREAM(g_streams[i])->dir != ROAR_DIR_PLAY ) 444 444 continue; 445 445 … … 538 538 ROAR_DBG("streams_check(id=%i) = ?", id); 539 539 540 s = (struct roar_stream *)(ss = g_streams[id]);540 s = ROAR_STREAM(ss = g_streams[id]); 541 541 542 542 if ( (fh = s->fh) == -1 ) … … 675 675 ROAR_DBG("streams_send_filter(id=%i) = ?", id); 676 676 677 s = (struct roar_stream *)(ss = g_streams[id]);677 s = ROAR_STREAM(ss = g_streams[id]); 678 678 679 679 if ( (fh = s->fh) == -1 )
Note: See TracChangeset
for help on using the changeset viewer.