[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11587: Fix pythonmod build.
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11587: Fix pythonmod build. |
Date: |
Mon, 26 Oct 2009 08:14:13 +0100 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11587
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2009-10-26 08:14:13 +0100
message:
Fix pythonmod build.
modified:
gui/pythonmod/gnash-view.cpp
libcore/movie_root.cpp
libcore/movie_root.h
=== modified file 'gui/pythonmod/gnash-view.cpp'
--- a/gui/pythonmod/gnash-view.cpp 2009-08-08 13:36:22 +0000
+++ b/gui/pythonmod/gnash-view.cpp 2009-10-26 07:14:13 +0000
@@ -473,13 +473,13 @@
gtk_widget_queue_resize (GTK_WIDGET(view));
- view->movie.reset ( view->movie_definition->createMovie() );
+ //view->movie.reset (view->movie_definition->createMovie());
std::map<std::string, std::string> variables;
gnash::URL::parse_querystring(url.querystring(), variables);
- view->movie->setVariables(variables);
- view->stage->setRootMovie( view->movie.get() ); // will construct the
instance
+ gnash::Movie* m = view->stage->init(view->movie_definition.get(),
variables);
+ view->movie.reset(m);
view->stage->set_background_alpha(1.0f);
=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp 2009-10-23 10:08:21 +0000
+++ b/libcore/movie_root.cpp 2009-10-26 07:14:13 +0000
@@ -188,12 +188,13 @@
assert(testInvariant());
}
-void
+Movie*
movie_root::init(movie_definition* def, const MovieClip::MovieVariables& vars)
{
Movie* mr = def->createMovie();
mr->setVariables(vars);
setRootMovie(mr);
+ return mr;
}
void
=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h 2009-10-24 21:45:33 +0000
+++ b/libcore/movie_root.h 2009-10-26 07:14:13 +0000
@@ -158,7 +158,17 @@
~movie_root();
- void init(movie_definition* def, const MovieClip::MovieVariables&
variables);
+ /// Initialize movie_root with a parsed movie definition
+ //
+ /// The definition may be a SWF or Bitmap movie definition.
+ //
+ /// The created Movie is returned; it is non-const so may be stored,
+ /// queried, and changed by the caller for debugging or manipulation.
+ /// Direct use of the pointer may result in unexpected behaviour during
+ /// SWF playback, so for normal playback this pointer should not be
+ /// used.
+ Movie* init(movie_definition* def,
+ const MovieClip::MovieVariables& variables);
/// Return the movie at the given level (0 if unloaded level).
//
@@ -883,6 +893,8 @@
}
+private:
+
/// Set the root movie, replacing the current one if any.
//
/// This is needed for the cases in which the top-level movie
@@ -907,8 +919,6 @@
/// Must have a depth of 0.
///
void setRootMovie(Movie* movie);
-private:
-
const RunResources& _runResources;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11587: Fix pythonmod build.,
Benjamin Wolsey <=