[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/kde.cpp plugin/plugin.cpp p...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog gui/kde.cpp plugin/plugin.cpp p... |
Date: |
Sun, 16 Jul 2006 21:42:36 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/07/16 21:42:36
Modified files:
. : ChangeLog
gui : kde.cpp
plugin : plugin.cpp plugin.h
Log message:
* gui/kde.cpp: Update setCallback() to match the arguments in
the
parent class.
* plugin/plugin.{h,cpp}: Remove more unused OpenGL and GTK code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.497&r2=1.498
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.h?cvsroot=gnash&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -b -r1.497 -r1.498
--- ChangeLog 15 Jul 2006 16:02:23 -0000 1.497
+++ ChangeLog 16 Jul 2006 21:42:35 -0000 1.498
@@ -1,3 +1,9 @@
+2006-07-16 Bastiaan Jacques <address@hidden>
+
+ * gui/kde.cpp: Update setCallback() to match the arguments in the
+ parent class.
+ * plugin/plugin.{h,cpp}: Remove more unused OpenGL and GTK code.
+
2006-07-15 Bastiaan Jacques <address@hidden>
* gui/gnash.cpp: Make sure the argument count is greater than two
Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gui/kde.cpp 13 May 2006 05:45:27 -0000 1.2
+++ gui/kde.cpp 16 Jul 2006 21:42:35 -0000 1.3
@@ -152,7 +152,7 @@
}
void
-KdeGui::setCallback(callback_t func, unsigned int interval)
+KdeGui::setCallback(unsigned int interval)
{
// GNASH_REPORT_FUNCTION;
_interval = interval;
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- plugin/plugin.cpp 15 Jul 2006 16:02:23 -0000 1.33
+++ plugin/plugin.cpp 16 Jul 2006 21:42:35 -0000 1.34
@@ -49,10 +49,6 @@
// long, including copyright info and URLs and such.
#define PLUGIN_DESCRIPTION SEE-BELOW-SEARCH-FOR-PLUGIN_DESCRIPTION
-#ifdef HAVE_GTK2
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#endif
#include <sys/param.h>
#include <signal.h>
#include <unistd.h>
@@ -91,12 +87,6 @@
PRLock *playerMutex = NULL;
PRCondVar *playerCond = NULL;
-#ifdef USE_GTK2
-GtkWidget *gtkplug = NULL;
-GtkMenu *popup_menu = NULL;
-GtkMenuItem *menuitem_play = NULL;
-GtkMenuItem *menuitem_pause = NULL;
-#endif
// static int streamfd = -1;
// static float s_scale = 1.0f;
@@ -339,10 +329,7 @@
mInstance(aInstance),
_window(0),
mXtwidget(0),
- mFontInfo(0),
- _glxContext(NULL),
_shutdown(FALSE),
- _glInitialized(FALSE),
_thread(NULL),
_thread_key(0),
_childpid(0)
@@ -464,11 +451,8 @@
_window = (Window) aWindow->window;
NPSetWindowCallbackStruct *ws_info =
(NPSetWindowCallbackStruct *)aWindow->ws_info;
- mVisual = ws_info->visual;
mDepth = ws_info->depth;
mColormap = ws_info->colormap;
-// gxDisplay = ws_info->display;
-
}
resizeWindow(mWidth,mHeight);
@@ -654,13 +638,9 @@
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_JOINABLE_THREAD, 0);
#else
-#ifdef HAVE_GTK2
- Window window = GdkNativeWindow(ptrdiff_t(_window));
-#else
Window window = _window;
-#endif
_childpid = startProc(_swf_file.c_str(), window);
-#endif
+#endif // !USE_FORK
// sprintf(tmp, "Started thread for Flash movie %s", _swf_file.c_str());
// WriteStatus(tmp);
@@ -701,14 +681,6 @@
return write(_streamfd, buffer, len);
}
-/// \brief Shutdown OpenGL
-void
-nsPluginInstance::destroyContext()
-{
-// log_trace("%s: enter for instance %p", __PRETTY_FUNCTION__, this);
-
-}
-
/// \brief Resize our viewport after a window resize event
int
nsPluginInstance::resizeWindow( int width, int height )
Index: plugin/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- plugin/plugin.h 30 May 2006 14:49:54 -0000 1.13
+++ plugin/plugin.h 16 Jul 2006 21:42:36 -0000 1.14
@@ -46,7 +46,6 @@
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
#include <X11/cursorfont.h>
-#include <GL/glx.h>
#ifdef HAVE_GTK2
#include <gtk/gtk.h>
#endif
@@ -68,8 +67,6 @@
#define RIGHT_ARROW 77
extern NPBool plugInitialized;
-extern Display *gxDisplay;
-extern PRLock *glMutex;
extern PRLock *playerMutex;
extern PRCondVar *playerCond;
@@ -101,7 +98,6 @@
// accessors
const char *getVersion();
Window getWindow() { return _window; };
- Display *getDisplay() { return gxDisplay; };
unsigned int getDepth() { return mDepth; };
int getWidth() { return mWidth; };
int getHeight() { return mHeight; };
@@ -110,107 +106,28 @@
NPBool getShutdown() { return _shutdown; };
// Set the current GL context
- inline void setGL() {
-// gnash::log_trace("%s: gxDisplay = %p, _window = %p, _glxContext = %p
for instance %p",
-// __PRETTY_FUNCTION__, gxDisplay, (void *)_window,
-// (void *)_glxContext, this);
- if (gxDisplay && _glxContext && _window) {
- glXMakeCurrent(gxDisplay, _window, _glxContext);
- XSync(gxDisplay, False);
- }
- }
- inline void unsetGL() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (gxDisplay) {
- glXMakeCurrent(gxDisplay, None, NULL);
- }
- }
- // Protect the GL state from multiple threads
- inline void lockGL() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (glMutex) {
- PR_Lock(glMutex);
- } else {
- gnash::log_error("%s, bad mutex pointer in instance %p!",
- __PRETTY_FUNCTION__, this);
- }
- }
- inline void freeGL() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (glMutex) {
- PR_Unlock(glMutex);
- } else {
- gnash::log_error("%s, bad mutex pointer in instance %p!",
- __PRETTY_FUNCTION__, this);
- }
- }
- // Protect the X context
- inline void lockX() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (gxDisplay) {
- XLockDisplay(gxDisplay);
- }
- }
- inline void freeX() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (gxDisplay) {
- XUnlockDisplay(gxDisplay);
- }
- }
-
- void swapBuffers() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- if (gxDisplay && _window) {
-// glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-// glFlush();
- glXSwapBuffers(gxDisplay, _window);
- }
- }
- void lockDisplay() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- lockGL();
- lockX();
- setGL();
- }
-
- void freeDisplay() {
-// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
- unsetGL();
- freeX();
- freeGL();
- }
- void destroyContext();
int resizeWindow(int width,int height);
void condWait() {
// gnash::log_trace("%s: for instance %p", __PRETTY_FUNCTION__, this);
PR_WaitCondVar(playerCond, PR_INTERVAL_NO_TIMEOUT);
// PR_WaitCondVar(_playerCond, PR_INTERVAL_NO_WAIT);
}
-
-
- void drawTestScene();
- void initGL();
-
private:
// This is a data is unique for each thread
NPP mInstance;
Window _window;
Widget mXtwidget;
- XFontStruct *mFontInfo;
std::string _swf_file;
int mX;
int mY;
unsigned int mWidth;
unsigned int mHeight;
- Visual *mVisual;
Colormap mColormap;
unsigned int mDepth;
std::map<std::string, std::string> _options;
- GLXContext _glxContext;
int _streamfd;
NPBool _shutdown;
- NPBool _glInitialized;
PRThread *_thread;
PRUintn _thread_key;
std::string _procname;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/kde.cpp plugin/plugin.cpp p...,
Bastiaan Jacques <=