[xiph-commits] r8479 - icecast/trunk/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-12-17 12:03:26 -0800 (Fri, 17 Dec 2004)
New Revision: 8479

Modified:
   icecast/trunk/icecast/src/format_ogg.c
   icecast/trunk/icecast/src/yp.c
Log:
make recent YP updates follow agreed spec


Modified: icecast/trunk/icecast/src/format_ogg.c
===================================================================
--- icecast/trunk/icecast/src/format_ogg.c	2004-12-17 19:39:53 UTC (rev 8478)
+++ icecast/trunk/icecast/src/format_ogg.c	2004-12-17 20:03:26 UTC (rev 8479)
@@ -285,7 +285,7 @@
             int len = strlen (codec_names);
             int remaining = sizeof (codec_names) - len;
             char *where = codec_names + len;
-            char *separator = " ";
+            char *separator = "/";
             if (len == 0)
                 separator = "";
             snprintf (where, remaining, "%s%s", separator, codec->name);

Modified: icecast/trunk/icecast/src/yp.c
===================================================================
--- icecast/trunk/icecast/src/yp.c	2004-12-17 19:39:53 UTC (rev 8478)
+++ icecast/trunk/icecast/src/yp.c	2004-12-17 20:03:26 UTC (rev 8479)
@@ -401,11 +401,18 @@
         free (max_listeners);
         max_listeners = (char *)stats_get_value (NULL, "client_limit");
     }
+    val = stats_get_value (yp->mount, "subtype");
+    if (val)
+    {
+        add_yp_info (yp, "subtype", val, YP_SUBTYPE);
+        free (val);
+    }
 
     ret = snprintf (s, len, "action=touch&sid=%s&st=%s"
-            "&listeners=%u&max_listeners=%s\r\n",
-            yp->sid, yp->current_song, listeners, max_listeners);
+            "&listeners=%u&max_listeners=%s&stype=%s\r\n",
+            yp->sid, yp->current_song, listeners, max_listeners, yp->subtype);
 
+    free (max_listeners);
     if (ret >= (signed)len)
         return ret+1; /* space required for above text and nul*/