diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2003-01-04 16:26:58 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2003-01-04 16:26:58 +0000 |
commit | d093fb3fa46346b4cdf455a16550ea84e6c48550 (patch) | |
tree | 0627241b84634f8bba7ed09a02c25cc489f403a0 | |
parent | 411642197f0552afa9faee2f3a7acde943fbb4cf (diff) |
Register the two indexers
Original commit message from CVS:
Register the two indexers
-rw-r--r-- | gst/indexers/Makefile.am | 2 | ||||
-rw-r--r-- | gst/indexers/gstfileindex.c | 16 | ||||
-rw-r--r-- | gst/indexers/gstindexers.c | 44 | ||||
-rw-r--r-- | gst/indexers/gstmemindex.c | 12 | ||||
-rw-r--r-- | plugins/indexers/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/indexers/gstfileindex.c | 16 | ||||
-rw-r--r-- | plugins/indexers/gstindexers.c | 44 | ||||
-rw-r--r-- | plugins/indexers/gstmemindex.c | 12 |
8 files changed, 98 insertions, 50 deletions
diff --git a/gst/indexers/Makefile.am b/gst/indexers/Makefile.am index 27a1903e7b..b4a9cd8d89 100644 --- a/gst/indexers/Makefile.am +++ b/gst/indexers/Makefile.am @@ -2,7 +2,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstindexers.la -libgstindexers_la_SOURCES = gstmemindex.c gstfileindex.c +libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c gstfileindex.c libgstindexers_la_CFLAGS = $(GST_CFLAGS) libgstindexers_la_LIBADD = libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/indexers/gstfileindex.c b/gst/indexers/gstfileindex.c index c0a04eecd0..da1326fe98 100644 --- a/gst/indexers/gstfileindex.c +++ b/gst/indexers/gstfileindex.c @@ -864,12 +864,8 @@ gst_file_index_get_assoc_entry (GstIndex *index, return entry; } -////////////////////////////////////////////////////////////////////// -// [UNTESTED] i don't understand the following plugin stuff [UNTESTED] -////////////////////////////////////////////////////////////////////// - -static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +gboolean +gst_file_index_plugin_init (GModule *module, GstPlugin *plugin) { GstIndexFactory *factory; @@ -887,11 +883,3 @@ plugin_init (GModule *module, GstPlugin *plugin) } return TRUE; } - -GstPluginDesc plugin_desc2 = { - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstindexs", - plugin_init -}; - diff --git a/gst/indexers/gstindexers.c b/gst/indexers/gstindexers.c new file mode 100644 index 0000000000..e2f491e901 --- /dev/null +++ b/gst/indexers/gstindexers.c @@ -0,0 +1,44 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * 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. + */ + +#include <gst/gst_private.h> +#include <gst/gstversion.h> +#include <gst/gstplugin.h> + +extern gboolean gst_mem_index_plugin_init (GModule *module, GstPlugin *plugin); +extern gboolean gst_file_index_plugin_init (GModule *module, GstPlugin *plugin); + +static gboolean +plugin_init (GModule *module, GstPlugin *plugin) +{ + gboolean res = TRUE; + + res &= gst_mem_index_plugin_init (module, plugin); + res &= gst_file_index_plugin_init (module, plugin); + + return res; +} + +GstPluginDesc plugin_desc = { + GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "gstindexers", + plugin_init +}; + diff --git a/gst/indexers/gstmemindex.c b/gst/indexers/gstmemindex.c index dea42da07d..0858862a53 100644 --- a/gst/indexers/gstmemindex.c +++ b/gst/indexers/gstmemindex.c @@ -401,8 +401,8 @@ gst_mem_index_get_assoc_entry (GstIndex *index, gint id, return entry; } -static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +gboolean +gst_mem_index_plugin_init (GModule *module, GstPlugin *plugin) { GstIndexFactory *factory; @@ -420,11 +420,3 @@ plugin_init (GModule *module, GstPlugin *plugin) } return TRUE; } - -GstPluginDesc plugin_desc = { - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstindexs", - plugin_init -}; - diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am index 27a1903e7b..b4a9cd8d89 100644 --- a/plugins/indexers/Makefile.am +++ b/plugins/indexers/Makefile.am @@ -2,7 +2,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstindexers.la -libgstindexers_la_SOURCES = gstmemindex.c gstfileindex.c +libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c gstfileindex.c libgstindexers_la_CFLAGS = $(GST_CFLAGS) libgstindexers_la_LIBADD = libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/plugins/indexers/gstfileindex.c b/plugins/indexers/gstfileindex.c index c0a04eecd0..da1326fe98 100644 --- a/plugins/indexers/gstfileindex.c +++ b/plugins/indexers/gstfileindex.c @@ -864,12 +864,8 @@ gst_file_index_get_assoc_entry (GstIndex *index, return entry; } -////////////////////////////////////////////////////////////////////// -// [UNTESTED] i don't understand the following plugin stuff [UNTESTED] -////////////////////////////////////////////////////////////////////// - -static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +gboolean +gst_file_index_plugin_init (GModule *module, GstPlugin *plugin) { GstIndexFactory *factory; @@ -887,11 +883,3 @@ plugin_init (GModule *module, GstPlugin *plugin) } return TRUE; } - -GstPluginDesc plugin_desc2 = { - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstindexs", - plugin_init -}; - diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c new file mode 100644 index 0000000000..e2f491e901 --- /dev/null +++ b/plugins/indexers/gstindexers.c @@ -0,0 +1,44 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * 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. + */ + +#include <gst/gst_private.h> +#include <gst/gstversion.h> +#include <gst/gstplugin.h> + +extern gboolean gst_mem_index_plugin_init (GModule *module, GstPlugin *plugin); +extern gboolean gst_file_index_plugin_init (GModule *module, GstPlugin *plugin); + +static gboolean +plugin_init (GModule *module, GstPlugin *plugin) +{ + gboolean res = TRUE; + + res &= gst_mem_index_plugin_init (module, plugin); + res &= gst_file_index_plugin_init (module, plugin); + + return res; +} + +GstPluginDesc plugin_desc = { + GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "gstindexers", + plugin_init +}; + diff --git a/plugins/indexers/gstmemindex.c b/plugins/indexers/gstmemindex.c index dea42da07d..0858862a53 100644 --- a/plugins/indexers/gstmemindex.c +++ b/plugins/indexers/gstmemindex.c @@ -401,8 +401,8 @@ gst_mem_index_get_assoc_entry (GstIndex *index, gint id, return entry; } -static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +gboolean +gst_mem_index_plugin_init (GModule *module, GstPlugin *plugin) { GstIndexFactory *factory; @@ -420,11 +420,3 @@ plugin_init (GModule *module, GstPlugin *plugin) } return TRUE; } - -GstPluginDesc plugin_desc = { - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstindexs", - plugin_init -}; - |