[xiph-commits] r8482 - icecast/branches/kh/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-12-17 16:27:14 -0800 (Fri, 17 Dec 2004)
New Revision: 8482

Modified:
   icecast/branches/kh/icecast/src/cfgfile.h
   icecast/branches/kh/icecast/src/connection.c
   icecast/branches/kh/icecast/src/format_ogg.c
   icecast/branches/kh/icecast/src/format_vorbis.c
   icecast/branches/kh/icecast/src/yp.c
Log:
sync up trunk


Modified: icecast/branches/kh/icecast/src/cfgfile.h
===================================================================
--- icecast/branches/kh/icecast/src/cfgfile.h	2004-12-18 00:11:56 UTC (rev 8481)
+++ icecast/branches/kh/icecast/src/cfgfile.h	2004-12-18 00:27:14 UTC (rev 8482)
@@ -24,7 +24,6 @@
 #include "thread/thread.h"
 #include "avl/avl.h"
 #include "global.h"
-#include "slave.h"
 
 typedef struct ice_config_dir_tag
 {

Modified: icecast/branches/kh/icecast/src/connection.c
===================================================================
--- icecast/branches/kh/icecast/src/connection.c	2004-12-18 00:11:56 UTC (rev 8481)
+++ icecast/branches/kh/icecast/src/connection.c	2004-12-18 00:27:14 UTC (rev 8482)
@@ -50,7 +50,6 @@
 #include "refbuf.h"
 #include "client.h"
 #include "stats.h"
-#include "auth.h"
 #include "logging.h"
 #include "xslt.h"
 #include "fserve.h"
@@ -62,6 +61,7 @@
 #include "format_mp3.h"
 #include "event.h"
 #include "admin.h"
+#include "auth.h"
 
 #define CATMODULE "connection"
 

Modified: icecast/branches/kh/icecast/src/format_ogg.c
===================================================================
--- icecast/branches/kh/icecast/src/format_ogg.c	2004-12-18 00:11:56 UTC (rev 8481)
+++ icecast/branches/kh/icecast/src/format_ogg.c	2004-12-18 00:27:14 UTC (rev 8482)
@@ -221,7 +221,7 @@
             break;
 #endif
         /* any others */
-        INFO0 ("Seen BOS page with unknown type");
+        ERROR0 ("Seen BOS page with unknown type");
         return -1;
     } while (0);
 
@@ -290,7 +290,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/branches/kh/icecast/src/format_vorbis.c
===================================================================
--- icecast/branches/kh/icecast/src/format_vorbis.c	2004-12-18 00:11:56 UTC (rev 8481)
+++ icecast/branches/kh/icecast/src/format_vorbis.c	2004-12-18 00:27:14 UTC (rev 8482)
@@ -82,9 +82,9 @@
     vorbis_codec_t *vorbis = codec->specific;
 
     DEBUG0 ("freeing vorbis codec");
-    stats_event (ogg_info->mount, "audio-bitrate", NULL);
-    stats_event (ogg_info->mount, "audio-channels", NULL);
-    stats_event (ogg_info->mount, "audio-samplerate", NULL);
+    stats_event (ogg_info->mount, "audio_bitrate", NULL);
+    stats_event (ogg_info->mount, "audio_channels", NULL);
+    stats_event (ogg_info->mount, "audio_samplerate", NULL);
     vorbis_info_clear (&vorbis->vi);
     vorbis_comment_clear (&vorbis->vc);
     ogg_stream_clear (&codec->os);
@@ -546,9 +546,9 @@
         ogg_info->artist = NULL;
     ogg_info->log_metadata = 1;
 
-    stats_event_args (ogg_info->mount, "audio-samplerate", "%ld", (long)source_vorbis->vi.rate);
-    stats_event_args (ogg_info->mount, "audio-channels", "%ld", (long)source_vorbis->vi.channels);
-    stats_event_args (ogg_info->mount, "audio-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal);
+    stats_event_args (ogg_info->mount, "audio_samplerate", "%ld", (long)source_vorbis->vi.rate);
+    stats_event_args (ogg_info->mount, "audio_channels", "%ld", (long)source_vorbis->vi.channels);
+    stats_event_args (ogg_info->mount, "audio_bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal);
     stats_event_args (ogg_info->mount, "ice-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal/1000);
 
     return NULL;

Modified: icecast/branches/kh/icecast/src/yp.c
===================================================================
--- icecast/branches/kh/icecast/src/yp.c	2004-12-18 00:11:56 UTC (rev 8481)
+++ icecast/branches/kh/icecast/src/yp.c	2004-12-18 00:27:14 UTC (rev 8482)
@@ -411,11 +411,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*/
 
@@ -497,7 +504,6 @@
         yp->server_name = strdup ("");
         yp->server_desc = strdup ("");
         yp->server_genre = strdup ("");
-        yp->server_desc = strdup ("");
         yp->server_type = strdup ("");
         yp->cluster_password = strdup ("");
         yp->url = strdup ("");