[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui Makefile.am Player.cpp aqua.cpp aqua_...
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash/gui Makefile.am Player.cpp aqua.cpp aqua_... |
Date: |
Sun, 06 May 2007 22:43:18 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 07/05/06 22:43:18
Modified files:
gui : Makefile.am Player.cpp aqua.cpp
aqua_ogl_glue.cpp
Log message:
Minor additions for adopting Aqua/Carbon.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- Makefile.am 3 May 2007 00:43:25 -0000 1.66
+++ Makefile.am 6 May 2007 22:43:17 -0000 1.67
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.66 2007/05/03 00:43:25 rsavoye Exp $
+# $Id: Makefile.am,v 1.67 2007/05/06 22:43:17 nihilus Exp $
AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
@@ -78,6 +78,9 @@
AM_CPPFLAGS += $(GLEXT_CFLAGS)
GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
endif # USE_GUI_GTK
+if USE_GUI_AQUA
+ AQUA_OPENGL_SRCS = aqua_ogl_glue.cpp aqua_ogl_glue.h
+endif # USE_GUI_AQUA
if USE_GUI_SDL
SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
endif # USE_GUI_SDL
@@ -137,6 +140,12 @@
RISCS_SRCS =
endif
+if USE_GUI_AQUA
+ AQUA_SRCS = aqua.cpp auqasup.h aqua_glue.h $(AQUA_OPENGL_SRCS)
+else
+ AQUA_SRCS =
+endif
+
if USE_GUI_SDL
SDL_SRCS = sdl.cpp sdlsup.h sdl_glue.h $(SDL_CAIRO_SRCS) $(SDL_OPENGL_SRCS)
$(SDL_AGG_SRCS)
else
@@ -196,6 +205,7 @@
$(GTK2_SRCS) \
$(KDE_SRCS) \
$(FB_SRCS) \
+ $(AQUA_SRCS) \
$(RISCOS_SRCS) \
gui.cpp gui.h \
NullGui.cpp \
Index: Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- Player.cpp 2 May 2007 07:34:34 -0000 1.47
+++ Player.cpp 6 May 2007 22:43:17 -0000 1.48
@@ -28,6 +28,9 @@
# elif defined(GUI_SDL)
# include "sdlsup.h"
# define GUI_CLASS SDLGui
+# elif defined(GUI_AQUA)
+# include "aquasup.h"
+# define GUI_CLASS AquaGui
# elif defined(GUI_RISCOS)
# include "riscossup.h"
# define GUI_CLASS RiscosGui
Index: aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- aqua.cpp 6 May 2007 22:13:51 -0000 1.2
+++ aqua.cpp 6 May 2007 22:43:17 -0000 1.3
@@ -17,4 +17,75 @@
//
//
-/* $Id: aqua.cpp,v 1.2 2007/05/06 22:13:51 nihilus Exp $ */
+/* $Id: aqua.cpp,v 1.3 2007/05/06 22:43:17 nihilus Exp $ */
+
+#include <CoreServices/CoreServices.h>
+
+void MyInit( void );
+void MyTimerProc( TMTaskPtr tmTaskPtr );
+
+Boolean gQuitFlag = false;
+int gCount = 0;
+
+TimerUPP gMyTimerProc = NULL;
+
+int main( int argc, char *argv[])
+{
+ MyInit();
+
+ while ( false == gQuitFlag ) {
+ ;
+ }
+
+ DisposeTimerUPP( gMyTimerProc );
+
+ return 0;
+}
+
+void MyTimerProc( TMTaskPtr tmTaskPtr )
+{
+ DateTimeRec localDateTime;
+
+ GetTime( &localDateTime );
+
+ printf( "MyTimerProc at %d:%d:%d\n", localDateTime.hour,
localDateTime.minute, localDateTime.second );
+
+ gCount++;
+
+ if ( gCount > 4 )
+ {
+ gQuitFlag = true;
+ }
+ else
+ {
+ PrimeTimeTask( ( QElemPtr )tmTaskPtr, 1000 );
+ }
+}
+
+void MyInit( void )
+{
+ struct TMTask myTask;
+ OSErr err = 0;
+
+ gMyTimerProc = NewTimerUPP( MyTimerProc );
+
+ if ( gMyTimerProc != NULL )
+ {
+ myTask.qLink = NULL;
+ myTask.qType = 0;
+ myTask.tmAddr = gMyTimerProc;
+ myTask.tmCount = 0;
+ myTask.tmWakeUp = 0;
+ myTask.tmReserved = 0;
+
+ err = InstallTimeTask( ( QElemPtr )&myTask );
+
+ if ( err == noErr )
+ PrimeTimeTask( ( QElemPtr )&myTask, 1000 );
+ else {
+ DisposeTimerUPP( gMyTimerProc );
+ gMyTimerProc = NULL;
+ gQuitFlag = true;
+ }
+ }
+}
Index: aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- aqua_ogl_glue.cpp 6 May 2007 22:13:51 -0000 1.1
+++ aqua_ogl_glue.cpp 6 May 2007 22:43:17 -0000 1.2
@@ -17,4 +17,6 @@
//
//
-/* $Id: aqua_ogl_glue.cpp,v 1.1 2007/05/06 22:13:51 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.2 2007/05/06 22:43:17 nihilus Exp $ */
+
+apa
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/gui Makefile.am Player.cpp aqua.cpp aqua_...,
Markus Gothe <=