[Gnash-commit] gnash ChangeLog gui/gui.cpp gui/gui.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/12 21:11:28

Modified files:
        .              : ChangeLog 
        gui            : gui.cpp gui.h 

Log message:
                * gui/gui.{cpp,h}: advance_movie reverted to a static, to make
                  current gtk gui work fine (there's no point of being 
non-static
                  *and* take a 'this' argument).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1175&r2=1.1176
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1175
retrieving revision 1.1176
diff -u -b -r1.1175 -r1.1176
--- ChangeLog   12 Oct 2006 20:24:04 -0000      1.1175
+++ ChangeLog   12 Oct 2006 21:11:28 -0000      1.1176
@@ -1,5 +1,8 @@
 2006-10-13 Sandro Santilli <address@hidden>
 
+       * gui/gui.{cpp,h}: advance_movie reverted to a static, to make
+         current gtk gui work fine (there's no point of being non-static
+         *and* take a 'this' argument).
        * macros/ogg.m4: added missing -I, -L and -l (!);
          quoted 'test' args.
 

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gui/gui.cpp 12 Oct 2006 18:59:00 -0000      1.22
+++ gui/gui.cpp 12 Oct 2006 21:11:28 -0000      1.23
@@ -202,6 +202,7 @@
 bool
 Gui::advance_movie(Gui* gui)
 {
+       assert(gui);
 
   rect changed_bounds;  // new bounds for the current frame
   rect draw_bounds;     // redraw bounds (union of current and previous frame)
@@ -218,8 +219,8 @@
   // Union it with the previous frame (when a character moved, we also need to
   // redraw it's previous position).
   draw_bounds = changed_bounds;
-  if (_last_invalidated_bounds.m_x_min <= _last_invalidated_bounds.m_x_max)  
-    draw_bounds.expand_to_rect(_last_invalidated_bounds);
+  if (gui->_last_invalidated_bounds.m_x_min <= 
gui->_last_invalidated_bounds.m_x_max)  
+    draw_bounds.expand_to_rect(gui->_last_invalidated_bounds);
   
   // Avoid drawing of stopped movies
   if (draw_bounds.m_x_min <= draw_bounds.m_x_max) {
@@ -252,7 +253,7 @@
        
   }
   
-  _last_invalidated_bounds = changed_bounds;
+  gui->_last_invalidated_bounds = changed_bounds;
   
        if ( ! gui->loops() )
        {

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gui/gui.h   12 Oct 2006 16:37:25 -0000      1.20
+++ gui/gui.h   12 Oct 2006 21:11:28 -0000      1.21
@@ -174,7 +174,7 @@
     /// \brief
     /// Advances the movie to the next frame. This is to take place after the
     /// interval specified in the call to setInterval().
-    bool advance_movie(Gui* gui);
+    static bool advance_movie(Gui* gui);
 
     /// Resize the client area view and the window accordingly.
     /// @param width  The desired width in pixels.