[transmageddon] Various fixes for audio input file behaviour



commit 1153e4ca15d3e6862342533b87a21cfa1144d84b
Author: Christian Fredrik Kalager Schaller <uraeus linuxrisin org>
Date:   Sat Sep 15 13:00:50 2012 +0200

    Various fixes for audio input file behaviour

 src/transcoder_engine.py |   29 ++++++++++++++---------------
 src/transmageddon.py     |   16 +++++++++++-----
 2 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 49a2cb7..274fa0c 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -88,8 +88,6 @@ class Transcoder(GObject.GObject):
 
        # if needed create a variable to store the filename of the multipass \
        # statistics file
-       print "self.multipass is " + str(self.multipass)
-       print "self.passcounter is " + str(self.passcounter)
        if self.multipass != 0:
            self.cachefile = (str (GLib.get_user_cache_dir()) + "/" + \
                    "multipass-cache-file" + self.timestamp + ".log")
@@ -124,22 +122,23 @@ class Transcoder(GObject.GObject):
  
            # What to do if we are not doing video passthrough (we only support video 
            # with container format
-           if self.videopasstoggle==False and self.passcounter == int(0):
-               self.videoflipper = Gst.ElementFactory.make('videoflip', None)
-               self.videoflipper.set_property("method", self.rotationvalue)
-               self.pipeline.add(self.videoflipper)
+           if self.videocaps !=False:
+               if (self.videopasstoggle==False and self.passcounter == int(0)):
+                   self.videoflipper = Gst.ElementFactory.make('videoflip', None)
+                   self.videoflipper.set_property("method", self.rotationvalue)
+                   self.pipeline.add(self.videoflipper)
 
-               self.colorspaceconverter = Gst.ElementFactory.make("videoconvert", None)
-               self.pipeline.add(self.colorspaceconverter)
+                   self.colorspaceconverter = Gst.ElementFactory.make("videoconvert", None)
+                   self.pipeline.add(self.colorspaceconverter)
 
-               self.deinterlacer = Gst.ElementFactory.make('deinterlace', None)
-               self.pipeline.add(self.deinterlacer)
+                   self.deinterlacer = Gst.ElementFactory.make('deinterlace', None)
+                   self.pipeline.add(self.deinterlacer)
    
-               self.deinterlacer.link(self.colorspaceconverter)
-	       self.colorspaceconverter.link(self.videoflipper)
-               self.deinterlacer.set_state(Gst.State.PAUSED)
-               self.colorspaceconverter.set_state(Gst.State.PAUSED)
-               self.videoflipper.set_state(Gst.State.PAUSED)
+                   self.deinterlacer.link(self.colorspaceconverter)
+	           self.colorspaceconverter.link(self.videoflipper)
+                   self.deinterlacer.set_state(Gst.State.PAUSED)
+                   self.colorspaceconverter.set_state(Gst.State.PAUSED)
+                   self.videoflipper.set_state(Gst.State.PAUSED)
            # this part of the pipeline is used for both passthrough and re-encoding
            if self.videocaps != "novid":
                if (self.videocaps != False):
diff --git a/src/transmageddon.py b/src/transmageddon.py
index d5729d3..1b43c94 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -592,12 +592,18 @@ class TransmageddonUI:
 
                    self.videodata = { 'videowidth' : videowidth, 'videoheight' : videoheight, 'videotype' : self.inputvideocaps,
                               'fratenum' : videonum, 'frateden' :  videodenom }
-
-                   self.discover_done=True
-                   if self.havevideo==False:
-                       self.videoinformation.set_markup(''.join(('<small>', _("No Video"), '</small>')))
-                       self.videocodec.set_markup(''.join(('<small>', "",
+                   self.presetchoice.set_sensitive(True)
+                   self.videorows[0].set_sensitive(True)
+                   self.rotationchoice.set_sensitive(True)
+               if self.havevideo==False:
+                   self.videoinformation.set_markup(''.join(('<small>', _("No Video"), '</small>')))
+                   self.videocodec.set_markup(''.join(('<small>', "",
                                       '</small>')))
+                   self.presetchoice.set_sensitive(False)
+                   self.videorows[0].set_sensitive(False)
+                   self.rotationchoice.set_sensitive(False)
+               self.discover_done=True
+
                if self.waiting_for_signal == True:
                    if self.containertoggle == True:
                        if self.container != False:



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