summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog25
-rw-r--r--browser-plugin/Makefile.am64
-rw-r--r--browser-plugin/idl/Makefile.am18
-rw-r--r--browser-plugin/idl/totemICone.idl48
-rw-r--r--browser-plugin/idl/totemIConeAudio.idl32
-rw-r--r--browser-plugin/idl/totemIConeInput.idl37
-rw-r--r--browser-plugin/idl/totemIConePlaylist.idl45
-rw-r--r--browser-plugin/idl/totemIConeVideo.idl36
-rw-r--r--browser-plugin/totemBasicPlugin.h6
-rw-r--r--browser-plugin/totemComplexPlugin.h6
-rw-r--r--browser-plugin/totemConePlugin.cpp98
-rw-r--r--browser-plugin/totemConePlugin.h53
-rw-r--r--browser-plugin/totemGMPError.h6
-rw-r--r--browser-plugin/totemGMPPlugin.h6
-rw-r--r--browser-plugin/totemMullYPlugin.h6
-rw-r--r--browser-plugin/totemNarrowSpacePlugin.h6
-rw-r--r--browser-plugin/totemPlugin.cpp2
-rw-r--r--browser-plugin/totemPluginGlue.h2
-rw-r--r--configure.in12
19 files changed, 489 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index dad0ee088..c5978fde1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2007-08-29 Bastien Nocera <hadess@hadess.net>
+
+ * browser-plugin/Makefile.am:
+ * browser-plugin/idl/Makefile.am:
+ * browser-plugin/idl/totemICone.idl:
+ * browser-plugin/idl/totemIConeAudio.idl:
+ * browser-plugin/idl/totemIConeInput.idl:
+ * browser-plugin/idl/totemIConePlaylist.idl:
+ * browser-plugin/idl/totemIConeVideo.idl:
+ * browser-plugin/totemConePlugin.cpp:
+ * browser-plugin/totemConePlugin.h:
+ * browser-plugin/totemPlugin.cpp:
+ * browser-plugin/totemPluginGlue.h:
+ * configure.in: Add the Cone plugin, a plugin to mimic the
+ VLC plugin, write IDL files from the web developers
+ documentation available on their site (Helps: #462544)
+
+ * browser-plugin/totemBasicPlugin.h:
+ * browser-plugin/totemComplexPlugin.h:
+ * browser-plugin/totemGMPError.h:
+ * browser-plugin/totemGMPPlugin.h:
+ * browser-plugin/totemMullYPlugin.h:
+ * browser-plugin/totemNarrowSpacePlugin.h:
+ Fix some includes #ifdef
+
2007-08-29 Philip Withnall <pwithnall@svn.gnome.org>
Update svn:ignore properties.
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index da67acc0f..93e6c9cd7 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -453,3 +453,67 @@ libtotem_mully_plugin_la_LDFLAGS = \
$(AM_LDFLAGS)
endif
+
+# Totem Cone Plugin
+
+if ENABLE_CONE_PLUGIN
+
+plugin_LTLIBRARIES += libtotem-cone-plugin.la
+
+libtotem_cone_plugin_la_SOURCES = \
+ totemDebug.h \
+ totemPluginGlue.cpp \
+ totemPluginGlue.h \
+ totemPlugin.cpp \
+ totemPlugin.h \
+ totemStringGlue.h \
+ totemConePlugin.cpp \
+ totemConePlugin.h \
+ totemClassInfo.h \
+ totem-plugin-viewer-commands.h
+
+libtotem_cone_plugin_la_CPPFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/backend \
+ -I$(top_srcdir)/src/plparse \
+ -I$(top_builddir)/src \
+ -I$(top_builddir)/src/backend \
+ -I$(top_builddir)/src/plparse \
+ -Iidl \
+ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
+ -DTOTEM_CONE_PLUGIN \
+ -DTOTEM_PL_PARSER_MINI \
+ -D_REENTRANT \
+ -DDBUS_API_SUBJECT_TO_CHANGE \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGCONF_PREFIX="\"/apps/totem\"" \
+ -DSYSCONFDIR="\"$(sysconfdir)\"" \
+ -DDATADIR="\"$(pkgdatadir)\"" \
+ -DLIBEXECDIR="\"$(libexecdir)\"" \
+ -DBINDIR="\"$(bindir)\"" \
+ $(DISABLE_DEPRECATED) \
+ $(AM_CPPFLAGS)
+
+libtotem_cone_plugin_la_CXXFLAGS = \
+ $(BROWSER_PLUGIN_CFLAGS) \
+ $(MOZILLA_XPCOM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(WARN_CXXFLAGS) \
+ $(PLUGIN_EXTRA_WARN_CXXFLAGS) \
+ $(AM_CXXFLAGS)
+
+libtotem_cone_plugin_la_LIBADD = \
+ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+ libtotempluginviewer_helper.la \
+ $(DBUS_LIBS) \
+ $(MOZILLA_LIBS) \
+ $(LIBXPCOMGLUE_S)
+
+libtotem_cone_plugin_la_LDFLAGS = \
+ -avoid-version \
+ -export-symbols $(srcdir)/plugin.symbols \
+ -module \
+ $(AM_LDFLAGS)
+
+endif
+
diff --git a/browser-plugin/idl/Makefile.am b/browser-plugin/idl/Makefile.am
index d114c6d4a..9f2076043 100644
--- a/browser-plugin/idl/Makefile.am
+++ b/browser-plugin/idl/Makefile.am
@@ -30,6 +30,13 @@ NARROWSPACE_IDLS = \
MULLY_IDLS = \
totemIMullYPlayer.idl
+CONE_IDLS = \
+ totemICone.idl \
+ totemIConeAudio.idl \
+ totemIConeInput.idl \
+ totemIConePlaylist.idl \
+ totemIConeVideo.idl
+
xptdir = $(MOZILLA_PLUGINDIR)
xpt_DATA =
@@ -60,6 +67,11 @@ ALL_IDLS += $(MULLY_IDLS)
xpt_DATA += libtotem-mully-plugin.xpt
endif
+if ENABLE_CONE_PLUGIN
+ALL_IDLS += $(CONE_IDLS)
+xpt_DATA += libtotem-cone-plugin.xpt
+endif
+
noinst_DATA = \
$(ALL_IDLS:.idl=.xpt) \
$(ALL_IDLS:.idl=.h)
@@ -78,7 +90,8 @@ EXTRA_DIST = \
$(GMP_IDLS) \
$(COMPLEX_IDLS) \
$(NARROWSPACE_IDLS) \
- $(MULLY_IDLS)
+ $(MULLY_IDLS) \
+ $(CONE_IDLS)
%.h: %.idl
$(MOZILLA_XPIDL) -w -m header -I $(MOZILLA_IDLDIR) -I $(srcdir) $<
@@ -107,3 +120,6 @@ libtotem-narrowspace-plugin.xpt: $(NARROWSPACE_IDLS:.idl=.xpt)
libtotem-mully-plugin.xpt: $(MULLY_IDLS:.idl=.xpt)
$(MOZILLA_XPT_LINK) $@ $^
+libtotem-cone-plugin.xpt: $(CONE_IDLS:.idl=.xpt)
+ $(MOZILLA_XPT_LINK) $@ $^
+
diff --git a/browser-plugin/idl/totemICone.idl b/browser-plugin/idl/totemICone.idl
new file mode 100644
index 000000000..33de719de
--- /dev/null
+++ b/browser-plugin/idl/totemICone.idl
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2006-2007, Bastien Nocera <hadess@hadess.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "nsISupports.idl"
+
+interface totemIConeAudio;
+interface totemIConeInput;
+interface totemIConePlaylist;
+interface totemIConeVideo;
+
+/* Documentation at
+ * http://www.videolan.org/doc/play-howto/en/ch04.html#id294468 */
+
+[scriptable, uuid(e31bd916-e3bb-41d6-a2dd-da42ed7d9c1a)]
+interface totemICone : nsISupports
+{
+ readonly attribute AUTF8String VersionInfo;
+ /* AUTF8String versionInfo() ? */
+
+ attribute totemIConeAudio audio;
+ attribute totemIConeInput input;
+ attribute totemIConePlaylist playlist;
+ attribute totemIConeVideo video;
+
+/* Nobody uses those interfaces
+
+ attribute totemIConeLog log;
+ attribute totemIConeMessages messages;
+ attribute totemIConeIterator iterator;
+*/
+};
+
diff --git a/browser-plugin/idl/totemIConeAudio.idl b/browser-plugin/idl/totemIConeAudio.idl
new file mode 100644
index 000000000..209dc6101
--- /dev/null
+++ b/browser-plugin/idl/totemIConeAudio.idl
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2006-2007, Bastien Nocera <hadess@hadess.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "nsISupports.idl"
+
+/* Documentation at
+ * http://www.videolan.org/doc/play-howto/en/ch04.html#id294468 */
+
+[scriptable, uuid(d31bc3e4-00d8-46f2-a841-990d63b16347)]
+interface totemIConeAudio : nsISupports
+{
+ attribute boolean mute;
+ attribute long volume;
+ void toggleMute ();
+};
+
diff --git a/browser-plugin/idl/totemIConeInput.idl b/browser-plugin/idl/totemIConeInput.idl
new file mode 100644
index 000000000..e872d0b5d
--- /dev/null
+++ b/browser-plugin/idl/totemIConeInput.idl
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2006-2007, Bastien Nocera <hadess@hadess.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "nsISupports.idl"
+
+/* Documentation at
+ * http://www.videolan.org/doc/play-howto/en/ch04.html#id294468 */
+
+[scriptable, uuid(b819de3d-92c9-4e85-8059-d42bc005013f)]
+interface totemIConeInput : nsISupports
+{
+ readonly attribute long length;
+ readonly attribute long fps;
+ readonly attribute boolean hasVout;
+
+ attribute double position;
+ attribute long time;
+ attribute long state;
+ attribute double rate;
+};
+
diff --git a/browser-plugin/idl/totemIConePlaylist.idl b/browser-plugin/idl/totemIConePlaylist.idl
new file mode 100644
index 000000000..173897dd4
--- /dev/null
+++ b/browser-plugin/idl/totemIConePlaylist.idl
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2006-2007, Bastien Nocera <hadess@hadess.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "nsISupports.idl"
+
+/* Documentation at
+ * http://www.videolan.org/doc/play-howto/en/ch04.html#id294468 */
+
+[scriptable, uuid(3c499730-9aa3-4c87-b752-05ae90116fa8)]
+interface totemIConePlaylist : nsISupports
+{
+ readonly attribute long itemCount;
+ readonly attribute boolean isPlaying;
+
+ void add (in AUTF8String MRL);
+/*
+ * We don't seem to be able to have 2 functions with the same name
+ * void add (in AUTF8String MRL, in AUTF8String name, in AUTF8String options);
+ */
+ void play ();
+
+ void togglePause ();
+ void stop ();
+ void next ();
+ void prev ();
+ void clear ();
+ void removeItem (in long number);
+};
+
diff --git a/browser-plugin/idl/totemIConeVideo.idl b/browser-plugin/idl/totemIConeVideo.idl
new file mode 100644
index 000000000..d5f2e3829
--- /dev/null
+++ b/browser-plugin/idl/totemIConeVideo.idl
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2006-2007, Bastien Nocera <hadess@hadess.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "nsISupports.idl"
+
+/* Documentation at
+ * http://www.videolan.org/doc/play-howto/en/ch04.html#id294468 */
+
+[scriptable, uuid(221cc95e-bdc1-4205-9bd9-79ab124b179c)]
+interface totemIConeVideo : nsISupports
+{
+ readonly attribute long width;
+ readonly attribute long height;
+
+ attribute boolean fullscreen;
+ attribute AUTF8String aspectRatio;
+
+ void toggleFullscreen ();
+};
+
diff --git a/browser-plugin/totemBasicPlugin.h b/browser-plugin/totemBasicPlugin.h
index dbc15c7b6..8fae45663 100644
--- a/browser-plugin/totemBasicPlugin.h
+++ b/browser-plugin/totemBasicPlugin.h
@@ -21,8 +21,8 @@
* $Id$
*/
-#ifndef __GMP_PLAYER_H__
-#define __GMP_PLAYER_H__
+#ifndef __BASIC_PLUGIN_H__
+#define __BASIC_PLUGIN_H__
#include <nsIClassInfo.h>
@@ -50,4 +50,4 @@ class totemScriptablePlugin : public totemIBasicPlayer,
totemPlugin *mPlugin;
};
-#endif /* __GMP_PLAYER_H__ */
+#endif /* __BASIC_PLUGIN_H__ */
diff --git a/browser-plugin/totemComplexPlugin.h b/browser-plugin/totemComplexPlugin.h
index fa6a60fd3..324254a2e 100644
--- a/browser-plugin/totemComplexPlugin.h
+++ b/browser-plugin/totemComplexPlugin.h
@@ -21,8 +21,8 @@
* $Id$
*/
-#ifndef __GMP_PLAYER_H__
-#define __GMP_PLAYER_H__
+#ifndef __COMPLEX_PLUGIN_H__
+#define __COMPLEX_PLUGIN_H__
#include <nsIClassInfo.h>
@@ -108,4 +108,4 @@ class totemScriptablePlugin : public totemIComplexPlayer,
PRUint32 mZoomed : 1;
};
-#endif /* __GMP_PLAYER_H__ */
+#endif /* __COMPLEX_PLUGIN_H__ */
diff --git a/browser-plugin/totemConePlugin.cpp b/browser-plugin/totemConePlugin.cpp
new file mode 100644
index 000000000..2f19e99b0
--- /dev/null
+++ b/browser-plugin/totemConePlugin.cpp
@@ -0,0 +1,98 @@
+/* Totem Cone Plugin
+ *
+ * Copyright (C) 2004 Bastien Nocera <hadess@hadess.net>
+ * Copyright (C) 2002 David A. Schleef <ds@schleef.org>
+ * Copyright (C) 2006 Christian Persch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * $Id: totemBasicPlugin.cpp 4463 2007-07-27 16:07:42Z fcrozat $
+ */
+
+#include <mozilla-config.h>
+#include "config.h"
+
+#include <glib.h>
+
+#include <nsISupportsImpl.h>
+#include <nsMemory.h>
+#include <nsXPCOM.h>
+#include <nsIProgrammingLanguage.h>
+
+#define GNOME_ENABLE_DEBUG 1
+/* define GNOME_ENABLE_DEBUG for more debug spew */
+#include "debug.h"
+
+#include "totemClassInfo.h"
+
+#include "totemConePlugin.h"
+
+/* 11ef8fce-9eb4-494e-804e-d56eae788625 */
+static const nsCID kClassID =
+ { 0x11ef8fce, 0x9eb4, 0x494e,
+ { 0x80, 0x4e, 0xd5, 0x6e, 0xae, 0x78, 0x86, 0x25 } };
+
+static const char kClassDescription[] = "totemConePlugin";
+static const char kPluginDescription[] = "VLC Multimedia Plugin (compatible Totem " VERSION ")";
+
+static const totemPluginMimeEntry kMimeTypes[] = {
+ { "application/x-vlc-plugin", "", "application/octet-stream" },
+ { "video/x-google-vlc-plugin", "", "application/octet-stream" },
+};
+
+totemScriptablePlugin::totemScriptablePlugin (totemPlugin *aPlugin)
+ : mPlugin(aPlugin)
+{
+ D ("%s ctor [%p]", kClassDescription, (void*) this);
+}
+
+totemScriptablePlugin::~totemScriptablePlugin ()
+{
+ D ("%s dtor [%p]", kClassDescription, (void*) this);
+}
+
+/* static */ char *
+totemScriptablePlugin::PluginDescription ()
+{
+ return (char*) kPluginDescription;
+}
+
+/* static */ void
+totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
+ PRUint32 *_count)
+{
+ *_entries = kMimeTypes;
+ *_count = G_N_ELEMENTS (kMimeTypes);
+}
+
+/* Interface implementations */
+
+NS_IMPL_ISUPPORTS2 (totemScriptablePlugin,
+ totemICone,
+ nsIClassInfo)
+
+/* nsIClassInfo */
+
+TOTEM_CLASSINFO_BEGIN (totemScriptablePlugin,
+ 1,
+ kClassID,
+ kClassDescription)
+ TOTEM_CLASSINFO_ENTRY (0, totemICone)
+TOTEM_CLASSINFO_END
+
+/* totemICone */
+
+
diff --git a/browser-plugin/totemConePlugin.h b/browser-plugin/totemConePlugin.h
new file mode 100644
index 000000000..fbb7b23ea
--- /dev/null
+++ b/browser-plugin/totemConePlugin.h
@@ -0,0 +1,53 @@
+/* Totem Cone Plugin
+ *
+ * Copyright (C) 2004 Bastien Nocera <hadess@hadess.net>
+ * Copyright (C) 2002 David A. Schleef <ds@schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * $Id: totemBasicPlugin.h 3717 2006-11-15 17:21:16Z chpe $
+ */
+
+#ifndef __CONE_PLUGIN_H__
+#define __CONE_PLUGIN_H__
+
+#include <nsIClassInfo.h>
+
+#include "totemICone.h"
+#include "totemPlugin.h"
+
+class totemScriptablePlugin : public totemICone,
+ public nsIClassInfo
+{
+ public:
+ NS_DECL_ISUPPORTS
+ NS_DECL_TOTEMICONE
+ NS_DECL_NSICLASSINFO
+
+ totemScriptablePlugin (totemPlugin *aPlugin);
+
+ PRBool IsValid () { return mPlugin != nsnull; }
+ void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
+
+ static char *PluginDescription ();
+ static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
+ private:
+ ~totemScriptablePlugin ();
+
+ totemPlugin *mPlugin;
+};
+
+#endif /* __CONE_PLUGIN_H__ */
diff --git a/browser-plugin/totemGMPError.h b/browser-plugin/totemGMPError.h
index 3a3c72a94..a56e143ae 100644
--- a/browser-plugin/totemGMPError.h
+++ b/browser-plugin/totemGMPError.h
@@ -20,8 +20,8 @@
* $Id: totemGMPPlugin.h 3717 2006-11-15 17:21:16Z chpe $
*/
-#ifndef __GMP_SETTINGS_H__
-#define __GMP_SETTINGS_H__
+#ifndef __GMP_ERROR_H__
+#define __GMP_ERROR_H__
#include <nsIClassInfo.h>
@@ -49,4 +49,4 @@ class totemGMPError : public totemIGMPError,
PRInt32 mCount;
};
-#endif /* __GMP_SETTINGS_H__ */
+#endif /* __GMP_ERROR_H__ */
diff --git a/browser-plugin/totemGMPPlugin.h b/browser-plugin/totemGMPPlugin.h
index 087caae8e..a024f2847 100644
--- a/browser-plugin/totemGMPPlugin.h
+++ b/browser-plugin/totemGMPPlugin.h
@@ -22,8 +22,8 @@
* $Id$
*/
-#ifndef __GMP_PLAYER_H__
-#define __GMP_PLAYER_H__
+#ifndef __GMP_PLUGIN_H__
+#define __GMP_PLUGIN_H__
#include <nsIClassInfo.h>
@@ -65,4 +65,4 @@ class totemScriptablePlugin : public totemIGMPPlayer,
PRUint32 mWindowlessVideo;
};
-#endif /* __GMP_PLAYER_H__ */
+#endif /* __GMP_PLUGIN_H__ */
diff --git a/browser-plugin/totemMullYPlugin.h b/browser-plugin/totemMullYPlugin.h
index 476523e3c..be3f54241 100644
--- a/browser-plugin/totemMullYPlugin.h
+++ b/browser-plugin/totemMullYPlugin.h
@@ -21,8 +21,8 @@
* $Id$
*/
-#ifndef __MULLY_PLAYER_H__
-#define __MULLY_PLAYER_H__
+#ifndef __MULLY_PLUGIN_H__
+#define __MULLY_PLUGIN_H__
#include <nsIClassInfo.h>
@@ -51,4 +51,4 @@ class totemScriptablePlugin : public totemIMullYPlayer,
totemPlugin *mPlugin;
};
-#endif /* __MULLY_PLAYER_H__ */
+#endif /* __MULLY_PLUGIN_H__ */
diff --git a/browser-plugin/totemNarrowSpacePlugin.h b/browser-plugin/totemNarrowSpacePlugin.h
index e1e996d65..0ab571008 100644
--- a/browser-plugin/totemNarrowSpacePlugin.h
+++ b/browser-plugin/totemNarrowSpacePlugin.h
@@ -21,8 +21,8 @@
* $Id$
*/
-#ifndef __NARROWSPACE_PLAYER_H__
-#define __NARROWSPACE_PLAYER_H__
+#ifndef __NARROWSPACE_PLUGIN_H__
+#define __NARROWSPACE_PLUGIN_H__
#include <nsIClassInfo.h>
@@ -81,4 +81,4 @@ class totemScriptablePlugin : public totemINarrowSpacePlayer,
PRUint32 mResetPropertiesOnReload : 1;
};
-#endif /* __NARROWSPACE_PLAYER_H__ */
+#endif /* __NARROWSPACE_PLUGIN_H__ */
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index f6d95c03d..37ecbe203 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -307,6 +307,8 @@ totemPlugin::ViewerFork ()
g_ptr_array_add (arr, g_strdup ("narrowspace"));
#elif defined(TOTEM_MULLY_PLUGIN)
g_ptr_array_add (arr, g_strdup ("mully"));
+#elif defined(TOTEM_CONE_PLUGIN)
+ g_ptr_array_add (arr, g_strdup ("cone"));
#else
#error Unknown plugin type
#endif
diff --git a/browser-plugin/totemPluginGlue.h b/browser-plugin/totemPluginGlue.h
index 1eb83d2cf..f5998071a 100644
--- a/browser-plugin/totemPluginGlue.h
+++ b/browser-plugin/totemPluginGlue.h
@@ -33,6 +33,8 @@
#include "totemNarrowSpacePlugin.h"
#elif defined(TOTEM_MULLY_PLUGIN)
#include "totemMullYPlugin.h"
+#elif defined(TOTEM_CONE_PLUGIN)
+#include "totemConePlugin.h"
#else
#error Unknown plugin type
#endif
diff --git a/configure.in b/configure.in
index c7f580f8c..bc0330604 100644
--- a/configure.in
+++ b/configure.in
@@ -670,6 +670,12 @@ AC_ARG_ENABLE([mully-plugin],
[],[enable_mully_plugin=yes])
AC_MSG_RESULT([$enable_mully_plugin])
+AC_MSG_CHECKING([whether to enable the Cone browser plugin])
+AC_ARG_ENABLE([cone-plugin],
+ AS_HELP_STRING([--enable-cone-plugin],[Whether to enable the Cone browser plugin]),
+ [],[enable_cone_plugin=yes])
+AC_MSG_RESULT([$enable_cone_plugin])
+
fi
AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"])
@@ -677,6 +683,7 @@ 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"])
AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
+AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])
dnl ********
dnl Nautilus
@@ -1111,6 +1118,11 @@ if test x$enable_browser_plugins = xyes ; then
else
AC_MSG_NOTICE([ MullY (DivX) plugin disabled])
fi
+ if test x$enable_cone_plugin = xyes ; then
+ AC_MSG_NOTICE([** Cone (VLC) plugin enabled])
+ else
+ AC_MSG_NOTICE([ Cone (VLC) plugin enabled])
+ fi
else
AC_MSG_NOTICE([ Browser plugin disabled])
fi
View Lorry Controller Status