Changeset 5256:6029a22d29b6 in roaraudio


Ignore:
Timestamp:
11/13/11 19:01:43 (8 years ago)
Author:
phi
Branch:
default
Message:

moved away from roar_vio_init_calls(), roar_vio_get_fh() and roar_vio_set_fh(). Also corrected some errno usage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/streams.c

    r5242 r5256  
    225225#endif 
    226226 
    227    roar_vio_init_calls(&(s->vio)); 
     227   roar_vio_clear_calls(&(s->vio)); 
    228228   roar_vio_clear_calls(&(s->jumbo)); 
    229229   s->viop      = &(s->vio); 
     
    789789 if ( ss->driver_id == -1 && fh != -2 ) { 
    790790#ifndef ROAR_TARGET_WIN32 
    791   roar_vio_set_fh(&(ss->vio), fh); 
     791  roar_vio_open_fh(&(ss->vio), fh); 
    792792#else 
    793793  roar_vio_open_fh_socket(&(ss->vio), fh); 
     
    24702470 } 
    24712471 
    2472  errno = 0; 
     2472 roar_err_clear_errno(); 
    24732473 
    24742474 if ( ss->codecfilter == -1 ) { 
    24752475  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 ) { 
    24772477   ROAR_DBG("streams_send_mon(id=%i) = 0", id); 
    24782478   _return(0); 
     
    24932493  ROAR_DBG("streams_send_mon(id=%i) = ?", id); 
    24942494 
    2495   if ( ret > 0 && errno == 0 ) { 
     2495  if ( ret > 0 && roar_err_is_errno_clear() ) { 
    24962496   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); 
    24972497   roar_notify_core_emit_simple(ROAR_OE_STREAM_XRUN, -1, id, ROAR_OT_STREAM, ROAR_XRUN_OVER_POST, -1, NULL, 0); 
     
    25042504  } 
    25052505 } else { 
    2506   errno = 0; 
    25072506  if ( codecfilter_write(ss->codecfilter_inst, ss->codecfilter, obuf, olen) 
    25082507            == olen ) { 
Note: See TracChangeset for help on using the changeset viewer.