GNOME.org
 

totem r5759 - in trunk: . browser-plugin browser-plugin/idl

Author: hadess
Date: Thu Oct  9 09:42:09 2008
New Revision: 5759
URL: http://svn.gnome.org/viewvc/totem?rev=5759&view=rev

Log:
2008-10-09  Bastien Nocera  <hadess hadess net>

	* browser-plugin/Makefile.am:
	* browser-plugin/idl/totemIBasicPlayer.idl:
	* browser-plugin/totem-plugin-viewer.c (parse_plugin_type):
	* browser-plugin/totemBasicPlugin.cpp:
	* browser-plugin/totemBasicPlugin.h:
	* browser-plugin/totemPlugin.cpp:
	* configure.in: Remove the "basic" web browser plugin, you should
	now use the VLC API to control the basic mime-types (Closes: #554867)



Removed:
   trunk/browser-plugin/idl/totemIBasicPlayer.idl
   trunk/browser-plugin/totemBasicPlugin.cpp
   trunk/browser-plugin/totemBasicPlugin.h
Modified:
   trunk/ChangeLog
   trunk/browser-plugin/Makefile.am
   trunk/browser-plugin/totem-plugin-viewer.c
   trunk/browser-plugin/totemPlugin.cpp
   trunk/configure.in

Modified: trunk/browser-plugin/Makefile.am
==============================================================================
--- trunk/browser-plugin/Makefile.am	(original)
+++ trunk/browser-plugin/Makefile.am	Thu Oct  9 09:42:09 2008
@@ -128,66 +128,6 @@
 EXTRA_DIST += \
 	org_gnome_totem_PluginViewer.xml
 
-# Totem Basic Plugin
-
-if ENABLE_BASIC_PLUGIN
-
-plugin_LTLIBRARIES += libtotem-basic-plugin.la
-
-libtotem_basic_plugin_la_SOURCES =	\
-	npapi.h				\
-	npruntime.h			\
-	npupp.h				\
-	totemNPNGlue.cpp		\
-	totemNPClass.cpp		\
-	totemNPClass.h			\
-	totemNPObject.cpp		\
-	totemNPObject.h			\
-	totemNPObjectWrapper.h		\
-	totemNPVariantWrapper.h		\
-	totemPluginGlue.cpp		\
-	totemPlugin.cpp			\
-	totemPlugin.h			\
-	totemBasicPlugin.cpp		\
-	totemBasicPlugin.h		\
-	totem-plugin-viewer-constants.h
-
-libtotem_basic_plugin_la_CPPFLAGS = \
-	-I$(top_srcdir)/src				\
-	-I$(top_srcdir)/src/backend			\
-	-I$(top_builddir)/src				\
-	-I$(top_builddir)/src/backend			\
-	-DXP_UNIX					\
-	-DMOZ_X11					\
-	-DTOTEM_BASIC_PLUGIN				\
-	-DTOTEM_PL_PARSER_MINI				\
-	-D_REENTRANT					\
-	-DDBUS_API_SUBJECT_TO_CHANGE			\
-	-DSYSCONFDIR="\"$(sysconfdir)\""		\
-	-DLIBEXECDIR="\"$(libexecdir)\""		\
-	$(DISABLE_DEPRECATED)				\
-	$(AM_CPPFLAGS)
-
-libtotem_basic_plugin_la_CXXFLAGS = \
-	$(BROWSER_PLUGIN_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(WARN_CXXFLAGS)		\
-	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
-	$(AM_CXXFLAGS)
-
-libtotem_basic_plugin_la_LIBADD = \
-	libtotembrowserplugin_helper.la	\
-	$(DBUS_LIBS)			\
-	$(BROWSER_PLUGIN_LIBS)
-
-libtotem_basic_plugin_la_LDFLAGS = \
-	-avoid-version	\
-	-export-symbols $(srcdir)/plugin.symbols \
-	-module		\
-	$(AM_LDFLAGS)
-
-endif
-
 # Totem GMP Plugin
 
 if ENABLE_GMP_PLUGIN

Modified: trunk/browser-plugin/totem-plugin-viewer.c
==============================================================================
--- trunk/browser-plugin/totem-plugin-viewer.c	(original)
+++ trunk/browser-plugin/totem-plugin-viewer.c	Thu Oct  9 09:42:09 2008
@@ -68,7 +68,6 @@
 #endif
 
 typedef enum {
-	TOTEM_PLUGIN_TYPE_BASIC,
 	TOTEM_PLUGIN_TYPE_GMP,
 	TOTEM_PLUGIN_TYPE_COMPLEX,
 	TOTEM_PLUGIN_TYPE_NARROWSPACE,
@@ -2206,7 +2205,6 @@
 	           GError **error)
 {
 	const char types[TOTEM_PLUGIN_TYPE_LAST][12] = {
-		"basic",
 		"gmp",
 		"complex",
 		"narrowspace",

Modified: trunk/browser-plugin/totemPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemPlugin.cpp	(original)
+++ trunk/browser-plugin/totemPlugin.cpp	Thu Oct  9 09:42:09 2008
@@ -57,9 +57,7 @@
 
 #include "totemPlugin.h"
 
-#if defined(TOTEM_BASIC_PLUGIN)
-#include "totemBasicPlugin.h"
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
 #include "totemGMPControls.h"
 #include "totemGMPNetwork.h"
 #include "totemGMPPlayer.h"
@@ -87,24 +85,7 @@
 #define PLUGIN_STREAM_CHUNK_SIZE (8 * 1024)
 
 static const totemPluginMimeEntry kMimeTypes[] = {
-#if defined(TOTEM_BASIC_PLUGIN)
-  { "application/x-ogg","ogg","application/ogg" },
-  { "application/ogg", "ogg", NULL },
-  { "audio/ogg", "oga", NULL },
-  { "audio/x-ogg", "ogg", NULL },
-  { "video/ogg", "ogv", NULL },
-  { "video/x-ogg", "ogg", NULL },
-  { "application/annodex", "anx", NULL },
-  { "audio/annodex", "axa", NULL },
-  { "video/annodex", "axv", NULL },
-  { "video/mpeg", "mpg, mpeg, mpe", NULL },
-  { "audio/wav", "wav", NULL },
-  { "audio/x-wav", "wav", NULL },
-  { "audio/mpeg", "mp3", NULL },
-  { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
-  { "video/flv", "flv", "application/x-flash-video" },
-  { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
   { "application/x-mplayer2", "avi, wma, wmv", "video/x-msvideo" },
   { "video/x-ms-asf-plugin", "asf, wmv", "video/x-ms-asf" },
   { "video/x-msvideo", "asf, wmv", NULL },
@@ -132,15 +113,29 @@
   { "application/x-vlc-plugin", "", "VLC Multimedia Plugin" },
   { "application/vlc", "", "VLC Multimedia Plugin" },
   { "video/x-google-vlc-plugin", "", "VLC Multimedia Plugin" },
+  { "application/x-ogg","ogg","application/ogg" },
+  { "application/ogg", "ogg", NULL },
+  { "audio/ogg", "oga", NULL },
+  { "audio/x-ogg", "ogg", NULL },
+  { "video/ogg", "ogv", NULL },
+  { "video/x-ogg", "ogg", NULL },
+  { "application/annodex", "anx", NULL },
+  { "audio/annodex", "axa", NULL },
+  { "video/annodex", "axv", NULL },
+  { "video/mpeg", "mpg, mpeg, mpe", NULL },
+  { "audio/wav", "wav", NULL },
+  { "audio/x-wav", "wav", NULL },
+  { "audio/mpeg", "mp3", NULL },
+  { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
+  { "video/flv", "flv", "application/x-flash-video" },
+  { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
 #else
 #error Unknown plugin type
 #endif
 };
 
 static const char kPluginDescription[] =
-#if defined(TOTEM_BASIC_PLUGIN)
-  "Totem Web Browser Plugin " VERSION;
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
   "Windows Media Player Plug-in 10 (compatible; Totem)";
 #elif defined(TOTEM_COMPLEX_PLUGIN)
   "Helix DNA Plugin: RealPlayer G2 Plug-In Compatible (compatible; Totem)";
@@ -505,9 +500,7 @@
 #endif
 
 	g_ptr_array_add (arr, g_strdup (DASHES TOTEM_OPTION_PLUGIN_TYPE));
-#if defined(TOTEM_BASIC_PLUGIN)
-	g_ptr_array_add (arr, g_strdup ("basic"));
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
 	g_ptr_array_add (arr, g_strdup ("gmp"));
 #elif defined(TOTEM_COMPLEX_PLUGIN)
 	g_ptr_array_add (arr, g_strdup ("complex"));
@@ -2089,12 +2082,12 @@
 	mCache = GetBooleanValue (args, "cache", mCache);
 #endif /* TOTEM_NARROWSPACE_PLUGIN */
 
-#if defined (TOTEM_NARROWSPACE_PLUGIN) || defined (TOTEM_BASIC_PLUGIN)
+#if defined (TOTEM_NARROWSPACE_PLUGIN)
 	mControllerHidden = !GetBooleanValue (args, "controller", true);
 
 	mAutoPlay = GetBooleanValue (args, "autoplay", true);
 
-#endif /* TOTEM_NARROWSPACE_PLUGIN || TOTEM_BASIC_PLUGIN */
+#endif /* TOTEM_NARROWSPACE_PLUGIN */
 
 /* VLC plugin defaults to have its controller hidden */
 #ifdef TOTEM_CONE_PLUGIN
@@ -2177,11 +2170,11 @@
 		mAudioOnly = true;
 	}
 #endif /* TOTEM_GMP_PLUGIN */
-#if defined(TOTEM_NARROWSPACE_PLUGIN) || defined (TOTEM_BASIC_PLUGIN)
+#if defined(TOTEM_NARROWSPACE_PLUGIN)
 	if (height <= 16 && !mControllerHidden) {
 		mAudioOnly = true;
 	}
-#endif /* TOTEM_NARROWSPACE_PLUGIN || TOTEM_BASIC_PLUGIN */
+#endif /* TOTEM_NARROWSPACE_PLUGIN */
 
 #ifdef TOTEM_NARROWSPACE_PLUGIN
 	/* We need to autostart if we're using an HREF
@@ -2586,9 +2579,7 @@
 
   totemNPClass_base *npclass = 0;
 
-#if defined(TOTEM_BASIC_PLUGIN)
-  npclass = totemBasicPlayerNPClass::Instance();
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
   switch (which) {
     case ePluginScriptable:
       npclass = totemGMPPlayerNPClass::Instance();
@@ -2687,9 +2678,7 @@
 	}
 #endif /* TOTEM_COMPLEX_PLUGIN */
 
-#if defined(TOTEM_BASIC_PLUGIN)
-        totemBasicPlayerNPClass::Shutdown ();
-#elif defined(TOTEM_GMP_PLUGIN)
+#if defined(TOTEM_GMP_PLUGIN)
         totemGMPPlayerNPClass::Shutdown ();
         totemGMPControlsNPClass::Shutdown ();
         totemGMPNetworkNPClass::Shutdown ();

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  9 09:42:09 2008
@@ -696,12 +696,6 @@
 
 if test "$enable_browser_plugins" = "yes"; then
 
-AC_MSG_CHECKING([whether to enable the basic browser plugin])
-AC_ARG_ENABLE([basic-plugin],
-	AS_HELP_STRING([--disable-basic-plugin],[Whether to disable the basic browser plugin]),
-	[],[enable_basic_plugin=yes])
-AC_MSG_RESULT([$enable_basic_plugin])
-
 AC_MSG_CHECKING([whether to enable the GMP browser plugin])
 AC_ARG_ENABLE([gmp-plugin],
 	AS_HELP_STRING([--enable-gmp-plugin],[Whether to enable the GMP browser plugin]),
@@ -734,7 +728,6 @@
 
 fi
 
-AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"])
 AM_CONDITIONAL([ENABLE_GMP_PLUGIN],[test "$enable_gmp_plugin" = "yes"])
 AM_CONDITIONAL([ENABLE_COMPLEX_PLUGIN],[test "$enable_complex_plugin" = "yes"])
 AM_CONDITIONAL([ENABLE_NARROWSPACE_PLUGIN],[test "$enable_narrowspace_plugin" = "yes"])
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]