follow core event changes

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 01e5cc8..fe50105 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -2,7 +2,7 @@ from GUIComponent import *
 from VariableText import *
 from VariableValue import *
 
-from enigma import pNavigation
+from enigma import iPlayableService
 from enigma import eLabel, eSlider
 
 class PerServiceDisplay(GUIComponent, VariableText):
@@ -16,7 +16,7 @@ class PerServiceDisplay(GUIComponent, VariableText):
                self.navcore.event.append(self.event)
 
                # start with stopped state, so simulate that
-               self.event(pNavigation.evStopService)
+               self.event(iPlayableService.evEnd)
 
        def event(self, ev):
                # loop up if we need to handle this event
@@ -39,7 +39,7 @@ class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceDisplay):
                self.navcore.event.append(self.event)
 
                # start with stopped state, so simulate that
-               self.event(pNavigation.evStopService)
+               self.event(iPlayableService.evEnd)
 
 
        def createWidget(self, parent):

diff --git a/lib/python/Components/ServiceName.py b/lib/python/Components/ServiceName.py
index a9c0930..c3cd8f0 100644 (file)
--- a/lib/python/Components/ServiceName.py
+++ b/lib/python/Components/ServiceName.py
@@ -1,14 +1,14 @@
 from PerServiceDisplay import *
 
-#from enigma import pNavigation, iServiceInformationPtr
+#from enigma import iPlayableService, iServiceInformationPtr
 from enigma import *
 
 class ServiceName(PerServiceDisplay):
        def __init__(self, navcore):
                PerServiceDisplay.__init__(self, navcore,
                        {
-                               pNavigation.evNewService: self.newService,
-                               pNavigation.evStopService: self.stopEvent
+                               iPlayableService.evStart: self.newService,
+                               iPlayableService.evEnd: self.stopEvent
                        })
 
        def newService(self):

diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index 7bfef93..4992e8e 100644 (file)
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -2,7 +2,7 @@ from PerServiceDisplay import *
 from enigma import eTimer
 
 
-from enigma import pNavigation, iSeekableServicePtr
+from enigma import iPlayableService, iSeekableServicePtr
 
 class ServicePosition(PerServiceDisplay):
        TYPE_LENGTH = 0,
@@ -14,8 +14,8 @@ class ServicePosition(PerServiceDisplay):
                self.updateTimer.timeout.get().append(self.update)
                PerServiceDisplay.__init__(self, navcore,
                        {
-                               pNavigation.evNewService: self.newService,
-                               pNavigation.evStopService: self.stopEvent
+                               iPlayableService.evStart: self.newService,
+                               iPlayableService.evEnd: self.stopEvent
                        })
                self.type = type
 #              self.setType(type)