[transmageddon] Partly fix profile transcoding to work with new UI

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

commit bc19809b53d39b62c37ec4a8bcd9e5aa65575f0d
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Sun Jan 30 12:09:04 2011 +0000

    Partly fix profile transcoding to work with new UI

 NEWS                 |    4 +++-
 src/transmageddon.py |   12 +++++-------
 src/transmageddon.ui |    8 +-------
 3 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/NEWS b/NEWS
index 56d55c7..ec1621a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 0.17
   Port to new plugins-base discoverer
-  Add setting of Transmageddon as encoding application name if supported
+  Add tag setting of Transmageddon as encoding application name if supported
+  Replace radiobutton lists with a combobox instead
+  Misc robusnessfixes for cancelling transcodings
 
 0.16 - 21-05-2010
   Add WebM support
diff --git a/src/transmageddon.py b/src/transmageddon.py
index b43cbba..24ce775 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -199,7 +199,7 @@ class TransmageddonUI:
        self.ProgressBar = self.builder.get_object("ProgressBar")
        self.cancelbutton = self.builder.get_object("cancelbutton")
        self.StatusBar = self.builder.get_object("StatusBar")
-       self.CodecBox.attach(self.vbox, 0, 1, 1, 3, yoptions = gtk.FILL)
+       self.CodecBox.attach(self.vbox, 0, 1, 1, 2, yoptions = gtk.FILL)
        self.CodecBox.show_all()
        self.rows[0].connect("changed", self.on_audiocodec_changed)
        self.TopWindow.connect("destroy", gtk.main_quit)
@@ -352,7 +352,7 @@ class TransmageddonUI:
        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.AudioCodec=self.reverse_lookup(str(preset.acodec.name))
        self.codec_buttons[self.reverse_lookup(str(preset.vcodec.name))].set_active(True)
 
        # Check for number of passes
@@ -436,6 +436,7 @@ class TransmageddonUI:
            self.start_time = False
            self.multipass = False
            self.passcounter = False
+           self.audiopasstoggle=True
        else:
            self.StatusBar.push(context_id, (_("Pass %(count)d Complete") % {'count': self.passcounter}))
            self.start_time = False
@@ -543,11 +544,7 @@ class TransmageddonUI:
                self.codec_buttons["vpass"].set_sensitive(False)
            else:
                self.codec_buttons["vpass"].set_sensitive(True)
-           if audiointersect == ("EMPTY"):
-               # self.codec_buttons["apass"].set_sensitive(False)
-               print "no passthrough"
-           else:
-               # self.codec_buttons["apass"].set_sensitive(True)
+           if audiointersect != ("EMPTY"):
                self.rows[0].append_text("Audio passthrough")
                self.oldaudiocodec.append("Audio passthrough")
 
@@ -706,6 +703,7 @@ class TransmageddonUI:
        self.ProgressBar.set_text(_("Transcoding Progress"))
        context_id = self.StatusBar.get_context_id("EOS")
        self.StatusBar.pop(context_id)
+       self.audiopasstoggle=False
 
    def on_containerchoice_changed(self, widget):
        self.CodecBox.set_sensitive(True)
diff --git a/src/transmageddon.ui b/src/transmageddon.ui
index 18dc04f..e797b61 100644
--- a/src/transmageddon.ui
+++ b/src/transmageddon.ui
@@ -839,13 +839,7 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
+                  <placeholder/>
                 </child>
               </object>
               <packing>