diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-23 00:06:27 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-23 00:06:27 +0000 |
| commit | 08fca93e7f2a37a452399d08c5c84b969b7e52af (patch) | |
| tree | e947a919972cdd6ad072c196640a643c6c9f7fff /lib/python/Plugins | |
| parent | 371447724a1e150c37a777e58a4725a3d2561c01 (diff) | |
| download | enigma2-08fca93e7f2a37a452399d08c5c84b969b7e52af.tar.gz enigma2-08fca93e7f2a37a452399d08c5c84b969b7e52af.zip | |
- switchtimer added to RecordingTimer
- media player to play mp3, ogg (not yet fully working) and ts files (needs gstreamer)
- language selection saves a language string instead of a changing index number
Diffstat (limited to 'lib/python/Plugins')
| -rw-r--r-- | lib/python/Plugins/Extensions/FileManager/plugin.py | 10 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/python/Plugins/Extensions/FileManager/plugin.py b/lib/python/Plugins/Extensions/FileManager/plugin.py index a17e631c..e9dccbd6 100644 --- a/lib/python/Plugins/Extensions/FileManager/plugin.py +++ b/lib/python/Plugins/Extensions/FileManager/plugin.py @@ -22,7 +22,7 @@ class FileManager(Screen): self.skin = FileManager.skin Screen.__init__(self, session) - self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3|mpeg|ts)") + self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3|mpeg|ts)", useServiceRef = True) self["pixmap"] = Pixmap() #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER) @@ -52,11 +52,11 @@ class FileManager(Screen): self["text"].right() def ok(self): - selection = self["list"].getSelection() - if selection[1] == True: # isDir - self["list"].changeDir(selection[0]) + + if self["list"].canDescent(): # isDir + self["list"].descent() else: - self["pixmap"].instance.setPixmapFromFile(selection[0]) + self["pixmap"].instance.setPixmapFromFile(self["list"].getSelection()) def keyNumberGlobal(self, number): print "pressed", number diff --git a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py index 7dc04d10..6dcdfee3 100644 --- a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py +++ b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py @@ -278,7 +278,8 @@ servicechanged = None def playService(self, ref): #print "--------------------Alternatives: trying to play service", str(ServiceReference(ref)) - servicechanged.lastPlayAction = str(ServiceReference(ref)) + if ref is not None: + servicechanged.lastPlayAction = str(ServiceReference(ref)) servicechanged.nextPlayTry = 0 result = oldPlayService(ref) |