Subtitles.py: add possibilty to use this screen with other InfoBarSubtitleSupport...

[enigma2.git] / lib / python / Screens / Subtitles.py

diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
index 54bc7a5bea2aef63fa227c77914ddb05eac270a4..9ba7e0a56e0e1acedaed0cc384163add73f126b0 100644 (file)
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -8,7 +8,7 @@ from enigma import iPlayableService
 from Tools.ISO639 import LanguageCodes
 
 class Subtitles(Screen, ConfigListScreen):
-       def __init__(self, session):
+       def __init__(self, session, infobar=None):
                Screen.__init__(self, session)
         
                self["actions"] = ActionMap(["SetupActions"],
@@ -19,7 +19,7 @@ class Subtitles(Screen, ConfigListScreen):
 
                self.list = []
                ConfigListScreen.__init__(self, self.list)
-               self.infobar = self.session.infobar
+               self.infobar = infobar or self.session.infobar
                self.fillList()
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
@@ -84,10 +84,8 @@ class Subtitles(Screen, ConfigListScreen):
                if self.infobar.selected_subtitle != subtitles:
                        self.infobar.subtitles_enabled = False
                        self.infobar.selected_subtitle = subtitles
-                       self.infobar.subtitles_enabled = True
-
-       def disableSubtitles(self):
-               self.infobar.subtitles_enabled = False
+                       if subtitles:
+                               self.infobar.subtitles_enabled = True
 
        def keyLeft(self):
                ConfigListScreen.keyLeft(self)