Changeset 3593:81af1674e14f in roaraudio

Timestamp:

02/28/10 06:05:21 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done cleanup for roar driver

Files:

• TODO (modified) (1 diff)
• roard/driver.c (modified) (1 diff)
• roard/driver_roar.c (modified) (2 diffs)
• roard/include/driver_roar.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: DMX, Roar
  * (0.3 W/N/-) Implement ALSA support
  * (0.3 W/L/-) Implement support for ICY Meta Data

roard/driver.c

@@ -35 +35 @@
  { "roar", "RoarAudio driver", "localhost, remote.host.dom", DRV_FLAG_NONE,
    ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_COMPLEX,
-   NULL, driver_roar_close, driver_roar_open_vio},
+   NULL, NULL, driver_roar_open_vio},
 #ifdef ROAR_HAVE_IO_POSIX
  { "raw",  "RAW driver", "/some/file", DRV_FLAG_FHSEC,

roard/driver_roar.c

@@ -2 +2 @@
 
 /*
- *      Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008
+ *      Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008-2010
  *
  *  This file is part of roard a part of RoarAudio,
@@ -46 +46 @@
  }
 
- if ( (fh = roar_simple_stream(info->rate, info->channels, info->bits, info->codec, device, dir, "roard")) == -1 ) {
+ if ( roar_vio_simple_stream(inst, info->rate, info->channels, info->bits, info->codec, device, dir, "roard") == -1 ) {
   return -1;
  }
-
- roar_vio_set_fh(inst, fh);
 
  return 0;
 }
 
-int driver_roar_close(DRIVER_USERDATA_T   inst) {
- return roar_simple_close(roar_vio_get_fh((struct roar_vio_calls *)inst));
-}
-
 //ll

roard/include/driver_roar.h

@@ -28 +28 @@
 
 int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream);
-int driver_roar_close(DRIVER_USERDATA_T   inst);
-int driver_roar_pause(DRIVER_USERDATA_T   inst, int newstate);
-int driver_roar_flush(DRIVER_USERDATA_T   inst);
 
 #endif