[Gnash-commit] gnash ChangeLog libbase/LoadThread.cpp server/a...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/06 20:03:55

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

Log message:
                * libbase/LoadThread.cpp: Delete the thread after use so we 
don't
                  try to join it again. Fixes bug #19811.
                * server/asobj/NetStreamGst.cpp: Fixed pausing and play, bug 
#19797.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3111&r2=1.3112
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3111
retrieving revision 1.3112
diff -u -b -r1.3111 -r1.3112
--- ChangeLog   6 May 2007 15:48:14 -0000       1.3111
+++ ChangeLog   6 May 2007 20:03:55 -0000       1.3112
@@ -1,5 +1,11 @@
 2007-05-06 Tomas Groth Christensen <address@hidden>
 
+       * libbase/LoadThread.cpp: Delete the thread after use so we don't
+         try to join it again. Fixes bug #19811.
+       * server/asobj/NetStreamGst.cpp: Fixed pausing and play, bug #19797.
+
+2007-05-06 Tomas Groth Christensen <address@hidden>
+
        * server/sprite_instance.cpp: Stop all sounds when restarting 
          a movie, fixes bug #19568.
        * server/asobj/NetStreamFfmpeg.cpp: Fixed return time.

Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/LoadThread.cpp      5 May 2007 12:21:13 -0000       1.8
+++ libbase/LoadThread.cpp      6 May 2007 20:03:55 -0000       1.9
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: LoadThread.cpp,v 1.8 2007/05/05 12:21:13 strk Exp $
+// $Id: LoadThread.cpp,v 1.9 2007/05/06 20:03:55 tgc Exp $
 
 #include "LoadThread.h"
 
@@ -209,6 +209,7 @@
        if (  _completed && _thread.get() )
        {
                _thread->join();
+               _thread.reset(NULL);
        }
 
        return _completed;

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/NetStreamGst.cpp       6 May 2007 15:48:14 -0000       1.32
+++ server/asobj/NetStreamGst.cpp       6 May 2007 20:03:55 -0000       1.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.32 2007/05/06 15:48:14 tgc Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.33 2007/05/06 20:03:55 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -667,6 +667,7 @@
        // Check if we should start the playback when a certain amount is 
buffered
        if (m_isFLV && m_pause && m_go && m_start_onbuffer && m_parser && 
m_parser->isTimeLoaded(m_bufferTime)) {
                setStatus(bufferFull);
+               m_start_onbuffer = false;
                m_pause = false;
                gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_PLAYING);
        }