diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-12-03 11:03:46 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-12-03 11:03:46 +0100 |
| commit | 25e47fc733db4df71494b761184961941778c72f (patch) | |
| tree | 5ab8bce094cd913218d0b1a53f1c04c57467354d | |
| parent | 8fc5d7baef1551cf9b8219d538c77ed4cf0b9392 (diff) | |
| parent | 91e6234a82c8dda473c0112e99e151e3c324d786 (diff) | |
| download | enigma2-25e47fc733db4df71494b761184961941778c72f.tar.gz enigma2-25e47fc733db4df71494b761184961941778c72f.zip | |
Merge branch 'acid-burn/bug_439_dvdplayer_missing_titlestring' into experimental
| -rwxr-xr-x | lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 2 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index ddfe1989..7f330ebe 100755 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -43,7 +43,7 @@ class FileBrowser(Screen): currDir = None inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/home", "/lib", "/proc", "/sbin", "/share", "/sys", "/tmp", "/usr", "/var"] - self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True) + self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso|img)", useServiceRef = True) self["filelist"] = self.filelist self["FilelistActions"] = ActionMap(["SetupActions"], diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index 4ef00ab0..5fbfb0aa 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -32,6 +32,7 @@ eServiceFactoryDVD::eServiceFactoryDVD() { std::list<std::string> extensions; extensions.push_back("iso"); + extensions.push_back("img"); sc->addServiceFactory(eServiceFactoryDVD::id, this, extensions); } } |