[Gnash-commit] gnash/gui aqua_glue.h aqua_ogl_glue.cpp aqua_og...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/09 20:28:57

Modified files:
        gui            : aqua_glue.h aqua_ogl_glue.cpp aqua_ogl_glue.h 
                         aquasup.h 

Log message:
        A bunch of minor clean-ups

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_glue.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aquasup.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: aqua_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_glue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- aqua_glue.h 8 May 2007 21:55:32 -0000       1.2
+++ aqua_glue.h 9 May 2007 20:28:57 -0000       1.3
@@ -17,7 +17,10 @@
 // 
 //
 
-/* $Id: aqua_glue.h,v 1.2 2007/05/08 21:55:32 nihilus Exp $ */
+/* $Id: aqua_glue.h,v 1.3 2007/05/09 20:28:57 nihilus Exp $ */
+
+#ifndef AQUA_GLUE_H
+#define AQUA_GLUE_H
 
 #include "gnash.h"
 
@@ -38,3 +41,5 @@
 };
 
 }
\ No newline at end of file
+
+#endif /* AQUA_GLUE_H */
\ No newline at end of file

Index: aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- aqua_ogl_glue.cpp   8 May 2007 21:55:32 -0000       1.4
+++ aqua_ogl_glue.cpp   9 May 2007 20:28:57 -0000       1.5
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.cpp,v 1.4 2007/05/08 21:55:32 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.5 2007/05/09 20:28:57 nihilus Exp $ */
 
 
 #include "aqua_ogl_glue.h"
@@ -33,56 +33,35 @@
 {
 
 AquaOglGlue::AquaOglGlue()
-#ifdef FIX_I810_LOD_BIAS
-  : _tex_lod_bias(-1.2f)
-#endif
 {
 //    GNASH_REPORT_FUNCTION;
 }
 
-SdlOglGlue::~SdlOglGlue()
+AquaOglGlue::~AquaOglGlue()
 {
 //    GNASH_REPORT_FUNCTION;
 
 }
 
-bool
-#ifdef FIX_I810_LOD_BIAS
-AquaOglGlue::init(int argc, char** argv[])
-#else
-AquaOglGlue::init(int, char***)
-#endif
+bool AquaOglGlue::init(int, char***)
 {
 //    GNASH_REPORT_FUNCTION;
-#ifdef FIX_I810_LOD_BIAS
-    int c = getopt (argc, *argv, "m:");
-    if (c == 'm') {
-      _tex_lod_bias = (float) atof(optarg);
-    }
-#endif
 
     return true;
 }
 
 
-render_handler*
-AquaOglGlue::createRenderHandler(int depth)
+render_handler* AquaOglGlue::createRenderHandler(int depth)
 {
 //    GNASH_REPORT_FUNCTION;
 
     _bpp = depth;
-
     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);
-#endif
-
     return renderer;
 }
 
-bool
-SdlOglGlue::prepDrawingArea(int width, int height, uint32_t aqua_flags)
+bool AquaOglGlue::prepDrawingArea(int width, int height)
 {
     if (_bpp == 16) {
       // 16-bit color, surface creation is likely to succeed.
@@ -128,10 +107,6 @@
     glDisable(GL_LIGHTING);
     glPushAttrib (GL_ALL_ATTRIB_BITS);         
 
-#  ifdef FIX_I810_LOD_BIAS
-    glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 
_tex_lod_bias);
-#  endif
-
     return true;
 }
 
@@ -142,6 +117,4 @@
     //SDL_GL_SwapBuffers();
 }
 
-
-
 } // namespace gnash
\ No newline at end of file

Index: aqua_ogl_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- aqua_ogl_glue.h     8 May 2007 21:55:32 -0000       1.2
+++ aqua_ogl_glue.h     9 May 2007 20:28:57 -0000       1.3
@@ -17,7 +17,10 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.h,v 1.2 2007/05/08 21:55:32 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.h,v 1.3 2007/05/09 20:28:57 nihilus Exp $ */
+
+#ifndef AQUA_OGL_GLUE_H
+#define AQUA_OGL_GLUE_H
 
 #include "aqua_glue.h"
 
@@ -34,13 +37,11 @@
 
     bool init(int argc, char ***argv);
     render_handler* createRenderHandler( int depth);
-    bool prepDrawingArea(int width, int height, uint32_t aqua_flags);
+    bool prepDrawingArea(int width, int height);
     void render();
   private:
-  
-#ifdef FIX_I810_LOD_BIAS
-    float _tex_lod_bias;
-#endif
 };
 
 }
+
+#endif /* AQUA_OGL_GLUE_H */
\ No newline at end of file

Index: aquasup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aquasup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- aquasup.h   8 May 2007 21:55:32 -0000       1.4
+++ aquasup.h   9 May 2007 20:28:57 -0000       1.5
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: aquasup.h,v 1.4 2007/05/08 21:55:32 nihilus Exp $ */
+/* $Id: aquasup.h,v 1.5 2007/05/09 20:28:57 nihilus Exp $ */
 
 #ifndef __AQUASUP_H__
 #define __AQUASUP_H__
@@ -47,7 +47,7 @@
        
        int valid_x(int x);
        int valid_y(int y);
-       
+       void key_event(int key, bool down);
        unsigned int    _timeout;
 
 #if defined(RENDERER_OPENGL)
@@ -66,7 +66,6 @@
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
-    
 };
 
 }