[transmageddon] add test for empty cap structure when using presets to avoid, spew on console



commit 9b97419dbe6b87beff1b438087f97b7fa7203dc8
Author: Christian Fredrik Kalager Schaller <uraeus linuxrisin org>
Date:   Sat Aug 4 19:57:19 2012 +0200

    add test for empty cap structure when using presets to avoid, spew on console

 src/transmageddon.py |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 734375e..cebed6e 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -385,7 +385,6 @@ class TransmageddonUI:
        self.containerchoice.set_active(-1) # resetting to -1 to ensure population of menu triggers
        self.presetaudiocodec=Gst.caps_from_string(preset.acodec.name)
        self.presetvideocodec=Gst.caps_from_string(preset.vcodec.name)
-       print "preset container is " +str(preset.container)
        if preset.container == "application/ogg":
            self.containerchoice.set_active(0)
        elif preset.container == "video/x-matroska":
@@ -414,7 +413,6 @@ class TransmageddonUI:
            self.containerchoice.set_active(12)
        else:
             print "failed to set container format from preset data"
-       print "done loading presets"
 
 
        # Check for number of passes
@@ -884,9 +882,11 @@ class TransmageddonUI:
        # start filling audio
        if self.haveaudio==True:
            if self.usingpreset==True: # First fill menu based on presetvalue
-               self.audiorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(self.presetaudiocodec)))
-               self.audiorows[0].set_active(0)
-               self.audiocodecs.append(self.presetaudiocodec)
+               testforempty = self.presetaudiocodec.to_string()
+               if testforempty != "EMPTY": 
+                   self.audiorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(self.presetaudiocodec)))
+                   self.audiorows[0].set_active(0)
+                   self.audiocodecs.append(self.presetaudiocodec)
            elif self.container==False: # special setup for container less case, looks ugly, but good enough for now
                self.audiorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(Gst.caps_from_string("audio/mpeg, mpegversion=(int)1, layer=(int)3"))))
                self.audiorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(Gst.caps_from_string("audio/mpeg, mpegversion=4, stream-format=adts"))))
@@ -912,9 +912,11 @@ class TransmageddonUI:
        if self.havevideo==True:
            if self.container != False:
                if self.usingpreset==True:
-                   self.videorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(self.presetvideocodec)))
-                   self.videorows[0].set_active(0)
-                   self.videocodecs.append(self.presetvideocodec)
+                   testforempty = self.presetvideocodec.to_string()
+                   if testforempty != "EMPTY":
+                       self.videorows[0].append_text(str(GstPbutils.pb_utils_get_codec_description(self.presetvideocodec)))
+                       self.videorows[0].set_active(0)
+                       self.videocodecs.append(self.presetvideocodec)
                else:
                    video_codecs=[]
                    video_codecs = supported_video_container_map[self.container]
@@ -980,8 +982,6 @@ class TransmageddonUI:
            self.usingpreset=True
            self.ProgressBar.set_fraction(0.0)
            if presetchoice != None:
-               print self.presetchoices
-               print presetchoice
                self.devicename= self.presetchoices[presetchoice-1]
                self.provide_presets(self.devicename)
                self.containerchoice.set_sensitive(False)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]