DVDBurn: parse new projectx version (0.90.4.00.b30) audio PID messages correctly

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index 74ffbde..5f22f13 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -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,7 +124,10 @@ 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, self.currentPID