[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/gnash.cpp g...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/gnash.cpp g... |
Date: |
Mon, 31 Jul 2006 03:13:43 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/07/31 03:13:43
Modified files:
. : ChangeLog
gui : Makefile.am gnash.cpp gui.h
Added files:
gui : NullGui.cpp NullGui.h
Log message:
* gui/Makefile.am, gui/NullGui.cpp, gui/NullGui.h,
gui/gnash.cpp, gui/gui.h:
Moved NullGui class into its own files, implemented
frame delay in NullGui so that sound doesn't choke.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.560&r2=1.561
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.h?cvsroot=gnash&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -b -r1.560 -r1.561
--- ChangeLog 31 Jul 2006 00:05:19 -0000 1.560
+++ ChangeLog 31 Jul 2006 03:13:43 -0000 1.561
@@ -1,5 +1,12 @@
2006-07-31 Sandro Santilli <address@hidden>
+ * gui/Makefile.am, gui/NullGui.cpp, gui/NullGui.h,
+ gui/gnash.cpp, gui/gui.h:
+ Moved NullGui class into its own files, implemented
+ frame delay in NullGui so that sound doesn't choke.
+
+2006-07-31 Sandro Santilli <address@hidden>
+
* gui/gui.h: added NullGui class definition.
* gui/gnash.cpp: use Gui trough a pointer, to allow for
dynamic polymorphism. Use NullGui when rendering is
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/Makefile.am 29 Jul 2006 23:01:14 -0000 1.9
+++ gui/Makefile.am 31 Jul 2006 03:13:43 -0000 1.10
@@ -146,7 +146,9 @@
$(FLTK_SRCS) \
$(GTK_SRCS) \
$(KDE_SRCS) \
- gui.cpp gui.h
+ gui.cpp gui.h \
+ NullGui.cpp \
+ NullGui.h
libgnashgui_la_LIBADD = ../server/libgnashserver.la
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gui/gnash.cpp 31 Jul 2006 00:46:28 -0000 1.22
+++ gui/gnash.cpp 31 Jul 2006 03:13:43 -0000 1.23
@@ -58,6 +58,8 @@
# endif
#endif
+#include "NullGui.h"
+
#include "gnash.h"
#include "movie_definition.h"
Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/gui.h 31 Jul 2006 00:05:19 -0000 1.9
+++ gui/gui.h 31 Jul 2006 03:13:43 -0000 1.10
@@ -109,33 +109,6 @@
render_handler* _renderer;
};
-/// Null GUI, used when rendering is disabled
-class NullGui : public Gui {
-
-public:
-
- NullGui() {}
- ~NullGui() {}
- void setCallback(unsigned int interval) {}
- void setTimeout(unsigned int timeout) {}
- bool init(int argc, char **argv[]) { return true; }
- bool createWindow(int , int)
- {
- return true;
- }
- bool run(void *)
- {
- while (true)
- {
- Gui::advance_movie(this);
- }
- return false;
- }
- bool createMenu() { return true; }
- bool setupEvents() { return true; }
- void renderBuffer() { }
-};
-
} // end of gnash namespace
Index: gui/NullGui.cpp
===================================================================
RCS file: gui/NullGui.cpp
diff -N gui/NullGui.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/NullGui.cpp 31 Jul 2006 03:13:43 -0000 1.1
@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
+//
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "NullGui.h"
+
+#include <unistd.h> // for usleep
+
+namespace gnash
+{
+
+bool
+NullGui::run(void *)
+{
+ while (true)
+ {
+ // sleep for _interval milliseconds
+ usleep(_interval*1000);
+ Gui::advance_movie(this);
+ }
+ return false;
+}
+
+} // end of gnash namespace
Index: gui/NullGui.h
===================================================================
RCS file: gui/NullGui.h
diff -N gui/NullGui.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/NullGui.h 31 Jul 2006 03:13:43 -0000 1.1
@@ -0,0 +1,82 @@
+//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
+//
+
+#ifndef _NULLGUI_H_
+#define _NULLGUI_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gui.h"
+
+namespace gnash
+{
+
+/// Null GUI, used when rendering is disabled
+class NullGui : public Gui {
+
+public:
+
+ NullGui() {}
+ ~NullGui() {}
+ void setCallback(unsigned int interval)
+ {
+ _interval=interval;
+ }
+ void setTimeout(unsigned int timeout)
+ {
+ }
+ bool init(int argc, char **argv[]) { return true; }
+ bool createWindow(int , int)
+ {
+ return true;
+ }
+ bool run(void *);
+ bool createMenu() { return true; }
+ bool setupEvents() { return true; }
+ void renderBuffer() { }
+
+private:
+
+ unsigned int _interval;
+};
+
+} // end of gnash namespace
+
+// end of _NULLGUI_H_
+#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/Makefile.am gui/gnash.cpp g...,
Sandro Santilli <=