[xiph-cvs] cvs commit: icecast/src format.c fserve.c

[Michael Smith]

msmith      03/02/11 07:18:23

  Modified:    src      format.c fserve.c
  Log:
  Now that it's been completely officially assigned, use application/ogg instead
  of application/x-ogg

Revision  Changes    Path
1.14      +4 -2      icecast/src/format.c

Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- format.c	18 Jan 2003 12:30:29 -0000	1.13
+++ format.c	11 Feb 2003 12:18:22 -0000	1.14
@@ -29,7 +29,9 @@
 format_type_t format_get_type(char *contenttype)
 {
     if(strcmp(contenttype, "application/x-ogg") == 0)
-        return FORMAT_TYPE_VORBIS;
+        return FORMAT_TYPE_VORBIS; /* Backwards compatibility */
+    else if(strcmp(contenttype, "application/ogg") == 0)
+        return FORMAT_TYPE_VORBIS; /* Now blessed by IANA */
     else if(strcmp(contenttype, "audio/mpeg") == 0)
         return FORMAT_TYPE_MP3; 
     else
@@ -40,7 +42,7 @@
 {
     switch(type) {
         case FORMAT_TYPE_VORBIS:
-            return "application/x-ogg";
+            return "application/ogg";
             break;
         case FORMAT_TYPE_MP3:
             return "audio/mpeg";

<p><p>1.10      +1 -1      icecast/src/fserve.c

Index: fserve.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/fserve.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fserve.c	6 Feb 2003 13:10:48 -0000	1.9
+++ fserve.c	11 Feb 2003 12:18:22 -0000	1.10
@@ -315,7 +315,7 @@
     else {
         /* Fallbacks for a few basic ones */
         if(!strcmp(ext, "ogg"))
-            return "application/x-ogg";
+            return "application/ogg";
         else if(!strcmp(ext, "mp3"))
             return "audio/mpeg";
         else if(!strcmp(ext, "html"))

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.