[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp [gnash_0_8_3_branch]

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Russ Nelson <nelsonrn>  08/06/04 00:15:09

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamGst.cpp 

Log message:
        * Apply patch #6533, adds autoresample to the gstreamer pipeline.
          https://savannah.gnu.org/patch/?6533

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.46&r2=1.6573.2.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.86.2.1&r2=1.86.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.46
retrieving revision 1.6573.2.47
diff -u -b -r1.6573.2.46 -r1.6573.2.47
--- ChangeLog   3 Jun 2008 19:14:45 -0000       1.6573.2.46
+++ ChangeLog   4 Jun 2008 00:15:06 -0000       1.6573.2.47
@@ -1,5 +1,10 @@
 2008-06-03 Russ Nelson <address@hidden>
 
+       * Apply patch #6533, adds autoresample to the gstreamer pipeline.
+         https://savannah.gnu.org/patch/?6533
+
+2008-06-03 Russ Nelson <address@hidden>
+
        * macros/ffmpeg.m4: Previous method for location of ffmpeg
          libraries didn't work on Mandriva.  Current method should be
          more supportable.

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.86.2.1
retrieving revision 1.86.2.2
diff -u -b -r1.86.2.1 -r1.86.2.2
--- server/asobj/NetStreamGst.cpp       14 May 2008 07:21:58 -0000      1.86.2.1
+++ server/asobj/NetStreamGst.cpp       4 Jun 2008 00:15:08 -0000       1.86.2.2
@@ -128,6 +128,7 @@
 
   // Setup audio sink
   GstElement* audioconvert = gst_element_factory_make ("audioconvert", NULL);  
+  GstElement* audioresample = gst_element_factory_make ("audioresample", NULL);
   
   GstElement* audiosink;
   
@@ -142,13 +143,13 @@
     audiosink = gst_element_factory_make ("fakesink", NULL);
   }
 
-  gst_bin_add_many(GST_BIN(_audiobin), audioconvert, audiosink, NULL);
+  gst_bin_add_many(GST_BIN(_audiobin), audioconvert, audioresample, audiosink, 
NULL);
 
-  if (!audioconvert || !audiosink) {
+  if (!audioconvert || !audiosink || !audioresample) {
     log_error("Couldn't create Gstreamer audio elements. Audio playback will "
               "not be possible");
   }
-  rv = gst_element_link(audioconvert, audiosink);
+  rv = gst_element_link_many(audioconvert, audioresample, audiosink, NULL);
   if (!rv) {
     log_error("Couldn't link audio elements. There will be no audio 
playback.");
   }