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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/10 11:19:30

Modified files:
        .              : ChangeLog 
        gui            : gui.cpp 

Log message:
        * gui/gui.cpp: always call advance_root, no matter play_state (the 
advance_root function should take care of that); reintroduce check for gui loop

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.618&r2=1.619
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -b -r1.618 -r1.619
--- ChangeLog   10 Aug 2006 09:10:06 -0000      1.618
+++ ChangeLog   10 Aug 2006 11:19:29 -0000      1.619
@@ -1,5 +1,8 @@
 2006-08-10  Sandro Santilli  <address@hidden>
 
+       * gui/gui.cpp: always call advance_root, no matter play_state
+         (the advance_root function should take care of that); reintroduce
+         check for gui loop
        * libbase/curl_adapter.cpp: removed compiler warnings.
 
 2006-08-10 annonygmouse <address@hidden>

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/gui.cpp 10 Aug 2006 09:05:10 -0000      1.14
+++ gui/gui.cpp 10 Aug 2006 11:19:30 -0000      1.15
@@ -202,16 +202,19 @@
     Gui *gui = reinterpret_cast<Gui*> (data);
     gnash::movie_interface* m = gnash::get_current_root();
 
-    if (m->get_play_state() == gnash::movie_interface::PLAY) {
         m->advance(1.0);
-    }
        m->display();
        gui->renderBuffer();
   
-        if (m->get_current_frame() + 1 ==
-            m->get_root_movie()->get_movie_definition()->get_frame_count()) {
+       if ( ! gui->loops() )
+       {
+               size_t curframe = m->get_current_frame();
+               gnash::sprite_instance* si = m->get_root_movie();
+               if (curframe + 1 == si->get_frame_count())
+               {
             exit(0); // TODO: quit in a more gentile fashion.
         }
+       }
 
     return true;
 }