[xiph-cvs] cvs commit: vorbis-tools/ogg123 flac_format.c oggvorbis_format.c speex_format.c

[Stan Seibert]

volsung     03/01/13 19:19:05

  Modified:    ogg123   flac_format.c oggvorbis_format.c speex_format.c
  Log:
  More uniform stream info.  Now the stream format is identified clearly.

Revision  Changes    Path
1.3       +13 -8     vorbis-tools/ogg123/flac_format.c

Index: flac_format.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/flac_format.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flac_format.c	12 Jan 2003 20:19:22 -0000	1.2
+++ flac_format.c	14 Jan 2003 00:19:05 -0000	1.3
@@ -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 @@
     
 
   
-
-  cb->printf_metadata(decoder->callback_arg, 2,
-		      _("Audio is %d bits, %d channel, %ldHz"),
-		      priv->bits_per_sample,
-		      priv->channels,
-		      priv->rate);
-  
+  if (EasyFLAC__is_oggflac(priv->decoder))
+    cb->printf_metadata(decoder->callback_arg, 2,
+			_("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
+			priv->bits_per_sample,
+			priv->channels,
+			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,

<p><p>1.12      +7 -8      vorbis-tools/ogg123/oggvorbis_format.c

Index: oggvorbis_format.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/oggvorbis_format.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- oggvorbis_format.c	12 Jan 2003 20:19:22 -0000	1.11
+++ oggvorbis_format.c	14 Jan 2003 00:19:05 -0000	1.12
@@ -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 @@
   if (cb == NULL || cb->printf_metadata == NULL)
     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,
-		      _("Version is %d"), 
+		      _("Vorbis format: Version %d"), 
                       priv->vi->version);
   
   cb->printf_metadata(decoder->callback_arg, 3,
@@ -310,12 +314,7 @@
                       priv->vi->bitrate_nominal,
                       priv->vi->bitrate_lower,
                       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,
                       _("Encoded by: %s"), priv->vc->vendor);
 }

<p><p>1.2       +12 -5     vorbis-tools/ogg123/speex_format.c

Index: speex_format.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/speex_format.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- speex_format.c	12 Jan 2003 20:19:22 -0000	1.1
+++ speex_format.c	14 Jan 2003 00:19:05 -0000	1.2
@@ -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 @@
   int modeID = header->mode;
 
   if (header->vbr)
-    cb->printf_metadata(callback_arg, 3, 
-			_("Decoding %d Hz audio using %s mode (VBR)"),
+    cb->printf_metadata(callback_arg, 2, 
+			_("Ogg Speex stream: %d channel, %d Hz, %s mode (VBR)"),
+			header->nb_channels,
                         header->rate,
                         speex_mode_list[modeID]->modeName);
   else
-    cb->printf_metadata(callback_arg, 3,
-			_("Decoding %d Hz audio using %s mode"),
+    cb->printf_metadata(callback_arg, 2,
+			_("Ogg Speex stream: %d channel, %d Hz, %s mode"),
+			header->nb_channels,
                         header->rate,
                         speex_mode_list[modeID]->modeName);
+
+  cb->printf_metadata(callback_arg, 3, 
+		      _("Speex version: %s"),
+		      header->speex_version);
+
 }
 
 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.