Changeset 957:96860770977c in roaraudio for roard/driver_shout.c

Timestamp:

12/08/08 20:44:07 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved codec check

File:

• roard/driver_shout.c (modified) (2 diffs)

roard/driver_shout.c

@@ -42 +42 @@
  shout_t * shout;
 
+/*
  if ( info->codec == ROAR_CODEC_DEFAULT )
   info->codec = ROAR_CODEC_OGG_VORBIS;
@@ -48 +49 @@
   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:
+    info->codec = ROAR_CODEC_OGG_VORBIS;
+   break;
+  case ROAR_CODEC_OGG_VORBIS:
+  case ROAR_CODEC_OGG_SPEEX:
+  case ROAR_CODEC_OGG_FLAC:
+  case ROAR_CODEC_OGG_GENERAL:
+    // ok, no errors here
+   break;
+  default:
+    ROAR_ERR("This driver only supports Ogg/Vorbis, current codec is %s", roar_codec2str(info->codec));
+    return -1;
+   break;
  }