-new option: do not zap to service when streaming

diff --git a/partnerbox/po/Partnerbox.pot b/partnerbox/po/Partnerbox.pot
index 69ce954..ee5e845 100644 (file)
--- a/partnerbox/po/Partnerbox.pot
+++ b/partnerbox/po/Partnerbox.pot
@@ -392,3 +392,7 @@ msgstr ""
 #: ../src/plugin.py:1249 ../src/plugin.py:1304
 msgid "zapped"
 msgstr ""
+
+#: ../src/PartnerboxSetup.py:257 
+msgid "Zap to service when streaming"
+msgstr ""

diff --git a/partnerbox/po/de.po b/partnerbox/po/de.po
index 0c3760b..89cdea9 100644 (file)
--- a/partnerbox/po/de.po
+++ b/partnerbox/po/de.po
@@ -471,3 +471,6 @@ msgstr "umschalten"
 msgid "zapped"
 msgstr "umgeschaltet"
 
+#: ../src/PartnerboxSetup.py:257 
+msgid "Zap to service when streaming"
+msgstr "Beim Streamen auf Sender zappen"

diff --git a/partnerbox/src/PartnerboxSetup.py b/partnerbox/src/PartnerboxSetup.py
index 16819ff..7d9f3d0 100644 (file)
--- a/partnerbox/src/PartnerboxSetup.py
+++ b/partnerbox/src/PartnerboxSetup.py
@@ -40,6 +40,7 @@ def initPartnerboxEntryConfig():
        config.plugins.Partnerbox.Entries[i].enigma = ConfigSelection(default="0", choices = [("0", _("Enigma 2")),("1", _("Enigma 1"))])
        config.plugins.Partnerbox.Entries[i].password = ConfigText(default = "dreambox", visible_width = 50, fixed_size = False)
        config.plugins.Partnerbox.Entries[i].useinternal = ConfigSelection(default="1", choices = [("0", _("use external")),("1", _("use internal"))])
+       config.plugins.Partnerbox.Entries[i].zaptoservicewhenstreaming = ConfigYesNo(default = True)
        return config.plugins.Partnerbox.Entries[i]
 
 def initConfig():
@@ -252,7 +253,8 @@ class PartnerboxEntryConfigScreen(ConfigListScreen, Screen):
                        getConfigListEntry(_("Port"), self.current.port),
                        getConfigListEntry(_("Enigma Type"), self.current.enigma),
                        getConfigListEntry(_("Password"), self.current.password),
-                       getConfigListEntry(_("Servicelists/EPG"), self.current.useinternal)
+                       getConfigListEntry(_("Servicelists/EPG"), self.current.useinternal),
+                       getConfigListEntry(_("Zap to service when streaming"), self.current.zaptoservicewhenstreaming)
                ]
 
                ConfigListScreen.__init__(self, cfglist, session)

diff --git a/partnerbox/src/plugin.py b/partnerbox/src/plugin.py
index e3f4978..ef266e9 100644 (file)
--- a/partnerbox/src/plugin.py
+++ b/partnerbox/src/plugin.py
@@ -533,6 +533,7 @@ class RemoteTimerChannelList(Screen):
                self.http = "http://%s:%d" % (self.ip,self.port)
                self.enigma_type = int(partnerboxentry.enigma.value)
                self.useinternal = int(partnerboxentry.useinternal.value)
+               self.zaptoservicewhenstreaming = partnerboxentry.zaptoservicewhenstreaming.value
                self.key_green_choice = self.ADD_TIMER
                self.zapTimer = eTimer()
                self.zapTimer.timeout.get().append(self.zapTimerTimeout)
@@ -564,7 +565,10 @@ class RemoteTimerChannelList(Screen):
                if self.playeronly == 1:
                        if self.mode == self.REMOTE_TIMER_MODE:
                                self.mode = self.REMOTE_TV_MODE
-                               self.Zap()
+                               if self.zaptoservicewhenstreaming == False and self.enigma_type == 0:
+                                       self.GetStreamInfosCallback()
+                               else:
+                                       self.Zap()
                        else:
                                self.session.nav.playService(self.CurrentService)
                                self.mode = self.REMOTE_TIMER_MODE