[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/03 10:10:35

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp movie_def_impl.h 

Log message:
        wiped out SDL threads stuff

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1003&r2=1.1004
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -b -r1.1003 -r1.1004
--- ChangeLog   3 Oct 2006 09:50:59 -0000       1.1003
+++ ChangeLog   3 Oct 2006 10:10:35 -0000       1.1004
@@ -1,5 +1,9 @@
 2006-10-03 Sandro Santilli  <address@hidden>
 
+       * server/parser/movie_def_impl.{cpp,h}: wiped out SDL threads stuff.
+
+2006-10-03 Sandro Santilli  <address@hidden>
+
        * server/parser/movie_def_impl.cpp (create_instance):
          ensure frame0 has been loaded before attempting to
          execute the actions therein.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/movie_def_impl.cpp    3 Oct 2006 09:50:59 -0000       1.26
+++ server/parser/movie_def_impl.cpp    3 Oct 2006 10:10:35 -0000       1.27
@@ -78,95 +78,6 @@
 namespace gnash
 {
 
-#ifdef USE_SDL_THREADS
-
-MovieLoader::MovieLoader(movie_def_impl& md)
-       :
-       _waiting_for_frame(0),
-       _movie_def(md)
-{
-       _frame_reached_condition = SDL_CreateCond();
-       _mutex = SDL_CreateMutex();
-}
-
-MovieLoader::~MovieLoader()
-{
-       SDL_DestroyMutex(_mutex);
-       SDL_DestroyCond(_frame_reached_condition);
-}
-
-int MovieLoader::execute(void* arg)
-{
-       movie_def_impl* md = static_cast<movie_def_impl*>(arg);
-       md->read_all_swf();
-       return 0;
-}
-
-bool MovieLoader::start()
-{
-        _thread = SDL_CreateThread(execute, &_movie_def);
-        if (_thread == NULL)
-        {
-                return false;
-        }
-       return true;
-}
-
-inline void MovieLoader::signal_frame_loaded(size_t frameno)
-{
-       if (_waiting_for_frame &&
-               frameno >= _waiting_for_frame )
-       {
-               SDL_CondSignal(_frame_reached_condition);
-       }
-}
-
-void MovieLoader::wait_for_frame(size_t framenum)
-{
-
-       lock();
-
-       if (_movie_def.get_loading_frame() < framenum)
-       {
-               //log_msg("Waiting for frame %u to load", framenum);
-
-               assert(_waiting_for_frame == 0);
-               _waiting_for_frame = framenum;
-
-               do
-               {
-                       SDL_CondWait(_frame_reached_condition, _mutex);
-               }
-               while (_movie_def.get_loading_frame() < framenum);
-
-               _waiting_for_frame = 0;
-
-               //log_msg("Done waiting (frame %u/%u loaded)",
-               //      _movie_def.get_loading_frame(),
-               //      _movie_def.get_frame_count());
-       }
-
-       unlock();
-}
-
-inline void MovieLoader::lock()
-{
-       if ( -1 == SDL_mutexP(_mutex) )
-       {
-               log_error("Error unlocking MovieLoader");
-       }
-}
-
-inline void MovieLoader::unlock()
-{
-       if ( -1 == SDL_mutexV(_mutex) )
-       {
-               log_error("Error unlocking MovieLoader");
-       }
-}
-
-#else
-
 MovieLoader::MovieLoader(movie_def_impl& md)
        :
        _waiting_for_frame(0),
@@ -300,9 +211,6 @@
        unlock();
 }
 
-#endif // PTHREAD MovieLoader
-
-
 //
 // some utility stuff
 //

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/movie_def_impl.h      3 Oct 2006 09:50:59 -0000       1.10
+++ server/parser/movie_def_impl.h      3 Oct 2006 10:10:35 -0000       1.11
@@ -56,22 +56,6 @@
 #include <string>
 #include <memory> // for auto_ptr
 
-// We'd avoid SDL threads if possible. Please define the macro below
-// if you experience problems and report the difference on gnash-dev
-#undef REALLY_USE_SDL_THREADS
-
-#ifdef REALLY_USE_SDL_THREADS
-#ifdef HAVE_SDL_H
-# define USE_SDL_THREADS 1
-#endif
-#endif
-
-#ifdef USE_SDL_THREADS
-#      include "SDL.h"
-#      include "SDL_thread.h"
-#endif
-
-
 namespace gnash
 {
 
@@ -146,25 +130,12 @@
        size_t _waiting_for_frame;
        movie_def_impl& _movie_def;
 
-#ifdef USE_SDL_THREADS
-
-       static int execute(void* arg);
-
-       SDL_Thread* _thread;
-       SDL_cond* _frame_reached_condition;
-       SDL_mutex* _mutex;
-
-#else
-
        pthread_cond_t _frame_reached_condition;
        pthread_mutex_t _mutex;
        pthread_t _thread;
 
        /// Entry point for the actual thread
        static void *execute(void* arg);
-
-#endif
-
 };
 
 /// The Characters dictionary associated with each SWF file.