[MPlayer-cvslog] CVS: main mencoder.c, 1.257, 1.258 mp_msg.h, 1.31, 1.32 mplayer.c, 1.813, 1.814 vobsub.c, 1.38, 1.39

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

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

Modified Files:
	mencoder.c mp_msg.h mplayer.c vobsub.c 
Log Message:
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches at en-directo.net>

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- mencoder.c	15 Nov 2004 09:09:27 -0000	1.257
+++ mencoder.c	25 Nov 2004 22:23:59 -0000	1.258
@@ -143,6 +143,7 @@
 //void resync_audio_stream(sh_audio_t *sh_audio){}
 
 int verbose=0; // must be global!
+int identify=0;
 int quiet=0;
 double video_time_usage=0;
 double vout_time_usage=0;

Index: mp_msg.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mp_msg.h	17 Sep 2004 12:16:42 -0000	1.31
+++ mp_msg.h	25 Nov 2004 22:23:59 -0000	1.32
@@ -2,7 +2,9 @@
 #ifndef _MP_MSG_H
 #define _MP_MSG_H
 
-extern int verbose; // defined in mplayer.c
+// defined in mplayer.c and mencoder.c
+extern int verbose;
+extern int identify;
 
 // verbosity elevel:
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- mplayer.c	20 Nov 2004 10:51:13 -0000	1.813
+++ mplayer.c	25 Nov 2004 22:23:59 -0000	1.814
@@ -760,6 +760,11 @@
         mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename);
     if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return;
     set_of_subtitles[set_of_sub_size] = subd;
+    if (identify)
+    {
+      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size);
+      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename);
+    }
     ++set_of_sub_size;
     mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
 }

Index: vobsub.c
===================================================================
RCS file: /cvsroot/mplayer/main/vobsub.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- vobsub.c	1 Jan 2004 11:01:09 -0000	1.38
+++ vobsub.c	25 Nov 2004 22:23:59 -0000	1.39
@@ -656,6 +656,12 @@
 	memcpy(vob->spu_streams[index].id, id, idlen);
     }
     vob->spu_streams_current = index;
+    if (identify)
+    {
+	mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VOBSUB_ID=%d\n", index);
+	if (id && idlen)
+	    mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id);
+    }
     mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n",
 		index, vob->spu_streams[index].id);
     return 0;