Changeset 4602:2098c7acb874 in roaraudio

Timestamp:

11/14/10 13:18:04 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Use libroar's MIME Type lookup functions (Closes: #56)

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roarmonhttp.c (modified) (1 diff)

ChangeLog

@@ -5 +5 @@
         * Added Base64 support.
         * Added codecfilter for FLAC (read-only, native FLAC).
+        * Use libroar's MIME Type lookup functions (Closes: #56)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

roarclients/roarmonhttp.c

@@ -50 +50 @@
 
 void print_header (int codec, int rate, int channels) {
- char * mime = "application/octet-stream";
-
- switch (codec) {
-  case ROAR_CODEC_OGG:
-  case ROAR_CODEC_OGG_GENERAL:
-  case ROAR_CODEC_OGG_VORBIS:
-    mime = "application/ogg";
-   break;
-  case ROAR_CODEC_OGG_SPEEX:
-    mime = "audio/ogg; codecs=speex";
-   break;
-  case ROAR_CODEC_OGG_FLAC:
-    mime = "audio/ogg; codecs=flac";
-   break;
-  case ROAR_CODEC_OGG_CELT:
-    mime = "audio/ogg; codecs=celt";
-   break;
-  case ROAR_CODEC_FLAC:
-    mime = "audio/x-flac";
-   break;
-  case ROAR_CODEC_RIFF_WAVE:
-    mime = "audio/x-wav";
-   break;
-  case ROAR_CODEC_AU:
-    mime = "audio/basic";
-   break;
-  case ROAR_CODEC_AIFF:
-    mime = "audio/aiff";
-   break;
- }
+ const char * mime;
+
+ mime = roar_codec2mime(codec);
+
+ if ( mime == NULL )
+  mime = "application/octet-stream";
 
  printf("Content-type: %s\r\n", mime);