a navigation instance might not be available at AUTOSTART. use first session's naviga...

diff --git a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
index 118f0cb6e4a0e4b75cfd3569e95d94af3d6d2e35..7dc04d10e345854bc8676ff088c310e3be4bbeb1 100644 (file)
--- a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
+++ b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
@@ -232,7 +232,7 @@ class AlternativeZapping(Screen):
                pass
 
 
                pass
 
 

-oldPlayService = NavigationInstance.instance.playService
+oldPlayService = None

 
 from Components.PerServiceDisplay import PerServiceDisplay
 
 
 from Components.PerServiceDisplay import PerServiceDisplay
 


@@ -274,29 +274,32 @@ class ServiceChanged(PerServiceDisplay):
 
                                        #print "Alternatives: No playable alternative found!"
 
 
                                        #print "Alternatives: No playable alternative found!"
 

-servicechanged = ServiceChanged(NavigationInstance.instance)
+servicechanged = None

 
 def playService(self, ref):
        #print "--------------------Alternatives: trying to play service", str(ServiceReference(ref))
        servicechanged.lastPlayAction = str(ServiceReference(ref))
        servicechanged.nextPlayTry = 0
        result = oldPlayService(ref)
 
 def playService(self, ref):
        #print "--------------------Alternatives: trying to play service", str(ServiceReference(ref))
        servicechanged.lastPlayAction = str(ServiceReference(ref))
        servicechanged.nextPlayTry = 0
        result = oldPlayService(ref)

-

        
        return result
 
        
        return result
 

-def autostart(reason):
+def sessionstart(reason, session, **kwargs):

        if reason == 0:
                try:
                        loadAlternatives()
        if reason == 0:
                try:
                        loadAlternatives()

-               except:
+               except: # FIXME, THIS IS ILLEGAL CODE AND WILL BE PROSECUTED!

                        pass
                        pass

-               NavigationInstance.instance.playService = type(NavigationInstance.instance.playService)(playService, NavigationInstance, Navigation)

                
                

+               # attach to this sessions navigation instance.
+               global oldPlayService, servicechanged
+               oldPlayService = session.nav.playService
+               session.nav.playService = type(session.nav.playService)(playService, NavigationInstance, Navigation)
+               servicechanged = ServiceChanged(session.nav)

 
 def AlternativeZappingSetup(session, **kwargs):
        session.open(AlternativeZapping)
 
 def Plugins(**kwargs):
 
 def AlternativeZappingSetup(session, **kwargs):
        session.open(AlternativeZapping)
 
 def Plugins(**kwargs):

-       return [PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart),
+       return [PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, fnc = sessionstart),

                        PluginDescriptor(name="Alternative services setup" , description="Defines alternatives for services.", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=AlternativeZappingSetup)]
                        PluginDescriptor(name="Alternative services setup" , description="Defines alternatives for services.", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=AlternativeZappingSetup)]