Changeset 934:0277459c7e79 in roaraudio
- Timestamp:
- 12/07/08 18:20:23 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/clients.c
r771 r934 353 353 int clients_send_mon (struct roar_audio_info * sa, uint32_t pos) { 354 354 int i; 355 int fh; 355 // int fh; 356 int j; 356 357 357 358 for (i = 0; i < ROAR_CLIENTS_MAX; i++) { … … 359 360 continue; 360 361 362 /* 361 363 if ( (fh = g_clients[i]->fh) == -1 ) 362 364 continue; 365 */ 363 366 364 367 if ( g_clients[i]->execed == -1 ) { 365 368 // TODO: add some code to send a message to the client insetd of the raw data. 369 for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) { 370 //if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) { 371 ROAR_DBG("clients_send_mon(*): client=%i, stream=%i -> %i", i, j, g_clients[i]->streams[j]); 372 if ( g_clients[i]->streams[j] != -1 ) 373 streams_send_mon(g_clients[i]->streams[j]); 374 } 366 375 } else { 367 376 // streams_check(g_clients[i]->execed); -
roard/driver_oss.c
r930 r934 88 88 } 89 89 90 ROAR_WARN("driver_oss_open(*): OSS devices opened :)"); 91 90 92 return 0; 91 93 } -
roard/roard.c
r933 r934 130 130 131 131 if ( (stream = streams_new()) == -1 ) { 132 ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts); 132 133 return -1; 133 134 } … … 145 146 if ( driver_openvio(&(ss->vio), &(ss->driver_id), drv, dev, &(s->info), -1) ) { 146 147 streams_delete(stream); 148 ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts); 147 149 return -1; 148 150 } -
roard/streams.c
r930 r934 684 684 s = ROAR_STREAM((ss = g_streams[id])); 685 685 686 /* 686 687 if ( (fh = s->fh) == -1 ) 687 688 return 0; 689 */ 688 690 689 691 if ( s->dir != ROAR_DIR_MONITOR && s->dir != ROAR_DIR_OUTPUT && s->dir != ROAR_DIR_BIDIR ) … … 693 695 return 0; 694 696 695 ROAR_ DBG("streams_send_mon(id=%i): fh = %i", id, fh);697 ROAR_WARN("streams_send_mon(id=%i): fh = %i", id, fh); 696 698 697 699 if ( s->info.channels != g_sa->channels || s->info.bits != g_sa->bits || … … 850 852 return -1; 851 853 852 roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh); 854 if ( roar_vio_get_fh(&(stream->vio)) == -1 && ROAR_STREAM(stream)->fh != -1 ) 855 roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh); 856 857 // ROAR_WARN("stream_vio_s_write(*): writing..."); 853 858 854 859 return roar_vio_write(&(stream->vio), buf, count);
Note: See TracChangeset
for help on using the changeset viewer.