packages: gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.pat...

[evil]

Author: evil                         Date: Fri Nov 25 13:18:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reworked version using hints provided by v^ from #gstreamer (patch is upstream)

---- Files affected:
packages/gstreamer-plugins-bad:
   gstreamer-plugins-bad-modplug_stereofix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch
diff -u packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch:1.1 packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch:1.2
--- packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch:1.1	Wed Nov 23 13:00:41 2011
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch	Fri Nov 25 14:18:44 2011
@@ -1,16 +1,34 @@
---- gst-plugins-bad-0.10.22/ext/modplug/gstmodplug.cc.orig	2011-01-07 16:30:28.000000000 +0100
-+++ gst-plugins-bad-0.10.22/ext/modplug/gstmodplug.cc	2011-11-23 12:21:07.191585028 +0100
-@@ -461,10 +461,10 @@
+From b743ce0a1dde67ecb36c64df87fca2b0a33ed835 Mon Sep 17 00:00:00 2001
+From: Krzysztof Krakowiak <krzysztof.krakowiak at gmail.com>
+Date: Wed, 23 Nov 2011 13:47:11 +0100
+Subject: [PATCH] replaced broken if-return logic for fixating rate and number
+ of channels that caused that modules were always(after
+ successfull fixation of rate) played as mono (instead of
+ stereo) by correct one with appropiate warnings.
+
+---
+ ext/modplug/gstmodplug.cc |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc
+index 6faaa0c..74b3a79 100644
+--- a/ext/modplug/gstmodplug.cc
++++ b/ext/modplug/gstmodplug.cc
+@@ -466,10 +466,10 @@ gst_modplug_fixate (GstPad * pad, GstCaps * caps)
    GstStructure *structure;
  
    structure = gst_caps_get_structure (caps, 0);
 -  if (gst_structure_fixate_field_nearest_int (structure, "rate", 44100))
 -    return;
 -  if (gst_structure_fixate_field_nearest_int (structure, "channels", 2))
+-    return;
 +  if (!gst_structure_fixate_field_nearest_int (structure, "rate", 44100))
-     return;
-+  else
-+    gst_structure_fixate_field_nearest_int (structure, "channels", 2);
++    GST_WARNING_OBJECT (pad, "Failed to fixate rate to 44100");
++  if (!gst_structure_fixate_field_nearest_int (structure, "channels", 2))
++    GST_WARNING_OBJECT (pad, "Failed to fixate number of channels to stereo");
  }
  
  static gboolean
+-- 
+1.7.7.3
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-plugins-bad/gstreamer-plugins-bad-modplug_stereofix.patch?r1=1.1&r2=1.2&f=u