[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.115,1.116 mplayer.c,1.352,1.353

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv18055

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
-alang/-slang options (audio/sub selection by language code)

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- cfg-mplayer.h	23 Dec 2001 01:34:10 -0000	1.115
+++ cfg-mplayer.h	26 Dec 2001 00:16:59 -0000	1.116
@@ -235,6 +235,11 @@
 	{"lircconf", &lirc_configfile, CONF_TYPE_STRING, 0, 0, 0}, 
 #endif
 
+#ifdef USE_DVDREAD
+	{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0},
+	{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0},
+#endif
+
 	{"gui", &use_gui, CONF_TYPE_FLAG, 0, 0, 1},
 	{"nogui", &use_gui, CONF_TYPE_FLAG, 0, 1, 0},
       

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- mplayer.c	25 Dec 2001 21:59:07 -0000	1.352
+++ mplayer.c	26 Dec 2001 00:16:59 -0000	1.353
@@ -189,6 +189,8 @@
 int audio_id=-1;
 int video_id=-1;
 int dvdsub_id=-1;
+char* audio_lang=NULL;
+char* dvdsub_lang=NULL;
 static int vcd_track=0;
 
 // cache2:
@@ -851,8 +853,11 @@
   exit_player(MSGTR_Exit_eof);
 }
 
-
 #ifdef USE_DVDREAD
+  current_module="dvd lang->id";
+  if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
+  if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
+
   current_module="spudec";
   vo_spudec=spudec_new(stream->priv);
   if (vo_spudec!=NULL)