[Gnash-dev] gui.cpp

[Rupert Swarbrick]

Pulling the latest bzr tree this evening, gnash seemed unable to
compile. The first error was to do with make files: it seemed to want a
swf.cpp to generate swf.lo from in the libcore (not libcore/swf/)
directory. I couldn't work out what was wrong there: maybe there were
some incorrect deps of mine somewhere or something. A symlink fixed the
problem in a hacky fashion!

The second error was compiling gui.cpp. It seems that getRootMovie() has
a new interface? Anyway, there were 2 lines using the result as a
pointer and one without some required parens. The attached patch makes
it compile and (seemingly) work happily.

Rupert

=== modified file 'gui/gui.cpp'
*** gui/gui.cpp 2009-04-15 05:33:51 +0000
--- gui/gui.cpp 2009-04-26 00:33:58 +0000
***************
*** 939,954 ****
        
  // Define REVIEW_ALL_FRAMES to have *all* frames
  // consequencially displaied. Useful for debugging.
! //#define REVIEW_ALL_FRAMES 1
  
  #ifndef REVIEW_ALL_FRAMES
        // Advance movie by one frame
        bool advanced = m->advance();
  #else
!       size_t cur_frame = m->getRootMovie()->get_current_frame();
!       size_t tot_frames = m->getRootMovie()->get_frame_count();
        bool advanced = m->advance();
!       m->getRootMovie.ensureFrameLoaded(tot_frames);
        m->goto_frame(cur_frame+1);
      m->set_play_state(gnash::MovieClip::PLAYSTATE_PLAY);
        log_debug(_("Frame %d"), m->get_current_frame());
--- 939,954 ----
        
  // Define REVIEW_ALL_FRAMES to have *all* frames
  // consequencially displaied. Useful for debugging.
! #define REVIEW_ALL_FRAMES 1
  
  #ifndef REVIEW_ALL_FRAMES
        // Advance movie by one frame
        bool advanced = m->advance();
  #else
!       size_t cur_frame = m->getRootMovie().get_current_frame();
!       size_t tot_frames = m->getRootMovie().get_frame_count();
        bool advanced = m->advance();
!       m->getRootMovie().ensureFrameLoaded(tot_frames);
        m->goto_frame(cur_frame+1);
      m->set_play_state(gnash::MovieClip::PLAYSTATE_PLAY);
        log_debug(_("Frame %d"), m->get_current_frame());

pgpkBy3StI7e7.pgp
Description: PGP signature