Changeset 5278:b3e0dd3f3141 in roaraudio for roard


Ignore:
Timestamp:
11/21/11 00:42:20 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

last parts of merging _nonblock into _ctl and fixed sizeof(cmd) of _ctls

Location:
roard
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • roard/container_framework.c

    r5276 r5278  
    197197} 
    198198 
    199 off_t   cont_fw_lseek   (struct roar_vio_calls * vio, off_t offset, int whence); 
     199roar_off_t   cont_fw_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence); 
    200200 
    201201int     cont_fw_sync    (struct roar_vio_calls * vio) { 
    … …  
    233233} 
    234234 
    235 int     cont_fw_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     235int     cont_fw_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    236236 
    237237// VIO Parent: 
    … …  
    260260} 
    261261 
    262 off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) { 
     262roar_off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 
    263263 return roar_vio_lseek(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), offset, whence); 
    264264} 
    … …  
    268268} 
    269269 
    270 int     cont_pvio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) { 
     270int     cont_pvio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    271271 return roar_vio_ctl(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), cmd, data); 
    272272} 

  • roard/driver.c

    r5276 r5278  
    317317#endif 
    318318 
    319 int  driver_dummy_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     319int  driver_dummy_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    320320 switch (cmd) { 
    321321  case ROAR_VIO_CTL_NONBLOCK: 

  • roard/driver_alsa.c

    r5276 r5278  
    324324 */ 
    325325 
    326 int driver_alsa_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     326int driver_alsa_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    327327 roar_alsa_t       * device    = vio->inst; 
    328328 snd_pcm_sframes_t alsa_delay; 

  • roard/driver_artsc.c

    r5276 r5278  
    156156} 
    157157 
    158 int     driver_artsc_ctl     (struct roar_vio_calls * vio, int cmd, void * data) { 
     158int     driver_artsc_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    159159 struct roar_artsc * self = vio->inst; 
    160160 ssize_t bps; 

  • roard/driver_dmx.c

    r5242 r5278  
    6666  return -1; 
    6767 
    68  if ( roar_vio_lseek(vio, 0, SEEK_SET) == (off_t)-1 ) 
     68 if ( roar_vio_lseek(vio, 0, SEEK_SET) == (roar_off_t)-1 ) 
    6969  return -1; 
    7070 
    … …  
    7272} 
    7373 
    74 int driver_dmx_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     74int driver_dmx_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    7575 
    7676 if ( vio == NULL ) 

  • roard/driver_jack.c

    r5276 r5278  
    163163} 
    164164 
    165 int     driver_jack_ctl     (struct roar_vio_calls * vio, int cmd, void * data) { 
     165int     driver_jack_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    166166 struct driver_jack * self = vio->inst; 
    167167 // function for a lot control features. 
    … …  
    184184    *(int*)data = FH...; 
    185185*/ 
     186    roar_err_set(ROAR_ERROR_NOTSUP); 
    186187    return -1; 
    187188   break; 
    … …  
    191192   break; 
    192193  case ROAR_VIO_CTL_NONBLOCK: 
    193  // control if read and write calls should block untill all data is read or written. 
    194  // state is in *(int*)data and could be: 
    195  //  ROAR_SOCKET_BLOCK    - Block untill the data is read or written 
    196  //  ROAR_SOCKET_NONBLOCK - Return as soon as possible 
     194    // control if read and write calls should block untill all data is read or written. 
     195    // state is in *(int*)data and could be: 
     196    //  ROAR_SOCKET_BLOCK    - Block untill the data is read or written 
     197    //  ROAR_SOCKET_NONBLOCK - Return as soon as possible 
     198    roar_err_set(ROAR_ERROR_NOTSUP); 
     199    return -1; 
    197200   break; 
    198201  case ROAR_VIO_CTL_GET_AUINFO: 
    199202  case ROAR_VIO_CTL_SET_AUINFO: 
    200203    // get or set audio info, data is a struct roar_audio_info*. 
     204    roar_err_set(ROAR_ERROR_NOTSUP); 
    201205    return -1; 
    202206   break; 
    203207  case ROAR_VIO_CTL_GET_DBLKSIZE: 
    204208  case ROAR_VIO_CTL_SET_DBLKSIZE: 
    205      // get or set block size used, data is uint_least32_t*, number of bytes. 
     209    // get or set block size used, data is uint_least32_t*, number of bytes. 
     210    roar_err_set(ROAR_ERROR_NOTSUP); 
    206211    return -1; 
    207212   break; 
    208213  case ROAR_VIO_CTL_GET_DBLOCKS: 
    209214  case ROAR_VIO_CTL_SET_DBLOCKS: 
    210      // get or set number of blocks used, data is uint_least32_t*. 
     215    // get or set number of blocks used, data is uint_least32_t*. 
     216    roar_err_set(ROAR_ERROR_NOTSUP); 
    211217    return -1; 
    212218   break; 
    213219  case ROAR_VIO_CTL_SET_SSTREAM: 
    214220    // set server stream object for this stream, data is struct roar_stream_server* 
     221    roar_err_set(ROAR_ERROR_NOTSUP); 
    215222    return -1; 
    216223   break; 
    217224  case ROAR_VIO_CTL_SET_SSTREAMID: 
    218225    // set stream ID for this stream, data is int* 
     226    roar_err_set(ROAR_ERROR_NOTSUP); 
    219227    return -1; 
    220228   break; 
    221229  case ROAR_VIO_CTL_SET_VOLUME: 
    222230    // set volume for this device, data is struct roar_mixer_settings* 
     231    roar_err_set(ROAR_ERROR_NOTSUP); 
    223232    return -1; 
    224233   break; 
    … …  
    226235    // get delay of this stream, data is uint_least32_t*, in bytes 
    227236    // there is more about delay. please ask. 
    228     return -1; 
    229    break; 
    230   default: 
    231     return -1; 
    232    break; 
    233  } 
     237    roar_err_set(ROAR_ERROR_NOTSUP); 
     238    return -1; 
     239   break; 
     240 } 
     241 
     242 roar_err_set(ROAR_ERROR_BADRQC); 
     243 return -1; 
    234244} 
    235245 

  • roard/driver_oss.c

    r5276 r5278  
    455455} 
    456456 
    457 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     457int driver_oss_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    458458 struct driver_oss * self = vio->inst; 
    459459#ifdef SNDCTL_DSP_GETODELAY 

  • roard/driver_pulsesimple.c

    r5276 r5278  
    159159} 
    160160 
    161 int     driver_pulsesimple_ctl          (struct roar_vio_calls * vio, int cmd, void * data) { 
     161int     driver_pulsesimple_ctl          (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    162162 struct driver_pulsesimple * self = vio->inst; 
    163163 

  • roard/driver_pwmled.c

    r5276 r5278  
    122122} 
    123123 
    124 int driver_pwmled_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     124int driver_pwmled_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    125125 struct driver_pwmled * self = vio->inst; 
    126126 

  • roard/driver_sndio.c

    r5276 r5278  
    3737 vio->sync     = driver_sndio_sync; 
    3838 vio->ctl      = driver_sndio_ctl; 
    39  vio->nonblock = driver_dummy_nonblock; 
    4039 
    4140 vio->inst     = (void*) inst; 
    … …  
    230229#define no_data(x) x: if ( data != NULL ) return -1; 
    231230 
    232 int     driver_sndio_ctl          (struct roar_vio_calls * vio, int cmd, void * data) { 
     231int     driver_sndio_ctl          (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    233232 struct driver_sndio * self = vio->inst; 
    234233 unsigned d; 

  • roard/include/container_framework.h

    r4708 r5278  
    8282ssize_t cont_fw_read    (struct roar_vio_calls * vio, void *buf, size_t count); 
    8383ssize_t cont_fw_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
    84 off_t   cont_fw_lseek   (struct roar_vio_calls * vio, off_t offset, int whence); 
    85 int     cont_fw_nonblock(struct roar_vio_calls * vio, int state); 
     84roar_off_t   cont_fw_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence); 
    8685int     cont_fw_sync    (struct roar_vio_calls * vio); 
    87 int     cont_fw_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     86int     cont_fw_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    8887int     cont_fw_close   (struct roar_vio_calls * vio); 
    8988 
    … …  
    9291ssize_t cont_pvio_read    (struct roar_vio_calls * vio, void *buf, size_t count); 
    9392ssize_t cont_pvio_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
    94 off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence); 
    95 int     cont_pvio_nonblock(struct roar_vio_calls * vio, int state); 
     93roar_off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence); 
    9694int     cont_pvio_sync    (struct roar_vio_calls * vio); 
    97 int     cont_pvio_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     95int     cont_pvio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    9896int     cont_pvio_close   (struct roar_vio_calls * vio); 
    9997 

  • roard/include/driver.h

    r5276 r5278  
    159159#endif 
    160160 
    161 int  driver_dummy_ctl(struct roar_vio_calls * vio, int cmd, void * data); 
     161int  driver_dummy_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    162162 
    163163#endif 

  • roard/include/driver_alsa.h

    r4708 r5278  
    4141int     driver_alsa_close   (struct roar_vio_calls * vio); 
    4242int     driver_alsa_sync    (struct roar_vio_calls * vio); 
    43 int     driver_alsa_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     43int     driver_alsa_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    4444 
    4545#endif 

  • roard/include/driver_artsc.h

    r4809 r5278  
    3535ssize_t driver_artsc_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
    3636int     driver_artsc_close   (struct roar_vio_calls * vio); 
    37 int     driver_artsc_nonblock(struct roar_vio_calls * vio, int state); 
    38 int     driver_artsc_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     37int     driver_artsc_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    3938 
    4039#endif 

  • roard/include/driver_dmx.h

    r4708 r5278  
    3535int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3636ssize_t driver_dmx_write (struct roar_vio_calls * vio,  void *buf, size_t count); 
    37 int     driver_dmx_ctl   (struct roar_vio_calls * vio,  int cmd, void * data); 
     37int     driver_dmx_ctl   (struct roar_vio_calls * vio,  roar_vio_ctl_t cmd, void * data); 
    3838 
    3939#endif 

  • roard/include/driver_jack.h

    r4825 r5278  
    3838ssize_t driver_jack_read    (struct roar_vio_calls * vio, void *buf, size_t count); 
    3939ssize_t driver_jack_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
    40 int     driver_jack_nonblock(struct roar_vio_calls * vio, int state); 
    4140int     driver_jack_sync    (struct roar_vio_calls * vio); 
    42 int     driver_jack_ctl     (struct roar_vio_calls * vio, int cmd, void * data); 
     41int     driver_jack_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    4342int     driver_jack_close   (struct roar_vio_calls * vio); 
    4443 

  • roard/include/driver_oss.h

    r5276 r5278  
    4242int driver_oss_close(DRIVER_USERDATA_T   inst); 
    4343int driver_oss_sync(struct roar_vio_calls * vio); 
    44 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data); 
     44int driver_oss_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    4545 
    4646ssize_t driver_oss_write    (struct roar_vio_calls * vio, void *buf, size_t count); 

  • roard/include/driver_portaudio.h

    r4858 r5278  
    4949ssize_t driver_portaudio_write        (struct roar_vio_calls * vio, void *buf, size_t count); 
    5050int     driver_portaudio_sync         (struct roar_vio_calls * vio); 
    51 int     driver_portaudio_ctl          (struct roar_vio_calls * vio, int cmd, void * data); 
    52 int     driver_portaudio_nonblock     (struct roar_vio_calls * vio, int state); 
    5351 
    5452#endif 

  • roard/include/driver_pulsesimple.h

    r4708 r5278  
    4141ssize_t driver_pulsesimple_write        (struct roar_vio_calls * vio, void *buf, size_t count); 
    4242int     driver_pulsesimple_sync         (struct roar_vio_calls * vio); 
    43 int     driver_pulsesimple_ctl          (struct roar_vio_calls * vio, int cmd, void * data); 
     43int     driver_pulsesimple_ctl          (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    4444 
    4545 

  • roard/include/driver_pwmled.h

    r4708 r5278  
    4242int driver_pwmled_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    4343ssize_t driver_pwmled_write (struct roar_vio_calls * vio,  void *buf, size_t count); 
    44 int     driver_pwmled_ctl   (struct roar_vio_calls * vio,  int cmd, void * data); 
     44int     driver_pwmled_ctl   (struct roar_vio_calls * vio,  roar_vio_ctl_t cmd, void * data); 
    4545int     driver_pwmled_close (struct roar_vio_calls * vio); 
    4646 

  • roard/include/driver_sndio.h

    r4708 r5278  
    4646ssize_t driver_sndio_write        (struct roar_vio_calls * vio, void *buf, size_t count); 
    4747int     driver_sndio_sync         (struct roar_vio_calls * vio); 
    48 int     driver_sndio_ctl          (struct roar_vio_calls * vio, int cmd, void * data); 
     48int     driver_sndio_ctl          (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 
    4949 
    5050 

  • roard/include/driver_sysclock.h

    r4897 r5278  
    3535int     driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3636int     driver_sysclock_close   (struct roar_vio_calls * vio); 
    37 int     driver_sysclock_nonblock(struct roar_vio_calls * vio, int state); 
    3837ssize_t driver_sysclock_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
    3938 

  • roard/include/midi.h

    r5276 r5278  
    174174// dummys: 
    175175int     midi_vio_set_dummy(int stream); 
    176 int     midi_vio_ctl(struct roar_vio_calls * vio, int cmd, void * data); 
    177 int     midi_vio_ok(struct roar_vio_calls * vio, ...); 
    178176 
    179177#endif 

  • roard/midi.c

    r5276 r5278  
    10491049// VIO: 
    10501050 
     1051static int midi_vio_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
     1052 if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 
     1053  return 0; 
     1054 return -1; 
     1055} 
     1056 
     1057static int     midi_vio_ok(struct roar_vio_calls * vio, ...) { 
     1058 return 0; 
     1059} 
     1060 
    10511061int     midi_vio_set_dummy(int stream) { 
    10521062 struct roar_stream_server * ss; 
    … …  
    10651075} 
    10661076 
    1067 int midi_vio_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
    1068  if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 
    1069   return 0; 
    1070  return -1; 
    1071 } 
    1072  
    1073 int     midi_vio_ok(struct roar_vio_calls * vio, ...) { 
    1074  return 0; 
    1075 } 
    1076  
    10771077#endif 
    10781078 

  • roard/sources.c

    r5276 r5278  
    323323  } 
    324324 
    325   if ( roar_vio_lseek(vio, -len, SEEK_CUR) == (off_t)-1 ) { 
     325  if ( roar_vio_lseek(vio, -len, SEEK_CUR) == (roar_off_t)-1 ) { 
    326326   _ret(-1); 
    327327  } 
    … …  
    418418} 
    419419 
    420 static int  sources_radionoise_ctl(struct roar_vio_calls * vio, int cmd, void * data) { 
     420static int  sources_radionoise_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 
    421421 if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 
    422422  return 0; 
Note: See TracChangeset for help on using the changeset viewer.