[Gnash-commit] gnash ./ChangeLog gui/gnash.cpp gui/gtk.cpp gui...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Bastiaan Jacques <address@hidden>       06/05/09 00:21:53

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp gtk.cpp sdl.cpp 

Log message:
        * gui/gnash.cpp: Use the GTK backend by default; if GTK isn't
        available, fall back to SDL.
        * gui/{gtk.cpp,sdl.cpp}: Fix includes to match recent filename
        changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.276&tr2=1.277&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdl.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.276 gnash/ChangeLog:1.277
--- gnash/ChangeLog:1.276       Mon May  8 21:12:24 2006
+++ gnash/ChangeLog     Tue May  9 00:21:53 2006
@@ -1,3 +1,10 @@
+2006-05-09 Bastiaan Jacques <address@hidden>
+
+       * gui/gnash.cpp: Use the GTK backend by default; if GTK isn't
+       available, fall back to SDL.
+       * gui/{gtk.cpp,sdl.cpp}: Fix includes to match recent filename
+       changes.
+
 2006-05-08 Bastiaan Jacques <address@hidden>
 
        * configure.ac: Build with -ansi by default.
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.2 gnash/gui/gnash.cpp:1.3
--- gnash/gui/gnash.cpp:1.2     Sun May  7 15:33:08 2006
+++ gnash/gui/gnash.cpp Tue May  9 00:21:53 2006
@@ -40,9 +40,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_SDL_H
-#include "sdlsup.h"
-#endif
 
 #include <unistd.h>
 #include <cstdlib>
@@ -50,9 +47,16 @@
 #include <vector>
 
 
-#  ifdef HAVE_GTK2
-#    include "gtksup.h"
-#  endif
+#if defined(HAVE_GTK2)
+#  include "gtksup.h"
+#  define GUI_CLASS GtkGui
+#  define GUI_GTK 1
+#elif defined(HAVE_SDL_H)
+#  include "sdlsup.h"
+#  define GUI_CLASS SDLGui
+#  define GUI_SDL 1
+#endif
+
 
 #include "gnash.h"
 #include "log.h"
@@ -60,7 +64,7 @@
 #include "container.h"
 #include "tu_file.h"
 #include "tu_types.h"
-#include "Movie.h"
+#include "movie_definition.h"
 #include <sys/time.h>
 
 using namespace std;
@@ -292,10 +296,6 @@
       height = int(movie_height * scale);
     }
 
-#define GUI_CLASS GtkGui
-#define GUI_GTK 1
-
-
     GUI_CLASS gui(windowid, scale, do_loop, bit_depth);
 #ifdef GUI_SDL
     if (!sdl_abort) {
Index: gnash/gui/gtk.cpp
diff -u gnash/gui/gtk.cpp:1.2 gnash/gui/gtk.cpp:1.3
--- gnash/gui/gtk.cpp:1.2       Sun May  7 15:33:08 2006
+++ gnash/gui/gtk.cpp   Tue May  9 00:21:53 2006
@@ -49,7 +49,7 @@
 #endif // RENDERER_OPENGL
 
 #include "gnash.h"
-#include "Movie.h" // For movie_definition.
+#include "movie_definition.h" 
 #include "log.h"
 
 #include <gtk/gtk.h>
Index: gnash/gui/sdl.cpp
diff -u gnash/gui/sdl.cpp:1.2 gnash/gui/sdl.cpp:1.3
--- gnash/gui/sdl.cpp:1.2       Mon May  8 21:12:24 2006
+++ gnash/gui/sdl.cpp   Tue May  9 00:21:53 2006
@@ -43,7 +43,6 @@
 #include <iostream>
 #include "gnash.h"
 #include "log.h"
-#include "Movie.h"
 
 #include "sdlsup.h"