[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui Player.cpp
From: |
Vitaly Alexeev |
Subject: |
[Gnash-commit] gnash/gui Player.cpp |
Date: |
Mon, 25 Sep 2006 11:48:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Vitaly Alexeev <alexeev> 06/09/25 11:48:33
Modified files:
gui : Player.cpp
Log message:
reverted
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Player.cpp 25 Sep 2006 11:27:09 -0000 1.3
+++ Player.cpp 25 Sep 2006 11:48:33 -0000 1.4
@@ -203,22 +203,6 @@
// Load the actual movie.
gnash::movie_definition *md;
- //Vitaly: gui.init should be up to create_library_movie()
- // because create_library_movie() uses OpenGL functions
- std::auto_ptr<Gui> gui_ptr;
- if ( do_render )
- {
- gui_ptr.reset(new GUI_CLASS(windowid, scale, do_loop, bit_depth));
-
- }
- else
- {
- gui_ptr.reset(new NullGui);
- }
- Gui& gui = *gui_ptr;
-
- gui.init(argc, &argv);
-
try {
md = gnash::create_library_movie(URL(infile), url);
} catch (const GnashException& er) {
@@ -239,6 +223,20 @@
height = int(movie_height * scale);
}
+ std::auto_ptr<Gui> gui_ptr;
+ if ( do_render )
+ {
+ gui_ptr.reset(new GUI_CLASS(windowid, scale, do_loop, bit_depth));
+
+ }
+ else
+ {
+ gui_ptr.reset(new NullGui);
+ }
+ Gui& gui = *gui_ptr;
+
+ gui.init(argc, &argv);
+
gui.createWindow(infile, width, height);
gnash::movie_interface *m = create_library_movie_inst(md);
- [Gnash-commit] gnash/gui Player.cpp,
Vitaly Alexeev <=