Changeset 1904

Timestamp:

21/11/08 19:11:29 (7 weeks ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11186

Message:

Updates to Adams livepause package
Patch from Adam Charrett applied

Location:

freevo

Files:

• share/skins/osd/base.fxd (modified) (1 diff)
• share/skins/plugins/osd (added)
• share/skins/plugins/osd/livepause.fxd (added)
• src/tv/plugins/livepause/__init__.py (modified) (2 diffs)
• src/tv/plugins/livepause/display/graphics.py (modified) (2 diffs)

freevo/share/skins/osd/base.fxd

@@ -118 +118 @@
             <button x="30" y="160" width="140" height="45" name="button1" style="button" />
             <button x="180" y="160" width="140" height="45" name="button2" style="button" />
-            <button x="330" y="160" width="140" height="45" name="button2" style="button" />
+            <button x="330" y="160" width="140" height="45" name="button3" style="button" />
 
             <navigationmap>

freevo/src/tv/plugins/livepause/__init__.py

@@ -276 +276 @@
             }
 
-        self.event_maps[State.PLAYING] = {
+        self.event_maps[State.NUMBER] = {
             'STOP'                : self.__handle_stop,
             'INPUT_1'             : self.__playing_handle_number,
@@ -458 +458 @@
         else:
             self.player.pause()
+        self.osd.display_info(self.__get_display_info)        
         return True
 

freevo/src/tv/plugins/livepause/display/graphics.py

@@ -36 +36 @@
 
 import kaa
-
+import time
+import tv.epg_xmltv
 from tv.plugins.livepause.display.base import OSD
 import dialog
@@ -50 +51 @@
 
     def display_info(self, info_function):
-        dialog = dialogs.InfoDialog(info_function)
+        dialog = InfoDialog(info_function)
         dialog.show()