git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/bug_112_enable_extensions_manager' into experimental
[enigma2.git]
/
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 be5ad245a410ccf5f35905b73ee84f7c58813819..61152e8a9ed7983a1a86efd53babed2881a6de75 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py
@@
-1,6
+1,7
@@
from Plugins.Extensions.CutListEditor.plugin import CutListEditor
from Components.ServiceEventTracker import ServiceEventTracker
from enigma import iPlayableService, iServiceInformation
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):
class TitleCutter(CutListEditor):
def __init__(self, session, t):
@@
-20,24
+21,24
@@
class TitleCutter(CutListEditor):
audio = service and service.audioTracks()
n = audio and audio.getNumberOfTracks() or 0
if n > 0:
audio = service and service.audioTracks()
n = audio and audio.getNumberOfTracks() or 0
if n > 0:
- from DVDTitle import ConfigFixedText
, ConfigActiveTrack
+ from DVDTitle import ConfigFixedText
from TitleProperties import languageChoices
from TitleProperties import languageChoices
- from Components.config import config, ConfigSubsection, ConfigSelection
+ from Components.config import config, ConfigSubsection, ConfigSubList, ConfigSelection, ConfigYesNo
+ self.t.properties.audiotracks = ConfigSubList()
for x in range(n):
i = audio.getTrackInfo(x)
for x in range(n):
i = audio.getTrackInfo(x)
-
language
= i.getLanguage()
+
DVB_lang
= i.getLanguage()
description = i.getDescription()
pid = str(i.getPID())
if description == "MPEG":
description = "MP2"
description = i.getDescription()
pid = str(i.getPID())
if description == "MPEG":
description = "MP2"
- if not languageChoices.langdict.has_key(language):
- language="nolang"
- print "[audiotrack] pid:", pid, "description:", description, "language:", language
+ print "[audiotrack] pid:", pid, "description:", description, "language:", DVB_lang
self.t.properties.audiotracks.append(ConfigSubsection())
self.t.properties.audiotracks.append(ConfigSubsection())
- self.t.properties.audiotracks[-1].active = Config
ActiveTrack(
)
+ self.t.properties.audiotracks[-1].active = Config
YesNo(default = True
)
self.t.properties.audiotracks[-1].format = ConfigFixedText(description)
self.t.properties.audiotracks[-1].format = ConfigFixedText(description)
- self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=language)
+ self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=language
Choices.getLanguage(DVB_lang)
)
self.t.properties.audiotracks[-1].pid = ConfigFixedText(pid)
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"
sAspect = service.info().getInfo(iServiceInformation.sAspect)
if sAspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
aspect = "4:3"
@@
-46,7
+47,12
@@
class TitleCutter(CutListEditor):
self.t.properties.aspect.setValue(aspect)
self.t.VideoType = service.info().getInfo(iServiceInformation.sVideoType)
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):
def exit(self):
+ self.checkAndGrabThumb()
self.session.nav.stopService()
self.close(self.cut_list[:])
self.session.nav.stopService()
self.close(self.cut_list[:])
@@
-56,4
+62,5
@@
class CutlistReader(TitleCutter):
def getPMTInfo(self):
TitleCutter.getPMTInfo(self)
def getPMTInfo(self):
TitleCutter.getPMTInfo(self)
+ TitleCutter.checkAndGrabThumb(self)
self.close(self.cut_list[:])
self.close(self.cut_list[:])