Changeset 3588:182c4557f9f6 in roaraudio

Timestamp:

02/28/10 05:33:46 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated libao driver

Files:

• TODO (modified) (1 diff)
• roard/driver.c (modified) (1 diff)
• roard/driver_ao.c (modified) (1 diff)
• roard/include/driver_ao.h (modified) (1 diff)

TODO

@@ -16 +16 @@
  * (0.3 W/H/-) Get into Debian
  * (0.3 W/N/-) Clean and update libroarpulse
- * (0.3 W/h/-) Cleanup driver: ao, DMX, ESD, Roar, Shout
+ * (0.3 W/h/-) Cleanup driver: DMX, ESD, Roar, Shout
  * (0.3 W/N/-) Implement ALSA support
  * (0.3 W/L/-) Implement support for ICY Meta Data

roard/driver.c

@@ -53 +53 @@
 #ifdef ROAR_HAVE_LIBAO
  { "ao", "libao audio driver", "DRIVER", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM,
-   NULL, driver_ao_close, driver_ao_open_vio},
+   NULL, NULL, driver_ao_open_vio},
 #endif
 #ifdef ROAR_HAVE_LIBSHOUT

roard/driver_ao.c

@@ -109 +109 @@
  inst->inst  = (void*) aodevice;
  inst->write = driver_ao_write;
+ inst->close = driver_ao_close;
 
  return 0;
 }
 
-int driver_ao_close(DRIVER_USERDATA_T   inst) {
+int driver_ao_close(struct roar_vio_calls * vio) {
 
- ao_close((ao_device*)(((struct roar_vio_calls *)inst)->inst));
+ ao_close((ao_device*)vio->inst);
 
  driver_ao_uninit();

roard/include/driver_ao.h

@@ -28 +28 @@
 
 int driver_ao_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream);
-int driver_ao_close(DRIVER_USERDATA_T   inst);
 ssize_t driver_ao_write(struct roar_vio_calls * vio, void *buf, size_t count);
+int driver_ao_close(struct roar_vio_calls * vio);
 
 #endif