Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental

[vuplus_dvbapp] / lib / python / Plugins / Extensions / DVDBurn / TitleCutter.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py b/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py
index 8f1adf1..71a7f23 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py
@@ -1,5 +1,7 @@
 from Plugins.Extensions.CutListEditor.plugin import CutListEditor
 from Components.ServiceEventTracker import ServiceEventTracker
+from enigma import iPlayableService, iServiceInformation
+from Tools.Directories import fileExists
 
 class TitleCutter(CutListEditor):
        def __init__(self, session, t):
@@ -9,35 +11,78 @@ class TitleCutter(CutListEditor):
                self.t = t
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
-                               iPlayableService.evUpdatedInfo: self.getAudioTracks,
+                               iPlayableService.evUpdatedInfo: self.getPMTInfo,
                                iPlayableService.evCuesheetChanged: self.refillList
                        })
                self.onExecBegin.remove(self.showTutorial)
 
-       def getAudioTracks(self):
+       def getPMTInfo(self):
                service = self.session.nav.getCurrentService()
                audio = service and service.audioTracks()
                n = audio and audio.getNumberOfTracks() or 0
-               print "self.t", self.t
-               print "self.t.audiotracks", self.t.audiotracks
                if n > 0:
+                       from DVDTitle import ConfigFixedText
+                       from TitleProperties import languageChoices
+                       from Components.config import config, ConfigSubsection, ConfigSubList, ConfigSelection, ConfigYesNo
+                       self.t.properties.audiotracks = ConfigSubList()
                        for x in range(n):
                                i = audio.getTrackInfo(x)
-                               language = i.getLanguage()[:2]
+                               DVB_lang = i.getLanguage()
                                description = i.getDescription()
+                               pid = str(i.getPID())
                                if description == "MPEG":
-                                       description = "mp2"
-                               self.t.audiotracks.append((description, language))
-               print "audiotracks", self.t.audiotracks
+                                       description = "MP2"
+                               print "[audiotrack] pid:", pid, "description:", description, "language:", DVB_lang, "count:", x, "active:", (x < 8)
+                               self.t.properties.audiotracks.append(ConfigSubsection())
+                               self.t.properties.audiotracks[-1].active = ConfigYesNo(default = (x < 8))
+                               self.t.properties.audiotracks[-1].format = ConfigFixedText(description)
+                               self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=languageChoices.getLanguage(DVB_lang))
+                               self.t.properties.audiotracks[-1].pid = ConfigFixedText(pid)
+                               self.t.properties.audiotracks[-1].DVB_lang = ConfigFixedText(DVB_lang)
+               sAspect = service.info().getInfo(iServiceInformation.sAspect)
+               if sAspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
+                       aspect = "4:3"
+               else:
+                       aspect = "16:9"
+               self.t.properties.aspect.setValue(aspect)
+               self.t.VideoType = service.info().getInfo(iServiceInformation.sVideoType)
+
+       def checkAndGrabThumb(self):
+               if not fileExists(self.t.inputfile.rsplit('.',1)[0] + ".png"):
+                       CutListEditor.grabFrame(self)
 
        def exit(self):
+               if self.t.VideoType == -1:
+                       self.getPMTInfo()
+               self.checkAndGrabThumb()
                self.session.nav.stopService()
                self.close(self.cut_list[:])
 
 class CutlistReader(TitleCutter):
+       skin = """
+               <screen position="0,0" size="720,576">
+               <eLabel position="0,0" size="720,576" zPosition="1" backgroundColor="#000000" />
+               <widget name="Video" position="0,0" size="100,75" />
+               <widget name="SeekState" position="0,0" />
+               <widget source="cutlist" position="0,0" render="Listbox" >
+                       <convert type="TemplatedMultiContent">
+                               {"template": [
+                                               MultiContentEntryText(text = 1),
+                                               MultiContentEntryText(text = 2)
+                                       ],
+                                "fonts": [gFont("Regular", 18)],
+                                "itemHeight": 20
+                               }
+                       </convert>
+               </widget>
+               <widget name="Timeline" position="0,0" />
+       </screen>"""
+
        def __init__(self, session, t):
                TitleCutter.__init__(self, session, t)
+               self.skin = CutlistReader.skin
 
-       def getAudioTracks(self):
-               TitleCutter.getAudioTracks()
-               self.exit()
\ No newline at end of file
+       def getPMTInfo(self):
+               TitleCutter.getPMTInfo(self)
+               TitleCutter.checkAndGrabThumb(self)
+               self.close(self.cut_list[:])