Navigation: Make true selected reference default
authorLittlesat <littlesat99@yahoo.com>
Sun, 5 Aug 2012 17:43:18 +0000 (19:43 +0200)
committerLittlesat <littlesat99@yahoo.com>
Sun, 5 Aug 2012 17:43:18 +0000 (19:43 +0200)
As this is most required after all. Also revert the previous commits
where true was set.

Navigation.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/ScanSetup.py
lib/python/Screens/ServiceInfo.py

index 775dd5d..e202c67 100644 (file)
@@ -95,7 +95,7 @@ class Navigation:
                        self.stopService()
                return 1
        
-       def getCurrentlyPlayingServiceReference(self, selected = False):
+       def getCurrentlyPlayingServiceReference(self, selected = True):
                if selected and self.currentlyPlayingServiceReference:
                        return self.currentlyPlayingSelectedServiceReference
                return self.currentlyPlayingServiceReference
index e9098db..6469570 100644 (file)
@@ -1653,7 +1653,7 @@ class InfoBarPiP:
                                del self.session.pip
 
        def swapPiP(self):
-               swapservice = self.session.nav.getCurrentlyPlayingServiceReference(True)
+               swapservice = self.session.nav.getCurrentlyPlayingServiceReference()
                pipref = self.session.pip.getCurrentService()
                if swapservice and pipref and pipref.toString() != swapservice.toString():
                        currentServicePath = self.servicelist.getCurrentServicePath()
index 88c43cd..2d0cae9 100644 (file)
@@ -319,7 +319,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
                del self.feinfo
                del self.service
 
-               self.session.postScanService = session.nav.getCurrentlyPlayingServiceReference(True)
+               self.session.postScanService = session.nav.getCurrentlyPlayingServiceReference()
 
                self["actions"] = NumberActionMap(["SetupActions", "MenuActions"],
                {
index 790a6de..cde451a 100644 (file)
@@ -105,8 +105,8 @@ class ServiceInfo(Screen):
        def information(self):
                if self.type == TYPE_SERVICE_INFO:
                        if self.session.nav.getCurrentlyPlayingServiceReference():
-                               name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName()
-                               refstr = self.session.nav.getCurrentlyPlayingServiceReference().toString()
+                               name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference(False)).getServiceName()
+                               refstr = self.session.nav.getCurrentlyPlayingServiceReference(False).toString()
                        else:
                                name = _("N/A")
                                refstr = _("N/A")