fix DVB-T manual scan

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 5fe2651783d94c40276346badf41f17f95ff2f33..63fc65352b7bd5b2d70eab29a2e5acf9006b5375 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,19 +11,16 @@ class Navigation:
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self

-               self.ServiceHandler = eServiceCenterPtr()
-               eServiceCenter.getInstance(self.ServiceHandler)
+               self.ServiceHandler = eServiceCenter.getInstance()

 
                import Navigation as Nav
                Nav.navcore = self
                
 
                import Navigation as Nav
                Nav.navcore = self
                

-               print "Navcore instance set!"
-               print Nav.navcore
-               

                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.currentlyPlayingService = None
                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.currentlyPlayingService = None

+               self.currentlyPlayingServiceReference = None

                
                self.RecordTimer = RecordTimer.RecordTimer()
 
                
                self.RecordTimer = RecordTimer.RecordTimer()
 


@@ -33,6 +30,10 @@ class Navigation:
        
        def playService(self, ref):
                self.currentlyPlayingServiceReference = None
        
        def playService(self, ref):
                self.currentlyPlayingServiceReference = None

+               if ref is None:
+                       self.stopService()
+                       return 0
+               

                if not self.pnav.playService(ref):
                        self.currentlyPlayingServiceReference = ref
                        return 0
                if not self.pnav.playService(ref):
                        self.currentlyPlayingServiceReference = ref
                        return 0


@@ -45,38 +46,37 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref

-               service = iRecordableServicePtr()
-               if self.pnav.recordService(ref, service):
+               service = self.pnav.recordService(ref)
+               
+               if service is None:

                        print "record returned non-zero"
                        return None
                else:
                        print "record returned non-zero"
                        return None
                else:

-                       print "ok, recordService didn't fail"

                        return service
        
                        return service
        

-       def enqueueService(self, ref):
-               return self.pnav.enqueueService(ref)
-       

        def getCurrentService(self):
        def getCurrentService(self):

-               service = iPlayableServicePtr()
-               if self.pnav.getCurrentService(service):
+               service = self.pnav.getCurrentService()
+               
+               if service is None:

                        return None
                        return None

+               

                return service
        
                return service
        

-       def getPlaylist(self):
-               playlist = ePlaylistPtr()
-               if self.pnav.getPlaylist(playlist):
-                       return None
-               return playlist
+       def stopService(self):
+               self.pnav.stopService()

        
        def pause(self, p):
                return self.pnav.pause(p)
        
        
        def pause(self, p):
                return self.pnav.pause(p)
        

-       def recordWithTimer(self, begin, end, ref, epg, description):
+       def recordWithTimer(self, ref, begin, end, name, description, eit):

                if isinstance(ref, eServiceReference):
                        ref = ServiceReference.ServiceReference(ref)
                if isinstance(ref, eServiceReference):
                        ref = ServiceReference.ServiceReference(ref)

-               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg, description)
+               entry = RecordTimer.RecordTimerEntry(ref, begin, end, name, description, eit)

                self.RecordTimer.record(entry)
                return entry
        
        def shutdown(self):
                self.RecordTimer.shutdown()
                self.RecordTimer.record(entry)
                return entry
        
        def shutdown(self):
                self.RecordTimer.shutdown()

+
+       def stopUserServices(self):
+               self.stopService()