experiments

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

diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index 0245cffbb084fcda26a78c7d500eff30f0ec5e89..2d35cff6f188b1cb404731671fc2060c8de30600 100644 (file)
--- a/lib/python/Screens/AudioSelection.py
+++ b/lib/python/Screens/AudioSelection.py
@@ -50,25 +50,33 @@ class AudioSelection(Screen, ConfigListScreen):
 
                self.settings = ConfigSubsection()
                choicelist = [(PAGE_AUDIO,_("audio tracks")), (PAGE_SUBTITLES,_("Subtitles"))]
+               print "debug 1: choicelist", page
                self.settings.menupage = ConfigSelection(choices = choicelist, default=page)
                self.settings.menupage.addNotifier(self.fillList)
+               print "debug 2"
                self.onLayoutFinish.append(self.__layoutFinished)
+               print "debug 3"
 
        def __layoutFinished(self):
+               print "[__layoutFinished]"
                self["config"].instance.setSelectionEnable(False)
+               print "after instance.setSelectionEnable"
                self.focus = FOCUS_STREAMS
+               print "debug 4"
 
        def fillList(self, arg=None):
+               print "debug fillList"
                streams = []
                conflist = []
                selectedidx = 0
                
-               service = self.session.nav.getCurrentService()
-               self.audioTracks = audio = service and service.audioTracks()
-               n = audio and audio.getNumberOfTracks() or 0
+               print "debug fillList 2"
                
                if self.settings.menupage.getValue() == PAGE_AUDIO:
                        self.setTitle(_("Select audio track"))
+                       service = self.session.nav.getCurrentService()
+                       self.audioTracks = audio = service and service.audioTracks()
+                       n = audio and audio.getNumberOfTracks() or 0
                        if SystemInfo["CanDownmixAC3"]:
                                self.settings.downmix = ConfigOnOff(default=config.av.downmix_ac3.value)
                                self.settings.downmix.addNotifier(self.changeAC3Downmix, initial_call = False)
@@ -110,13 +118,12 @@ class AudioSelection(Screen, ConfigListScreen):
                                        streams.append((x, "", number, description, language, selected))
 
                        else:
-                               conflist.append(getConfigListEntry("", self.settings.dummy))
-                               self["key_green"].setBoolean(False)
                                streams = []
                                conflist.append(('',))
                                self["key_green"].setBoolean(False)
 
                elif self.settings.menupage.getValue() == PAGE_SUBTITLES:
+                       print "debug PAGE_SUBTITLES"
                        self.setTitle(_("Subtitle selection"))
                        conflist.append(('',))
                        conflist.append(('',))
@@ -131,6 +138,7 @@ class AudioSelection(Screen, ConfigListScreen):
                        idx = 0
                        
                        subtitlelist = self.getSubtitleList()
+                       print ">>>>>>>>subtitlelist", subtitlelist
 
                        if len(subtitlelist):
                                for x in subtitlelist:
@@ -162,6 +170,7 @@ class AudioSelection(Screen, ConfigListScreen):
                                                description = types[x[2]]
 
                                        streams.append((x, "", number, description, language, selected))
+                                       print "appending", x, "", number, description, language, selected
                                        idx += 1
                        
                        else:
@@ -312,4 +321,5 @@ class AudioSelection(Screen, ConfigListScreen):
 
 class SubtitleSelection(AudioSelection):
        def __init__(self, session, infobar=None):
-               AudioSelection.__init__(self, session, infobar, PAGE_SUBTITLES)
+               AudioSelection.__init__(self, session, infobar, page=PAGE_SUBTITLES)
+               self.skinName = ["AudioSelection"]