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

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-12-17 13:05:20 -0800 (Fri, 17 Dec 2004)
New Revision: 8480

Modified:
   icecast/trunk/icecast/src/format_ogg.c
   icecast/trunk/icecast/src/format_vorbis.c
Log:
make vorbis specific stat names consistent with the existing ones, and make
sure if unknown ogg codecs are sent then it is logged


Modified: icecast/trunk/icecast/src/format_ogg.c
===================================================================
--- icecast/trunk/icecast/src/format_ogg.c	2004-12-17 20:03:26 UTC (rev 8479)
+++ icecast/trunk/icecast/src/format_ogg.c	2004-12-17 21:05:20 UTC (rev 8480)
@@ -216,7 +216,7 @@
             break;
 #endif
         /* any others */
-        INFO0 ("Seen BOS page with unknown type");
+        ERROR0 ("Seen BOS page with unknown type");
         return -1;
     } while (0);
 

Modified: icecast/trunk/icecast/src/format_vorbis.c
===================================================================
--- icecast/trunk/icecast/src/format_vorbis.c	2004-12-17 20:03:26 UTC (rev 8479)
+++ icecast/trunk/icecast/src/format_vorbis.c	2004-12-17 21:05:20 UTC (rev 8480)
@@ -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;