[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui Makefile.am gnash.cpp gtk.cpp gtksup....
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash/gui Makefile.am gnash.cpp gtk.cpp gtksup.... |
|
Date: |
Sat, 13 May 2006 00:36:50 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/05/13 00:36:50
Modified files:
gui : Makefile.am gnash.cpp gtk.cpp gtksup.h gui.cpp
gui.h sdl.cpp sdlsup.h
Added files:
gui : kde.cpp kde_glue.h kde_glue_opengl.cpp
kde_glue_opengl.h kdesup.h
Log message:
* gui/kde.cpp: New file for KDE support.
* gui/kde_glue.h: New file for KDE support.
* gui/kde_glue_opengl.cpp: New file for KDE support.
* gui/kde_glue_opengl.h: New file for KDE support.
* gui/kdesup.h: New file for KDE support.
* gui/Makefile.am: Add support for Klash and KDE.
* gui/gnash.cpp: Add support for building with KDE support.
* gui/gtk.cpp: Use Gui class methods for movie control instead of
having the code here.
* gui/gtksup.h: run() now takes an argument.
* gui/gui.cpp: Include movie_definition. Add methods for movie
control. Move advance_movie() from gnash.cpp to here.
* gui/gui.h: Add non virtual init() and createWindow(). Add static
methods for movie control.
* gui/sdl.cpp: run() now takes an argument.
* gui/sdlsup.h: run() now takes an argument.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtksup.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gui.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gui.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/kde.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/kde_glue.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/kde_glue_opengl.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/kde_glue_opengl.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/kdesup.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdl.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdlsup.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnash/gui/Makefile.am
diff -u gnash/gui/Makefile.am:1.4 gnash/gui/Makefile.am:1.5
--- gnash/gui/Makefile.am:1.4 Fri May 12 04:34:49 2006
+++ gnash/gui/Makefile.am Sat May 13 00:36:50 2006
@@ -38,54 +38,75 @@
AUTOMAKE_OPTIONS =
+if USE_RENDERER_OPENGL
+GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
+KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
+else
+GTK_OPENGL_SRCS =
+KDE_OPENGL_SRCS =
+endif
+
+if USE_RENDERER_CAIRO
+GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
+KDE_CAIRO_SRCS = kde_glue_cairo.cpp kde_glue_cairo.h
+else
+GTK_CAIRO_SRCS =
+KDE_CAIRO_SRCS =
+endif
+
+if HAS_GTK2
+GTK_SRCS = gtk.cpp gtksup.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
+else
+GTK_SRCS =
+endif
+
+if HAS_SDL
+SDL_SRCS = sdl.cpp sdlsup.h # glow for SDL widgets
+else
+SDL_SRCS =
+endif
+
+if HAS_KDE
+KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
+else
+KDE_SRCS =
+endif
+
+#if HAS_FLTK
+#FLTK_SRCS = fltk.cpp fltksup.h
+#else
+#FLTK_SRCS =
+#endif
INCLUDES = -I.. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/server \
+ -I$(kde_includes)/kio $(all_includes) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/server \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libgeometry \
- $(PTHREAD_CFLAGS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(OPENGL_CFLAGS) \
- $(GLEXT_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(ATK_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(MP3_CFLAGS) \
+ $(PTHREAD_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(GLEXT_CFLAGS) \
+ $(GTK2_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK2_INCLS) \
+ $(FLTK_INCLS) \
+ $(KDE_INCLS) \
+ $(CAIRO_CFLAGS) \
+ $(ATK_CFLAGS) \
+ $(DMALLOC_CFLAGS) \
+ $(PNG_CFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(MP3_CFLAGS) \
$(OGG_CFLAGS)
AM_CPPFLAGS = $(INCLUDES)
-AM_CXXFLAGS = \
- -I$(top_srcdir)/server \
- -I$(top_srcdir)/libbase \
- $(PTHREAD_CFLAGS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(OPENGL_CFLAGS) \
- $(GLEXT_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(FLTK_CFLAGS) \
- $(XFT_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(ATK_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(MP3_CFLAGS) \
- $(OGG_CFLAGS)
-# We need this library to get the debug logging system.
AM_LDFLAGS = \
../libbase/libgnashbase.la \
$(JPEG_LIBS) \
@@ -107,53 +128,32 @@
$(X_LIBS) \
$(DMALLOC_LIBS) \
$(MP3_LIBS) \
- $(PTHREAD_LIBS)
-
-
-if USE_RENDERER_OPENGL
-GTK_GTKGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
-else
-GTK_GTKGL_SRCS =
-endif
-
-if USE_RENDERER_CAIRO
-GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
-else
-GTK_CAIRO_SRCS =
-endif
-
-
-
-if HAS_GTK2
-GTK_SRCS = gtk.cpp gtksup.h $(GTK_CAIRO_SRCS) $(GTK_GTKGL_SRCS)
-else
-GTK_SRCS =
-endif
-
-if HAS_SDL
-SDL_SRCS = sdl.cpp sdlsup.h # glow for SDL widgets
-else
-SDL_SRCS =
-endif
-
-#if HAS_FLTK
-#FLTK_SRCS = fltk.cpp fltksup.h
-#else
-#FLTK_SRCS =
-#endif
+ $(PTHREAD_LIBS) \
+ $(LIB_KDEUI) \
+ $(LIB_KDECORE) \
+ $(KDE_LDFLAGS) \
+ $(all_libraries) \
+ $(KDE_RPATH)
lib_LTLIBRARIES = libgnashgui.la
libgnashgui_la_SOURCES = \
$(SDL_SRCS) \
$(FLTK_SRCS) \
$(GTK_SRCS) \
+ $(KDE_SRCS) \
gui.cpp gui.h
libgnashgui_la_LIBADD = ../server/libgnashserver.la
+if HAS_KDE
+bin_PROGRAMS = gnash klash
+else
bin_PROGRAMS = gnash
+endif
+
gnash_SOURCES = gnash.cpp # $(libgnashgui_la_SOURCES)
-gnash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
+gnash_CPPFLAGS = -DUSE_GTK
+gnash_LDFLAGS = -module -avoid-version -no-undefined
gnash_LDADD = $(AM_LDFLAGS) \
libgnashgui.la \
../backend/libgnashbackend.la \
@@ -162,7 +162,27 @@
../libgeometry/libgnashgeo.la \
../libbase/libgnashbase.la
+klash_SOURCES = gnash.cpp
+klash_CPPFLAGS = -DUSE_KDE
+klash_LDFLAGS = -module -avoid-version -no-undefined
+klash_LDADD = $(AM_LDFLAGS) \
+ libgnashgui.la \
+ ../backend/libgnashbackend.la \
+ ../server/libgnashserver.la \
+ ../server/libgnashasobjs.la \
+ ../libgeometry/libgnashgeo.la \
+ ../libbase/libgnashbase.la
+klash_DEPENDANCIES = klash.moc libgnashgui.la
+CLEANFILES = klash.moc
+klash.moc: $(srcdir)/kdesup.h
+ @if test x"$(MOC)" != x; then \
+ echo "Generating MOC file..."; \
+ $(MOC) $(srcdir)/kdesup.h -o klash.moc; \
+ else \
+ echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
+ ln -s $(srcdir)/klash.moc.in klash.moc; \
+ fi
#noinst_PROGRAMS = guitest # klash flak
#guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp
gtk.cpp
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.8 gnash/gui/gnash.cpp:1.9
--- gnash/gui/gnash.cpp:1.8 Fri May 12 04:34:51 2006
+++ gnash/gui/gnash.cpp Sat May 13 00:36:50 2006
@@ -40,12 +40,22 @@
#include "config.h"
#endif
-#if defined(GUI_GTK)
+#ifndef USE_KDE
+# ifdef GUI_GTK
# include "gtksup.h"
# define GUI_CLASS GtkGui
-#elif defined(GUI_SDL)
+# elif defined(GUI_SDL)
# include "sdlsup.h"
# define GUI_CLASS SDLGui
+# endif
+#else
+# ifdef HAVE_KDE
+# include "kdesup.h"
+# include <qapplication.h>
+# define GUI_CLASS KdeGui
+# else
+# error "KDE development packages not installed!"
+# endif
#endif
#include "gnash.h"
@@ -96,6 +106,11 @@
unsigned int delay = 0;
float scale = 1.0f, exit_timeout = 0;
long int width = 0, height = 0;
+#ifdef USE_KDE
+ QApplication *app = new QApplication(argc, argv);
+#else
+ void *app;
+#endif
#if defined(RENDERER_CAIRO)
unsigned int bit_depth = 32;
#else
@@ -299,15 +314,15 @@
m->set_background_alpha(background ? 1.0f : 0.05f);
if (!delay) {
- delay = (unsigned int) (1000 / movie_fps) ; // milliseconds per frame
+ delay = (unsigned int) (400 / movie_fps) ; // milliseconds per frame
}
- gui.setCallback(advance_movie, delay);
+ gui.setCallback(NULL, delay);
if (exit_timeout) {
gui.setTimeout((unsigned int)(exit_timeout * 1000));
}
- gui.run();
+ gui.run(app);
// Clean up as much as possible, so valgrind will help find actual leaks.
gnash::clear();
@@ -315,30 +330,6 @@
return EXIT_SUCCESS;
}
-static bool
-advance_movie(void* data)
-{
- Gui *gui = static_cast<Gui*> (data);
- gnash::movie_interface* m = gnash::get_current_root();
-
- m->notify_mouse_state(gui->getMouseX(), gui->getMouseY(),
gui->getMouseButtons());
-
- m->advance(1.0);
- m->display();
-
- gui->renderBuffer();
-
- if (!gui->loops()) {
- if (m->get_current_frame() + 1 ==
- m->get_root_movie()->get_movie_definition()->get_frame_count()) {
- exit(0); // TODO: quit in a more gentile fashion.
- }
- }
-
- return true;
-}
-
-
void
version_and_copyright()
{
Index: gnash/gui/gtk.cpp
diff -u gnash/gui/gtk.cpp:1.8 gnash/gui/gtk.cpp:1.9
--- gnash/gui/gtk.cpp:1.8 Fri May 12 04:34:51 2006
+++ gnash/gui/gtk.cpp Sat May 13 00:36:50 2006
@@ -140,12 +140,12 @@
void
GtkGui::setCallback(callback_t func, unsigned int interval)
{
- g_timeout_add_full (G_PRIORITY_LOW, interval, (GSourceFunc)func, this,
- NULL);
+ g_timeout_add_full (G_PRIORITY_LOW, interval, (GSourceFunc)advance_movie,
+ this, NULL);
}
bool
-GtkGui::run()
+GtkGui::run(void *arg)
{
GNASH_REPORT_FUNCTION;
gtk_main();
@@ -290,7 +290,7 @@
GtkGui::menuitem_restart_callback(GtkMenuItem *menuitem, gpointer data)
{
GNASH_REPORT_FUNCTION;
- get_current_root()->restart();
+ menu_restart();
}
/// \brief quit complete, and close the application
@@ -307,7 +307,7 @@
GtkGui::menuitem_play_callback(GtkMenuItem *menuitem, gpointer data)
{
GNASH_REPORT_FUNCTION;
- get_current_root()->set_play_state(gnash::movie_interface::PLAY);
+ menu_play();
}
/// \brief toggle that's playing or paused.
@@ -316,13 +316,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
-
- movie_interface* m = get_current_root();
- if (m->get_play_state() == gnash::movie_interface::STOP) {
- m->set_play_state(gnash::movie_interface::PLAY);
- } else {
- m->set_play_state(gnash::movie_interface::STOP);
- }
+ menu_pause();
}
/// \brief stop the movie that's playing.
@@ -331,7 +325,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
- get_current_root()->set_play_state(gnash::movie_interface::STOP);
+ menu_stop();
}
/// \brief step forward 1 frame
@@ -340,8 +334,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
- movie_interface* m = get_current_root();
- m->goto_frame(m->get_current_frame()+1);
+ menu_step_forward();
}
/// \brief step backward 1 frame
@@ -350,8 +343,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
- movie_interface* m = get_current_root();
- m->goto_frame(m->get_current_frame()-1);
+ menu_step_backward();
}
/// \brief jump forward 10 frames
@@ -360,8 +352,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
- movie_interface* m = get_current_root();
- m->goto_frame(m->get_current_frame()+10);
+ menu_jump_forward();
}
/// \brief jump backward 10 frames
@@ -370,8 +361,7 @@
gpointer data)
{
GNASH_REPORT_FUNCTION;
- movie_interface* m = get_current_root();
- m->goto_frame(m->get_current_frame()-10);
+ menu_jump_backward();
}
//
Index: gnash/gui/gtksup.h
diff -u gnash/gui/gtksup.h:1.7 gnash/gui/gtksup.h:1.8
--- gnash/gui/gtksup.h:1.7 Fri May 12 04:34:51 2006
+++ gnash/gui/gtksup.h Sat May 13 00:36:50 2006
@@ -71,7 +71,7 @@
virtual ~GtkGui();
virtual bool init(int argc, char **argv[]);
virtual bool createWindow(int width, int height);
- virtual bool run();
+ virtual bool run(void *arg);
virtual void resizeWindow();
virtual bool createMenu();
virtual bool setupEvents();
Index: gnash/gui/gui.cpp
diff -u gnash/gui/gui.cpp:1.4 gnash/gui/gui.cpp:1.5
--- gnash/gui/gui.cpp:1.4 Fri May 12 04:34:51 2006
+++ gnash/gui/gui.cpp Sat May 13 00:36:50 2006
@@ -44,32 +44,170 @@
#include "log.h"
#include "gnash.h"
+#include "movie_definition.h"
#include "gui.h"
namespace gnash {
const char *GNASH = "Gnash";
-Gui::Gui(unsigned long xid, float scale, bool loop, unsigned int depth)
- : _xid(xid),
- _scale(scale),
- _loop(loop),
+Gui::Gui() :
+ _loop(true),
+ _xid(0),
+ _width(0),
+ _height(0),
_mouse_x(0),
_mouse_y(0),
+ _scale(0.1f),
_mouse_buttons(0),
- _depth(depth)
+ _xembed(0),
+ _depth(16)
#if defined(FIX_I810_LOD_BIAS)
,_tex_lod_bias(-1.2f)
#endif
{
+// GNASH_REPORT_FUNCTION;
+}
+
+Gui::Gui(unsigned long xid, float scale, bool loop, unsigned int depth) :
+ _loop(true),
+ _xid(0),
+ _width(0),
+ _height(0),
+ _mouse_x(0),
+ _mouse_y(0),
+ _scale(0.1f),
+ _mouse_buttons(0),
+ _xembed(0),
+ _depth(16)
+#if defined(FIX_I810_LOD_BIAS)
+ ,_tex_lod_bias(-1.2f)
+#endif
+{
+}
+
+bool
+Gui::init(int xid, int argc, char **argv[])
+{
+ _xembed = true;
+ _xid = xid;
+// return init(argc, argv);
+ return false;
+}
+
+bool
+Gui::createWindow(int xid, int width, int height)
+{
+// GNASH_REPORT_FUNCTION;
+ _xembed = true;
+ _xid = xid;
+// return createWindow(width, height);
+ return false;
}
Gui::~Gui()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
delete _renderer;
}
+void
+Gui::menu_restart()
+{
+// GNASH_REPORT_FUNCTION;
+ get_current_root()->restart();
+}
+
+void
+Gui::menu_quit()
+{
+ GNASH_REPORT_FUNCTION;
+ exit(0);
+}
+
+void
+Gui::menu_play()
+{
+// GNASH_REPORT_FUNCTION;
+ get_current_root()->set_play_state(gnash::movie_interface::PLAY);
+}
+
+void
+Gui::menu_pause()
+{
+// GNASH_REPORT_FUNCTION;
+
+ movie_interface* m = get_current_root();
+ if (m->get_play_state() == gnash::movie_interface::STOP) {
+ m->set_play_state(gnash::movie_interface::PLAY);
+ } else {
+ m->set_play_state(gnash::movie_interface::STOP);
+ }
+}
+
+void
+Gui::menu_stop()
+{
+// GNASH_REPORT_FUNCTION;
+ get_current_root()->set_play_state(gnash::movie_interface::STOP);
+}
+
+void
+Gui::menu_step_forward()
+{
+// GNASH_REPORT_FUNCTION;
+ movie_interface* m = get_current_root();
+ m->goto_frame(m->get_current_frame()+1);
+}
+
+void
+Gui::menu_step_backward()
+{
+// GNASH_REPORT_FUNCTION;
+ movie_interface* m = get_current_root();
+ m->goto_frame(m->get_current_frame()-1);
+}
+
+void
+Gui::menu_jump_forward()
+{
+// GNASH_REPORT_FUNCTION;
+ movie_interface* m = get_current_root();
+ m->goto_frame(m->get_current_frame()+10);
+}
+
+void
+Gui::menu_jump_backward()
+{
+// GNASH_REPORT_FUNCTION;
+ movie_interface* m = get_current_root();
+ m->goto_frame(m->get_current_frame()-10);
+}
+
+bool
+Gui::advance_movie(void *data)
+{
+// GNASH_REPORT_FUNCTION;
+
+ Gui *gui = reinterpret_cast<Gui*> (data);
+ gnash::movie_interface* m = gnash::get_current_root();
+
+ m->notify_mouse_state(gui->getMouseX(), gui->getMouseY(),
gui->getMouseButtons());
+
+ m->advance(1.0);
+ m->display();
+
+ gui->renderBuffer();
+
+ if (!gui->loops()) {
+ if (m->get_current_frame() + 1 ==
+ m->get_root_movie()->get_movie_definition()->get_frame_count()) {
+ exit(0); // TODO: quit in a more gentile fashion.
+ }
+ }
+
+ return true;
+}
// end of namespace
}
Index: gnash/gui/gui.h
diff -u gnash/gui/gui.h:1.4 gnash/gui/gui.h:1.5
--- gnash/gui/gui.h:1.4 Fri May 12 04:34:52 2006
+++ gnash/gui/gui.h Sat May 13 00:36:50 2006
@@ -58,12 +58,14 @@
class Gui {
public:
+ Gui();
Gui(unsigned long xid, float scale, bool loop, unsigned int depth);
virtual ~Gui();
- virtual bool init(int argc, char **argv[]) = 0;
+ bool init(int xid, int argc, char **argv[]);
+ bool createWindow(int xid, int width, int height);
virtual bool createWindow(int width, int height) = 0;
- virtual bool run() = 0;
+ virtual bool run(void *) = 0;
virtual void resizeWindow() = 0;
virtual bool createMenu() = 0;
virtual bool setupEvents() = 0;
@@ -80,6 +82,18 @@
void addMouseHandler(callback_t ptr);
void addKeyboardHandler(callback_t ptr);
+ void setXembed(int xid);
+
+ static void menu_restart();
+ static void menu_quit();
+ static void menu_play();
+ static void menu_pause();
+ static void menu_stop();
+ static void menu_step_forward();
+ static void menu_step_backward();
+ static void menu_jump_forward();
+ static void menu_jump_backward();
+ static bool advance_movie(void *data);
protected:
bool _loop;
@@ -90,10 +104,12 @@
int _mouse_y;
float _scale;
int _mouse_buttons;
+ bool _xembed;
int _depth;
std::string _name;
callback_t _mouse_handler;
callback_t _heyboard_handler;
+ unsigned int _interval;
render_handler* _renderer;
};
Index: gnash/gui/sdl.cpp
diff -u gnash/gui/sdl.cpp:1.5 gnash/gui/sdl.cpp:1.6
--- gnash/gui/sdl.cpp:1.5 Fri May 12 04:34:52 2006
+++ gnash/gui/sdl.cpp Sat May 13 00:36:50 2006
@@ -80,7 +80,7 @@
}
bool
-SDLGui::run()
+SDLGui::run(void *arg)
{
GNASH_REPORT_FUNCTION;
Index: gnash/gui/sdlsup.h
diff -u gnash/gui/sdlsup.h:1.3 gnash/gui/sdlsup.h:1.4
--- gnash/gui/sdlsup.h:1.3 Fri May 12 04:34:52 2006
+++ gnash/gui/sdlsup.h Sat May 13 00:36:50 2006
@@ -61,7 +61,7 @@
virtual ~SDLGui();
virtual bool init(int argc, char **argv[]);
virtual bool createWindow(int width, int height);
- virtual bool run();
+ virtual bool run(void *arg);
virtual void resizeWindow();
virtual bool createMenu();
virtual bool setupEvents();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/gui Makefile.am gnash.cpp gtk.cpp gtksup....,
Rob Savoye <=