[transmageddon] fix bugs caused by last minute inclusion of mpeg ps support

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit 1fcbf1eaab4c4844e9c624165aeb1450173d20d9
Author: Christian Schaller <christian schaller collabora co uk>
Date:   Mon Sep 14 11:28:51 2009 +0100

    fix bugs caused by last minute inclusion of mpeg ps support

 profiles/ipod.xml     |    4 ++--
 profiles/krzr-k1v.xml |    4 ++--
 profiles/n800.xml     |    4 ++--
 src/codecfinder.py    |    2 +-
 src/transmageddon.py  |   28 ++++++++++++++--------------
 5 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/profiles/ipod.xml b/profiles/ipod.xml
index a057103..f536002 100644
--- a/profiles/ipod.xml
+++ b/profiles/ipod.xml
@@ -17,7 +17,7 @@
         <container>video/quicktime,variant=apple</container>
         <extension>m4v</extension>
         <audio>
-            <name>audio/mpeg,mpegversion={4, 2}</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Low, Profile Low Complexity
@@ -46,7 +46,7 @@
         <container>video/quicktime,variant=apple</container>
         <extension>m4v</extension>
         <audio>
-            <name>audio/mpeg,mpegversion=[4, 2]</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Normal, Profile Low Complexity
diff --git a/profiles/krzr-k1v.xml b/profiles/krzr-k1v.xml
index 1b2b39f..aa631f1 100644
--- a/profiles/krzr-k1v.xml
+++ b/profiles/krzr-k1v.xml
@@ -17,7 +17,7 @@
         <container>video/quicktime,variant=iso</container>
         <extension>mp4</extension>
         <audio>
-            <name>audio/mpeg,mpegversion=[4, 2]</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Low, Profile Low Complexity
@@ -46,7 +46,7 @@
         <container>video/quicktime,variant=iso</container>
         <extension>mp4</extension>
         <audio>
-            <name>audio/mpeg,mpegversion=[4, 2]</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Low , Profile Low Complexity
diff --git a/profiles/n800.xml b/profiles/n800.xml
index 6e62d74..9e4ac16 100644
--- a/profiles/n800.xml
+++ b/profiles/n800.xml
@@ -17,7 +17,7 @@
         <container>video/quicktime,variant=iso</container>
         <extension>mp4</extension>
         <audio>
-            <name>audio/mpeg,mpegversion=[4, 2]</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Low, Profile Low Complexity
@@ -46,7 +46,7 @@
         <container>video/quicktime,variant=iso</container>
         <extension>mp4</extension>
         <audio>
-            <name>audio/mpeg,mpegversion=[4, 2]</name>
+            <name>audio/mpeg,mpegversion=4</name>
             <presets>
                 <preset>
                     Quality Normal, Profile Low Complexity
diff --git a/src/codecfinder.py b/src/codecfinder.py
index 6dfd004..5a595dc 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -44,7 +44,7 @@ csuffixmap =   { 'Ogg' : ".ogg", 'Matroska' : ".mkv", 'MXF' : ".mxf", 'AVI' : ".
                  'ASF' : ".asf" }
 
 codecmap = {     'vorbis' : "audio/x-vorbis", 'flac' : "audio/x-flac", 'mp3' : "audio/mpeg, mpegversion=(int)1, layer=(int)3", 
-                        'aac' : "audio/mpeg, mpegversion=(int){ 4, 2 }", 'ac3' : "audio/x-ac3", 'speex' : "audio/x-speex", 
+                        'aac' : "audio/mpeg,mpegversion=4", 'ac3' : "audio/x-ac3", 'speex' : "audio/x-speex", 
                         'celt' : "audio/x-celt", 'alac' : "audio/x-alac", 'wma2' : "audio/x-wma, wmaversion=(int)2", 
                         'theora' : "video/x-theora", 'dirac' : "video/x-dirac", 'h264' : "video/x-h264", 
                         'mpeg2' : "video/mpeg,mpegversion=2,systemstream=false", 'mpeg4' : "video/mpeg,mpegversion=4",
diff --git a/src/transmageddon.py b/src/transmageddon.py
index e926c71..14b5e1c 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -268,15 +268,9 @@ class TransmageddonUI (gtk.glade.XML):
 
    # Get all preset values
    def reverse_lookup(self,v):
-       #FIXME - this is ugly special casing of AAC due to 
-       #python/gstreamer conflict over meaning of []
-       if v == "audio/mpeg,mpegversion=[4, 2]":
-           k = "aac"
-           return k
-       else:
-           for k in codecfinder.codecmap:
-               if codecfinder.codecmap[k] == v:
-                   return k
+       for k in codecfinder.codecmap:
+           if codecfinder.codecmap[k] == v:
+               return k
 
    def provide_presets(self,devicename): 
        devices = presets.get()
@@ -290,20 +284,25 @@ class TransmageddonUI (gtk.glade.XML):
            self.containerchoice.set_active(2)
        elif preset.container == "video/mpegts":
            self.containerchoice.set_active(3)
-       elif preset.container == "video/x-flv":
+       elif preset.container == "video/mpeg,mpegversion=2,systemstream=true":
            self.containerchoice.set_active(4)
-       elif preset.container == "video/quicktime,variant=apple":
+       elif preset.container == "video/x-flv":
            self.containerchoice.set_active(5)
-       elif preset.container == "video/quicktime,variant=iso":
+       elif preset.container == "video/quicktime,variant=apple":
            self.containerchoice.set_active(6)
-       elif preset.container == "video/quicktime,variant=3gpp":
+       elif preset.container == "video/quicktime,variant=iso":
            self.containerchoice.set_active(7)
        elif preset.container == "video/quicktime,variant=3gpp":
            self.containerchoice.set_active(8)
+       elif preset.container == "video/quicktime,variant=3gpp":
+           self.containerchoice.set_active(9)
        elif preset.container == "application/mxf":
-           self.containerchoice.set_active(9) 
+           self.containerchoice.set_active(10)
+       elif preset.container == "video/x-ms-asf":
+           self.containerchoice.set_active(11)
        else:
             print "failed to set container format"
+       # print "preset.acodec.name is " + str(preset.acodec.name)
        self.codec_buttons[self.reverse_lookup(str(preset.acodec.name))].set_active(True)
        self.codec_buttons[self.reverse_lookup(str(preset.vcodec.name))].set_active(True)
 
@@ -660,6 +659,7 @@ class TransmageddonUI (gtk.glade.XML):
        else:
            self.ProgressBar.set_fraction(0.0)
            self.devicename= self.presetchoices[presetchoice]
+           # print "self.devicename is " + str(self.devicename)
            self.provide_presets(self.devicename)
            self.containerchoice.set_sensitive(False)
            self.CodecBox.set_sensitive(False)