[soundconverter] Change GStreamer pipeline usage of audioresample and audioconvert,

[Michael Schwendt]

commit 5d85568050ed533717807b292d76bccc468badae
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Feb 10 21:51:26 2013 +0100

    Change GStreamer pipeline usage of audioresample and audioconvert,
    
      so conversion from FLAC and AIFF works.

 soundconverter-2.0.4-gst-pipeline.patch |   29 +++++++++++++++++++++++++++++
 soundconverter.spec                     |    9 ++++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-2.0.4-gst-pipeline.patch b/soundconverter-2.0.4-gst-pipeline.patch
new file mode 100644
index 0000000..c4af031
--- /dev/null
+++ b/soundconverter-2.0.4-gst-pipeline.patch
@@ -0,0 +1,29 @@
+diff -Nur soundconverter-2.0.4-orig/soundconverter/gstreamer.py soundconverter-2.0.4/soundconverter/gstreamer.py
+--- soundconverter-2.0.4-orig/soundconverter/gstreamer.py	2012-10-04 13:56:26.000000000 +0200
++++ soundconverter-2.0.4/soundconverter/gstreamer.py	2013-02-10 21:45:20.700438115 +0100
+@@ -501,17 +501,16 @@
+             'gst-profile': self.add_audio_profile,
+         }
+         self.add_command('audiorate')
+-        self.add_command('audioresample')
+         self.add_command('audioconvert')
++        self.add_command('audioresample')
+ 
+-        # audio resampling support
+-        if self.output_resample:
+-            self.add_command('audio/x-raw-int,rate=%d' % self.resample_rate)
+-            self.add_command('audioresample')
+-            self.add_command('audioconvert')
+-
+-        if self.force_mono:
+-            self.add_command('audio/x-raw-int,channels=1')
++        if self.output_resample or self.force_mono:
++            cmd = 'audio/x-raw-int'
++            if self.output_resample:
++                cmd += ',rate=%d' % self.resample_rate
++            if self.force_mono:
++                cmd += ',channels=1'
++            self.add_command(cmd)
+             self.add_command('audioconvert')
+ 
+         encoder = self.encoders[self.output_type]()
diff --git a/soundconverter.spec b/soundconverter.spec
index 43f36fa..715ddb8 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -23,6 +23,8 @@ Patch3: soundconverter-2.0.4-gstreamer-show_error.patch
 Patch4: soundconverter-2.0.4-tagreader-converter-race.patch
 # lp #1121297
 Patch5: soundconverter-2.0.4-abort-conversion.patch
+# lp #1121132
+Patch6: soundconverter-2.0.4-gst-pipeline.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool gettext
@@ -67,6 +69,7 @@ writes anything the GStreamer library can.
 %patch3 -p1 -b .gstreamer-show-error
 %patch4 -p1 -b .tagreader-converter-race
 %patch5 -p1 -b .abort-conversion
+%patch6 -p1 -b .gst-pipeline
 
 
 %build
@@ -117,6 +120,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sun Feb 10 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-10
+- Change GStreamer pipeline usage of audioresample and audioconvert,
+  so conversion from FLAC and AIFF works.
+
 * Sun Feb 10 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-9
 - Fix aborted task queue.
 - Fix race condition between tags_read() and converter.start() (#909681).