[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/29 00:38:56

Modified files:
        .              : ChangeLog 
        testsuite      : MovieTester.cpp 

Log message:
        * testsuite/MovieTester.cpp (ctor): fixed reference to root movie (it's 
still pretty confusing)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1811&r2=1.1812
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -b -r1.1811 -r1.1812
--- ChangeLog   29 Nov 2006 00:32:27 -0000      1.1811
+++ ChangeLog   29 Nov 2006 00:38:56 -0000      1.1812
@@ -2,6 +2,9 @@
 
        * testsuite/Makefile.am: added -Iserver/vm
          needed for MovieTester.cpp
+       * testsuite/MovieTester.cpp (ctor): fixed
+         reference to root movie (it's still pretty
+         confusing)
 
 2006-11-28 Markus Gothe <address@hidden>
 

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/MovieTester.cpp   28 Nov 2006 21:26:17 -0000      1.10
+++ testsuite/MovieTester.cpp   29 Nov 2006 00:38:56 -0000      1.11
@@ -56,16 +56,19 @@
                throw GnashException("Could not load movie from "+url);
        }
 
-       _movie = VM::init(*_movie_def).getRoot();
-       assert(_movie);
+       sprite_instance* root = VM::init(*_movie_def).getRoot();
+       assert(root);
 
        // Now complete load of the movie
        _movie_def->completeLoad();
        _movie_def->ensure_frame_loaded(_movie_def->get_frame_count());
 
-       _movie_root = dynamic_cast<movie_root*>(_movie);
+       _movie_root = dynamic_cast<movie_root*>(root);
        assert(_movie_root);
 
+       _movie = root->get_root_movie();
+       assert(_movie);
+
 }
 
 void