Changeset 3589:702473d502ab in roaraudio

Timestamp:

02/28/10 05:37:45 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated driver shout

Files:

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

roard/driver.c

@@ -57 +57 @@
 #ifdef ROAR_HAVE_LIBSHOUT
  {"shout", "libshout streaming", "http://user:pw@host:port/mount.ogg", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM,
-  NULL, driver_shout_close, driver_shout_open_vio},
+  NULL, NULL, driver_shout_open_vio},
 #endif
 #ifdef ROAR_HAVE_LIBSNDIO

roard/driver_shout.c

@@ -43 +43 @@
  shout_t * shout;
 
-/*
- if ( info->codec == ROAR_CODEC_DEFAULT )
-  info->codec = ROAR_CODEC_OGG_VORBIS;
-
- if ( info->codec != ROAR_CODEC_OGG_VORBIS ) {
-  ROAR_ERR("This driver only supports Ogg/Vorbis, current codec is %s", roar_codec2str(info->codec));
-  return -1;
- }
-*/
-
  switch (info->codec) {
   case ROAR_CODEC_DEFAULT:
@@ -64 +54 @@
    break;
   default:
-    ROAR_ERR("This driver only supports Ogg/Vorbis, current codec is %s", roar_codec2str(info->codec));
+    ROAR_ERR("This driver only supports Ogg/* (most common is Ogg/Vorbis), current codec is %s", roar_codec2str(info->codec));
     return -1;
    break;
@@ -211 +201 @@
  inst->inst  = (void*)shout;
  inst->write = driver_shout_write;
+ inst->close = driver_shout_close;
 
  return 0;
 }
 
-int     driver_shout_close(DRIVER_USERDATA_T   inst) {
-
- shout_close((shout_t *)((struct roar_vio_calls *)inst)->inst);
+int     driver_shout_close(struct roar_vio_calls * vio) {
+
+ shout_close((shout_t *)vio->inst);
 
  if ( _driver_shout_usage_counter-- == 1 )

roard/include/driver_shout.h

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