Changeset 5256:6029a22d29b6 in roaraudio for roard
- Timestamp:
- 11/13/11 19:01:43 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r5242 r5256 225 225 #endif 226 226 227 roar_vio_ init_calls(&(s->vio));227 roar_vio_clear_calls(&(s->vio)); 228 228 roar_vio_clear_calls(&(s->jumbo)); 229 229 s->viop = &(s->vio); … … 789 789 if ( ss->driver_id == -1 && fh != -2 ) { 790 790 #ifndef ROAR_TARGET_WIN32 791 roar_vio_ set_fh(&(ss->vio), fh);791 roar_vio_open_fh(&(ss->vio), fh); 792 792 #else 793 793 roar_vio_open_fh_socket(&(ss->vio), fh); … … 2470 2470 } 2471 2471 2472 errno = 0;2472 roar_err_clear_errno(); 2473 2473 2474 2474 if ( ss->codecfilter == -1 ) { 2475 2475 ROAR_DBG("streams_send_mon(id=%i): not a CF stream", id); 2476 if ( s->fh == -1 && roar_vio_get_fh(&(ss->vio)) == -1) {2476 if ( s->fh == -1 && ss->vio.inst == NULL ) { 2477 2477 ROAR_DBG("streams_send_mon(id=%i) = 0", id); 2478 2478 _return(0); … … 2493 2493 ROAR_DBG("streams_send_mon(id=%i) = ?", id); 2494 2494 2495 if ( ret > 0 && errno == 0) {2495 if ( ret > 0 && roar_err_is_errno_clear() ) { 2496 2496 ROAR_WARN("streams_send_mon(id=%i): Overrun in stream: wrote %i of %i bytes, %i bytes missing", id, (int)ret, olen, olen-(int)ret); 2497 2497 roar_notify_core_emit_simple(ROAR_OE_STREAM_XRUN, -1, id, ROAR_OT_STREAM, ROAR_XRUN_OVER_POST, -1, NULL, 0); … … 2504 2504 } 2505 2505 } else { 2506 errno = 0;2507 2506 if ( codecfilter_write(ss->codecfilter_inst, ss->codecfilter, obuf, olen) 2508 2507 == olen ) {
Note: See TracChangeset
for help on using the changeset viewer.