git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21e43b5
)
fix progress scaling and remove unneeded project paramter from dvd media toolbox
author
Andreas Frisch
<andreas.frisch@multimedia-labs.de>
Wed, 22 Oct 2008 07:50:46 +0000
(07:50 +0000)
committer
Andreas Frisch
<andreas.frisch@multimedia-labs.de>
Wed, 22 Oct 2008 07:50:46 +0000
(07:50 +0000)
lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
patch
|
blob
|
history
lib/python/Plugins/Extensions/DVDBurn/Process.py
patch
|
blob
|
history
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
patch
|
blob
|
history
diff --git
a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
index 3ea4874792747f5eab26c26ebfcbb87ee60eb7fd..058c30ca57b97c49b0aca7c9302d33c5886d45bc 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@
-26,9
+26,8
@@
class DVDToolbox(Screen):
<widget source="space_label" render="Label" position="20,414" size="520,22" zPosition="2" font="Regular;18" halign="center" transparent="1" foregroundColor="#000000" />
</screen>"""
<widget source="space_label" render="Label" position="20,414" size="520,22" zPosition="2" font="Regular;18" halign="center" transparent="1" foregroundColor="#000000" />
</screen>"""
- def __init__(self, session
, project = None
):
+ def __init__(self, session):
Screen.__init__(self, session)
Screen.__init__(self, session)
- self.project = project
self["key_red"] = StaticText(_("Exit"))
self["key_green"] = StaticText(_("Update"))
self["key_red"] = StaticText(_("Exit"))
self["key_green"] = StaticText(_("Update"))
diff --git
a/lib/python/Plugins/Extensions/DVDBurn/Process.py
b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index 9ee5a3c621349141a930443f44c096ec3f4df0df..3bf9111012fac4d92b5529d2aaaac92791b57e23 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/Process.py
@@
-8,7
+8,7
@@
class png2yuvTask(Task):
self.setTool("/usr/bin/png2yuv")
self.args += ["-n1", "-Ip", "-f25", "-j", inputfile]
self.dumpFile = outputfile
self.setTool("/usr/bin/png2yuv")
self.args += ["-n1", "-Ip", "-f25", "-j", inputfile]
self.dumpFile = outputfile
- self.weighting = 1
0
+ self.weighting = 1
5
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
@@
-24,7
+24,7
@@
class mpeg2encTask(Task):
self.setTool("/usr/bin/mpeg2enc")
self.args += ["-f8", "-np", "-a2", "-o", outputfile]
self.inputFile = inputfile
self.setTool("/usr/bin/mpeg2enc")
self.args += ["-f8", "-np", "-a2", "-o", outputfile]
self.inputFile = inputfile
- self.weighting =
10
+ self.weighting =
25
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
@@
-40,7
+40,7
@@
class spumuxTask(Task):
self.args += [xmlfile]
self.inputFile = inputfile
self.dumpFile = outputfile
self.args += [xmlfile]
self.inputFile = inputfile
self.dumpFile = outputfile
- self.weighting = 1
0
+ self.weighting = 1
5
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
def run(self, callback, task_progress_changed):
Task.run(self, callback, task_progress_changed)
@@
-77,7
+77,7
@@
class CopyMeta(Task):
if file.startswith(filename+"."):
self.args += [path+'/'+file]
self.args += [self.job.workspace]
if file.startswith(filename+"."):
self.args += [path+'/'+file]
self.args += [self.job.workspace]
- self.weighting = 1
0
+ self.weighting = 1
5
class DemuxTask(Task):
def __init__(self, job, inputfile):
class DemuxTask(Task):
def __init__(self, job, inputfile):
@@
-168,9
+168,9
@@
class MplexTaskPostcondition(Condition):
class MplexTask(Task):
ERROR_UNDERRUN, ERROR_UNKNOWN = range(2)
class MplexTask(Task):
ERROR_UNDERRUN, ERROR_UNKNOWN = range(2)
- def __init__(self, job, outputfile, inputfiles=None, demux_task=None):
+ def __init__(self, job, outputfile, inputfiles=None, demux_task=None
, weighting = 500
):
Task.__init__(self, job, "Mux ES into PS")
Task.__init__(self, job, "Mux ES into PS")
- self.weighting =
500
+ self.weighting =
weighting
self.demux_task = demux_task
self.postconditions.append(MplexTaskPostcondition())
self.setTool("/usr/bin/mplex")
self.demux_task = demux_task
self.postconditions.append(MplexTaskPostcondition())
self.setTool("/usr/bin/mplex")
@@
-202,6
+202,7
@@
class RemoveESFiles(Task):
Task.__init__(self, job, "Remove temp. files")
self.demux_task = demux_task
self.setTool("/bin/rm")
Task.__init__(self, job, "Remove temp. files")
self.demux_task = demux_task
self.setTool("/bin/rm")
+ self.weighting = 10
def prepare(self):
self.args += ["-f"]
def prepare(self):
self.args += ["-f"]
@@
-211,7
+212,6
@@
class RemoveESFiles(Task):
class DVDAuthorTask(Task):
def __init__(self, job, diskspaceNeeded):
Task.__init__(self, job, "Authoring DVD")
class DVDAuthorTask(Task):
def __init__(self, job, diskspaceNeeded):
Task.__init__(self, job, "Authoring DVD")
-
self.global_preconditions.append(DiskspacePrecondition(diskspaceNeeded))
self.weighting = 300
self.setTool("/usr/bin/dvdauthor")
self.global_preconditions.append(DiskspacePrecondition(diskspaceNeeded))
self.weighting = 300
self.setTool("/usr/bin/dvdauthor")
@@
-322,12
+322,14
@@
class RemoveDVDFolder(Task):
Task.__init__(self, job, "Remove temp. files")
self.setTool("/bin/rm")
self.args += ["-rf", self.job.workspace]
Task.__init__(self, job, "Remove temp. files")
self.setTool("/bin/rm")
self.args += ["-rf", self.job.workspace]
+ self.weighting = 10
class PreviewTask(Task):
def __init__(self, job):
Task.__init__(self, job, "Preview")
self.postconditions.append(PreviewTaskPostcondition())
self.job = job
class PreviewTask(Task):
def __init__(self, job):
Task.__init__(self, job, "Preview")
self.postconditions.append(PreviewTaskPostcondition())
self.job = job
+ self.weighting = 10
def run(self, callback, task_progress_changed):
self.callback = callback
def run(self, callback, task_progress_changed):
self.callback = callback
@@
-433,7
+435,7
@@
class MenuImageTask(Task):
def __init__(self, job, menu_count, spuxmlfilename, menubgpngfilename, highlightpngfilename):
Task.__init__(self, job, "Create Menu %d Image" % menu_count)
self.postconditions.append(ImagingPostcondition())
def __init__(self, job, menu_count, spuxmlfilename, menubgpngfilename, highlightpngfilename):
Task.__init__(self, job, "Create Menu %d Image" % menu_count)
self.postconditions.append(ImagingPostcondition())
- self.weighting =
20
+ self.weighting =
10
self.job = job
self.Menus = job.Menus
self.menu_count = menu_count
self.job = job
self.Menus = job.Menus
self.menu_count = menu_count
@@
-563,7
+565,7
@@
class Menus:
mpeg2encTask(job, job.workspace+"/dvdmenubg"+num+".yuv", menubgm2vfilename)
menubgmpgfilename = job.workspace+"/dvdmenubg"+num+".mpg"
menuaudiofilename = s.menuaudio.getValue()
mpeg2encTask(job, job.workspace+"/dvdmenubg"+num+".yuv", menubgm2vfilename)
menubgmpgfilename = job.workspace+"/dvdmenubg"+num+".mpg"
menuaudiofilename = s.menuaudio.getValue()
- MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, menuaudiofilename])
+ MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, menuaudiofilename]
, weighting = 20
)
menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg"
spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg"
spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
diff --git
a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
index 1842a5d71021fb7eced792d4fca1828f08b2802b..2c2d16c83503b9b7ee3a540baf0b27390051355c 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
@@
-165,7
+165,7
@@
class TitleList(Screen, HelpableScreen):
self.updateTitleList()
def toolbox(self):
self.updateTitleList()
def toolbox(self):
- self.session.open(DVDToolbox.DVDToolbox
, self.project
)
+ self.session.open(DVDToolbox.DVDToolbox)
def settings(self):
self.session.openWithCallback(self.settingsCB, ProjectSettings.ProjectSettings, self.project)
def settings(self):
self.session.openWithCallback(self.settingsCB, ProjectSettings.ProjectSettings, self.project)