[Gnash-commit] gnash ChangeLog server/movie_def_impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/21 21:47:52

Modified files:
        .              : ChangeLog 
        server         : movie_def_impl.cpp 

Log message:
                * server/movie_def_impl.cpp: added
                  LOAD_MOVIES_IN_A_SEPARATE_THREAD define to switch between
                  threaded or sequential movie load.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.665&r2=1.666
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_def_impl.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -b -r1.665 -r1.666
--- ChangeLog   21 Aug 2006 15:28:02 -0000      1.665
+++ ChangeLog   21 Aug 2006 21:47:52 -0000      1.666
@@ -1,3 +1,9 @@
+2006-08-21 Sandro Santilli  <address@hidden>
+
+       * server/movie_def_impl.cpp: added
+         LOAD_MOVIES_IN_A_SEPARATE_THREAD define to switch between
+         threaded or sequential movie load.
+
 2006-08-21 Vitaly Alexeev <address@hidden>
        
        * server\movie.h: fixed a bit bit but opposite bug

Index: server/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_def_impl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/movie_def_impl.cpp   21 Aug 2006 13:27:25 -0000      1.24
+++ server/movie_def_impl.cpp   21 Aug 2006 21:47:52 -0000      1.25
@@ -71,6 +71,10 @@
 // Debug frames load
 #undef DEBUG_FRAMES_LOAD 
 
+// Define this this to load movies using a separate thread
+// (undef and it will fully load a movie before starting to play it)
+#define LOAD_MOVIES_IN_A_SEPARATE_THREAD 1
+
 // Debug threads locking
 #undef DEBUG_THREADS_LOCKING
 
@@ -602,6 +606,8 @@
                        m_frame_rate, m_frame_count);
        );
 
+#ifdef LOAD_MOVIES_IN_A_SEPARATE_THREAD
+
        // Start the loading frame
        if ( ! _loader.start() )
        {
@@ -616,6 +622,11 @@
 #endif
        ensure_frame_loaded(startup_frames);
 
+#else // ndef LOAD_MOVIES_IN_A_SEPARATE_THREAD
+
+       read_all_swf();
+#endif
+
 // Can't delete here as we will keep reading from it while playing
 // FIXME: remove this at end of reading (or in destructor)
 #if 0