[transmageddon] fix FLV muxing again, remove all print statements



commit 52ba83e13847813df8cbce6feedcf524940f5a48
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Tue Jul 1 10:47:35 2014 +0200

    fix FLV muxing again, remove all print statements

 src/transcoder_engine.py |   17 ++++++++---------
 src/transmageddon.py     |   23 ++---------------------
 2 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index ebd41b7..26bfc5f 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -41,6 +41,7 @@ class Transcoder(GObject.GObject):
        self.audiodata = AUDIODATA
        self.videodata = VIDEODATA
        self.streamdata = STREAMDATA
+
        # set preset directory
        Gst.preset_set_app_dir("/usr/share/transmageddon/presets/")
 
@@ -292,8 +293,8 @@ class Transcoder(GObject.GObject):
                    if self.probestreamid not in self.usedstreamids:
                        self.usedstreamids.append(self.probestreamid)
                        if self.audiodata[x]['outputaudiocaps'] != 'noaud':
-                           self.sinkpad = self.encodebin.emit("request-profile-pad", 
"audioprofilename"+str(x))
-                           pad.link(self.sinkpad)
+                           sinkpad = self.encodebin.emit("request-profile-pad", "audioprofilename"+str(x))
+                           pad.link(sinkpad)
                x=x+1
        return Gst.PadProbeReturn.OK
 
@@ -337,23 +338,23 @@ class Transcoder(GObject.GObject):
 
    def OnDynamicPad(self, uridecodebin, src_pad):
        origin = src_pad.query_caps(None)
-       print("origin is " + str(origin))
+       #print("origin is " + str(origin))
        if (self.streamdata['container']==False):
            a =  origin.to_string()
            if a.startswith("audio/"): # this is for audio only files
                src_pad.add_probe(Gst.PadProbeType.EVENT_DOWNSTREAM, self.padprobe, None)
        else:
            c = origin.to_string()
-           print("c is " +str(c))
+           #print("c is " +str(c))
            if not (c.startswith("text/") or c.startswith("subpicture/") or c.startswith("audio/")):
                if not (c.startswith("video/") and (self.videodata[0]['outputvideocaps'] == False)):
                    if self.streamdata['passcounter'] == int(0):
                        # if not c.startswith("audio/"):
                            if c.startswith("video/x-raw"):
-                               print("origin is now " +str(origin))
-                               print("try to emit")
+                               #print("origin is now " +str(origin))
+                               #print("try to emit")
                                self.sinkpad = self.encodebin.emit("request-pad", origin)
-                               print(self.sinkpad)
+                               #print(self.sinkpad)
            if c.startswith("audio/"):
                if self.streamdata['passcounter'] == int(0):
                    src_pad.add_probe(Gst.PadProbeType.EVENT_DOWNSTREAM, self.padprobe, None)
@@ -366,7 +367,6 @@ class Transcoder(GObject.GObject):
                        if c.startswith("video/x-raw"):
                            deinterlacerpad = self.deinterlacer.get_static_pad("sink")
                            src_pad.link(deinterlacerpad)
-                           print("self.sinkpad is " + str(self.sinkpad))
                            if self.sinkpad != None:
                                self.videoflipper.get_static_pad("src").link(self.sinkpad)
                else:
@@ -387,7 +387,6 @@ class Transcoder(GObject.GObject):
                x=x+1
            if streamid ==self.videodata[0]['streamid']:
                if self.videodata[0]['dopassthrough'] == True:
-                   print("autoplug  discontinue")
                    self.autoplugreturnvalue = False
            capsvalue=caps.to_string()
            if capsvalue.startswith("subtitle/"): # this is to avoid wasting resources on decoding subtitles
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 7d1020d..7f44b38 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -992,10 +992,6 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            else:
                self.streamdata['passcounter']=int(1)
                self.StatusBar.push(context_id, (_("Pass %(count)d Progress") % {'count': 
self.streamdata['passcounter']}))
-       print("on transcode")
-       print(self.audiodata)
-       print(self.videodata)
-       print(self.streamdata)
        if self.haveaudio:
            if "samplerate" in self.audiodata[0]:
                # self.check_for_elements()
@@ -1017,11 +1013,6 @@ class TransmageddonUI(Gtk.ApplicationWindow):
        self.CodecBox.set_sensitive(True)
        self.presetchoice.set_sensitive(True)
        self.rotationchoice.set_sensitive(True)
-       # self.presetchoice.set_active(0)
-       print("on cancel")
-       print(self.audiodata)
-       print(self.videodata)
-       print(self.streamdata)
        self.cancelbutton.set_sensitive(False)
        self.transcodebutton.set_sensitive(True)
        self._cancel_encoding = \
@@ -1037,7 +1028,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
        # audio_codecs, video_codecs - temporary lists
 
        # clean up stuff from previous run
-       self.houseclean=True # set this to avoid triggering events when cleaning out menus
+       self.houseclean=True  # set this to avoid triggering events when cleaning out menus
        self.audiopassmenuno=[] # reset this field
        self.noaudiomenuno=[]
        x=0
@@ -1166,6 +1157,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                    if self.audiorows[streamno].get_active() == self.noaudiomenuno[y]:
                        self.audiorows[0].set_active(0)
                y=y+1
+           self.houseclean=False
 
    def on_containerchoice_changed(self, widget):
        self.CodecBox.set_sensitive(True)
@@ -1324,17 +1316,6 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                self.finder_disc_lost = self.finder.connect("disc-lost",
                                                         self.on_disc_lost) 
 
-       #if self.finder:
-       #     if self.finder_disc_found is not None:
-       #         self.finder.disconnect(self.finder_disc_found)
-       #         self.finder_disc_found = None
-       #     
-       #     if self.finder_disc_lost is not None:
-       #         self.finder.disconnect(self.finder_disc_lost)
-       #         self.finder_disc_lost = None
-
-       # udev code to find DVD drive on system
-
        client = GUdev.Client(subsystems=['block'])
        for device in client.query_by_subsystem("block"):
            if device.has_property("ID_CDROM"):


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