[Swfdec-commits] 2 commits - configure.ac src/plugin.c src/plugin_x11.c src/swfmoz_dialog.c src/swfmoz_loader.c src/swfmoz_player.c
Benjamin Otte
company at kemper.freedesktop.org
Tue Feb 19 12:17:52 PST 2008
configure.ac | 2 +-
src/plugin.c | 23 ++++++++++++++++++-----
src/plugin_x11.c | 1 +
src/swfmoz_dialog.c | 2 +-
src/swfmoz_loader.c | 4 ++++
src/swfmoz_player.c | 4 ++++
6 files changed, 29 insertions(+), 7 deletions(-)
New commits:
commit af5ddd4d3437807a350d55d0c2c3b630244309f0
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Feb 19 21:15:00 2008 +0100
use same warning flags as Swfdec does
diff --git a/configure.ac b/configure.ac
index 1d9abe8..930a42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl if we support them, we set them unconditionally
AS_COMPILER_FLAG(-Wall, GLOBAL_CFLAGS="-Wall", GLOBAL_CFLAGS="")
dnl I want this but stupid headers don't let me
dnl AS_COMPILER_FLAG(-Wshadow, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wshadow")
-AS_COMPILER_FLAG(-Wextra -Wno-missing-field-initializers -Wno-unused-parameter, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter")
+AS_COMPILER_FLAG(-Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wold-style-definition -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wformat-nonliteral -Wformat-security -Wswitch-enum -Wswitch-default, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wold-style-definition -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wformat-nonliteral -Wformat-security -Wswitch-enum -Wswitch-default")
dnl if we're in nano >= 1, add -Werror if supported
if test x$SWFDEC_CVS = xyes ; then
AS_COMPILER_FLAG(-Werror, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Werror")
diff --git a/src/plugin.c b/src/plugin.c
index 1f758ee..ef63b80 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -31,6 +31,7 @@
#include "swfmoz_loader.h"
#include "swfmoz_player.h"
+#include "plugin.h"
#include "plugin_x11.h"
NPNetscapeFuncs mozilla_funcs;
@@ -97,7 +98,7 @@ plugin_pop_allow_popups (NPP instance)
char *
NP_GetMIMEDescription (void)
{
- return "application/x-shockwave-flash:swf:Adobe Flash movie;application/futuresplash:spl:FutureSplash movie";
+ return (char *) "application/x-shockwave-flash:swf:Adobe Flash movie;application/futuresplash:spl:FutureSplash movie";
}
NPError
@@ -112,15 +113,26 @@ NP_GetValue (void* reserved, NPPVariable var, void* out)
switch (var) {
case NPPVpluginNameString:
- *val = "Shockwave Flash";
+ *val = (char *) "Shockwave Flash";
break;
case NPPVpluginDescriptionString:
/* FIXME: find a way to encode the Swfdec version without breaking stupid JS scripts */
- *val = "Shockwave Flash 9.0 r100";
+ *val = (char *) "Shockwave Flash 9.0 r100";
break;
case NPPVpluginNeedsXEmbed:
*((PRBool*) val) = PR_TRUE;
break;
+ case NPPVpluginWindowBool:
+ case NPPVpluginTransparentBool:
+ case NPPVjavaClass:
+ case NPPVpluginWindowSize:
+ case NPPVpluginTimerInterval:
+ case NPPVpluginScriptableInstance:
+ case NPPVpluginScriptableIID:
+ case NPPVjavascriptPushCallerBool:
+ case NPPVpluginKeepLibraryInMemory:
+ case NPPVpluginScriptableNPObject:
+ case NPPVformValue:
default:
return NPERR_INVALID_PARAM;
break;
@@ -128,6 +140,7 @@ NP_GetValue (void* reserved, NPPVariable var, void* out)
return NPERR_NO_ERROR;
}
+G_MODULE_EXPORT gboolean swfdec_mozilla_make_sure_this_thing_stays_in_memory (void);
/* This mess is unfortunately necessary */
#define PLUGIN_FILE PLUGIN_DIR G_DIR_SEPARATOR_S "libswfdecmozilla." G_MODULE_SUFFIX
G_MODULE_EXPORT gboolean
@@ -240,7 +253,7 @@ plugin_new (NPMIMEType mime_type, NPP instance,
guint j;
for (j = 0; j < G_N_ELEMENTS (possibilities); j++) {
- if (g_ascii_strcasecmp (argv[i], possibilities[j].name) == 0) {
+ if (g_ascii_strcasecmp (argv[j], possibilities[j].name) == 0) {
align = possibilities[j].align;
break;
}
@@ -255,7 +268,7 @@ plugin_new (NPMIMEType mime_type, NPP instance,
return NPERR_NO_ERROR;
}
-NPError
+static NPError
plugin_destroy (NPP instance, NPSavedData **save)
{
if (instance == NULL || !SWFMOZ_IS_PLAYER (instance->pdata))
diff --git a/src/plugin_x11.c b/src/plugin_x11.c
index 7abe0b7..206dca8 100644
--- a/src/plugin_x11.c
+++ b/src/plugin_x11.c
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#include "plugin_x11.h"
#include "swfmoz_player.h"
#include <gdk/gdkkeysyms.h>
diff --git a/src/swfmoz_dialog.c b/src/swfmoz_dialog.c
index 439e9f1..9cb4e7f 100644
--- a/src/swfmoz_dialog.c
+++ b/src/swfmoz_dialog.c
@@ -100,7 +100,7 @@ swfmoz_dialog_get_loader_filename (SwfdecLoader *loader)
path = swfdec_url_get_path (url);
if (path == NULL) {
- return "unknown";
+ return g_strdup ("unknown");
} else {
const char *slash = strrchr (path, '/');
if (slash) {
diff --git a/src/swfmoz_loader.c b/src/swfmoz_loader.c
index c520a9e..433e0de 100644
--- a/src/swfmoz_loader.c
+++ b/src/swfmoz_loader.c
@@ -156,6 +156,10 @@ swfmoz_loader_get_data_type_string (SwfdecLoader *loader)
return "Text";
case SWFDEC_LOADER_DATA_XML:
return "XML Data";
+ case SWFDEC_LOADER_DATA_JPEG:
+ return "JPEG image";
+ case SWFDEC_LOADER_DATA_PNG:
+ return "PNG image";
default:
g_printerr ("unknown data type %u\n",
(guint) swfdec_loader_get_data_type (loader));
commit 83edc93596c57ab924cee9b1e549823142e3af0b
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Feb 18 13:56:01 2008 +0100
we're a plugin, not a stand-alone player
diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index 9b2d16a..b8e1c67 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -392,9 +392,13 @@ SwfdecPlayer *
swfmoz_player_new (NPP instance, gboolean windowless)
{
SwfmozPlayer *ret;
+ SwfdecSystem *system;
+ system = swfdec_gtk_system_new (NULL);
+ g_object_set (system, "player-type", "PlugIn", NULL);
ret = g_object_new (SWFMOZ_TYPE_PLAYER,
"loader-type", SWFMOZ_TYPE_LOADER, "socket-type", SWFDEC_TYPE_SOCKET, //SWFDEC_TYPE_GTK_SOCKET,
+ "system", system,
NULL);
ret->instance = instance;
ret->windowless = windowless;
More information about the Swfdec-commits
mailing list