Changeset 958:06746d10d7a9 in roaraudio

Timestamp:

12/08/08 21:24:57 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ported libao driver to new vio interface :)

Location:

roard

Files:

• driver.c (modified) (1 diff)
• driver_ao.c (modified) (4 diffs)
• include/driver_ao.h (modified) (1 diff)

roard/driver.c

@@ -39 +39 @@
 #endif
 #ifdef ROAR_HAVE_LIBAO
- { "ao", "libao audio driver", "DRIVER", driver_ao_open, driver_ao_close, driver_ao_pause, driver_ao_write, driver_ao_read, driver_ao_flush, NULL},
+ { "ao", "libao audio driver", "DRIVER", NULL, driver_ao_close, NULL, NULL, NULL, NULL, driver_ao_open_vio},
 #endif
 #ifdef ROAR_HAVE_LIBSHOUT

roard/driver_ao.c

@@ -26 +26 @@
 #ifdef ROAR_HAVE_LIBAO
 
-int driver_ao_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) {
+int _driver_ao_usage_counter = 0;
+
+void driver_ao_init (void) {
+ if ( _driver_ao_usage_counter++ == 0 )
+  ao_initialize();
+}
+
+void driver_ao_uninit (void) {
+ if ( _driver_ao_usage_counter-- == 1 )
+  ao_shutdown();
+}
+
+int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) {
+//int driver_ao_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) {
  ao_device        * aodevice;
  ao_sample_format     format;
  int driver;
 
- ao_initialize();
+ if ( fh != -1 )
+  return -1;
+
+ driver_ao_init();
 
  if ( device == NULL ) {
@@ -38 +54 @@
   if ( (driver = ao_driver_id(device)) == -1 ) {
    ROAR_ERR("Can not open audio device via libao's driver '%s'", device);
+   driver_ao_uninit();
    return -1;
   }
@@ -51 +68 @@
  if ( aodevice == NULL ) {
   ROAR_ERR("Can not open audio device via libao.");
+  driver_ao_uninit();
   return -1;
  }
 
- *((ao_device**)inst) = aodevice;
+ memset(inst, 0, sizeof(struct roar_vio_calls));
+ inst->inst  = (void*) aodevice;
+ inst->write = driver_ao_write;
 
  return 0;
@@ -61 +81 @@
 int driver_ao_close(DRIVER_USERDATA_T   inst) {
 
- ao_close((ao_device*)inst);
+ ao_close((ao_device*)(((struct roar_vio_calls *)inst)->inst));
 
- ao_shutdown();
+ driver_ao_uninit();
 
- return -1;
+ return 0;
 }
 
-int driver_ao_pause(DRIVER_USERDATA_T   inst, int newstate) {
- return -1;
-}
-
-int driver_ao_write(DRIVER_USERDATA_T   inst, char * buf, int len) {
- return ao_play((ao_device*)inst, buf, len);
-}
-
-int driver_ao_read(DRIVER_USERDATA_T   inst, char * buf, int len) {
- return -1;
-}
-
-int driver_ao_flush(DRIVER_USERDATA_T   inst) {
- return 0;
+ssize_t driver_ao_write(struct roar_vio_calls * vio, void *buf, size_t count) {
+ if ( ao_play((ao_device*)(vio->inst), buf, count) == 0 )
+  return -1;
+ return count;
 }
 

roard/include/driver_ao.h

@@ -26 +26 @@
 #define _DRIVER_AO_H_
 
-int driver_ao_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info);
+int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh);
 int driver_ao_close(DRIVER_USERDATA_T   inst);
-int driver_ao_pause(DRIVER_USERDATA_T   inst, int newstate);
-int driver_ao_write(DRIVER_USERDATA_T   inst, char * buf, int len);
-int driver_ao_read(DRIVER_USERDATA_T   inst, char * buf, int len);
-int driver_ao_flush(DRIVER_USERDATA_T   inst);
+ssize_t driver_ao_write(struct roar_vio_calls * vio, void *buf, size_t count);
 
 #endif