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

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/21 13:27:25

Modified files:
        server         : gnash.h movie_def_impl.cpp 

Log message:
        attempting to do multithread opengl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_def_impl.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gnash.h     3 Aug 2006 19:16:37 -0000       1.36
+++ gnash.h     21 Aug 2006 13:27:25 -0000      1.37
@@ -68,7 +68,7 @@
 
 // @@ forward decl to avoid including base/image.h; TODO change the
 // render_handler interface to not depend on these structs at all.
-namespace image { struct rgb; struct rgba; }
+namespace image { struct image_base; struct rgb; struct rgba; }
 
 // forward decl
 namespace jpeg { struct input; }
@@ -646,6 +646,9 @@
 /// using textures.
 struct bitmap_info : public ref_counted
 {
+       virtual void layout_image(image::image_base* im) { };
+       image::image_base*  m_suspended_image;
+
        unsigned int    m_texture_id;           // nuke?
        int             m_original_width;       // nuke?
        int             m_original_height;      // nuke?
@@ -654,7 +657,8 @@
                :
                m_texture_id(0),
                m_original_width(0),
-               m_original_height(0)
+               m_original_height(0),
+               m_suspended_image(NULL)
                {
                }
 };

Index: movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_def_impl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- movie_def_impl.cpp  21 Aug 2006 09:53:10 -0000      1.23
+++ movie_def_impl.cpp  21 Aug 2006 13:27:25 -0000      1.24
@@ -602,12 +602,6 @@
                        m_frame_rate, m_frame_count);
        );
 
-// Vitaly: temporarily (becouse _loader.start() does not work on win32)
-#ifdef WIN32
-       read_all_swf();
-       return true;
-#endif
-
        // Start the loading frame
        if ( ! _loader.start() )
        {