From e59095b11a85cd3961ce83d763e70b12c24a2108 Mon Sep 17 00:00:00 2001 From: Karl Heyes Date: Fri, 17 Dec 2004 21:05:20 +0000 Subject: [PATCH] make vorbis specific stat names consistent with the existing ones, and make sure if unknown ogg codecs are sent then it is logged svn path=/icecast/trunk/icecast/; revision=8480 --- src/format_ogg.c | 2 +- src/format_vorbis.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/format_ogg.c b/src/format_ogg.c index b0cfaf75..bc950c5b 100644 --- a/src/format_ogg.c +++ b/src/format_ogg.c @@ -216,7 +216,7 @@ static int process_initial_page (format_plugin_t *plugin, ogg_page *page) break; #endif /* any others */ - INFO0 ("Seen BOS page with unknown type"); + ERROR0 ("Seen BOS page with unknown type"); return -1; } while (0); diff --git a/src/format_vorbis.c b/src/format_vorbis.c index ff381572..b1df07d8 100644 --- a/src/format_vorbis.c +++ b/src/format_vorbis.c @@ -82,9 +82,9 @@ static void vorbis_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec) 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 @@ static refbuf_t *process_vorbis_page (ogg_state_t *ogg_info, 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;