X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6e4252048719916fbe136dbe2a22eea0bbac9a7e..a648830a100839cb95548cffe2a6cd291f8da19c:/lib/python/Plugins/Extensions/DVDBurn/Process.py?ds=sidebyside diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 3cf874c0..b64541b6 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -5,7 +5,7 @@ from Screens.MessageBox import MessageBox class png2yuvTask(Task): def __init__(self, job, inputfile, outputfile): Task.__init__(self, job, "Creating menu video") - self.setTool("/usr/bin/png2yuv") + self.setTool("png2yuv") self.args += ["-n1", "-Ip", "-f25", "-j", inputfile] self.dumpFile = outputfile self.weighting = 15 @@ -21,7 +21,7 @@ class png2yuvTask(Task): class mpeg2encTask(Task): def __init__(self, job, inputfile, outputfile): Task.__init__(self, job, "Encoding menu video") - self.setTool("/usr/bin/mpeg2enc") + self.setTool("mpeg2enc") self.args += ["-f8", "-np", "-a2", "-o", outputfile] self.inputFile = inputfile self.weighting = 25 @@ -36,7 +36,7 @@ class mpeg2encTask(Task): class spumuxTask(Task): def __init__(self, job, xmlfile, inputfile, outputfile): Task.__init__(self, job, "Muxing buttons into menu") - self.setTool("/usr/bin/spumux") + self.setTool("spumux") self.args += [xmlfile] self.inputFile = inputfile self.dumpFile = outputfile @@ -54,7 +54,7 @@ class spumuxTask(Task): class MakeFifoNode(Task): def __init__(self, job, number): Task.__init__(self, job, "Make FIFO nodes") - self.setTool("/bin/mknod") + self.setTool("mknod") nodename = self.job.workspace + "/dvd_title_%d" % number + ".mpg" self.args += [nodename, "p"] self.weighting = 10 @@ -62,14 +62,14 @@ class MakeFifoNode(Task): class LinkTS(Task): def __init__(self, job, sourcefile, link_name): Task.__init__(self, job, "Creating symlink for source titles") - self.setTool("/bin/ln") + self.setTool("ln") self.args += ["-s", sourcefile, link_name] self.weighting = 10 class CopyMeta(Task): def __init__(self, job, sourcefile): Task.__init__(self, job, "Copy title meta files") - self.setTool("/bin/cp") + self.setTool("cp") from os import listdir path, filename = sourcefile.rstrip("/").rsplit("/",1) tsfiles = listdir(path) @@ -84,7 +84,7 @@ class DemuxTask(Task): Task.__init__(self, job, "Demux video into ES") title = job.project.titles[job.i] self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace)) - self.setTool("/usr/bin/projectx") + self.setTool("projectx") self.args += [inputfile, "-demux", "-out", self.job.workspace ] self.end = 300 self.prog_state = 0 @@ -109,10 +109,11 @@ class DemuxTask(Task): def processOutputLine(self, line): line = line[:-1] + #print "[DemuxTask]", line MSG_NEW_FILE = "---> new File: " MSG_PROGRESS = "[PROGRESS] " - MSG_NEW_MP2 = "--> MPEG Audio (0x" - MSG_NEW_AC3 = "--> AC-3/DTS Audio on PID " + MSG_NEW_MP2 = "++> Mpg Audio: PID 0x" + MSG_NEW_AC3 = "++> AC3/DTS Audio: PID 0x" if line.startswith(MSG_NEW_FILE): file = line[len(MSG_NEW_FILE):] @@ -123,10 +124,13 @@ class DemuxTask(Task): progress = line[len(MSG_PROGRESS):] self.haveProgress(progress) elif line.startswith(MSG_NEW_MP2) or line.startswith(MSG_NEW_AC3): - self.currentPID = str(int(line.rstrip()[-6:].rsplit('0x',1)[-1],16)) + try: + self.currentPID = str(int(line.split(': PID 0x',1)[1].split(' ',1)[0],16)) + except ValueError: + print "[DemuxTask] ERROR: couldn't detect Audio PID (projectx too old?)" def haveNewFile(self, file): - print "[DemuxTask] produced file:", file + print "[DemuxTask] produced file:", file, self.currentPID self.generated_files.append(file) if self.currentPID in self.relevantAudioPIDs or file.endswith("m2v"): self.mplex_streamfiles.append(file) @@ -165,8 +169,11 @@ class DemuxTask(Task): def cleanup(self, failed): if failed: import os - for file in self.generated_files.itervalues(): - os.remove(file) + for file in self.generated_files: + try: + os.remove(file) + except OSError: + pass class MplexTaskPostcondition(Condition): def check(self, task): @@ -187,7 +194,7 @@ class MplexTask(Task): self.weighting = weighting self.demux_task = demux_task self.postconditions.append(MplexTaskPostcondition()) - self.setTool("/usr/bin/mplex") + self.setTool("mplex") self.args += ["-f8", "-o", outputfile, "-v1"] if inputfiles: self.args += inputfiles @@ -215,19 +222,19 @@ class RemoveESFiles(Task): def __init__(self, job, demux_task): Task.__init__(self, job, "Remove temp. files") self.demux_task = demux_task - self.setTool("/bin/rm") + self.setTool("rm") self.weighting = 10 def prepare(self): self.args += ["-f"] - self.args += self.demux_task.generated_files.values() + self.args += self.demux_task.generated_files self.args += [self.demux_task.cutfile] class DVDAuthorTask(Task): def __init__(self, job): Task.__init__(self, job, "Authoring DVD") self.weighting = 20 - self.setTool("/usr/bin/dvdauthor") + self.setTool("dvdauthor") self.CWD = self.job.workspace self.args += ["-x", self.job.workspace+"/dvdauthor.xml"] self.menupreview = job.menupreview @@ -248,7 +255,7 @@ class DVDAuthorTask(Task): class DVDAuthorFinalTask(Task): def __init__(self, job): Task.__init__(self, job, "dvdauthor finalize") - self.setTool("/usr/bin/dvdauthor") + self.setTool("dvdauthor") self.args += ["-T", "-o", self.job.workspace + "/dvd"] class WaitForResidentTasks(Task): @@ -257,6 +264,7 @@ class WaitForResidentTasks(Task): def run(self, callback): print "waiting for %d resident task(s) %s to finish..." % (len(self.job.resident_tasks),str(self.job.resident_tasks)) + self.callback = callback if self.job.resident_tasks == 0: callback(self, []) @@ -284,7 +292,7 @@ class BurnTaskPostcondition(Condition): class BurnTask(Task): ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_FILETOOLARGE, ERROR_ISOTOOLARGE, ERROR_MINUSRWBUG, ERROR_UNKNOWN = range(10) - def __init__(self, job, extra_args=[], tool="/bin/growisofs"): + def __init__(self, job, extra_args=[], tool="growisofs"): Task.__init__(self, job, job.name) self.weighting = 500 self.end = 120 # 100 for writing, 10 for buffer flush, 10 for closing disc @@ -308,9 +316,9 @@ class BurnTask(Task): elif line.startswith(":-["): if line.find("ASC=30h") != -1: self.error = self.ERROR_NOTWRITEABLE - if line.find("ASC=24h") != -1: + elif line.find("ASC=24h") != -1: self.error = self.ERROR_LOAD - if line.find("SK=5h/ASC=A8h/ACQ=04h") != -1: + elif line.find("SK=5h/ASC=A8h/ACQ=04h") != -1: self.error = self.ERROR_MINUSRWBUG else: self.error = self.ERROR_UNKNOWN @@ -349,7 +357,7 @@ class BurnTask(Task): class RemoveDVDFolder(Task): def __init__(self, job): Task.__init__(self, job, "Remove temp. files") - self.setTool("/bin/rm") + self.setTool("rm") self.args += ["-rf", self.job.workspace] self.weighting = 10 @@ -368,12 +376,15 @@ class CheckDiskspaceTask(Task): self.global_preconditions.append(DiskspacePrecondition(diskSpaceNeeded)) self.weighting = 5 + def abort(self): + self.finish(aborted = True) + def run(self, callback): + self.callback = callback failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False) if len(failed_preconditions): callback(self, failed_preconditions) return - self.callback = callback Task.processFinished(self, 0) class PreviewTask(Task): @@ -389,8 +400,12 @@ class PreviewTask(Task): if self.job.menupreview: self.previewProject() else: - from Tools import Notifications - Notifications.AddNotificationWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) + import Screens.Standby + if Screens.Standby.inStandby: + self.previewCB(False) + else: + from Tools import Notifications + Notifications.AddNotificationWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) def abort(self): self.finish(aborted = True) @@ -452,13 +467,13 @@ class ImagePrepareTask(Task): try: from ImageFont import truetype from Image import open as Image_open - s = self.job.project.settings + s = self.job.project.menutemplate.settings + (width, height) = s.dimensions.getValue() self.Menus.im_bg_orig = Image_open(s.menubg.getValue()) - if self.Menus.im_bg_orig.size != (self.Menus.imgwidth, self.Menus.imgheight): - self.Menus.im_bg_orig = self.Menus.im_bg_orig.resize((720, 576)) - self.Menus.fontsizes = s.font_size.getValue() - fontface = s.font_face.getValue() - self.Menus.fonts = [truetype(fontface, self.Menus.fontsizes[0]), truetype(fontface, self.Menus.fontsizes[1]), truetype(fontface, self.Menus.fontsizes[2])] + if self.Menus.im_bg_orig.size != (width, height): + self.Menus.im_bg_orig = self.Menus.im_bg_orig.resize((width, height)) + self.Menus.fontsizes = [s.fontsize_headline.getValue(), s.fontsize_title.getValue(), s.fontsize_subtitle.getValue()] + self.Menus.fonts = [(truetype(s.fontface_headline.getValue(), self.Menus.fontsizes[0])), (truetype(s.fontface_title.getValue(), self.Menus.fontsizes[1])),(truetype(s.fontface_subtitle.getValue(), self.Menus.fontsizes[2]))] Task.processFinished(self, 0) except: Task.processFinished(self, 1) @@ -477,98 +492,158 @@ class MenuImageTask(Task): def run(self, callback): self.callback = callback - try: - import ImageDraw, Image, os - s = self.job.project.settings - fonts = self.Menus.fonts - im_bg = self.Menus.im_bg_orig.copy() - im_high = Image.new("P", (self.Menus.imgwidth, self.Menus.imgheight), 0) - im_high.putpalette(self.Menus.spu_palette) - draw_bg = ImageDraw.Draw(im_bg) - draw_high = ImageDraw.Draw(im_high) - if self.menu_count == 1: - headline = s.name.getValue().decode("utf-8") - textsize = draw_bg.textsize(headline, font=fonts[0]) - if textsize[0] > self.Menus.imgwidth: - offset = (0 , 20) - else: - offset = (((self.Menus.imgwidth-textsize[0]) / 2) , 20) - draw_bg.text(offset, headline, fill=self.Menus.color_headline, font=fonts[0]) - spuxml = """ - - - """ % (self.highlightpngfilename, self.Menus.spu_palette[0], self.Menus.spu_palette[1], self.Menus.spu_palette[2]) - s_top, s_rows, s_left = s.space.getValue() - rowheight = (self.Menus.fontsizes[1]+self.Menus.fontsizes[2]+s_rows) - menu_start_title = (self.menu_count-1)*self.job.titles_per_menu + 1 - menu_end_title = (self.menu_count)*self.job.titles_per_menu + 1 - nr_titles = len(self.job.project.titles) - if menu_end_title > nr_titles: - menu_end_title = nr_titles+1 - menu_i = 0 - for title_no in range( menu_start_title , menu_end_title ): - menu_i += 1 - title = self.job.project.titles[title_no-1] - top = s_top + ( menu_i * rowheight ) - titleText = title.formatDVDmenuText(s.titleformat.getValue(), title_no).decode("utf-8") - draw_bg.text((s_left,top), titleText, fill=self.Menus.color_button, font=fonts[1]) - draw_high.text((s_left,top), titleText, fill=1, font=self.Menus.fonts[1]) - subtitleText = title.formatDVDmenuText(s.subtitleformat.getValue(), title_no).decode("utf-8") - draw_bg.text((s_left,top+36), subtitleText, fill=self.Menus.color_button, font=fonts[2]) - bottom = top+rowheight - if bottom > self.Menus.imgheight: - bottom = self.Menus.imgheight - spuxml += """ - """ % (str(title_no).zfill(2),s_left,self.Menus.imgwidth,top,bottom ) - if self.menu_count < self.job.nr_menus: - next_page_text = ">>>" - textsize = draw_bg.textsize(next_page_text, font=fonts[1]) - offset = ( self.Menus.imgwidth-textsize[0]-2*s_left, s_top + ( self.job.titles_per_menu * rowheight ) ) - draw_bg.text(offset, next_page_text, fill=self.Menus.color_button, font=fonts[1]) - draw_high.text(offset, next_page_text, fill=1, font=fonts[1]) - spuxml += """ - """ % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1]) - if self.menu_count > 1: - prev_page_text = "<<<" - textsize = draw_bg.textsize(prev_page_text, font=fonts[1]) - offset = ( 2*s_left, s_top + ( self.job.titles_per_menu * rowheight ) ) - draw_bg.text(offset, prev_page_text, fill=self.Menus.color_button, font=fonts[1]) - draw_high.text(offset, prev_page_text, fill=1, font=fonts[1]) - spuxml += """ - """ % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1]) - del draw_bg - del draw_high - fd=open(self.menubgpngfilename,"w") - im_bg.save(fd,"PNG") - fd.close() - fd=open(self.highlightpngfilename,"w") - im_high.save(fd,"PNG") - fd.close() + #try: + import ImageDraw, Image, os + s = self.job.project.menutemplate.settings + s_top = s.margin_top.getValue() + s_bottom = s.margin_bottom.getValue() + s_left = s.margin_left.getValue() + s_right = s.margin_right.getValue() + s_rows = s.space_rows.getValue() + s_cols = s.space_cols.getValue() + nr_cols = s.cols.getValue() + nr_rows = s.rows.getValue() + thumb_size = s.thumb_size.getValue() + if thumb_size[0]: + from Image import open as Image_open + (s_width, s_height) = s.dimensions.getValue() + fonts = self.Menus.fonts + im_bg = self.Menus.im_bg_orig.copy() + im_high = Image.new("P", (s_width, s_height), 0) + im_high.putpalette(self.Menus.spu_palette) + draw_bg = ImageDraw.Draw(im_bg) + draw_high = ImageDraw.Draw(im_high) + if self.menu_count == 1: + headlineText = self.job.project.settings.name.getValue().decode("utf-8") + headlinePos = self.getPosition(s.offset_headline.getValue(), 0, 0, s_width, s_top, draw_bg.textsize(headlineText, font=fonts[0])) + draw_bg.text(headlinePos, headlineText, fill=self.Menus.color_headline, font=fonts[0]) + spuxml = """ + + + """ % (self.highlightpngfilename, self.Menus.spu_palette[0], self.Menus.spu_palette[1], self.Menus.spu_palette[2]) + #rowheight = (self.Menus.fontsizes[1]+self.Menus.fontsizes[2]+thumb_size[1]+s_rows) + menu_start_title = (self.menu_count-1)*self.job.titles_per_menu + 1 + menu_end_title = (self.menu_count)*self.job.titles_per_menu + 1 + nr_titles = len(self.job.project.titles) + if menu_end_title > nr_titles: + menu_end_title = nr_titles+1 + col = 1 + row = 1 + for title_no in range( menu_start_title , menu_end_title ): + title = self.job.project.titles[title_no-1] + col_width = ( s_width - s_left - s_right ) / nr_cols + row_height = ( s_height - s_top - s_bottom ) / nr_rows + left = s_left + ( (col-1) * col_width ) + s_cols/2 + right = left + col_width - s_cols + top = s_top + ( (row-1) * row_height) + s_rows/2 + bottom = top + row_height - s_rows + width = right - left + height = bottom - top + + if bottom > s_height: + bottom = s_height + #draw_bg.rectangle((left, top, right, bottom), outline=(255,0,0)) + im_cell_bg = Image.new("RGBA", (width, height),(0,0,0,0)) + draw_cell_bg = ImageDraw.Draw(im_cell_bg) + im_cell_high = Image.new("P", (width, height), 0) + im_cell_high.putpalette(self.Menus.spu_palette) + draw_cell_high = ImageDraw.Draw(im_cell_high) + + if thumb_size[0]: + thumbPos = self.getPosition(s.offset_thumb.getValue(), 0, 0, width, height, thumb_size) + box = (thumbPos[0], thumbPos[1], thumbPos[0]+thumb_size[0], thumbPos[1]+thumb_size[1]) + try: + thumbIm = Image_open(title.inputfile.rsplit('.',1)[0] + ".png") + im_cell_bg.paste(thumbIm,thumbPos) + except: + draw_cell_bg.rectangle(box, fill=(64,127,127,127)) + border = s.thumb_border.getValue() + if border: + draw_cell_high.rectangle(box, fill=1) + draw_cell_high.rectangle((box[0]+border, box[1]+border, box[2]-border, box[3]-border), fill=0) + + titleText = title.formatDVDmenuText(s.titleformat.getValue(), title_no).decode("utf-8") + titlePos = self.getPosition(s.offset_title.getValue(), 0, 0, width, height, draw_bg.textsize(titleText, font=fonts[1])) + + draw_cell_bg.text(titlePos, titleText, fill=self.Menus.color_button, font=fonts[1]) + draw_cell_high.text(titlePos, titleText, fill=1, font=self.Menus.fonts[1]) + + subtitleText = title.formatDVDmenuText(s.subtitleformat.getValue(), title_no).decode("utf-8") + subtitlePos = self.getPosition(s.offset_subtitle.getValue(), 0, 0, width, height, draw_cell_bg.textsize(subtitleText, font=fonts[2])) + draw_cell_bg.text(subtitlePos, subtitleText, fill=self.Menus.color_button, font=fonts[2]) + + del draw_cell_bg + del draw_cell_high + im_bg.paste(im_cell_bg,(left, top, right, bottom), mask=im_cell_bg) + im_high.paste(im_cell_high,(left, top, right, bottom)) + spuxml += """ - - - """ - - f = open(self.spuxmlfilename, "w") - f.write(spuxml) - f.close() - Task.processFinished(self, 0) - except: - Task.processFinished(self, 1) + """ % (str(title_no).zfill(2),left,right,top,bottom ) + if col < nr_cols: + col += 1 + else: + col = 1 + row += 1 + + top = s_height - s_bottom - s_rows/2 + if self.menu_count < self.job.nr_menus: + next_page_text = s.next_page_text.getValue().decode("utf-8") + textsize = draw_bg.textsize(next_page_text, font=fonts[1]) + pos = ( s_width-textsize[0]-s_right, top ) + draw_bg.text(pos, next_page_text, fill=self.Menus.color_button, font=fonts[1]) + draw_high.text(pos, next_page_text, fill=1, font=fonts[1]) + spuxml += """ + """ % (pos[0],pos[0]+textsize[0],pos[1],pos[1]+textsize[1]) + if self.menu_count > 1: + prev_page_text = s.prev_page_text.getValue().decode("utf-8") + textsize = draw_bg.textsize(prev_page_text, font=fonts[1]) + pos = ( (s_left+s_cols/2), top ) + draw_bg.text(pos, prev_page_text, fill=self.Menus.color_button, font=fonts[1]) + draw_high.text(pos, prev_page_text, fill=1, font=fonts[1]) + spuxml += """ + """ % (pos[0],pos[0]+textsize[0],pos[1],pos[1]+textsize[1]) + del draw_bg + del draw_high + fd=open(self.menubgpngfilename,"w") + im_bg.save(fd,"PNG") + fd.close() + fd=open(self.highlightpngfilename,"w") + im_high.save(fd,"PNG") + fd.close() + spuxml += """ + + + """ + + f = open(self.spuxmlfilename, "w") + f.write(spuxml) + f.close() + Task.processFinished(self, 0) + #except: + #Task.processFinished(self, 1) + + def getPosition(self, offset, left, top, right, bottom, size): + pos = [left, top] + if offset[0] != -1: + pos[0] += offset[0] + else: + pos[0] += ( (right-left) - size[0] ) / 2 + if offset[1] != -1: + pos[1] += offset[1] + else: + pos[1] += ( (bottom-top) - size[1] ) / 2 + return tuple(pos) class Menus: def __init__(self, job): self.job = job job.Menus = self - - s = self.job.project.settings - self.imgwidth = 720 - self.imgheight = 576 + s = self.job.project.menutemplate.settings self.color_headline = tuple(s.color_headline.getValue()) self.color_button = tuple(s.color_button.getValue()) @@ -577,10 +652,9 @@ class Menus: ImagePrepareTask(job) nr_titles = len(job.project.titles) - if nr_titles < 6: - job.titles_per_menu = 5 - else: - job.titles_per_menu = 4 + + job.titles_per_menu = s.cols.getValue()*s.rows.getValue() + job.nr_menus = ((nr_titles+job.titles_per_menu-1)/job.titles_per_menu) #a new menu_count every 4 titles (1,2,3,4->1 ; 5,6,7,8->2 etc.) @@ -599,14 +673,14 @@ class Menus: menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg" spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename) -def CreateAuthoringXML_simple(job): +def CreateAuthoringXML_singleset(job): nr_titles = len(job.project.titles) mode = job.project.settings.authormode.getValue() authorxml = [] authorxml.append('\n') authorxml.append(' \n') authorxml.append(' \n') - authorxml.append(' \n') + authorxml.append(' \n') authorxml.append(' \n') authorxml.append(' \n', ) if mode.startswith("menu"): @@ -618,7 +692,7 @@ def CreateAuthoringXML_simple(job): authorxml.append(' \n') authorxml.append(' \n') if mode.startswith("menu"): - authorxml.append(' \n') + authorxml.append(' \n') authorxml.append(' \n') for menu_count in range(1 , job.nr_menus+1): if menu_count == 1: @@ -674,11 +748,14 @@ def CreateAuthoringXML_multiset(job): authorxml.append('\n') authorxml.append(' \n') authorxml.append(' \n') - authorxml.append(' \n') + authorxml.append(' \n') authorxml.append(' \n') if mode.startswith("menu"): for menu_count in range(1 , job.nr_menus+1): - authorxml.append(' \n') + if menu_count == 1: + authorxml.append(' \n') + else: + authorxml.append(' \n') menu_start_title = (menu_count-1)*job.titles_per_menu + 1 menu_end_title = (menu_count)*job.titles_per_menu + 1 if menu_end_title > nr_titles: @@ -703,6 +780,13 @@ def CreateAuthoringXML_multiset(job): for i in range( nr_titles ): title = job.project.titles[i] authorxml.append(' \n') + authorxml.append(' \n') + authorxml.append(' \n') + authorxml.append(' \n') + authorxml.append(' jump vmgm menu entry title;\n') + authorxml.append(' \n') + authorxml.append(' \n') + authorxml.append(' \n') authorxml.append(' \n') for audiotrack in title.properties.audiotracks: active = audiotrack.active.getValue() @@ -771,7 +855,10 @@ class DVDJob(Job): CheckDiskspaceTask(self) if self.project.settings.authormode.getValue().startswith("menu") or self.menupreview: Menus(self) - CreateAuthoringXML_multiset(self) + if self.project.settings.titlesetmode.getValue() == "multi": + CreateAuthoringXML_multiset(self) + else: + CreateAuthoringXML_singleset(self) DVDAuthorTask(self) @@ -788,18 +875,20 @@ class DVDJob(Job): demux = DemuxTask(self, link_name) self.mplextask = MplexTask(self, outputfile=title_filename, demux_task=demux) self.mplextask.end = self.estimateddvdsize - #RemoveESFiles(self, demux) + RemoveESFiles(self, demux) WaitForResidentTasks(self) PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/") output = self.project.settings.output.getValue() volName = self.project.settings.name.getValue() if output == "dvd": self.name = _("Burn DVD") - tool = "/bin/growisofs" + tool = "growisofs" burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ] + if self.project.size/(1024*1024) > self.project.MAX_SL: + burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ] elif output == "iso": self.name = _("Create DVD-ISO") - tool = "/usr/bin/mkisofs" + tool = "genisoimage" isopathfile = getISOfilename(self.project.settings.isopath.getValue(), volName) burnargs = [ "-o", isopathfile ] burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, self.workspace + "/dvd" ] @@ -831,12 +920,14 @@ class DVDdataJob(Job): output = self.project.settings.output.getValue() volName = self.project.settings.name.getValue() - tool = "/bin/growisofs" + tool = "growisofs" if output == "dvd": self.name = _("Burn DVD") burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ] + if self.project.size/(1024*1024) > self.project.MAX_SL: + burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ] elif output == "iso": - tool = "/usr/bin/mkisofs" + tool = "genisoimage" self.name = _("Create DVD-ISO") isopathfile = getISOfilename(self.project.settings.isopath.getValue(), volName) burnargs = [ "-o", isopathfile ] @@ -855,13 +946,18 @@ class DVDisoJob(Job): Job.__init__(self, _("Burn DVD")) self.project = project self.menupreview = False + from Tools.Directories import getSize if imagepath.endswith(".iso"): PreviewTask(self, imagepath) burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD() + '='+imagepath, "-dvd-compat" ] + if getSize(imagepath)/(1024*1024) > self.project.MAX_SL: + burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ] else: PreviewTask(self, imagepath + "/VIDEO_TS/") volName = self.project.settings.name.getValue() burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ] + if getSize(imagepath)/(1024*1024) > self.project.MAX_SL: + burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ] burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, imagepath ] - tool = "/bin/growisofs" + tool = "growisofs" BurnTask(self, burnargs, tool)
\n') + authorxml.append(' jump vmgm menu entry title;\n') + authorxml.append('