[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/Makefile.am extensions/...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/Makefile.am extensions/... |
|
Date: |
Sun, 28 Oct 2007 22:01:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/10/28 22:01:33
Modified files:
. : ChangeLog
backend : Makefile.am
extensions/dbus: Makefile.am
extensions/dejagnu: Makefile.am
extensions/fileio: Makefile.am
extensions/gtk2: Makefile.am
extensions/lirc: Makefile.am
extensions/metome: Makefile.am
extensions/mysql: Makefile.am
gui : Info.plist.in Makefile.am aqua.cpp aqua_glue.h
aqua_ogl_glue.cpp aqua_ogl_glue.h aquasup.h
gui.h
testsuite : Makefile.am
utilities : Makefile.am
Log message:
* various Makefile.am: Remove libgnashbackend, since it is
unused and OS X's `ar' chokes on the empty archive we
currently create.
* gui/Makefile.am: Don't put the gnash script in the Carbon
bundle; instead, put bin_PROGRAMS in it.
* gui/aqua.cpp: Implement the event loop necessary to draw
the renderer.
* gui/aqua_glue.h: Pass a window pointer to the rendering glue
so the glue can attach the renderer to the window.
* gui/aqua_ogl_glue.{cpp,h}: Implement the aqua GUI by setting
up an OpenGL context.
* gui/gui.h: Add a default implementation for setInterval since
it is the same for most renderers.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4731&r2=1.4732
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dbus/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/Makefile.am?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/Makefile.am?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gtk2/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/lirc/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/metome/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Info.plist.in?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_glue.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aquasup.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.58&r2=1.59
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4731
retrieving revision 1.4732
diff -u -b -r1.4731 -r1.4732
--- ChangeLog 27 Oct 2007 17:05:21 -0000 1.4731
+++ ChangeLog 28 Oct 2007 22:01:30 -0000 1.4732
@@ -1,3 +1,19 @@
+2007-10-27 Bastiaan Jacques <address@hidden>
+
+ * various Makefile.am: Remove libgnashbackend, since it is
+ unused and OS X's `ar' chokes on the empty archive we
+ currently create.
+ * gui/Makefile.am: Don't put the gnash script in the Carbon
+ bundle; instead, put bin_PROGRAMS in it.
+ * gui/aqua.cpp: Implement the event loop necessary to draw
+ the renderer.
+ * gui/aqua_glue.h: Pass a window pointer to the rendering glue
+ so the glue can attach the renderer to the window.
+ * gui/aqua_ogl_glue.{cpp,h}: Implement the aqua GUI by setting
+ up an OpenGL context.
+ * gui/gui.h: Add a default implementation for setInterval since
+ it is the same for most renderers.
+
2007-10-27 Sandro Santilli <address@hidden>
* testsuite/swfdec/PASSING: add new successes
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- backend/Makefile.am 22 Oct 2007 03:54:08 -0000 1.65
+++ backend/Makefile.am 28 Oct 2007 22:01:31 -0000 1.66
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.65 2007/10/22 03:54:08 nihilus Exp $
+# $Id: Makefile.am,v 1.66 2007/10/28 22:01:31 bjacques Exp $
## Process this file with automake to generate Makefile.in
@@ -29,19 +29,6 @@
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-libgnashbackend_LIBS = \
- $(GLIB_LIBS) \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
- $(OGG_LIBS) \
- $(Z_LIBS) \
- $(SDL_LIBS) \
- $(PANGO_LIBS) \
- $(ATK_LIBS) \
- $(X_LIBS) \
- $(DMALLOC_LIBS) \
- $(PTHREAD_LIBS) \
- $(NULL)
AM_CPPFLAGS = -I.. \
-I$(srcdir) \
@@ -77,20 +64,8 @@
# bin_PROGRAMS = gnash
-pkglib_LTLIBRARIES = libgnashbackend.la
-
# RENDER_SOURCES = render_handler_tri.cpp
-libgnashbackend_la_LIBADD = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/server/libgnashserver.la \
- $(libgnashbackend_LIBS)
-
-libgnashbackend_la_SOURCES =
-#$(SOUND_SOURCES)
-
-libgnashbackend_la_LDFLAGS = -release $(VERSION)
-
noinst_LTLIBRARIES = # set later on by conditionals
if BUILD_OGL_RENDERER
Index: extensions/dbus/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/dbus/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/dbus/Makefile.am 27 Sep 2007 00:29:30 -0000 1.1
+++ extensions/dbus/Makefile.am 28 Oct 2007 22:01:31 -0000 1.2
@@ -33,7 +33,6 @@
dbus_la_LDFLAGS = -module -avoid-version -no-undefined
dbus_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: extensions/dejagnu/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/dejagnu/Makefile.am 1 Jul 2007 10:53:58 -0000 1.7
+++ extensions/dejagnu/Makefile.am 28 Oct 2007 22:01:31 -0000 1.8
@@ -31,7 +31,6 @@
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: extensions/fileio/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/fileio/Makefile.am 24 Oct 2007 16:27:25 -0000 1.7
+++ extensions/fileio/Makefile.am 28 Oct 2007 22:01:31 -0000 1.8
@@ -37,7 +37,6 @@
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: extensions/gtk2/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/gtk2/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/gtk2/Makefile.am 1 Jul 2007 10:53:59 -0000 1.4
+++ extensions/gtk2/Makefile.am 28 Oct 2007 22:01:31 -0000 1.5
@@ -46,7 +46,6 @@
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(GTK2_LIBS) \
$(GLEXT_LIBS) \
Index: extensions/lirc/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/lirc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- extensions/lirc/Makefile.am 15 Sep 2007 03:06:38 -0000 1.2
+++ extensions/lirc/Makefile.am 28 Oct 2007 22:01:31 -0000 1.3
@@ -33,7 +33,6 @@
lirc_la_LDFLAGS = -module -avoid-version -no-undefined
lirc_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: extensions/metome/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/metome/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/metome/Makefile.am 22 Oct 2007 15:58:41 -0000 1.1
+++ extensions/metome/Makefile.am 28 Oct 2007 22:01:32 -0000 1.2
@@ -33,7 +33,6 @@
metome_ext_la_LDFLAGS = -module -avoid-version -no-undefined
metome_ext_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: extensions/mysql/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/mysql/Makefile.am 1 Jul 2007 10:53:59 -0000 1.4
+++ extensions/mysql/Makefile.am 28 Oct 2007 22:01:32 -0000 1.5
@@ -31,7 +31,6 @@
AM_LDFLAGS = \
$(MYSQL_LIBS) \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(PTHREAD_LIBS) \
$(NULL)
Index: gui/Info.plist.in
===================================================================
RCS file: /sources/gnash/gnash/gui/Info.plist.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/Info.plist.in 30 Jul 2007 15:27:41 -0000 1.7
+++ gui/Info.plist.in 28 Oct 2007 22:01:32 -0000 1.8
@@ -16,6 +16,7 @@
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
+<!-- four-character Mac OS 9-style creator code -->
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleTypeExtensions</key>
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- gui/Makefile.am 27 Sep 2007 23:59:51 -0000 1.108
+++ gui/Makefile.am 28 Oct 2007 22:01:32 -0000 1.109
@@ -90,7 +90,6 @@
GNASH_LIBS = \
$(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libgeometry/libgnashgeo.la \
@@ -114,16 +113,6 @@
bundle_name = gnash.app
-bundle: Info.plist
- @echo " Building: $(bundle_name)"
- -rm -rf $(bundle_name)/Contents
- mkdir -p $(bundle_name)/Contents/MacOS
- mkdir -p $(bundle_name)/Contents/Resources
- echo "APPL????" > $(bundle_name)/Contents/PkgInfo
- cp Info.plist $(bundle_name)/Contents/Info.plist
- strip -S gnash
- cp -f gnash $(bundle_name)/Contents/MacOS
- cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
if HAVE_OPENGL
noinst_LTLIBRARIES += libgnashaqua_ogl.la
@@ -184,8 +173,8 @@
NullGui.cpp NullGui.h
if BUILD_AQUA_GUI
-bin_PROGRAMS += bundle
-bundle_SOURCES = $(NULL)
+BUILT_SOURCES += bundle
+EXTRA_DIST += gnash.app
endif
#
@@ -394,6 +383,17 @@
CLEANFILES = klash.moc .configline gnash
+bundle: Info.plist
+ @echo " Building: $(bundle_name)"
+ rm -rf $(bundle_name)/Contents
+ mkdir -p $(bundle_name)/Contents/MacOS
+ mkdir -p $(bundle_name)/Contents/Resources
+ echo "APPL????" > $(bundle_name)/Contents/PkgInfo
+ cp Info.plist $(bundle_name)/Contents/Info.plist
+ cp -f $(bin_PROGRAMS) $(bundle_name)/Contents/MacOS
+ cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
+
+
klash.moc: $(srcdir)/kdesup.h
@if test x"$(MOC)" != x; then \
echo "Generating MOC file..."; \
Index: gui/aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gui/aqua.cpp 30 Jul 2007 17:22:01 -0000 1.26
+++ gui/aqua.cpp 28 Oct 2007 22:01:32 -0000 1.27
@@ -18,7 +18,7 @@
//
//
-/* $Id: aqua.cpp,v 1.26 2007/07/30 17:22:01 nihilus Exp $ */
+/* $Id: aqua.cpp,v 1.27 2007/10/28 22:01:32 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,57 +42,65 @@
#include <Carbon/Carbon.h>
+namespace gnash {
+
WindowRef myWindow;
pascal OSStatus DoWindowClose (EventHandlerCallRef nextHandler,
EventRef theEvent,
- void* userData){
+ void* userData)
+{
QuitApplicationEventLoop();
+ return noErr;
+}
+
+void DoAdvanceMovie ( EventLoopTimerRef inTimer, void * data)
+{
+ Gui::advance_movie(static_cast<Gui*>(data));
}
-namespace gnash {
AquaGui::AquaGui(unsigned long xid, float scale, bool loop, unsigned int depth)
- : Gui(xid, scale, loop, depth)
+ : Gui(xid, scale, loop, depth),
+ _advance_timer(NULL)
{
}
AquaGui::~AquaGui()
{
-
+ if (_advance_timer) {
+ RemoveEventLoopTimer(*_advance_timer);
+ }
}
-void AquaGui::setInterval(unsigned int interval)
-{
- _interval = interval;
-}
bool AquaGui::run()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
+ double interval = _interval / 1000.0;
+
+
+ OSStatus ret = InstallEventLoopTimer (GetMainEventLoop(), 0, interval,
+ DoAdvanceMovie, this, _advance_timer);
+ if (!ret) {
+ return ret;
+ }
- RepositionWindow(myWindow, NULL, kWindowCenterOnMainScreen);
+ RepositionWindow(myWindow, NULL, kWindowCascadeOnMainScreen);
+ SelectWindow(myWindow);
ShowWindow(myWindow);
+
RunApplicationEventLoop();
return true;
}
void AquaGui::renderBuffer()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
_glue.render();
}
-void
-AquaGui::setInvalidatedRegions(const InvalidatedRanges& ranges)
-{
- GNASH_REPORT_FUNCTION;
-#if 0
- _glue.setInvalidatedRegions(ranges);
-#endif
-}
-
-bool AquaGui::init(int argc, char ***argv) /* Self-explainatory */
+bool AquaGui::init(int argc, char ***argv)
{
OSErr err;
@@ -111,15 +119,12 @@
ExitToShell();
}
- /* Initialize the cursor */
- InitCursor();
-
-#if 0
_glue.init(argc, argv);
_renderer = _glue.createRenderHandler();
if(!_renderer)return false;
-#endif
+
+ set_render_handler(_renderer);
return true;
}
@@ -161,12 +166,9 @@
GNASH_REPORT_FUNCTION;
SetRect(&theBounds, 0, 0, width, height);
- CreateNewWindow (kDocumentWindowClass,
+ OSStatus status = CreateNewWindow ( kDocumentWindowClass,
kWindowStandardDocumentAttributes
- | kWindowStandardHandlerAttribute
- | kWindowMetalAttribute
- | kWindowCompositingAttribute
- | kWindowInWindowMenuAttribute,
+ | kWindowStandardHandlerAttribute,
&theBounds,
&myWindow);
@@ -182,8 +184,8 @@
InstallWindowEventHandler (myWindow, handlerUPP, // Install handler
1, &eventType,
NULL, NULL);
- _glue.prepDrawingArea(_width, _height);
- set_render_handler(_renderer);
+ _glue.prepDrawingArea(_width, _height, GetWindowPort(myWindow));
+
return true;
}
@@ -213,4 +215,5 @@
return true;
}
-}
\ No newline at end of file
+} // namespace gnash
+
Index: gui/aqua_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_glue.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/aqua_glue.h 24 Jul 2007 00:04:39 -0000 1.8
+++ gui/aqua_glue.h 28 Oct 2007 22:01:32 -0000 1.9
@@ -18,13 +18,14 @@
//
//
-/* $Id: aqua_glue.h,v 1.8 2007/07/24 00:04:39 nihilus Exp $ */
+/* $Id: aqua_glue.h,v 1.9 2007/10/28 22:01:32 bjacques Exp $ */
#ifndef AQUA_GLUE_H
#define AQUA_GLUE_H
#include "gnash.h"
#include "snappingrange.h"
+#include <AGL/agl.h>
namespace gnash
{
@@ -34,7 +35,7 @@
public:
virtual ~AquaGlue() { }
virtual bool init(int argc, char **argv[]) = 0;
- virtual bool prepDrawingArea(int width, int height) = 0;
+ virtual bool prepDrawingArea(int width, int height, AGLDrawable drawable)
= 0;
virtual render_handler* createRenderHandler() = 0;
virtual void render() = 0;
protected:
Index: gui/aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/aqua_ogl_glue.cpp 24 Jul 2007 00:04:39 -0000 1.15
+++ gui/aqua_ogl_glue.cpp 28 Oct 2007 22:01:32 -0000 1.16
@@ -18,11 +18,10 @@
//
//
-/* $Id: aqua_ogl_glue.cpp,v 1.15 2007/07/24 00:04:39 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.16 2007/10/28 22:01:32 bjacques Exp $ */
#include "aqua_ogl_glue.h"
-#include <AGL/agl.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <OpenGL/glext.h>
@@ -36,9 +35,11 @@
{
AquaOglGlue::AquaOglGlue()
+: _context(NULL)
#ifdef FIX_I810_LOD_BIAS
- : _tex_lod_bias(-1.2f)
+ ,_tex_lod_bias(-1.2f)
#endif
+
{
// GNASH_REPORT_FUNCTION;
}
@@ -46,7 +47,7 @@
AquaOglGlue::~AquaOglGlue()
{
// GNASH_REPORT_FUNCTION;
-
+ aglDestroyContext (_context);
}
@@ -64,12 +65,29 @@
_tex_lod_bias = (float) atof(optarg);
}
#endif
- return true;
+
+ const GLint glattribs[] = { AGL_RGBA, AGL_ACCELERATED,
+ AGL_DEPTH_SIZE, 24,
+ AGL_DOUBLEBUFFER, AGL_NONE };
+
+ AGLPixelFormat pixfmt = aglChoosePixelFormat ( NULL, 0, glattribs);
+
+
+ _context = aglCreateContext (pixfmt, NULL);
+ if (!_context) {
+ aglDestroyPixelFormat(pixfmt);
+ return false;
+ }
+
+ bool ret = aglSetCurrentContext(_context);
+ aglDestroyPixelFormat(pixfmt);
+
+ return ret;
}
render_handler* AquaOglGlue::createRenderHandler()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
render_handler* renderer = create_render_handler_ogl();
#ifdef FIX_I810_LOD_BIAS
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
@@ -77,7 +95,7 @@
return renderer;
}
-bool AquaOglGlue::prepDrawingArea(int width, int height)
+bool AquaOglGlue::prepDrawingArea(int width, int height, AGLDrawable drawable)
{
GNASH_REPORT_FUNCTION;
//SDL_SetVideoMode(width, height, _bpp, sdl_flags | SDL_OPENGL);
@@ -104,14 +122,15 @@
#ifdef FIX_I810_LOD_BIAS
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT,
_tex_lod_bias);
#endif
- return true;
+ bool ret = aglSetDrawable(_context, drawable);
+
+ return ret;
}
void AquaOglGlue::render()
{
- GNASH_REPORT_FUNCTION;
- //SDL_GL_SwapBuffers();
- aglUpdateContext(aglGetCurrentContext());
+// GNASH_REPORT_FUNCTION;
+ aglSwapBuffers(_context);
}
} // namespace gnash
\ No newline at end of file
Index: gui/aqua_ogl_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/aqua_ogl_glue.h 23 Jul 2007 01:04:18 -0000 1.8
+++ gui/aqua_ogl_glue.h 28 Oct 2007 22:01:32 -0000 1.9
@@ -18,12 +18,13 @@
//
//
-/* $Id: aqua_ogl_glue.h,v 1.8 2007/07/23 01:04:18 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.h,v 1.9 2007/10/28 22:01:32 bjacques Exp $ */
#ifndef AQUA_OGL_GLUE_H
#define AQUA_OGL_GLUE_H
#include "aqua_glue.h"
+#include <AGL/agl.h>
using namespace std;
@@ -38,13 +39,14 @@
bool init(int argc, char ***argv);
render_handler* createRenderHandler();
- bool prepDrawingArea(int width, int height);
+ bool prepDrawingArea(int width, int height, AGLDrawable drawable);
void setInvalidatedRegions(const InvalidatedRanges& /* ranges */);
void render();
private:
#ifdef FIX_I810_LOD_BIAS
float _tex_lod_bias;
#endif
+ AGLContext _context;
};
}
Index: gui/aquasup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aquasup.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gui/aquasup.h 23 Jul 2007 01:01:31 -0000 1.10
+++ gui/aquasup.h 28 Oct 2007 22:01:32 -0000 1.11
@@ -18,7 +18,7 @@
//
//
-/* $Id: aquasup.h,v 1.10 2007/07/23 01:01:31 nihilus Exp $ */
+/* $Id: aquasup.h,v 1.11 2007/10/28 22:01:32 bjacques Exp $ */
#ifndef __AQUASUP_H__
#define __AQUASUP_H__
@@ -51,6 +51,8 @@
void key_event(int key, bool down);
unsigned int _timeout;
+ EventLoopTimerRef* _advance_timer;
+
#if defined(RENDERER_OPENGL)
AquaOglGlue _glue;
#ifdef FIX_I810_LOD_BIAS
@@ -68,8 +70,6 @@
virtual bool createMenu();
virtual bool setupEvents();
virtual void renderBuffer();
- virtual void setInvalidatedRegions(const InvalidatedRanges& ranges);
- virtual void setInterval(unsigned int interval);
virtual void setTimeout(unsigned int timeout);
};
Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gui/gui.h 1 Oct 2007 21:47:04 -0000 1.67
+++ gui/gui.h 28 Oct 2007 22:01:32 -0000 1.68
@@ -75,7 +75,9 @@
virtual bool init(int argc, char **argv[]) = 0;
/// Set main loop delay in milliseconds.
- virtual void setInterval(unsigned int interval) = 0;
+ virtual void setInterval(unsigned int interval) {
+ _interval = interval;
+ }
/// Set the time in milliseconds after which the programme should exit.
virtual void setTimeout(unsigned int timeout) = 0;
Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- testsuite/Makefile.am 20 Oct 2007 15:14:07 -0000 1.46
+++ testsuite/Makefile.am 28 Oct 2007 22:01:32 -0000 1.47
@@ -32,7 +32,6 @@
$(NULL)
libtestsuite_la_LIBADD = \
$(RENDERER_LIBS) \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libbase/libgnashbase.la \
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- utilities/Makefile.am 27 Sep 2007 23:59:57 -0000 1.58
+++ utilities/Makefile.am 28 Oct 2007 22:01:32 -0000 1.59
@@ -27,7 +27,6 @@
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libmedia/libgnashmedia.la \
- $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/libamf/libgnashamf.la
## WARNING: make sure GLIB_LIBS appears first
- [Gnash-commit] gnash ChangeLog backend/Makefile.am extensions/...,
Bastiaan Jacques <=