[transmageddon] Misc cleanups and smaller changes

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

commit 22ca474774187792866edc038c8bea3c7362edf6
Author: Christian Schaller <christian schaller collabora co uk>
Date:   Sat Sep 12 20:28:07 2009 +0100

    Misc cleanups and smaller changes

 src/codecfinder.py       |    1 -
 src/discoverer.py        |    2 +-
 src/transcoder_engine.py |   10 +---------
 src/transmageddon.py     |    5 +++--
 4 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/src/codecfinder.py b/src/codecfinder.py
index fb9c4ad..6dfd004 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -175,4 +175,3 @@ def get_video_encoder_element(videoencodercaps):
                        if mostrecent >= original:
                            elementname = element
    return elementname
-
diff --git a/src/discoverer.py b/src/discoverer.py
index ef7a759..6c572a1 100644
--- a/src/discoverer.py
+++ b/src/discoverer.py
@@ -322,7 +322,7 @@ class Discoverer(gst.Pipeline):
                    # if caps[0].has_field("rate"):
                        if caps.is_fixed():
                            blacklist = ['rate','channels','bitrate','block_align','mode','subbands'
-                                        ,'allocation','framed','bitpool','blocks','width','parsed','depth'
+                                        ,'allocation','bitpool','blocks','width','depth'
                                         ,'codec_data']
                            for x in caps:
                                aresult = caps[0].get_name();
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 071a216..83e918c 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -384,8 +384,6 @@ class Transcoder(gobject.GObject):
                                        parseintersect = caps.intersect(gst.caps_from_string(self.audiocaps))
                                    if parseintersect != ("EMPTY"):
                                        self.aparserelement = parser
-                                       print "audio parser " + str(parser)
-                   # TODO: Need to handle the case when no parser is found
             
                    self.audioparse = gst.element_factory_make(self.aparserelement)
                    self.pipeline.add(self.audioparse)
@@ -515,9 +513,7 @@ class Transcoder(gobject.GObject):
                    sink_pad.link(self.multiqueuevideosinkpad)
                    self.multiqueuevideosrcpad.link(self.containermuxervideosinkpad)
                    self.gstmultiqueue.set_state(gst.STATE_PAUSED)
-                   print "video pad is subset"
                else:
-                   print "video pad is not subset"
                    flist = gst.registry_get_default().get_feature_list(gst.ElementFactory)
                    parsers = []
                    for fact in flist:
@@ -527,19 +523,15 @@ class Transcoder(gobject.GObject):
                            parsers.append(fact.get_name())
                            for x in parsers:
                                parser = x
-                               print parser
                                factory = gst.registry_get_default().lookup_feature(str(x))
                                sinkcaps = [x.get_caps() for x in factory.get_static_pad_templates() if x.direction == gst.PAD_SRC]
                                parseintersect = ("EMPTY")   
                                for caps in sinkcaps:
                                    if parseintersect == ("EMPTY"):
-                                       print "trying to intersect videoparser"
-                                       print "parser caps are   " + gst.Caps.to_string(caps)
-                                       print "incomign caps are " + self.videocaps
                                        parseintersect = caps.intersect(gst.caps_from_string(self.videocaps))
                                    if parseintersect != ("EMPTY"):
                                        self.vparserelement = parser
-                                       print "video parser " + str(parser)
+
 
                    self.videoparse = gst.element_factory_make(self.vparserelement)
                    self.pipeline.add(self.videoparse)
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 4dfe6bf..7f5386a 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -529,11 +529,12 @@ class TransmageddonUI (gtk.glade.XML):
        # print "containerstatus is " + str(containerstatus)
        if self.AudioCodec != "apass":
            audiostatus = codecfinder.get_audio_encoder_element(codecfinder.codecmap[self.AudioCodec])
-       else: audiostatus = "apass"
+       else:
+           audiostatus = "apass"
        if self.VideoCodec != "vpass":
            videostatus = codecfinder.get_video_encoder_element(codecfinder.codecmap[self.VideoCodec])
        else:
-           videostatus = "vpass"
+           audiostatus= "apass"
 
        if not containerstatus or not videostatus or not audiostatus:
            fail_info = []