[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp |
Date: |
Tue, 28 Nov 2006 21:26:17 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/11/28 21:26:17
Modified files:
. : ChangeLog
testsuite : MovieTester.cpp
Log message:
* testsuite/MovieTester.cpp (ctor): properly initialize the virtual
machine.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1808&r2=1.1809
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -b -r1.1808 -r1.1809
--- ChangeLog 28 Nov 2006 17:58:06 -0000 1.1808
+++ ChangeLog 28 Nov 2006 21:26:16 -0000 1.1809
@@ -1,5 +1,7 @@
2006-11-28 Sandro Santilli <address@hidden>
+ * testsuite/MovieTester.cpp (ctor): properly initialize
+ the virtual machine.
* testsuite/misc-ming.all/DefineEditTextVariableNameTest.c:
test TextField.variable.
* testsuite/misc-ming.all/ming_utils.c (add_xtrace_function):
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/MovieTester.cpp 21 Nov 2006 00:25:47 -0000 1.9
+++ testsuite/MovieTester.cpp 28 Nov 2006 21:26:17 -0000 1.10
@@ -27,6 +27,7 @@
#include "sprite_instance.h"
#include "as_environment.h"
#include "gnash.h" // for create_movie and create_library_movie
+#include "VM.h" // for initialization
#include <cstdio>
#include <string>
@@ -39,12 +40,12 @@
if ( url == "-" )
{
tu_file* in = noseek_fd_adapter::make_stream(fileno(stdin));
- _movie_def = gnash::create_movie(in, url);
+ _movie_def = gnash::create_movie(in, url, false);
}
else
{
// _url should be always set at this point...
- _movie_def = gnash::create_library_movie(URL(url));
+ _movie_def = gnash::create_library_movie(URL(url), NULL, false);
}
// TODO: use PWD if url == '-'
@@ -55,20 +56,16 @@
throw GnashException("Could not load movie from "+url);
}
- // Make sure to load the whole movie
+ _movie = VM::init(*_movie_def).getRoot();
+ assert(_movie);
+
+ // Now complete load of the movie
+ _movie_def->completeLoad();
_movie_def->ensure_frame_loaded(_movie_def->get_frame_count());
- sprite_instance* root = _movie_def->create_instance();
- assert(root);
- _movie_root = dynamic_cast<movie_root*>(root);
+ _movie_root = dynamic_cast<movie_root*>(_movie);
assert(_movie_root);
- // This is surely be needed by internal functions triggered
- // by pressMouseButton and depressMouseButton
- set_current_root(_movie_root);
-
- _movie = root->get_root_movie();
- assert(_movie);
}
void