[transmageddon] Fix suffix handling for audio in container formats

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

commit f7b77a05b9a4d7d52711216fd2afa2dd0ce543eb
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Sat Jul 16 09:12:21 2011 +0100

    Fix suffix handling for audio in container formats

 src/codecfinder.py   |    3 +--
 src/transmageddon.py |    6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/codecfinder.py b/src/codecfinder.py
index e85ae40..eef999c 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -60,8 +60,7 @@ csuffixmap =   { 'Ogg' : ".ogg", \
         'FLV' : ".flv", \
         '3GPP' : ".3gp",
         'ASF' : ".asf", \
-        'WebM' : ".webm", \
-        'No container' : ".mp3" }
+        'WebM' : ".webm" }
 
 audiosuffixmap =   { 'Ogg' : ".ogg", \
         'Matroska' : ".mkv", \
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 6f18375..5d7cf20 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -795,10 +795,12 @@ class TransmageddonUI:
        # pick output suffix
        container = self.builder.get_object ("containerchoice").get_active_text ()
        if self.container==False: # deal with container less formats
-           print "self.audiocodec is " + str(self.AudioCodec)
            self.ContainerFormatSuffix = codecfinder.nocontainersuffixmap[gst.Caps.to_string(self.AudioCodec)]
        else:
-           self.ContainerFormatSuffix = codecfinder.csuffixmap[container]
+           if self.havevideo == False:
+               self.ContainerFormatSuffix = codecfinder.audiosuffixmap[container]
+           else:
+               self.ContainerFormatSuffix = codecfinder.csuffixmap[container]
        self.outputfilename = str(self.nosuffix+self.timestamp+self.ContainerFormatSuffix)
        context_id = self.StatusBar.get_context_id("EOS")
        self.StatusBar.push(context_id, (_("Writing %(filename)s") % {'filename': self.outputfilename}))