X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4946a987277adbbd057e4d82d54e7e4ef688e419..99a717e9813eab30cd34f5da6f4a5ab6e791dc1f:/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
index 26f51e63..660005e6 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
@@ -14,7 +14,7 @@ class DVDTitle:
 		self.DVBname = _("Title")
 		self.DVBdescr = _("Description")
 		self.DVBchannel = _("Channel")
-		self.properties.aspect = ConfigSelection(choices = [("4:3", "4:3"), ("16:9", "16:9")])
+		self.properties.aspect = ConfigSelection(choices = [("4:3", _("4:3")), ("16:9", _("16:9"))])
 		self.properties.widescreen = ConfigSelection(choices = [("nopanscan", "nopanscan"), ("noletterbox", "noletterbox")])
 		self.properties.autochapter = ConfigInteger(default = 0, limits = (0, 60))
 		self.properties.audiotracks = ConfigSubList()
@@ -51,11 +51,11 @@ class DVDTitle:
 		self.length = info.getLength(service)
 
 	def initDVDmenuText(self, project, track):
-		self.properties.menutitle.setValue(self.formatDVDmenuText(project.settings.titleformat.getValue(), track))
-		self.properties.menusubtitle.setValue(self.formatDVDmenuText(project.settings.subtitleformat.getValue(), track))
+		s = project.menutemplate.settings
+		self.properties.menutitle.setValue(self.formatDVDmenuText(s.titleformat.getValue(), track))
+		self.properties.menusubtitle.setValue(self.formatDVDmenuText(s.subtitleformat.getValue(), track))
 
 	def formatDVDmenuText(self, template, track):
-		properties = self.properties
 		template = template.replace("$i", str(track))
 		template = template.replace("$t", self.DVBname)
 		template = template.replace("$d", self.DVBdescr)
@@ -76,7 +76,7 @@ class DVDTitle:
 				audiolist.append(trackstring)
 		audiostring = ', '.join(audiolist)
 		template = template.replace("$A", audiostring)
-		
+
 		if template.find("$l") >= 0:
 			l = self.length
 			lengthstring = "%d:%02d:%02d" % (l/3600, l%3600/60, l%60)
@@ -90,7 +90,7 @@ class DVDTitle:
 		else:
 			template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$T", "")
 		return template
-	
+
 	def produceFinalCuesheet(self):
 		CUT_TYPE_IN = 0
 		CUT_TYPE_OUT = 1
@@ -136,7 +136,7 @@ class DVDTitle:
 			self.estimatedDiskspace = usedsize
 			self.length = accumulated_in / 90000
 
-	def getChapterMarks(self):
+	def getChapterMarks(self, template="$h:$m:$s.$t"):
 		timestamps = [ ]
 		chapters = [ ]
 		minutes = self.properties.autochapter.getValue()
@@ -148,10 +148,9 @@ class DVDTitle:
 		else:
 			chapters = self.chaptermarks
 		for p in chapters:
-			h = p / (90000 * 3600)
-			m = p % (90000 * 3600) / (90000 * 60)
-			s = p % (90000 * 60) / 90000
-			ms = (p % 90000) / 90
-			timestamps.append("%d:%02d:%02d.%03d" % (h, m, s, ms))
-		print "timestamps:", timestamps
+			timestring = template.replace("$h", str(p / (90000 * 3600)))
+			timestring = timestring.replace("$m", ("%02d" % (p % (90000 * 3600) / (90000 * 60))))
+			timestring = timestring.replace("$s", ("%02d" % (p % (90000 * 60) / 90000)))
+			timestring = timestring.replace("$t", ("%03d" % ((p % 90000) / 90)))
+			timestamps.append(timestring)
 		return timestamps
\ No newline at end of file