Merge commit 'dm/experimental' into test branch

[vuplus_dvbapp] / 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 f1f5e73..816551c 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -85,7 +85,7 @@ class DemuxTask(Task):
                title = job.project.titles[job.i]
                self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace))
                self.setTool("projectx")
-               self.args += [inputfile, "-demux", "-out", self.job.workspace ]
+               self.args += [inputfile, "-demux", "-set", "ExportPanel.Streamtype.Subpicture=0", "-set", "ExportPanel.Streamtype.Teletext=0", "-out", self.job.workspace ]
                self.end = 300
                self.prog_state = 0
                self.weighting = 1000
@@ -174,7 +174,8 @@ class DemuxTask(Task):
                print "[DemuxTask::cleanup]"
                self.mplex_streamfiles = [ self.mplex_videofile ]
                for pid in self.relevantAudioPIDs:
-                       self.mplex_streamfiles.append(self.mplex_audiofiles[pid])
+                       if pid in self.mplex_audiofiles:
+                               self.mplex_streamfiles.append(self.mplex_audiofiles[pid])
                print self.mplex_streamfiles
 
                if failed: