now nav.getCurrentlyPlayingServiceReference() and nav.getCurrentService()

[vuplus_dvbapp] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 37f3fbf..b4110f4 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,4 +1,4 @@
-from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference, iPlayableService
 from Components.ParentalControl import parentalControl
 from Tools.BoundFunction import boundFunction
 import RecordTimer
@@ -7,8 +7,6 @@ import SleepTimer
 import NavigationInstance
 import ServiceReference
 
-from time import time
-
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
        def __init__(self):
@@ -34,6 +32,9 @@ class Navigation:
        def dispatchEvent(self, i):
                for x in self.event:
                        x(i)
+               if i == iPlayableService.evEnd:
+                       self.currentlyPlayingServiceReference = None
+                       self.currentlyPlayingService = None
 
        def dispatchRecordEvent(self, rec_service, event):
 #              print "record_event", rec_service, event
@@ -46,8 +47,6 @@ class Navigation:
                        print "ignore request to play already running service"
                        return 0
                print "playing", ref and ref.toString()
-               self.currentlyPlayingServiceReference = None
-               self.currentlyPlayingService = None
                if ref is None:
                        self.stopService()
                        return 0
@@ -62,7 +61,7 @@ class Navigation:
                        else:
                                playref = ref
                        if self.pnav and not self.pnav.playService(playref):
-                               self.currentlyPlayingServiceReference = ref
+                               self.currentlyPlayingServiceReference = playref
                                return 0
                else:
                        self.stopService()
@@ -100,8 +99,6 @@ class Navigation:
                print "stopService"
                if self.pnav:
                        self.pnav.stopService()
-               self.currentlyPlayingService = None
-               self.currentlyPlayingServiceReference = None
 
        def pause(self, p):
                return self.pnav and self.pnav.pause(p)