move VolumeControl to own file

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index c2d2752a1a4b9cc1e1b9de95f7610de925d9b51b..7b1deb030d049b6ed9dad5223f4c6149611c5d45 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,4 +1,4 @@
-from enigma import eServiceCenter, eServiceReference, pNavigation
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
 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):
@@ -28,12 +26,10 @@ class Navigation:
                self.record_event = [ ]
                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingService = None
-               self.state = 0
                self.RecordTimer = RecordTimer.RecordTimer()
                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):
-               self.state = i != 1
                for x in self.event:
                        x(i)
 
@@ -44,24 +40,27 @@ class Navigation:
 
        def playService(self, ref, checkParentalControl = True):
                oldref = self.currentlyPlayingServiceReference
+               if ref and oldref and ref == oldref:
+                       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
-               if not checkParentalControl or parentalControl.isServicePlayable(ref.toCompareString(), boundFunction(self.playService, checkParentalControl = False)):
+               if not checkParentalControl or parentalControl.isServicePlayable(ref, boundFunction(self.playService, checkParentalControl = False)):
                        if ref.flags & eServiceReference.isGroup:
                                if not oldref:
                                        oldref = eServiceReference()
                                playref = getBestPlayableServiceReference(ref, oldref)
-                               if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref.toCompareString(), boundFunction(self.playService, checkParentalControl = False))):
+                               if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref, boundFunction(self.playService, checkParentalControl = False))):
                                        self.stopService()
                                        return 0
                        else:
                                playref = ref
                        if self.pnav and not self.pnav.playService(playref):
-                               self.currentlyPlayingServiceReference = ref
+                               self.currentlyPlayingServiceReference = playref
                                return 0
                else:
                        self.stopService()
@@ -91,11 +90,9 @@ class Navigation:
                return self.pnav and self.pnav.getRecordings()
 
        def getCurrentService(self):
-               if self.state:
-                       if not self.currentlyPlayingService:
-                               self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
-                       return self.currentlyPlayingService
-               return None
+               if not self.currentlyPlayingService:
+                       self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+               return self.currentlyPlayingService
 
        def stopService(self):
                print "stopService"