From 579da0e777130e0947e7e4cacad19cc4a154d978 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Thu, 25 Nov 2010 18:40:21 +0100 Subject: DVDPlayer/src/servicedvd.cpp: add possibility to override servicename for played dvd's. DVDPlayer/plugin.py: manually set servicename if playing from a dvd structure on hdd/networkmount. Small useability improvements. refs #439 --- lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp') diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index 2ba53927..4ef00ab0 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -480,7 +480,10 @@ RESULT eServiceDVD::getName(std::string &name) if ( m_ddvd_titlestring[0] != '\0' ) name = m_ddvd_titlestring; else - name = m_ref.path; + if ( !m_ref.name.empty() ) + name = m_ref.name; + else + name = m_ref.path; return 0; } -- cgit v1.2.3 From 91e6234a82c8dda473c0112e99e151e3c324d786 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 3 Dec 2010 11:01:58 +0100 Subject: Extensions/DVDPlayer: add ".img" file extension to playable dvd formats. refs #439 --- lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 2 +- lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp') diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 063925e2..e1ab3ef4 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 extensions; extensions.push_back("iso"); + extensions.push_back("img"); sc->addServiceFactory(eServiceFactoryDVD::id, this, extensions); } } -- cgit v1.2.3