Merge branch 'master' of https://github.com/OpenPLi/enigma2
authormeo <lupomeo@hotmail.com>
Tue, 29 Dec 2015 08:59:31 +0000 (09:59 +0100)
committermeo <lupomeo@hotmail.com>
Tue, 29 Dec 2015 08:59:31 +0000 (09:59 +0100)
Conflicts:
configure.ac
lib/python/Components/NimManager.py

1  2 
configure.ac
lib/python/Components/NimManager.py
lib/python/Components/UsageConfig.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/MovieSelection.py
main/Makefile.am

diff --cc configure.ac
Simple merge
@@@ -118,14 -117,11 +117,11 @@@ class SecConfigure
                        nim.setInternalLink()
  
        def linkNIMs(self, sec, nim1, nim2):
-               print "link tuner", nim1, "to tuner", nim2
- #             if nim2 == (nim1 - 1):
- #                     self.linkInternally(nim1)
- #
- # for internally connect tuner A to B
-               self.linkInternally(nim1)
+               print "[SecConfigure] link tuner", nim1, "to tuner", nim2
+               if nim2 == (nim1 - 1):
+                       self.linkInternally(nim1)
                sec.setTunerLinked(nim1, nim2)
 -
 +              
        def getRoot(self, slotid, connto):
                visited = []
                while (self.NimManager.getNimConfig(connto).configMode.value in ("satposdepends", "equal", "loopthrough")):
Simple merge
Simple merge
Simple merge
Simple merge