aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-03-10 12:04:49 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-03-10 12:04:49 +0100
commitc598ff78dac60b446b42ae23f3128c518b76642a (patch)
tree565098e590d192b478008605be1f6955b1a66dfd /lib/python
parente57f94d8f1156deee0874d24c33c98d600c9af0d (diff)
parente926fbc3973297be694469ce932cb40cea5356c7 (diff)
downloadenigma2-c598ff78dac60b446b42ae23f3128c518b76642a.tar.gz
enigma2-c598ff78dac60b446b42ae23f3128c518b76642a.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index c2590af5..e35f2807 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -103,7 +103,10 @@ eServiceDVD::eServiceDVD(const char *filename):
// create handle
ddvd_set_dvd_path(m_ddvdconfig, filename);
ddvd_set_ac3thru(m_ddvdconfig, 0);
- ddvd_set_language(m_ddvdconfig, "de");
+
+ std::string ddvd_language;
+ if (!ePythonConfigQuery::getConfigValue("config.osd.language", ddvd_language))
+ ddvd_set_language(m_ddvdconfig, (ddvd_language.substr(0,2)).c_str());
int fd = open("/proc/stb/video/aspect", O_RDONLY);
if (fd > -1)