Changeset 2367:bdbcf1c16820 in roaraudio


Ignore:
Timestamp:
08/15/09 03:01:20 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added server stream para to all drivers

Location:
roard
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • roard/driver.c

    r2365 r2367  
    119119    memset(*inst, 0, sizeof(struct roar_vio_calls)); 
    120120 
    121     if ( (i = g_driver[i].vio_init(*inst, device, info, -1)) == -1 ) { 
     121    if ( (i = g_driver[i].vio_init(*inst, device, info, -1, NULL)) == -1 ) { 
    122122     free(*inst); 
    123123     return -1; 
    … …  
    172172 
    173173   ROAR_DBG("driver_openvio(*): Opening VIO driver %s(%i)...", driver, i); 
    174    return g_driver[i].vio_init(calls, device, info, fh); 
     174   return g_driver[i].vio_init(calls, device, info, fh, sstream); 
    175175  } 
    176176 } 
    … …  
    245245 
    246246 
    247 int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     247int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    248248 char * driver; 
    249249 char * delm; 

  • roard/driver_ao.c

    r960 r2367  
    3838} 
    3939 
    40 int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     40int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    4141//int driver_ao_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) { 
    4242 ao_device        * aodevice; 

  • roard/driver_dmx.c

    r1831 r2367  
    2525#include "roard.h" 
    2626 
    27 int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     27int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    2828 
    2929 if ( fh == -1 ) { 

  • roard/driver_esd.c

    r2365 r2367  
    6060} 
    6161 
    62 int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     62int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    6363 
    6464 if ( fh != -1 ) 

  • roard/driver_oss.c

    r1672 r2367  
    329329 
    330330#define er() close(self->fh); if ( self->device ) free(self->device); free(self); return -1 
    331 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     331int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    332332 struct driver_oss * self = NULL; 
    333333 

  • roard/driver_pwmled.c

    r2056 r2367  
    2525#include "roard.h" 
    2626 
    27 int driver_pwmled_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     27int driver_pwmled_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    2828 struct roar_vio_defaults def; 
    2929 struct driver_pwmled * self = malloc(sizeof(struct driver_pwmled)); 

  • roard/driver_raw.c

    r2365 r2367  
    2626 
    2727#ifdef ROAR_HAVE_IO_POSIX 
    28 int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     28int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    2929 
    3030 if ( device == NULL ) { 

  • roard/driver_roar.c

    r2365 r2367  
    2525#include "roard.h" 
    2626 
    27 int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     27int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    2828 
    2929 if ( fh != -1 ) { // this is a connection to a roard, no roar_simple_*() interface avalible for this case 

  • roard/driver_shout.c

    r957 r2367  
    2828int _driver_shout_usage_counter = 0; 
    2929 
    30 int     driver_shout_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     30int     driver_shout_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    3131 char * s_server = NULL; 
    3232 char * s_mount  = NULL; 

  • roard/driver_sndio.c

    r1672 r2367  
    4343 
    4444#define er() if ( self->handle ) sio_close(self->handle); if ( self->device ) free(self->device); free(self); return -1 
    45 int driver_sndio_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     45int driver_sndio_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    4646 struct driver_sndio * self = NULL; 
    4747 

  • roard/driver_sysclock.c

    r2213 r2367  
    2626 
    2727#ifdef ROAR_HAVE_DRIVER_SYSCLOCK 
    28 int driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) { 
     28int driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    2929 struct driver_sysclock * self = malloc(sizeof(struct driver_sysclock)); 
    3030 

  • roard/include/driver.h

    r2365 r2367  
    103103 int (*open )(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info); 
    104104 int (*close)(DRIVER_USERDATA_T   inst); 
    105  int (*vio_init)(struct roar_vio_calls * calls, char * device, struct roar_audio_info * info, int fh); 
     105 int (*vio_init)(struct roar_vio_calls * calls, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    106106}; 
    107107 
    … …  
    125125 
    126126// opening a cdriver 
    127 int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     127int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    128128 
    129129#endif 

  • roard/include/driver_ao.h

    r958 r2367  
    2626#define _DRIVER_AO_H_ 
    2727 
    28 int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     28int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    2929int driver_ao_close(DRIVER_USERDATA_T   inst); 
    3030ssize_t driver_ao_write(struct roar_vio_calls * vio, void *buf, size_t count); 

  • roard/include/driver_dmx.h

    r1828 r2367  
    2626#define _DRIVER_DMX_H_ 
    2727 
    28 int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     28int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    2929ssize_t driver_dmx_write (struct roar_vio_calls * vio,  void *buf, size_t count); 
    3030int     driver_dmx_ctl   (struct roar_vio_calls * vio,  int cmd, void * data); 

  • roard/include/driver_esd.h

    r1656 r2367  
    2727 
    2828int driver_esd_open_sysio(DRIVER_USERDATA_T * inst,   char * device, struct roar_audio_info * info); 
    29 int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     29int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3030int driver_esd_close(DRIVER_USERDATA_T   inst); 
    3131int driver_esd_pause(DRIVER_USERDATA_T   inst, int newstate); 

  • roard/include/driver_oss.h

    r1544 r2367  
    3838}; 
    3939 
    40 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     40int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    4141int driver_oss_close(DRIVER_USERDATA_T   inst); 
    4242int driver_oss_sync(struct roar_vio_calls * vio); 

  • roard/include/driver_pwmled.h

    r1983 r2367  
    3333}; 
    3434 
    35 int driver_pwmled_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     35int driver_pwmled_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3636ssize_t driver_pwmled_write (struct roar_vio_calls * vio,  void *buf, size_t count); 
    3737int     driver_pwmled_ctl   (struct roar_vio_calls * vio,  int cmd, void * data); 

  • roard/include/driver_raw.h

    r947 r2367  
    2626#define _DRIVER_RAW_H_ 
    2727 
    28 int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     28int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    2929int driver_raw_close(DRIVER_USERDATA_T   inst); 
    3030int driver_raw_pause(DRIVER_USERDATA_T   inst, int newstate); 

  • roard/include/driver_roar.h

    r949 r2367  
    2626#define _DRIVER_ROAR_H_ 
    2727 
    28 int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     28int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    2929int driver_roar_close(DRIVER_USERDATA_T   inst); 
    3030int driver_roar_pause(DRIVER_USERDATA_T   inst, int newstate); 

  • roard/include/driver_shout.h

    r950 r2367  
    2626#define _DRIVER_SHOUT_H_ 
    2727 
    28 int     driver_shout_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     28int     driver_shout_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    2929int     driver_shout_close(DRIVER_USERDATA_T   inst); 
    3030ssize_t driver_shout_write(struct roar_vio_calls * vio, void *buf, size_t count); 

  • roard/include/driver_sndio.h

    r1546 r2367  
    3636}; 
    3737 
    38 int     driver_sndio_open         (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     38int     driver_sndio_open         (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3939int     driver_sndio_close_vio    (struct roar_vio_calls * vio); 
    4040int     driver_sndio_open_device  (struct driver_sndio * self); 

  • roard/include/driver_sysclock.h

    r2211 r2367  
    3131}; 
    3232 
    33 int     driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh); 
     33int     driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
    3434int     driver_sysclock_close   (struct roar_vio_calls * vio); 
    3535ssize_t driver_sysclock_write   (struct roar_vio_calls * vio, void *buf, size_t count); 
Note: See TracChangeset for help on using the changeset viewer.