Changeset 1915:559d6db65d5d in roaraudio
- Timestamp:
- 05/27/09 17:06:27 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/driver.c
r1827 r1915 26 26 27 27 struct roar_driver g_driver[] = { 28 { "null", "null audio driver", "/dev/null", NULL, NULL, NULL, NULL, NULL, NULL, NULL},28 { "null", "null audio driver", "/dev/null", DRV_FLAG_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, 29 29 #ifdef ROAR_HAVE_ESD 30 { "esd", "EsounD audio driver", "localhost, remote.host.dom", NULL, driver_esd_close, driver_esd_pause, NULL, NULL, driver_esd_flush, driver_esd_open_vio}, 31 #endif 32 { "roar", "RoarAudio driver", "localhost, remote.host.dom", NULL, driver_roar_close, NULL, NULL, NULL, driver_roar_flush, driver_roar_open_vio}, 30 { "esd", "EsounD audio driver", "localhost, remote.host.dom", DRV_FLAG_NONE, 31 NULL, driver_esd_close, driver_esd_pause, NULL, NULL, driver_esd_flush, driver_esd_open_vio}, 32 #endif 33 { "roar", "RoarAudio driver", "localhost, remote.host.dom", DRV_FLAG_NONE, 34 NULL, driver_roar_close, NULL, NULL, NULL, driver_roar_flush, driver_roar_open_vio}, 33 35 #ifdef ROAR_HAVE_IO_POSIX 34 { "raw", "RAW PCM driver", "/some/file", NULL, NULL, NULL, NULL, NULL, driver_raw_flush, driver_raw_open_vio}, 36 { "raw", "RAW PCM driver", "/some/file", DRV_FLAG_FHSEC, 37 NULL, NULL, NULL, NULL, NULL, driver_raw_flush, driver_raw_open_vio}, 35 38 #endif 36 39 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS) … … 38 41 #define ROAR_DEFAULT_OSS_DEV "no default device" 39 42 #endif 40 { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, NULL, NULL, NULL, NULL, NULL, NULL, driver_oss_open}, 43 { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, DRV_FLAG_NONE, 44 NULL, NULL, NULL, NULL, NULL, NULL, driver_oss_open}, 41 45 #endif 42 46 #ifdef ROAR_HAVE_LIBAO 43 { "ao", "libao audio driver", "DRIVER", NULL, driver_ao_close, NULL, NULL, NULL, NULL, driver_ao_open_vio}, 47 { "ao", "libao audio driver", "DRIVER", DRV_FLAG_NONE, 48 NULL, driver_ao_close, NULL, NULL, NULL, NULL, driver_ao_open_vio}, 44 49 #endif 45 50 #ifdef ROAR_HAVE_LIBSHOUT 46 {"shout", "libshout streaming", "http://user:pw@host:port/mount.ogg", NULL, driver_shout_close, NULL, NULL, NULL, NULL, driver_shout_open_vio}, 51 {"shout", "libshout streaming", "http://user:pw@host:port/mount.ogg", DRV_FLAG_NONE, 52 NULL, driver_shout_close, NULL, NULL, NULL, NULL, driver_shout_open_vio}, 47 53 #endif 48 54 #ifdef ROAR_HAVE_LIBSNDIO 49 {"sndio", "OpenBSD sndio", "/dev/audio, /tmp/aucat-<uid>/default", NULL, NULL, NULL, NULL, NULL, NULL, driver_sndio_open}, 50 #endif 51 {"dmx", "DMX512 driver", "/dev/dmx", NULL, NULL, NULL, NULL, NULL, NULL, driver_dmx_open_vio}, 52 {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list 55 {"sndio", "OpenBSD sndio", "/dev/audio, /tmp/aucat-<uid>/default", DRV_FLAG_NONE, 56 NULL, NULL, NULL, NULL, NULL, NULL, driver_sndio_open}, 57 #endif 58 {"dmx", "DMX512 driver", "/dev/dmx", DRV_FLAG_NONE, 59 NULL, NULL, NULL, NULL, NULL, NULL, driver_dmx_open_vio}, 60 {NULL, NULL, NULL, DRV_FLAG_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list 53 61 }; 54 62 … … 56 64 int i; 57 65 58 printf(" Driver Type- Description (devices)\n");66 printf(" Driver Flag - Description (devices)\n"); 59 67 printf("------------------------------------------------------\n"); 60 68 61 69 for (i = 0; g_driver[i].name != NULL; i++) { 62 printf(" %-8s %c%c - %s (devices: %s)\n", g_driver[i].name, 70 printf(" %-7s %c%c%c - %s (devices: %s)\n", g_driver[i].name, 71 g_driver[i].flags & DRV_FLAG_FHSEC ? 's' : ' ', 63 72 g_driver[i].open != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ', 64 73 g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ', -
roard/include/driver.h
r1824 r1915 84 84 #endif 85 85 86 #define DRV_FLAG_NONE 0x00 87 #define DRV_FLAG_FHSEC 0x01 88 86 89 struct roar_driver { 87 90 char * name; 88 91 char * desc; 89 92 char * devices; 93 unsigned int flags; 90 94 int (*open )(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info); 91 95 int (*close)(DRIVER_USERDATA_T inst);
Note: See TracChangeset
for help on using the changeset viewer.