X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2dc13ab463d67b1255ec31cbe2b27cafef318dbe..a6dfff23d0d29b636120a3e6fdd845fb2f4117b4:/lib/python/Plugins/Extensions/DVDBurn/Process.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index b9710d5a..0fcbab04 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -1,4 +1,4 @@
-from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition
+from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition, ToolExistsPrecondition
 from Screens.MessageBox import MessageBox
 
 class png2yuvTask(Task):
@@ -11,13 +11,11 @@ class png2yuvTask(Task):
 
 	def run(self, callback, task_progress_changed):
 		Task.run(self, callback, task_progress_changed)
+		self.container.stdoutAvail.get().remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 
 	def processStderr(self, data):
-		print "[png2yuvTask]", data
-
-	def processStdout(self, data):
-		pass
+		print "[png2yuvTask]", data[:-1]
 
 class mpeg2encTask(Task):
 	def __init__(self, job, inputfile, outputfile):
@@ -32,7 +30,7 @@ class mpeg2encTask(Task):
 		self.container.readFromFile(self.inputFile)
 
 	def processOutputLine(self, line):
-		print "[mpeg2encTask]", line
+		print "[mpeg2encTask]", line[:-1]
 
 class spumuxTask(Task):
 	def __init__(self, job, xmlfile, inputfile, outputfile):
@@ -45,14 +43,12 @@ class spumuxTask(Task):
 
 	def run(self, callback, task_progress_changed):
 		Task.run(self, callback, task_progress_changed)
+		self.container.stdoutAvail.get().remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 		self.container.readFromFile(self.inputFile)
 
 	def processStderr(self, data):
-		print "[spumuxTask]", data
-
-	def processStdout(self, data):
-		pass
+		print "[spumuxTask]", data[:-1]
 
 class MakeFifoNode(Task):
 	def __init__(self, job, number):
@@ -69,6 +65,19 @@ class LinkTS(Task):
 		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")
+		from os import listdir
+		path, filename = sourcefile.rstrip("/").rsplit("/",1)
+		tsfiles = listdir(path)
+		for file in tsfiles:
+			if file.startswith(filename+"."):
+				self.args += [path+'/'+file]
+		self.args += [self.job.workspace]
+		self.weighting = 10
+
 class DemuxTask(Task):
 	def __init__(self, job, inputfile):
 		Task.__init__(self, job, "Demux video into ES")
@@ -107,7 +116,7 @@ class DemuxTask(Task):
 		self.generated_files.append(file)
 
 	def haveProgress(self, progress):
-		print "PROGRESS [%s]" % progress
+		#print "PROGRESS [%s]" % progress
 		MSG_CHECK = "check & synchronize audio file"
 		MSG_DONE = "done..."
 		if progress == "preparing collection(s)...":
@@ -144,22 +153,48 @@ class DemuxTask(Task):
 			for f in self.generated_files:
 				os.remove(f)
 
+class MplexTaskPostcondition(Condition):
+	def check(self, task):
+		if task.error == task.ERROR_UNDERRUN:
+			return True
+		return task.error is None
+
+	def getErrorMessage(self, task):
+		return {
+			task.ERROR_UNDERRUN: ("Can't multiplex source video!"),
+			task.ERROR_UNKNOWN: ("An unknown error occured!")
+		}[task.error]
+
 class MplexTask(Task):
+	ERROR_UNDERRUN, ERROR_UNKNOWN = range(2)
 	def __init__(self, job, outputfile, inputfiles=None, demux_task=None):
 		Task.__init__(self, job, "Mux ES into PS")
 		self.weighting = 500
 		self.demux_task = demux_task
+		self.postconditions.append(MplexTaskPostcondition())
 		self.setTool("/usr/bin/mplex")
 		self.args += ["-f8", "-o", outputfile, "-v1"]
 		if inputfiles:
 			self.args += inputfiles
 
+	def setTool(self, tool):
+		self.cmd = tool
+		self.args = [tool]
+		self.global_preconditions.append(ToolExistsPrecondition())
+		# we don't want the ReturncodePostcondition in this case because for right now we're just gonna ignore the fact that mplex fails with a buffer underrun error on some streams (this always at the very end)
+
 	def prepare(self):
+		self.error = None			
 		if self.demux_task:
 			self.args += self.demux_task.generated_files
 
 	def processOutputLine(self, line):
-		print "[MplexTask] processOutputLine=", line
+		print "[MplexTask] ", line[:-1]
+		if line.startswith("**ERROR:"):
+			if line.find("Frame data under-runs detected") != -1:
+				self.error = self.ERROR_UNDERRUN
+			else:
+				self.error = self.ERROR_UNKNOWN
 
 class RemoveESFiles(Task):
 	def __init__(self, job, demux_task):
@@ -184,7 +219,7 @@ class DVDAuthorTask(Task):
 		self.menupreview = job.menupreview
 
 	def processOutputLine(self, line):
-		print "[DVDAuthorTask] processOutputLine=", line
+		print "[DVDAuthorTask] ", line[:-1]
 		if not self.menupreview and line.startswith("STAT: Processing"):
 			self.callback(self, [], stay_resident=True)
 
@@ -204,29 +239,34 @@ class WaitForResidentTasks(Task):
 			callback(self, [])
 
 class BurnTaskPostcondition(Condition):
+	RECOVERABLE = True
 	def check(self, task):
 		return task.error is None
 
 	def getErrorMessage(self, task):
 		return {
-			task.ERROR_MEDIA: ("Medium is not a writeable DVD!"),
-			task.ERROR_SIZE: ("Content does not fit on DVD!"),
-			task.ERROR_WRITE_FAILED: ("Write failed!"),
-			task.ERROR_DVDROM: ("No (supported) DVDROM found!"),
-			task.ERROR_UNKNOWN: ("An unknown error occured!")
+			task.ERROR_NOTWRITEABLE: _("Medium is not a writeable DVD!"),
+			task.ERROR_LOAD: _("Could not load Medium! No disc inserted?"),
+			task.ERROR_SIZE: _("Content does not fit on DVD!"),
+			task.ERROR_WRITE_FAILED: _("Write failed!"),
+			task.ERROR_DVDROM: _("No (supported) DVDROM found!"),
+			task.ERROR_ISOFS: _("Medium is not empty!"),
+			task.ERROR_UNKNOWN: _("An unknown error occured!")
 		}[task.error]
 
 class BurnTask(Task):
-	ERROR_MEDIA, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_UNKNOWN = range(5)
-	def __init__(self, job):
-		Task.__init__(self, job, "burn")
+	ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_UNKNOWN = range(7)
+	def __init__(self, job, extra_args=[]):
+		Task.__init__(self, job, _("Burn to DVD..."))
 
 		self.weighting = 500
 		self.end = 120 # 100 for writing, 10 for buffer flush, 10 for closing disc
 		self.postconditions.append(BurnTaskPostcondition())
 		self.setTool("/bin/growisofs")
-		
-		self.args += ["-dvd-video", "-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", self.getASCIIname(job.project.name), "-P", "Dreambox", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"]
+		volName = self.getASCIIname(job.project.settings.name.getValue())
+		self.args += [ "-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", volName, "-publisher", "Dreambox", "-use-the-force-luke=dummy" ]
+		self.args += extra_args
+		self.args += [ self.job.workspace + "/dvd" ]
 
 	def getASCIIname(self, name):
 		ASCIIname = ""
@@ -252,7 +292,9 @@ class BurnTask(Task):
 			self.progress = 110
 		elif line.startswith(":-["):
 			if line.find("ASC=30h") != -1:
-				self.error = self.ERROR_MEDIA
+				self.error = self.ERROR_NOTWRITEABLE
+			if line.find("ASC=24h") != -1:
+				self.error = self.ERROR_LOAD
 			else:
 				self.error = self.ERROR_UNKNOWN
 				print "BurnTask: unknown error %s" % line
@@ -264,7 +306,13 @@ class BurnTask(Task):
 			elif line.find("unable to open64(\"/dev/cdroms/cdrom0\",O_RDONLY): No such file or directory") != -1: # fixme
 				self.error = self.ERROR_DVDROM
 			elif line.find("media is not recognized as recordable DVD") != -1:
-				self.error = self.ERROR_MEDIA
+				self.error = self.ERROR_NOTWRITEABLE
+			else:
+				self.error = self.ERROR_UNKNOWN
+				print "BurnTask: unknown error %s" % line
+		elif line.startswith("FATAL:"):
+			if line.find("already carries isofs!"):
+				self.error = self.ERROR_ISOFS
 			else:
 				self.error = self.ERROR_UNKNOWN
 				print "BurnTask: unknown error %s" % line
@@ -278,21 +326,20 @@ class RemoveDVDFolder(Task):
 class PreviewTask(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "Preview")
+		self.postconditions.append(PreviewTaskPostcondition())
 		self.job = job
 
 	def run(self, callback, task_progress_changed):
 		self.callback = callback
 		self.task_progress_changed = task_progress_changed
-		if self.job.project.waitboxref:
-			self.job.project.waitboxref.close()
 		if self.job.menupreview:
-			self.waitAndOpenPlayer()
+			self.previewProject()
 		else:
-			self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this project before burning?"), timeout = 60, default = False)
+			self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False)
 	
 	def previewCB(self, answer):
 		if answer == True:
-			self.waitAndOpenPlayer()
+			self.previewProject()
 		else:
 			self.closedCB(True)
 
@@ -300,245 +347,309 @@ class PreviewTask(Task):
 		if self.job.menupreview:
 			self.closedCB(True)
 		else:
-			self.job.project.session.openWithCallback(self.closedCB, MessageBox, _("Do you want to burn this project to DVD medium?") )
+			self.job.project.session.openWithCallback(self.closedCB, MessageBox, _("Do you want to burn this collection to DVD medium?") )
 
 	def closedCB(self, answer):
 		if answer == True:
 			Task.processFinished(self, 0)
 		else:
 			Task.processFinished(self, 1)
-
-	def waitAndOpenPlayer(self):
-		from enigma import eTimer
-		self.delayTimer = eTimer()
-		self.delayTimer.callback.append(self.previewProject)
-		self.delayTimer.start(10,1)
 		
 	def previewProject(self):
 		from Plugins.Extensions.DVDPlayer.plugin import DVDPlayer
 		self.job.project.session.openWithCallback(self.playerClosed, DVDPlayer, dvd_filelist= [ self.job.project.workspace + "/dvd/VIDEO_TS/" ])
 
-def getTitlesPerMenu(nr_titles):
-	if nr_titles < 6:
-		titles_per_menu = 5
+class PreviewTaskPostcondition(Condition):
+	def check(self, task):
+		return task.returncode == 0
+
+	def getErrorMessage(self, task):
+		return "Cancel"
+
+def formatTitle(template, title, track):
+	template = template.replace("$i", str(track))
+	template = template.replace("$t", title.name)
+	template = template.replace("$d", title.descr)
+	template = template.replace("$c", str(len(title.chaptermarks)+1))
+	template = template.replace("$A", str(title.audiotracks))
+	template = template.replace("$f", title.inputfile)
+	template = template.replace("$C", title.channel)
+	l = title.length
+	lengthstring = "%d:%02d:%02d" % (l/3600, l%3600/60, l%60)
+	template = template.replace("$l", lengthstring)
+	if title.timeCreate:
+		template = template.replace("$Y", str(title.timeCreate[0]))
+		template = template.replace("$M", str(title.timeCreate[1]))
+		template = template.replace("$D", str(title.timeCreate[2]))
+		timestring = "%d:%02d" % (title.timeCreate[3], title.timeCreate[4])
+		template = template.replace("$T", timestring)
 	else:
-		titles_per_menu = 4
-	return titles_per_menu
+		template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$T", "")
+	return template.decode("utf-8")
 
-def CreateMenus(job):
-	import os, Image, ImageDraw, ImageFont, re
-	imgwidth = 720
-	imgheight = 576
-	
-	im_bg_orig = Image.open(job.project.menubg)
-	if im_bg_orig.size != (imgwidth, imgheight):
-		im_bg_orig = im_bg_orig.resize((720, 576))
+class ImagingPostcondition(Condition):
+	def check(self, task):
+		return task.returncode == 0
 
-	font0 = ImageFont.truetype(job.project.font_face, job.project.font_size[0])
-	font1 = ImageFont.truetype(job.project.font_face, job.project.font_size[1])
-	font2 = ImageFont.truetype(job.project.font_face, job.project.font_size[2])
-	spu_palette = [	0x60, 0x60, 0x60 ] + list(job.project.color_highlight)
+	def getErrorMessage(self, task):
+		return "python-imaging " + _("failed")
 
-	nr_titles = len(job.project.titles)
-	titles_per_menu = getTitlesPerMenu(nr_titles)
-	job.nr_menus = ((nr_titles+titles_per_menu-1)/titles_per_menu)
-
-	#a new menu_count every 5 titles (1,2,3,4,5->1 ; 6,7,8,9,10->2 etc.)
-	for menu_count in range(1 , job.nr_menus+1):
-		im_bg = im_bg_orig.copy()
-		im_high = Image.new("P", (imgwidth, imgheight), 0)
-		im_high.putpalette(spu_palette)
-		draw_bg = ImageDraw.Draw(im_bg)
-		draw_high = ImageDraw.Draw(im_high)
-
-		if menu_count == 1:
-			headline = job.project.name.decode("utf-8")
-			textsize = draw_bg.textsize(headline, font=font0)
-			if textsize[0] > imgwidth:
-				offset = (0 , 20)
-			else:
-				offset = (((imgwidth-textsize[0]) / 2) , 20)
-			draw_bg.text(offset, headline, fill=job.project.color_headline, font=font0)
+class ImagePrepareTask(Task):
+	def __init__(self, job):
+		Task.__init__(self, job, _("please wait, loading picture..."))
+		self.postconditions.append(ImagingPostcondition())
+		self.weighting = 20
+		self.job = job
+		self.Menus = job.Menus
 		
-		menubgpngfilename = job.workspace+"/dvd_menubg"+str(menu_count)+".png"
-		highlightpngfilename = job.workspace+"/dvd_highlight"+str(menu_count)+".png"
-		spuxml = """<?xml version="1.0" encoding="utf-8"?>
-	<subpictures>
-	<stream>
-	<spu 
-	highlight="%s"
-	transparent="%02x%02x%02x"
-	start="00:00:00.00"
-	force="yes" >""" % (highlightpngfilename, spu_palette[0], spu_palette[1], spu_palette[2])
-
-		rowheight = (job.project.font_size[1]+job.project.font_size[2]+job.project.space_rows)
-		menu_start_title = (menu_count-1)*titles_per_menu + 1
-		menu_end_title = (menu_count)*titles_per_menu + 1
-		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 ):
-			i = title_no-1
-			top = job.project.space_top + ( menu_i * rowheight )
-			menu_i += 1
-			title = job.project.titles[i]
-			titlename = title.name.decode("utf-8")
-			menuitem = "%d. %s" % (title_no, titlename)
-			draw_bg.text((job.project.space_left,top), menuitem, fill=job.project.color_button, font=font1)
-			draw_high.text((job.project.space_left,top), menuitem, fill=1, font=font1)
-			res = re.search("(?:/.*?).*/(?P<year>\d{4})(?P<month>\d{2})(?P<day>\d{2}).(?P<hour>\d{2})(?P<minute>\d{2}).-.*.?.ts", title.inputfile)
-			subtitle = ""
-			if res:
-				subtitle = "%s-%s-%s, %s:%s. " % (res.group("year"),res.group("month"),res.group("day"),res.group("hour"),res.group("minute"))
-			if len(title.descr) > 1:
-				subtitle += title.descr.decode("utf-8") + ". "
-			if len(title.chaptermarks) > 1:
-				subtitle += (" (%d %s)" % (len(title.chaptermarks)+1, _("chapters")))
-			draw_bg.text((job.project.space_left,top+36), subtitle, fill=job.project.color_button, font=font2)
-	
-			bottom = top+rowheight
-			if bottom > imgheight:
-				bottom = imgheight
-			spuxml += """
-	<button name="button%s" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (str(title_no).zfill(2),job.project.space_left,imgwidth,top,bottom )
-		if menu_count > 1:
-			prev_page_text = "<<<"
-			textsize = draw_bg.textsize(prev_page_text, font=font1)
-			offset = ( 2*job.project.space_left, job.project.space_top + ( titles_per_menu * rowheight ) )
-			draw_bg.text(offset, prev_page_text, fill=job.project.color_button, font=font1)
-			draw_high.text(offset, prev_page_text, fill=1, font=font1)
-			spuxml += """
-	<button name="button_prev" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1])
-
-		if menu_count < job.nr_menus:
-			next_page_text = ">>>"
-			textsize = draw_bg.textsize(next_page_text, font=font1)
-			offset = ( imgwidth-textsize[0]-2*job.project.space_left, job.project.space_top + ( titles_per_menu * rowheight ) )
-			draw_bg.text(offset, next_page_text, fill=job.project.color_button, font=font1)
-			draw_high.text(offset, next_page_text, fill=1, font=font1)
+	def run(self, callback, task_progress_changed):			
+		self.callback = callback
+		self.task_progress_changed = task_progress_changed
+		# we are doing it this weird way so that the TaskView Screen actually pops up before the spinner comes
+		from enigma import eTimer
+		self.delayTimer = eTimer()
+		self.delayTimer.callback.append(self.conduct)
+		self.delayTimer.start(10,1)
+
+	def conduct(self):
+		try:
+			from ImageFont import truetype
+			from Image import open as Image_open		
+			s = self.job.project.settings
+			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])]
+			Task.processFinished(self, 0)
+		except:
+			Task.processFinished(self, 1)
+
+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())
+		self.weighting = 20 
+		self.job = job
+		self.Menus = job.Menus
+		self.menu_count = menu_count
+		self.spuxmlfilename = spuxmlfilename
+		self.menubgpngfilename = menubgpngfilename
+		self.highlightpngfilename = highlightpngfilename
+
+	def run(self, callback, task_progress_changed):
+		self.callback = callback
+		self.task_progress_changed = task_progress_changed
+		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 = """<?xml version="1.0" encoding="utf-8"?>
+		<subpictures>
+		<stream>
+		<spu 
+		highlight="%s"
+		transparent="%02x%02x%02x"
+		start="00:00:00.00"
+		force="yes" >""" % (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 ):
+				i = title_no-1
+				top = s_top + ( menu_i * rowheight )
+				menu_i += 1
+				title = self.job.project.titles[i]
+				titleText = formatTitle(s.titleformat.getValue(), title, title_no)
+				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 = formatTitle(s.subtitleformat.getValue(), title, title_no)
+				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 += """
+		<button name="button%s" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (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 += """
+		<button name="button_next" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (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 += """
+		<button name="button_prev" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (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()
 			spuxml += """
-	<button name="button_next" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1])
-				
-		del draw_bg
-		del draw_high
-		fd=open(menubgpngfilename,"w")
-		im_bg.save(fd,"PNG")
-		fd.close()
-		fd=open(highlightpngfilename,"w")
-		im_high.save(fd,"PNG")
-		fd.close()
-	
-		png2yuvTask(job, menubgpngfilename, job.workspace+"/dvdmenubg"+str(menu_count)+".yuv")
-		menubgm2vfilename = job.workspace+"/dvdmenubg"+str(menu_count)+".mv2"
-		mpeg2encTask(job, job.workspace+"/dvdmenubg"+str(menu_count)+".yuv", menubgm2vfilename)
-		menubgmpgfilename = job.workspace+"/dvdmenubg"+str(menu_count)+".mpg"
-		MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, job.project.menuaudio])
+		</spu>
+		</stream>
+		</subpictures>"""
 	
-		spuxml += """
-	</spu>
-	</stream>
-	</subpictures>"""
-		spuxmlfilename = job.workspace+"/spumux"+str(menu_count)+".xml"
-		f = open(spuxmlfilename, "w")
-		f.write(spuxml)
-		f.close()
+			f = open(self.spuxmlfilename, "w")
+			f.write(spuxml)
+			f.close()
+			Task.processFinished(self, 0)
+		except:
+			Task.processFinished(self, 1)
+
+class Menus:
+	def __init__(self, job):
+		self.job = job
+		job.Menus = self
 		
-		menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
-		spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
+		s = self.job.project.settings
+
+		self.imgwidth = 720
+		self.imgheight = 576
+
+		self.color_headline = tuple(s.color_headline.getValue())
+		self.color_button = tuple(s.color_button.getValue())
+		self.color_highlight = tuple(s.color_highlight.getValue())
+		self.spu_palette = [ 0x60, 0x60, 0x60 ] + s.color_highlight.getValue()
+
+		ImagePrepareTask(job)
+		nr_titles = len(job.project.titles)
+		if nr_titles < 6:
+			job.titles_per_menu = 5
+		else:
+			job.titles_per_menu = 4
+		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.)
+		for menu_count in range(1 , job.nr_menus+1):
+			num = str(menu_count)
+			spuxmlfilename = job.workspace+"/spumux"+num+".xml"
+			menubgpngfilename = job.workspace+"/dvd_menubg"+num+".png"
+			highlightpngfilename = job.workspace+"/dvd_highlight"+num+".png"
+			MenuImageTask(job, menu_count, spuxmlfilename, menubgpngfilename, highlightpngfilename)
+			png2yuvTask(job, menubgpngfilename, job.workspace+"/dvdmenubg"+num+".yuv")
+			menubgm2vfilename = job.workspace+"/dvdmenubg"+num+".mv2"
+			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])
+			menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg"
+			spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
 		
 def CreateAuthoringXML(job):
 	nr_titles = len(job.project.titles)
-	titles_per_menu = getTitlesPerMenu(nr_titles)
-	authorxml = """<?xml version="1.0" encoding="utf-8"?>
-<dvdauthor dest="%s">
-   <vmgm>
-      <menus>
-         <pgc>
-            <vob file="%s" />
-            <post> jump titleset 1 menu; </post>
-         </pgc>
-      </menus>
-   </vmgm>
-   <titleset>
-      <menus>
-         <video aspect="4:3"/>"""% (job.workspace+"/dvd", job.project.vmgm)
-	for menu_count in range(1 , job.nr_menus+1):
-		if menu_count == 1:
-			authorxml += """
-         <pgc entry="root">"""
-		else:
-			authorxml += """
-         <pgc>"""
-		menu_start_title = (menu_count-1)*titles_per_menu + 1
-		menu_end_title = (menu_count)*titles_per_menu + 1
-		if menu_end_title > nr_titles:
-			menu_end_title = nr_titles+1
-		for i in range( menu_start_title , menu_end_title ):
-			authorxml += """
-            <button name="button%s">jump title %d;</button>""" % (str(i).zfill(2), i)
-		
-		if menu_count > 1:
-			authorxml += """
-            <button name="button_prev">jump menu %d;</button>""" % (menu_count-1)
-			
-		if menu_count < job.nr_menus:
-			authorxml += """
-            <button name="button_next">jump menu %d;</button>""" % (menu_count+1)
-
-		menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
-		authorxml += """
-            <vob file="%s" pause="inf"/>
-	 </pgc>""" % menuoutputfilename
-	authorxml += """
-      </menus>
-      <titles>"""
+	mode = job.project.settings.authormode.getValue()
+	authorxml = []
+	authorxml.append('<?xml version="1.0" encoding="utf-8"?>\n')
+	authorxml.append(' <dvdauthor dest="' + (job.workspace+"/dvd") + '">\n')
+	authorxml.append('  <vmgm>\n')
+	authorxml.append('   <menus>\n')
+	authorxml.append('    <pgc>\n')
+	authorxml.append('     <vob file="' + job.project.settings.vmgm.getValue() + '" />\n', )
+	if mode.startswith("menu"):
+		authorxml.append('     <post> jump titleset 1 menu; </post>\n')
+	else:
+		authorxml.append('     <post> jump title 1; </post>\n')
+	authorxml.append('    </pgc>\n')
+	authorxml.append('   </menus>\n')
+	authorxml.append('  </vmgm>\n')
+	authorxml.append('  <titleset>\n')
+	if mode.startswith("menu"):
+		authorxml.append('   <menus>\n')
+		authorxml.append('    <video aspect="4:3"/>\n')
+		for menu_count in range(1 , job.nr_menus+1):
+			if menu_count == 1:
+				authorxml.append('    <pgc entry="root">\n')
+			else:
+				authorxml.append('    <pgc>\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:
+				menu_end_title = nr_titles+1
+			for i in range( menu_start_title , menu_end_title ):
+				authorxml.append('     <button name="button' + (str(i).zfill(2)) + '"> jump title ' + str(i) +'; </button>\n')
+			if menu_count > 1:
+				authorxml.append('     <button name="button_prev"> jump menu ' + str(menu_count-1) + '; </button>\n')
+			if menu_count < job.nr_menus:
+				authorxml.append('     <button name="button_next"> jump menu ' + str(menu_count+1) + '; </button>\n')
+			menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
+			authorxml.append('     <vob file="' + menuoutputfilename + '" pause="inf"/>\n')
+			authorxml.append('    </pgc>\n')
+		authorxml.append('   </menus>\n')
+	authorxml.append('   <titles>\n')
 	for i in range( nr_titles ):
+		#for audiotrack in job.project.titles[i].audiotracks:
+			#authorxml.append('    <audio lang="'+audiotrack[0][:2]+'" format="'+audiotrack[1]+'" />\n')
 		chapters = ','.join(["%d:%02d:%02d.%03d" % (p / (90000 * 3600), p % (90000 * 3600) / (90000 * 60), p % (90000 * 60) / 90000, (p % 90000) / 90) for p in job.project.titles[i].chaptermarks])
-
 		title_no = i+1
 		title_filename = job.workspace + "/dvd_title_%d.mpg" % (title_no)
-		
 		if job.menupreview:
-			LinkTS(job, job.project.vmgm, title_filename)
+			LinkTS(job, job.project.settings.vmgm.getValue(), title_filename)
 		else:
 			MakeFifoNode(job, title_no)
-		
-		vob_tag = """file="%s" chapters="%s" />""" % (title_filename, chapters)
-					
-		if title_no < nr_titles:
+		if mode.endswith("linked") and title_no < nr_titles:
 			post_tag = "jump title %d;" % ( title_no+1 )
-		else:
+		elif mode.startswith("menu"):
 			post_tag = "call vmgm menu 1;"
-		authorxml += """
-         <pgc>
-            <vob %s
-            <post> %s </post>
-         </pgc>""" % (vob_tag, post_tag)
-	 
-	authorxml += """
-     </titles>
-   </titleset>
-</dvdauthor>
-"""
+		else:	post_tag = ""
+
+		authorxml.append('    <pgc>\n')
+		authorxml.append('     <vob file="' + title_filename + '" chapters="' + chapters + '" />\n')
+		authorxml.append('     <post> ' + post_tag + ' </post>\n')
+		authorxml.append('    </pgc>\n')
+
+	authorxml.append('   </titles>\n')
+	authorxml.append('  </titleset>\n')
+	authorxml.append(' </dvdauthor>\n')
 	f = open(job.workspace+"/dvdauthor.xml", "w")
-	f.write(authorxml)
+	for x in authorxml:
+		f.write(x)
 	f.close()
 
 class DVDJob(Job):
 	def __init__(self, project, menupreview=False):
-		Job.__init__(self, "DVD Burn")
+		Job.__init__(self, _("Burn DVD"))
 		self.project = project
 		from time import strftime
 		from Tools.Directories import SCOPE_HDD, resolveFilename, createDir
 		new_workspace = resolveFilename(SCOPE_HDD) + "tmp/" + strftime("%Y%m%d%H%M%S")
-		createDir(new_workspace)
+		createDir(new_workspace, True)
 		self.workspace = new_workspace
 		self.project.workspace = self.workspace
 		self.menupreview = menupreview
 		self.conduct()
 
 	def conduct(self):
-		CreateMenus(self)
+		if self.project.settings.authormode.getValue().startswith("menu") or self.menupreview:
+			Menus(self)
 		CreateAuthoringXML(self)
 
 		totalsize = 50*1024*1024 # require an extra safety 50 MB
@@ -548,7 +659,6 @@ class DVDJob(Job):
 			if titlesize > maxsize: maxsize = titlesize
 			totalsize += titlesize
 		diskSpaceNeeded = totalsize + maxsize
-		print "diskSpaceNeeded:", diskSpaceNeeded
 
 		DVDAuthorTask(self, diskSpaceNeeded)
 		
@@ -567,17 +677,47 @@ class DVDJob(Job):
 				RemoveESFiles(self, demux)
 			WaitForResidentTasks(self)
 			PreviewTask(self)
-			BurnTask(self)
-		#RemoveDVDFolder(self)
+			BurnTask(self,["-dvd-video"])
+		RemoveDVDFolder(self)
+
+class DVDdataJob(Job):
+	def __init__(self, project):
+		Job.__init__(self, "Data DVD Burn")
+		self.project = project
+		from time import strftime
+		from Tools.Directories import SCOPE_HDD, resolveFilename, createDir
+		new_workspace = resolveFilename(SCOPE_HDD) + "tmp/" + strftime("%Y%m%d%H%M%S") + "/dvd/"
+		createDir(new_workspace, True)
+		self.workspace = new_workspace
+		self.project.workspace = self.workspace
+		self.conduct()
+
+	def conduct(self):
+		diskSpaceNeeded = 50*1024*1024 # require an extra safety 50 MB
+		for title in self.project.titles:
+			diskSpaceNeeded += title.filesize
+		nr_titles = len(self.project.titles)
+
+		for self.i in range(nr_titles):
+			title = self.project.titles[self.i]
+			filename = title.inputfile.rstrip("/").rsplit("/",1)[1]
+			link_name =  self.workspace + filename
+			LinkTS(self, title.inputfile, link_name)
+			CopyMeta(self, title.inputfile)
+		BurnTask(self)
+		RemoveDVDFolder(self)
 
 def Burn(session, project):
-	print "burning cuesheet!"
 	j = DVDJob(project)
 	job_manager.AddJob(j)
 	return j
 
 def PreviewMenu(session, project):
-	print "preview DVD menu!"
 	j = DVDJob(project, menupreview=True)
 	job_manager.AddJob(j)
 	return j
+
+def BurnDataTS(session, project):
+	j = DVDdataJob(project)
+	job_manager.AddJob(j)
+	return j