diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-02 16:00:05 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-02 16:00:05 +0100 |
| commit | f3a30a79a5dda5f33a9241de575bbf9fa66b4170 (patch) | |
| tree | 27ab064722ed11419a44f0518578140f8bd1e33d /lib | |
| parent | e5d1c5ed0eab9fd038ecde67a16a79dd1ba50f41 (diff) | |
| parent | 597d64c2e00be8759286e37fd15823b1c1518845 (diff) | |
| download | enigma2-f3a30a79a5dda5f33a9241de575bbf9fa66b4170.tar.gz enigma2-f3a30a79a5dda5f33a9241de575bbf9fa66b4170.zip | |
Merge branch '2_5_to_2_6_bug_107'2.6.0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Components/NimManager.py | 2 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 | ||||
| -rw-r--r-- | lib/service/servicemp3.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 70cde47c..5154e2b0 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -939,7 +939,7 @@ def InitNimManager(nimmgr): lnb_choices = { "universal_lnb": _("Universal LNB"), - "unicable": _("Unicable"), +# "unicable": _("Unicable"), "c_band": _("C-Band"), "user_defined": _("User defined")} diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 596f2d5a..0e3bdf02 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # 'None' is magic to start at the list of mountpoints defaultDir = config.mediaplayer.defaultDir.getValue() - self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 7f87ffad..e1bf23dd 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -42,7 +42,6 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("mp4"); extensions.push_back("mov"); extensions.push_back("m4a"); - extensions.push_back("m2ts"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } |