[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac gui/kde_glue.h gui...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac gui/kde_glue.h gui... |
|
Date: |
Mon, 16 Oct 2006 12:25:07 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/10/16 12:25:07
Modified files:
. : ChangeLog configure.ac
gui : kde_glue.h kde_glue_opengl.cpp
kde_glue_opengl.h kdesup.h
plugin/klash : Makefile.am
Log message:
* configure.ac: Permit only the KDE GUI when klash is
requested. KDE
is not a renderer, so don't test for it.
* gui/{kde_glue.h, kde_glue_opengl.cpp, kde_glue_opengl.h,
gui/kdesup.h}: Remove OpenGL-specific code from KdeGlue, so as
to
allow glues other than OpenGL to inherit from KdeGlue;
propagate this
change to subclasses. Also fix some typos.
* plugin/klash/Makefile.am: Deprecate the klash binary from
plugins/klash in favour of gui/klash.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1233&r2=1.1234
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue_opengl.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue_opengl.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -b -r1.1233 -r1.1234
--- ChangeLog 16 Oct 2006 12:12:07 -0000 1.1233
+++ ChangeLog 16 Oct 2006 12:25:07 -0000 1.1234
@@ -30,6 +30,14 @@
`windowid' is actually defined.
* macros/docbook.m4: Make an invalid directory passing message refer
to the relevant directory.
+ * configure.ac: Permit only the KDE GUI when klash is requested. KDE
+ is not a renderer, so don't test for it.
+ * gui/{kde_glue.h, kde_glue_opengl.cpp, kde_glue_opengl.h,
+ gui/kdesup.h}: Remove OpenGL-specific code from KdeGlue, so as to
+ allow glues other than OpenGL to inherit from KdeGlue; propagate this
+ change to subclasses. Also fix some typos.
+ * plugin/klash/Makefile.am: Deprecate the klash binary from
+ plugins/klash in favour of gui/klash.
2006-10-16 Markus Gothe <address@hidden>
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- configure.ac 15 Oct 2006 14:26:04 -0000 1.158
+++ configure.ac 16 Oct 2006 12:25:07 -0000 1.159
@@ -33,7 +33,7 @@
dnl also makes it possible to release a modified version which carries
dnl forward this exception.
-dnl $Id: configure.ac,v 1.158 2006/10/15 14:26:04 bjacques Exp $
+dnl $Id: configure.ac,v 1.159 2006/10/16 12:25:07 bjacques Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.1-cvs)
@@ -176,6 +176,10 @@
AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
+if test x"$klash" = xyes -a x"$gui" != xkde; then
+ AC_MSG_ERROR([You must use the kde GUI ( --enable-gui=KDE ) if you enable
klash.])
+fi
+
if test x$renderer = xcairo; then
AC_DEFINE([RENDERER_CAIRO], [1], [Use cairo renderer])
fi
@@ -478,7 +482,7 @@
AC_CHECK_SIZEOF(size_t) dnl set SIZEOF_SIZE_T.
-if test x$renderer = xkde -o x$gui = xkde -o x$klash = xyes ; then
+if test x$gui = xkde -o x$klash = xyes ; then
KDE_SET_PREFIX
AM_KDE_WITH_NLS
AC_PATH_KDE
Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/kde_glue.h 15 Oct 2006 22:40:57 -0000 1.3
+++ gui/kde_glue.h 16 Oct 2006 12:25:07 -0000 1.4
@@ -36,21 +36,13 @@
//
-/* $Id: kde_glue.h,v 1.3 2006/10/15 22:40:57 nihilus Exp $ */
+/* $Id: kde_glue.h,v 1.4 2006/10/16 12:25:07 bjacques Exp $ */
#include "gnash.h"
#include "tu_opengl_includes.h"
-#include <qapplication.h>
-#include <qgl.h>
-#include <qeventloop.h>
#include <qwidget.h>
-#include <qpopupmenu.h>
-#include <qlabel.h>
-#include <qevent.h>
-#include <qkeycode.h>
-#include <qmessagebox.h>
namespace gnash
{
@@ -58,14 +50,14 @@
class KdeGlue
{
public:
- virtual ~KdeGlue() { };
+ virtual ~KdeGlue() { delete _drawing_area; }
virtual bool init(int argc, char **argv[]) = 0;
- virtual void prepDrawingArea(QGLWidget *drawing_area) = 0;
+ virtual void prepDrawingArea(QWidget *drawing_area) = 0;
virtual render_handler* createRenderHandler() = 0;
virtual void render() = 0;
protected:
- QGLWidget *_drawing_area;
+ QWidget *_drawing_area;
};
} // namespace gnash
Index: gui/kde_glue_opengl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue_opengl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gui/kde_glue_opengl.cpp 28 Sep 2006 16:30:24 -0000 1.5
+++ gui/kde_glue_opengl.cpp 16 Oct 2006 12:25:07 -0000 1.6
@@ -35,7 +35,7 @@
//
//
-/* $Id: kde_glue_opengl.cpp,v 1.5 2006/09/28 16:30:24 nihilus Exp $ */
+/* $Id: kde_glue_opengl.cpp,v 1.6 2006/10/16 12:25:07 bjacques Exp $ */
#include "kde_glue_opengl.h"
//#include "log.h"
@@ -47,7 +47,7 @@
KdeOpenGLGlue::KdeOpenGLGlue()
#ifdef FIX_I810_LOD_BIAS
- : tex_lod_bias(-1.2f)
+ : _tex_lod_bias(-1.2f)
#endif
{
}
@@ -62,7 +62,7 @@
// GNASH_REPORT_FUNCTION;
#ifdef FIX_I810_LOD_BIAS
- int c = getopt (argc, argv, "m:");
+ int c = getopt (argc, *argv, "m:");
if (c == 'm') {
_tex_lod_bias = (float) atof(optarg);
}
@@ -72,7 +72,7 @@
void
-KdeOpenGLGlue::prepDrawingArea(QGLWidget *drawing_area)
+KdeOpenGLGlue::prepDrawingArea(QWidget *drawing_area)
{
// GNASH_REPORT_FUNCTION;
_drawing_area = drawing_area;
@@ -95,7 +95,7 @@
{
// GNASH_REPORT_FUNCTION;
- _drawing_area->swapBuffers();
+ static_cast<QGLWidget*>(_drawing_area)->swapBuffers();
}
// end of namespace gnash
Index: gui/kde_glue_opengl.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue_opengl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gui/kde_glue_opengl.h 13 May 2006 00:36:50 -0000 1.1
+++ gui/kde_glue_opengl.h 16 Oct 2006 12:25:07 -0000 1.2
@@ -35,11 +35,9 @@
//
//
+#include <qapplication.h>
#include "kde_glue.h"
#include <qgl.h>
-#include <qwidget.h>
-#include <qpopupmenu.h>
-#include <qapplication.h>
using namespace std;
@@ -53,7 +51,7 @@
~KdeOpenGLGlue();
bool init(int argc, char **argv[]);
- void prepDrawingArea(QGLWidget *drawing_area);
+ void prepDrawingArea(QWidget *drawing_area);
render_handler* createRenderHandler();
void render();
private:
Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/kdesup.h 9 Oct 2006 16:05:24 -0000 1.7
+++ gui/kdesup.h 16 Oct 2006 12:25:07 -0000 1.8
@@ -85,9 +85,6 @@
virtual void renderBuffer();
virtual void setInterval(unsigned int interval);
virtual void setTimeout(unsigned int timeout);
-#if defined(RENDERER_OPENGL) && defined(FIX_I810_LOD_BIAS)
- virtual void setLodBias(float tex_lod_bias);
-#endif
public slots:
void menuitem_restart_callback();
void menuitem_quit_callback();
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- plugin/klash/Makefile.am 15 Oct 2006 09:11:20 -0000 1.16
+++ plugin/klash/Makefile.am 16 Oct 2006 12:25:07 -0000 1.17
@@ -35,7 +35,7 @@
# forward this exception.
#
-# $Id: Makefile.am,v 1.16 2006/10/15 09:11:20 nihilus Exp $
+# $Id: Makefile.am,v 1.17 2006/10/16 12:25:07 bjacques Exp $
AUTOMAKE_OPTIONS =
@@ -48,7 +48,7 @@
libklashpart_la_SOURCES = klash_part.cpp klash_part.h
#nodist_libklashpart_la_SOURCES= klash_part.moc
libklashpart_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
-libklashpart_la_DEPENDENCIES = klash_part.moc klash.moc
+libklashpart_la_DEPENDENCIES = klash_part.moc
libklashpart.la: $(libklashpart_la_DEPENDENCIES) $(libklashpart_la_OBJECTS)
$(CXXLINK) -rpath $(kde_moduledir) $(libklashpart_la_LDFLAGS)
$(libklashpart_la_OBJECTS) $(libklashpart_la_LIBADD) $(LIBS)
@@ -108,22 +108,7 @@
$(MP3_CFLAGS) \
$(OGG_CFLAGS)
-bin_PROGRAMS = klash
-
-klash_SOURCES = klash.cpp
-klash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
-
-klash_LDADD = $(AM_LDFLAGS) \
- $(top_builddir)/backend/libgnashbackend.la \
- $(top_builddir)/server/libgnashserver.la \
- $(top_builddir)/server/asobj/libgnashasobjs.la \
- $(top_builddir)/libgeometry/libgnashgeo.la \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libamf/libgnashamf.la \
- $(LIB_QT)
-
-
-CLEANFILES = klash_part.moc klash.moc
+CLEANFILES = klash_part.moc
dummy.cpp:
echo > dummy.cpp
@@ -139,12 +124,3 @@
ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
fi
-klash.moc: $(srcdir)/klash.cpp
- @if test x"$(MOC)" != x; then \
- echo "Generating MOC file..."; \
- $(MOC) $(srcdir)/klash.cpp -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
-
- [Gnash-commit] gnash ChangeLog configure.ac gui/kde_glue.h gui...,
Bastiaan Jacques <=