Changeset 5278:b3e0dd3f3141 in roaraudio for roard/include


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/include
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • 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 
Note: See TracChangeset for help on using the changeset viewer.