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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/08 06:43:42

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

Log message:
                * server/asobj/NetStreamGst.{cpp,h}: Make start thread
                  use a compile-time option. Defaults to true for now,
                  but worth disabling for better testing (btw: why do
                  we need a "start" thread and a "continue" thread?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3121&r2=1.3122
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3121
retrieving revision 1.3122
diff -u -b -r1.3121 -r1.3122
--- ChangeLog   7 May 2007 23:15:44 -0000       1.3121
+++ ChangeLog   8 May 2007 06:43:42 -0000       1.3122
@@ -1,3 +1,10 @@
+2007-05-07 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStreamGst.{cpp,h}: Make start thread
+         use a compile-time option. Defaults to true for now,
+         but worth disabling for better testing (btw: why do
+         we need a "start" thread and a "continue" thread?)
+
 2007-05-07 Tomas Groth Christensen <address@hidden>
 
        * libbase/FLVParser.cpp: When seeking to 0 just go to

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetStreamGst.cpp       7 May 2007 23:15:44 -0000       1.35
+++ server/asobj/NetStreamGst.cpp       8 May 2007 06:43:42 -0000       1.36
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.35 2007/05/07 23:15:44 tgc Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.36 2007/05/08 06:43:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -84,7 +84,9 @@
 
        m_go(false),
        m_imageframe(NULL),
+#ifndef DISABLE_START_THREAD
        startThread(NULL),
+#endif
        m_pause(false),
        inputPos(0),
        videowidth(0),
@@ -131,8 +133,10 @@
        if (m_go)
        {
                m_go = false;
+#ifndef DISABLE_START_THREAD
                startThread->join();
                delete startThread;
+#endif
        }
 
        gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
@@ -174,7 +178,11 @@
        m_go = true;
 
        // To avoid blocking while connecting, we use a thread.
+#ifndef DISABLE_START_THREAD
        startThread = new 
boost::thread(boost::bind(NetStreamGst::startPlayback, this));
+#else
+       startPlayback(this);
+#endif
        return 0;
 }
 

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/NetStreamGst.h 7 May 2007 23:15:44 -0000       1.15
+++ server/asobj/NetStreamGst.h 8 May 2007 06:43:42 -0000       1.16
@@ -35,6 +35,14 @@
 #include "NetStream.h" // for inheritance
 #include "FLVParser.h"
 
+/// Define DISABLE_START_THREAD to avoid using threads 
+///
+/// TODO: use a globally-defined thread-disabling routine
+///       when available
+///
+//#define DISABLE_START_THREAD
+
+
 namespace gnash {
   
 class NetStreamGst: public NetStream {
@@ -105,8 +113,12 @@
        // The image/videoframe which is given to the renderer
        image::image_base* m_imageframe;
 
-       boost::thread *startThread;
        boost::mutex image_mutex;
+
+#ifndef DISABLE_START_THREAD
+       boost::thread *startThread;
+#endif
+
        bool m_pause;
 
        long inputPos;