[MPlayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.64,1.65

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv24147

Modified Files:
	demux_ogg.c 
Log Message:
More user-friendly stream, -xid and -slang info output even in non-verbose mode part 2.

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- demux_ogg.c	21 Jan 2005 18:55:01 -0000	1.64
+++ demux_ogg.c	22 Jan 2005 14:28:23 -0000	1.65
@@ -819,7 +819,7 @@
         mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
       ogg_d->subs[ogg_d->num_sub].id = n_audio;
       n_audio++;
-      mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is vorbis\n",ogg_d->num_sub);
+      mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Vorbis), -aid %d\n",ogg_d->num_sub,n_audio-1);
 
       // check for Theora
 #   ifdef HAVE_OGGTHEORA
@@ -859,15 +859,13 @@
 	      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
 	    ogg_d->subs[ogg_d->num_sub].id = n_video;
 	    n_video++;
-	    mp_msg(MSGT_DEMUX,MSGL_V,
-		   "Ogg : stream %d is theora v%i.%i.%i %i:%i, %.3f FPS,"
-		   " aspect %i:%i\n", ogg_d->num_sub,
+	    mp_msg(MSGT_DEMUX,MSGL_INFO,
+		   "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n",
+		   ogg_d->num_sub,
 		   (int)inf.version_major, 
 		   (int)inf.version_minor, 
 		   (int)inf.version_subminor, 
-		   inf.width, inf.height,
-		   sh_v->fps,
-		   inf.aspect_numerator, inf.aspect_denominator);
+		   n_video - 1);
 	    if(verbose>0) print_video_header(sh_v->bih);
 	}
 #   endif /* HAVE_OGGTHEORA */
@@ -881,7 +879,7 @@
 	n_audio++;
 	ogg_d->subs[ogg_d->num_sub].flac = 1;
 	sh_a->wf = NULL;
-	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is FLAC\n",ogg_d->num_sub);
+	mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (FLAC), -aid %d\n",ogg_d->num_sub,n_audio-1);
 #   endif /* HAVE_FLAC */
 
       /// Check for old header