[Gnash-commit] gnash/gui gui.cpp sdl.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/10/27 14:32:50

Modified files:
        gui            : gui.cpp sdl.cpp 

Log message:
        videostream implementation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gui.cpp     26 Oct 2006 13:15:46 -0000      1.41
+++ gui.cpp     27 Oct 2006 14:32:49 -0000      1.42
@@ -251,7 +251,10 @@
   
   
        // Avoid drawing of stopped movies
+
+#ifndef WIN32  // hack
        if ( ! changed_bounds.is_null() )
+#endif
        {
                // Tell the GUI that we only need to update this region
                // (it may ignore this information)

Index: sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- sdl.cpp     22 Oct 2006 16:07:42 -0000      1.47
+++ sdl.cpp     27 Oct 2006 14:32:50 -0000      1.48
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.47 2006/10/22 16:07:42 bjacques Exp $ */
+/* $Id: sdl.cpp,v 1.48 2006/10/27 14:32:50 alexeev Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -165,12 +165,13 @@
 
                Gui::advance_movie(this);
 
-               int delay = _interval - (SDL_GetTicks() - start_tick);
-               if (delay < 0)
-               {
-                       delay = 0;
-               }
-               SDL_Delay(delay);
+//             int delay = _interval - (SDL_GetTicks() - start_tick);
+//             if (delay < 0)
+//             {
+//                     delay = 0;
+//             }
+               SDL_Delay(10);
+
        }
        return false;
 }