[transmageddon] Some fixes to both AMR support and debug support

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

commit 98c84e4d88d47f1d364d53f852abad90d73076ad
Author: Christian Schaller <christian schaller collabora co uk>
Date:   Fri Jul 31 18:04:18 2009 +0100

    Some fixes to both AMR support and debug support

 src/transcoder_engine.py |    8 +++++---
 src/transmageddon.py     |    5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index f7c3a11..6a1ba20 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -330,7 +330,8 @@ class Transcoder(gobject.GObject):
 
                    self.audioresampler = gst.element_factory_make("audioresample")
                    self.pipeline.add(self.audioresampler)
-
+               
+               if self.preset != "nopreset":
                    self.acaps = gst.Caps()
                    self.acaps.append_structure(gst.Structure("audio/x-raw-float"))
                    self.acaps.append_structure(gst.Structure("audio/x-raw-int"))
@@ -348,12 +349,13 @@ class Transcoder(gobject.GObject):
                    self.audioresampler.link(self.acapsfilter)
                    self.acapsfilter.link(self.audioencoder)
                else:
-                   self.audioconverter.link(self.audioencoder)
+                   self.audioconverter.link(self.audioresampler)
+                   self.audioresampler.link(self.audioencoder)
                self.audioencoder.get_static_pad("src").link(self.multiqueueaudiosinkpad)
                self.audioconverter.set_state(gst.STATE_PAUSED)
                if self.preset != "nopreset":
-                   self.audioresampler.set_state(gst.STATE_PAUSED)
                    self.acapsfilter.set_state(gst.STATE_PAUSED)
+               self.audioresampler.set_state(gst.STATE_PAUSED)
                self.audioencoder.set_state(gst.STATE_PAUSED)
                self.gstmultiqueue.set_state(gst.STATE_PAUSED)
                self.multiqueueaudiosrcpad.link(self.containermuxeraudiosinkpad)
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 89b9d7e..5fb5f0c 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -658,8 +658,9 @@ class TransmageddonUI (gtk.glade.XML):
 
    def on_debug_activate(self, widget):
        gst.DEBUG_BIN_TO_DOT_FILE (self._transcoder.pipeline, gst.DEBUG_GRAPH_SHOW_ALL, 'transmageddon-debug-graph')
-       os.system("dot -Tsvg -o /tmp/transmageddon-pipeline.svg /tmp/transmageddon-debug-graph.dot")
-       os.system("eog /tmp/transmageddon-pipeline.svg &")
+       print "The debug feature requirs Eye of GNOME (eog) and graphviz (dot) to be installed"
+       os.system("dot -Tpng -o /tmp/transmageddon-pipeline.png /tmp/transmageddon-debug-graph.dot")
+       os.system("eog /tmp/transmageddon-pipeline.png &")
 if __name__ == "__main__":
         hwg = TransmageddonUI()
         gtk.main()