[Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp d... [release_0_7_2]

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Markus Gothe <nihilus>  06/11/01 09:45:33

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_gst.cpp 
        doc/C          : gnashrc.xml 

Log message:
        Applied patches from Hiroyuki Ikezoe.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.34&r2=1.1412.2.35
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22.2.1&r2=1.22.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnashrc.xml?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1&r2=1.1.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.34
retrieving revision 1.1412.2.35
diff -u -b -r1.1412.2.34 -r1.1412.2.35
--- ChangeLog   31 Oct 2006 19:45:01 -0000      1.1412.2.34
+++ ChangeLog   1 Nov 2006 09:45:33 -0000       1.1412.2.35
@@ -1,3 +1,8 @@
+2006-11-01 Markus Gothe <address@hidden>
+
+       * doc/C/gnashrc.xml, backend/sound_handler_gst.cpp: 
+         Applied patches from Hiroyuki Ikezoe.
+       
 2006-10-31  Rob Savoye  <address@hidden>
 
        * packaging/debian/rules: Remove --enable-plugin.

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- backend/sound_handler_gst.cpp       31 Oct 2006 08:00:53 -0000      1.22.2.1
+++ backend/sound_handler_gst.cpp       1 Nov 2006 09:45:33 -0000       1.22.2.2
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.22.2.1 2006/10/31 08:00:53 strk Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.22.2.2 2006/11/01 09:45:33 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -65,6 +65,9 @@
 
        long loop_count;
        
+       // signal id
+       guint handoff_signal_id;
+
 } gst_elements;
 
 
@@ -166,7 +169,7 @@
        ~GST_sound_handler()
        {
 
-               for (size_t i= m_sound_data.size(); i > 0; i--) { //Optimized
+               for (size_t i=0, e=m_sound_data.size(); i < e; ++i)  {
                        stop_sound(i);
                        delete_sound(i);
                }
@@ -460,7 +463,7 @@
                                                "sizetype", 2, 
"can-activate-pull", FALSE, "signal-handoffs", TRUE,
                                                "sizemax", BUFFER_SIZE, 
"num-buffers", numBuf, NULL);
                        // Setup the callback
-                       g_signal_connect (gst_element->input, "handoff", 
G_CALLBACK (callback_handoff), gst_element);
+                       gst_element->handoff_signal_id = g_signal_connect 
(gst_element->input, "handoff", G_CALLBACK (callback_handoff), gst_element);
 
                        // link data, decoder, audio* and adder
                        gst_element_link_many (gst_element->input,
@@ -494,7 +497,7 @@
                                                "sizetype", 2, 
"can-activate-pull", FALSE, "signal-handoffs", TRUE,
                                                "sizemax", BUFFER_SIZE, 
"num-buffers", numBuf, NULL);
                        // Setup the callback
-                       g_signal_connect (gst_element->input, "handoff", 
G_CALLBACK (callback_handoff), gst_element);
+                       gst_element->handoff_signal_id = g_signal_connect 
(gst_element->input, "handoff", G_CALLBACK (callback_handoff), gst_element);
 
 /*     caps info:
       audio/x-raw-int
@@ -567,6 +570,8 @@
                        // FIXME: This stops ALL sounds, not just the current.
                        if (gst_element_set_state (GST_ELEMENT (elements->bin), 
GST_STATE_NULL) != 1) continue;
 
+                       // Disconnect signals
+                       g_signal_handler_disconnect (elements->input, 
elements->handoff_signal_id);
 
                        // Unref/delete the elements
                        gst_object_unref (GST_OBJECT (elements->bin));
@@ -574,6 +579,7 @@
 
                        // Delete the gst_element struct
                        // @@ we're deleting the elements from the start, so 
half-way of the loop we will be referring to undefined elements. Is this 
intended ? --strk;
+                       delete elements;
                        
sounddata->m_gst_elements.erase(sounddata->m_gst_elements.begin() + i);
                        --soundsPlaying;
                        stopped = true;
@@ -596,6 +602,8 @@
                if (sound_handle >= 0 && (unsigned int) sound_handle < 
m_sound_data.size())
                {
                        delete[] m_sound_data[sound_handle]->data;
+                       delete m_sound_data[sound_handle];
+                       m_sound_data.erase (m_sound_data.begin() + 
sound_handle);
                }
 
        }

Index: doc/C/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnashrc.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- doc/C/gnashrc.xml   16 Oct 2006 17:13:01 -0000      1.1
+++ doc/C/gnashrc.xml   1 Nov 2006 09:45:33 -0000       1.1.2.1
@@ -120,7 +120,7 @@
       </varlistentry>
 
       <varlistentry>
-       <term>pluginSound</term>
+       <term>pluginsound</term>
        <listitem>
          <para>
            This value can be set to either <emphasis>on</emphasis> or
@@ -169,7 +169,7 @@
     set sound on
 
     # Enable or Disable sound for the standalone player
-    set pluginSound on
+    set pluginsound on
 
   </programlisting>