Changeset 5012:b263759832f1 in roaraudio


Ignore:
Timestamp:
05/26/11 12:57:17 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Updated drivers to use new sync stream selection logic correctly (Closes: #136)

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r5011 r5012  
    33        * Updated roar_reset() (Closes: #131) 
    44        * Added memory corruption and double free detection to buffer API. 
     5        * Updated drivers to use new sync stream selection logic correctly (Closes: #136) 
    56 
    67v. 0.4beta6 - Mon May 23 2011 19:49 CEST 
  • roard/driver.c

    r4975 r5012  
    323323#endif 
    324324 
     325int  driver_dummy_nonblock(struct roar_vio_calls * vio, int state) { 
     326 if ( state == ROAR_SOCKET_BLOCK ) 
     327  return 0; 
     328 
     329 roar_err_set(ROAR_ERROR_NOTSUP); 
     330 return -1; 
     331} 
     332 
    325333//ll 
  • roard/driver_alsa.c

    r4708 r5012  
    226226 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    227227 
    228  inst->inst  = (void*) interface; 
    229  inst->write = driver_alsa_write; 
    230  inst->close = driver_alsa_close; 
    231  inst->sync  = driver_alsa_sync; 
    232  inst->ctl   = driver_alsa_ctl; 
     228 inst->inst     = (void*) interface; 
     229 inst->write    = driver_alsa_write; 
     230 inst->close    = driver_alsa_close; 
     231 inst->sync     = driver_alsa_sync; 
     232 inst->ctl      = driver_alsa_ctl; 
     233 inst->nonblock = driver_dummy_nonblock; 
    233234 
    234235 ROAR_DBG("driver_alsa_open_vio(inst=%p, device='%s', info=%p, fh=%i, sstream=%p) = 0", inst, device, info, fh, sstream); 
  • roard/driver_ao.c

    r4967 r5012  
    109109 
    110110 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    111  inst->inst  = (void*) aodevice; 
    112  inst->write = driver_ao_write; 
    113  inst->close = driver_ao_close; 
     111 inst->inst     = (void*) aodevice; 
     112 inst->write    = driver_ao_write; 
     113 inst->close    = driver_ao_close; 
     114 inst->nonblock = driver_dummy_nonblock; 
    114115 
    115116 return 0; 
  • roard/driver_portaudio.c

    r4858 r5012  
    9191 inst->close = driver_portaudio_close; 
    9292 inst->write = driver_portaudio_write; 
    93  inst->nonblock = driver_portaudio_nonblock; 
     93 inst->nonblock = driver_dummy_nonblock; 
    9494 
    9595 Pa_Initialize(); 
     
    212212} 
    213213 
    214 int driver_portaudio_nonblock         (struct roar_vio_calls * vio, int state) { 
    215  if ( state == ROAR_SOCKET_BLOCK ) 
    216   return 0; 
    217  return -1; 
    218 } 
    219  
    220214#endif 
    221215 
  • roard/driver_pulsesimple.c

    r4764 r5012  
    9595 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    9696 
    97  inst->inst  = self; 
    98  inst->close = driver_pulsesimple_close; 
    99  inst->write = driver_pulsesimple_write; 
    100  inst->sync  = driver_pulsesimple_sync; 
    101  inst->ctl   = driver_pulsesimple_ctl; 
     97 inst->inst     = self; 
     98 inst->close    = driver_pulsesimple_close; 
     99 inst->write    = driver_pulsesimple_write; 
     100 inst->sync     = driver_pulsesimple_sync; 
     101 inst->ctl      = driver_pulsesimple_ctl; 
     102 inst->nonblock = driver_dummy_nonblock; 
    102103 
    103104 return 0; 
  • roard/driver_rsound.c

    r4708 r5012  
    139139 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    140140 
    141  inst->inst  = self; 
    142  inst->close = driver_rsound_close; 
    143  inst->write = driver_rsound_write; 
     141 inst->inst     = self; 
     142 inst->close    = driver_rsound_close; 
     143 inst->write    = driver_rsound_write; 
     144 inst->nonblock = driver_dummy_nonblock; 
    144145 
    145146 return 0; 
  • roard/driver_shout.c

    r4967 r5012  
    199199 
    200200 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    201  inst->inst  = (void*)shout; 
    202  inst->write = driver_shout_write; 
    203  inst->close = driver_shout_close; 
     201 inst->inst     = (void*)shout; 
     202 inst->write    = driver_shout_write; 
     203 inst->close    = driver_shout_close; 
     204 inst->nonblock = driver_dummy_nonblock; 
    204205 
    205206 return 0; 
  • roard/driver_sndio.c

    r4975 r5012  
    3737 vio->sync     = driver_sndio_sync; 
    3838 vio->ctl      = driver_sndio_ctl; 
     39 vio->nonblock = driver_dummy_nonblock; 
    3940 
    4041 vio->inst     = (void*) inst; 
  • roard/driver_sysclock.c

    r4898 r5012  
    4242 inst->inst     = self; 
    4343 inst->close    = driver_sysclock_close; 
    44  inst->nonblock = driver_sysclock_nonblock; 
     44 inst->nonblock = driver_dummy_nonblock; 
    4545 inst->write    = driver_sysclock_write; 
    4646 
     
    8686} 
    8787 
    88 int driver_sysclock_nonblock(struct roar_vio_calls * vio, int state) { 
    89  if ( state == ROAR_SOCKET_BLOCK ) 
    90   return 0; 
    91  return -1; 
    92 } 
    93  
    9488ssize_t driver_sysclock_write   (struct roar_vio_calls * vio, void *buf, size_t count) { 
    9589 struct driver_sysclock * self = vio->inst; 
  • roard/driver_wmm.c

    r4957 r5012  
    189189 // VIO Setup: 
    190190 memset(inst, 0, sizeof(struct roar_vio_calls)); 
    191  inst->inst  = self; 
    192  inst->close = driver_wmm_close_vio; 
    193  inst->write = driver_wmm_write; 
     191 inst->inst     = self; 
     192 inst->close    = driver_wmm_close_vio; 
     193 inst->write    = driver_wmm_write; 
     194 inst->nonblock = driver_dummy_nonblock; 
    194195 
    195196 // WMM Setup: 
  • roard/include/driver.h

    r4955 r5012  
    188188#endif 
    189189 
     190int  driver_dummy_nonblock(struct roar_vio_calls * vio, int state); 
     191 
    190192#endif 
    191193 
Note: See TracChangeset for help on using the changeset viewer.