Re: [Gnash-commit] gnash/gui Player.cpp gnash.cpp sdl.cpp

[strk]

create_library_movie should *NOT* use OpenGL function.
Please revert this change, so we have a clear testcase
for dropping those lines.

create_library_movie should only involve the parser
and we want to drop opengl calls from it
(see task #5837)

https://savannah.gnu.org/task/?5837

--strk;


On Mon, Sep 25, 2006 at 11:27:10AM +0000, Vitaly Alexeev wrote:
> CVSROOT:      /sources/gnash
> Module name:  gnash
> Changes by:   Vitaly Alexeev <alexeev>        06/09/25 11:27:10
> 
> Modified files:
>       gui            : Player.cpp gnash.cpp sdl.cpp 
> 
> Log message:
>       fixed SDL OpenGL bug & ported to win32
> 
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.2&r2=1.3
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.42&r2=1.43
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.23&r2=1.24
> 
> Patches:
> Index: Player.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/Player.cpp,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- Player.cpp        23 Sep 2006 15:54:14 -0000      1.2
> +++ Player.cpp        25 Sep 2006 11:27:09 -0000      1.3
> @@ -58,11 +58,6 @@
>  # endif
>  #endif
>  
> -
> -#if defined(_WIN32) || defined(WIN32)
> -# include "getopt.c"
> -#endif
> -
>  #include "NullGui.h"
>  
>  #include "gnash.h"
> @@ -208,6 +203,22 @@
>      // 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) {
> @@ -228,25 +239,8 @@
>        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);
>      assert(m);
>  
> 
> Index: gnash.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -u -b -r1.42 -r1.43
> --- gnash.cpp 25 Sep 2006 10:53:44 -0000      1.42
> +++ gnash.cpp 25 Sep 2006 11:27:09 -0000      1.43
> @@ -43,13 +43,12 @@
>  #include "Player.h"
>  #include "log.h" // for dbglogfile (I hate this)
>  
> -#if defined(_WIN32) || defined(WIN32)        //vv
> -#    include "getopt_win32.h"
> +#if defined(_WIN32) || defined(WIN32)
> +#    include "getopt_win32.c"
>  #endif
>  
>  #include <iostream>
>  
> -
>  using namespace gnash; // for dbglogfile
>  
>  using namespace std;
> 
> Index: sdl.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -b -r1.23 -r1.24
> --- sdl.cpp   25 Sep 2006 10:53:44 -0000      1.23
> +++ sdl.cpp   25 Sep 2006 11:27:09 -0000      1.24
> @@ -201,7 +201,7 @@
>  {
>      GNASH_REPORT_FUNCTION;
>  
> -     int c;  //vv
> +     int c;
>       while ((c = getopt (argc, *argv, "m:c")) != -1)
>       {
>               switch (c)
> 
> 
> _______________________________________________
> Gnash-commit mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-commit

-- 

 /"\    ASCII Ribbon Campaign
 \ /    Respect for low technology.
  X     Keep e-mail messages readable by any computer system.
 / \    Keep it ASCII.