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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/02/02 20:41:55

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

Log message:
        * server/asobj/NetStreamFfmpeg.cpp: Fixed a deadlock when deleting
          netstream before playback started.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2236&r2=1.2237
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2236
retrieving revision 1.2237
diff -u -b -r1.2236 -r1.2237
--- ChangeLog   2 Feb 2007 15:50:28 -0000       1.2236
+++ ChangeLog   2 Feb 2007 20:41:55 -0000       1.2237
@@ -1,3 +1,8 @@
+2007-02-02 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStreamFfmpeg.cpp: Fixed a deadlock when deleting
+         netstream before playback started.
+
 2007-02-02  Rob Savoye  <address@hidden>
 
        * plugin/klash/Makefile.am: Simplify heavily as most of the KDE

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/NetStreamFfmpeg.cpp    30 Jan 2007 12:49:03 -0000      1.11
+++ server/asobj/NetStreamFfmpeg.cpp    2 Feb 2007 20:41:55 -0000       1.12
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.11 2007/01/30 12:49:03 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.12 2007/02/02 20:41:55 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -54,6 +54,9 @@
        m_Frame(NULL),
        m_Resample(NULL),
 
+       m_thread(NULL),
+       startThread(NULL),
+
        m_go(false),
        m_imageframe(NULL),
        m_video_clock(0),
@@ -92,15 +95,20 @@
 
 void NetStreamFfmpeg::close()
 {
+
        if (m_go)
        {
                // terminate thread
                m_go = false;
 
                // wait till thread is complete before main continues
+               if (m_thread) {
                m_thread->join();
-               if (m_thread) delete m_thread;
+                       delete m_thread;
        }
+
+       }
+
        if (startThread) {
                delete startThread;
        }
@@ -406,7 +414,6 @@
 
        int delay = 0;
        ns->m_start_clock = tu_timer::ticks_to_seconds(tu_timer::get_ticks());
-       ns->m_go = true;
        ns->m_unqueued_data = NULL;
 
        while (ns->m_go)