[Mplayer-cvslog] CVS: main mencoder.c,1.107,1.108 cfg-common.h,1.34,1.35 cfg-mplayer.h,1.141,1.142

[Arpi of Ize]

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

Modified Files:
	mencoder.c cfg-common.h cfg-mplayer.h 
Log Message:
-alang/-slang support in mencoder too

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mencoder.c	29 Mar 2002 15:12:41 -0000	1.107
+++ mencoder.c	31 Mar 2002 22:01:54 -0000	1.108
@@ -124,6 +124,8 @@
 int video_id=-1;
 int dvdsub_id=-1;
 int vobsub_id=-1;
+char* audio_lang=NULL;
+char* dvdsub_lang=NULL;
 static char* spudec_ifo=NULL;
 
 static int has_audio=1;
@@ -605,6 +607,15 @@
   }
 
   printf("success: format: %d  data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
+
+#ifdef USE_DVDREAD
+if(stream->type==STREAMTYPE_DVD){
+  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=NULL;
+}
+#endif
 
   if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0);
 

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cfg-common.h	29 Mar 2002 03:17:57 -0000	1.34
+++ cfg-common.h	31 Mar 2002 22:01:54 -0000	1.35
@@ -21,6 +21,8 @@
 	{"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
 	{"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
 	{"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
+	{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
 	{"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- cfg-mplayer.h	24 Mar 2002 14:15:24 -0000	1.141
+++ cfg-mplayer.h	31 Mar 2002 22:01:54 -0000	1.142
@@ -281,11 +281,6 @@
 	{"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, 
 #endif
 
-#ifdef USE_DVDREAD
-	{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#endif
-
 	{"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
 	{"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},