Added an option for DVD/BluRay menu language

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 13aaa3d5bda6f374bbc344c964b585b398db1549..4c6eccf832000960cb08b23cc96c07063be00faf 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -282,9 +282,8 @@ static int Open( vlc_object_t *p_this )
         msg_Warn( p_demux, "cannot set PGC positioning flag" );
     }
 
-    /* Set menu language
-     * XXX A menu-language may be better than sub-language */
-    psz_code = DemuxGetLanguageCode( p_demux, "sub-language" );
+    /* Set menu language */
+    psz_code = DemuxGetLanguageCode( p_demux, "menu-language" );
     if( dvdnav_menu_language_select( p_sys->dvdnav, psz_code ) !=
         DVDNAV_STATUS_OK )
     {

diff --git a/src/input/var.c b/src/input/var.c
index 3e3d1125bdfc88bd2d46aa2ffac5cf03448cae08..6ec28f051db5b990aee0f1ed5fd7fe38ee452a45 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -429,6 +429,8 @@ void input_ConfigVarInit ( input_thread_t *p_input )
                     VLC_VAR_STRING|VLC_VAR_DOINHERIT );
         var_Create( p_input, "sub-language",
                     VLC_VAR_STRING|VLC_VAR_DOINHERIT );
+        var_Create( p_input, "menu-language",
+                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
 
         var_Create( p_input, "audio-track-id",
                     VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 94faf8e41a556c06a6e8431156ddbd88ad0b98cc..691f1e34010534e53ac691d3aea33bc020c290be 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -595,6 +595,11 @@ static const char *const ppsz_clock_descriptions[] =
     "Language of the subtitle track you want to use " \
     "(comma separated, two or three letters country code, you may use 'any' as a fallback).")
 
+#define INPUT_MENUTRACK_LANG_TEXT N_("Menu language")
+#define INPUT_MENUTRACK_LANG_LONGTEXT N_( \
+    "Language of the menus you want to use with DVD/BluRay " \
+    "(comma separated, two or three letters country code, you may use 'any' as a fallback).")
+
 /// \todo Document how to find it
 #define INPUT_AUDIOTRACK_ID_TEXT N_("Audio track ID")
 #define INPUT_AUDIOTRACK_ID_LONGTEXT N_( \
@@ -1688,6 +1693,10 @@ vlc_module_begin ()
                  INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT,
                   false )
         change_safe ()
+    add_string( "menu-language", "",
+                 INPUT_MENUTRACK_LANG_TEXT, INPUT_MENUTRACK_LANG_LONGTEXT,
+                  false )
+        change_safe ()
     add_integer( "audio-track-id", -1, INPUT_AUDIOTRACK_ID_TEXT,
                  INPUT_AUDIOTRACK_ID_LONGTEXT, true )
         change_safe ()