Changeset 547:797f5692456f in roaraudio for roard
- Timestamp:
- 08/18/08 18:03:26 (16 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/loop.c
r259 r547 5 5 int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa) { 6 6 void ** streams_input = NULL; 7 int term = 0; 8 int streams; 7 9 #ifdef MONITOR_LATENCY 8 10 struct timeval try, ans; … … 31 33 32 34 ROAR_DBG("main_loop(*): check for new data..."); 33 if ( clients_check_all() == 0 && g_terminate && g_listen_socket == -1 ) 34 alive = 0; 35 if ( clients_check_all() == 0 && g_terminate && g_listen_socket == -1 ) { 36 term = 1; 37 } 35 38 36 39 ROAR_DBG("main_loop(*): mixing clients..."); 37 40 if ( g_standby ) { 38 41 // while in standby we still neet to get the buffers to free input buffer space. 39 streams _get_mixbuffers(&streams_input, sa, g_pos);42 streams = streams_get_mixbuffers(&streams_input, sa, g_pos); 40 43 } else { 41 if ( streams_get_mixbuffers(&streams_input, sa, g_pos) == 0) {44 if ( ( streams = streams_get_mixbuffers(&streams_input, sa, g_pos)) != -1 ) { 42 45 mix_clients(g_output_buffer, sa->bits, streams_input, ROAR_OUTPUT_BUFFER_SAMPLES * sa->channels); 43 46 } 44 47 } 48 49 if ( term && streams < 1 ) 50 alive = 0; 45 51 46 52 /* -
roard/streams.c
r538 r547 465 465 466 466 *bufferlist = bufs; 467 return 0;467 return have; 468 468 } 469 469
Note: See TracChangeset
for help on using the changeset viewer.