Commit eb04d272 authored by Stan Seibert's avatar Stan Seibert

More uniform stream info. Now the stream format is identified clearly.

svn path=/trunk/vorbis-tools/; revision=4237
parent 01a472bb
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* * * *
******************************************************************** ********************************************************************
last mod: $Id: flac_format.c,v 1.2 2003/01/12 20:19:22 volsung Exp $ last mod: $Id: flac_format.c,v 1.3 2003/01/14 00:19:05 volsung Exp $
********************************************************************/ ********************************************************************/
...@@ -457,13 +457,18 @@ void print_flac_stream_info (decoder_t *decoder) ...@@ -457,13 +457,18 @@ void print_flac_stream_info (decoder_t *decoder)
if (EasyFLAC__is_oggflac(priv->decoder))
cb->printf_metadata(decoder->callback_arg, 2, cb->printf_metadata(decoder->callback_arg, 2,
_("Audio is %d bits, %d channel, %ldHz"), _("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
priv->bits_per_sample, priv->bits_per_sample,
priv->channels, priv->channels,
priv->rate); priv->rate);
else
cb->printf_metadata(decoder->callback_arg, 2,
_("FLAC stream: %d bits, %d channel, %ld Hz"),
priv->bits_per_sample,
priv->channels,
priv->rate);
} }
void print_flac_comments (FLAC__StreamMetadata_VorbisComment *f_comments, void print_flac_comments (FLAC__StreamMetadata_VorbisComment *f_comments,
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* * * *
******************************************************************** ********************************************************************
last mod: $Id: oggvorbis_format.c,v 1.11 2003/01/12 20:19:22 volsung Exp $ last mod: $Id: oggvorbis_format.c,v 1.12 2003/01/14 00:19:05 volsung Exp $
********************************************************************/ ********************************************************************/
...@@ -298,9 +298,13 @@ void print_vorbis_stream_info (decoder_t *decoder) ...@@ -298,9 +298,13 @@ void print_vorbis_stream_info (decoder_t *decoder)
if (cb == NULL || cb->printf_metadata == NULL) if (cb == NULL || cb->printf_metadata == NULL)
return; return;
cb->printf_metadata(decoder->callback_arg, 2,
_("Ogg Vorbis stream: %d channel, %ld Hz"),
priv->vi->channels,
priv->vi->rate);
cb->printf_metadata(decoder->callback_arg, 3, cb->printf_metadata(decoder->callback_arg, 3,
_("Version is %d"), _("Vorbis format: Version %d"),
priv->vi->version); priv->vi->version);
cb->printf_metadata(decoder->callback_arg, 3, cb->printf_metadata(decoder->callback_arg, 3,
...@@ -310,12 +314,7 @@ void print_vorbis_stream_info (decoder_t *decoder) ...@@ -310,12 +314,7 @@ void print_vorbis_stream_info (decoder_t *decoder)
priv->vi->bitrate_nominal, priv->vi->bitrate_nominal,
priv->vi->bitrate_lower, priv->vi->bitrate_lower,
priv->vi->bitrate_window); priv->vi->bitrate_window);
cb->printf_metadata(decoder->callback_arg, 2,
_("Bitstream is %d channel, %ldHz"),
priv->vi->channels,
priv->vi->rate);
cb->printf_metadata(decoder->callback_arg, 3, cb->printf_metadata(decoder->callback_arg, 3,
_("Encoded by: %s"), priv->vc->vendor); _("Encoded by: %s"), priv->vc->vendor);
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* * * *
******************************************************************** ********************************************************************
last mod: $Id: speex_format.c,v 1.1 2003/01/12 20:19:22 volsung Exp $ last mod: $Id: speex_format.c,v 1.2 2003/01/14 00:19:05 volsung Exp $
********************************************************************/ ********************************************************************/
...@@ -354,15 +354,22 @@ void print_speex_info(SpeexHeader *header, decoder_callbacks_t *cb, ...@@ -354,15 +354,22 @@ void print_speex_info(SpeexHeader *header, decoder_callbacks_t *cb,
int modeID = header->mode; int modeID = header->mode;
if (header->vbr) if (header->vbr)
cb->printf_metadata(callback_arg, 3, cb->printf_metadata(callback_arg, 2,
_("Decoding %d Hz audio using %s mode (VBR)"), _("Ogg Speex stream: %d channel, %d Hz, %s mode (VBR)"),
header->nb_channels,
header->rate, header->rate,
speex_mode_list[modeID]->modeName); speex_mode_list[modeID]->modeName);
else else
cb->printf_metadata(callback_arg, 3, cb->printf_metadata(callback_arg, 2,
_("Decoding %d Hz audio using %s mode"), _("Ogg Speex stream: %d channel, %d Hz, %s mode"),
header->nb_channels,
header->rate, header->rate,
speex_mode_list[modeID]->modeName); speex_mode_list[modeID]->modeName);
cb->printf_metadata(callback_arg, 3,
_("Speex version: %s"),
header->speex_version);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment