From c37fca4fd42da8ca2b39d2220c71ade4bc14f934 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 1 Dec 2005 12:29:34 +0000 Subject: [PATCH] document core plugins in a separate document just like all the others rename these plugins to something starting with... Original commit message from CVS: document core plugins in a separate document just like all the others rename these plugins to something starting with core --- ChangeLog | 33 ++++++ common | 2 +- configure.ac | 2 + docs/Makefile.am | 4 +- docs/gst/Makefile.am | 4 - docs/gst/gstreamer-docs.sgml | 37 ------- docs/gst/gstreamer-sections.txt | 91 ---------------- docs/gst/gstreamer.types | 14 --- docs/gst/gstreamer.types.in | 14 --- docs/plugins/Makefile.am | 105 +++++++++++++++++++ docs/plugins/gstreamer-plugins-docs.sgml | 28 +++++ docs/plugins/gstreamer-plugins-sections.txt | 84 +++++++++++++++ docs/plugins/gstreamer-plugins.types | 1 + docs/plugins/inspect.stamp | 1 + docs/plugins/inspect/plugin-coreelements.xml | 83 +++++++++++++++ docs/plugins/inspect/plugin-coreindexers.xml | 14 +++ docs/plugins/scanobj-build.stamp | 0 gstreamer.spec.in | 1 + plugins/elements/Makefile.am | 12 +-- plugins/elements/gstelements.c | 2 +- plugins/elements/gstfakesink.c | 2 +- plugins/elements/gstfakesrc.c | 2 +- plugins/elements/gstfilesink.c | 2 +- plugins/elements/gstfilesrc.c | 2 +- plugins/elements/gstqueue.c | 2 +- plugins/indexers/Makefile.am | 12 +-- plugins/indexers/gstindexers.c | 2 +- 27 files changed, 374 insertions(+), 182 deletions(-) create mode 100644 docs/plugins/Makefile.am create mode 100644 docs/plugins/gstreamer-plugins-docs.sgml create mode 100644 docs/plugins/gstreamer-plugins-sections.txt create mode 100644 docs/plugins/gstreamer-plugins.types create mode 100644 docs/plugins/inspect.stamp create mode 100644 docs/plugins/inspect/plugin-coreelements.xml create mode 100644 docs/plugins/inspect/plugin-coreindexers.xml create mode 100644 docs/plugins/scanobj-build.stamp diff --git a/ChangeLog b/ChangeLog index 84fcb8b625..5dbf49fad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2005-12-01 Thomas Vander Stichele + + * common/gst-xmlinspect.py: + * common/gtk-doc-plugins.mak: + * configure.ac: + * docs/Makefile.am: + * docs/gst/Makefile.am: + * docs/gst/gstreamer-docs.sgml: + * docs/gst/gstreamer-sections.txt: + * docs/gst/gstreamer.types: + * docs/gst/gstreamer.types.in: + * docs/plugins/Makefile.am: + * docs/plugins/gstreamer-plugins-docs.sgml: + * docs/plugins/gstreamer-plugins-sections.txt: + * docs/plugins/gstreamer-plugins.types: + * docs/plugins/inspect.stamp: + * docs/plugins/inspect/plugin-coreelements.xml: + * docs/plugins/inspect/plugin-coreindexers.xml: + * docs/plugins/scanobj-build.stamp: + * gstreamer.spec.in: + * plugins/elements/Makefile.am: + * plugins/elements/gstelements.c: + * plugins/elements/gstfakesink.c: + * plugins/elements/gstfakesrc.c: + * plugins/elements/gstfilesink.c: + * plugins/elements/gstfilesrc.c: + * plugins/elements/gstqueue.c: + * plugins/indexers/Makefile.am: + * plugins/indexers/gstindexers.c: + document core plugins in a separate document just like all the + others + rename these plugins to something starting with core + 2005-12-01 Andy Wingo * gst/gstevent.h (struct _GstEvent): Meant to remove the extra diff --git a/common b/common index f9f5f06372..54bb21c57b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f9f5f063728688cf455a1512d492b632c43963d7 +Subproject commit 54bb21c57bb86941d80c15590e0a121405173156 diff --git a/configure.ac b/configure.ac index 586816acc5..28061e49c8 100644 --- a/configure.ac +++ b/configure.ac @@ -261,6 +261,7 @@ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno") dnl check for documentation tools GST_DOCBOOK_CHECK GTK_DOC_CHECK([1.3]) +AS_PATH_PYTHON([2.1]) dnl *** checks for libraries *** @@ -513,6 +514,7 @@ docs/faq/Makefile docs/gst/Makefile docs/gst/gstreamer.types docs/libs/Makefile +docs/plugins/Makefile docs/manual/Makefile docs/pwg/Makefile docs/xsl/Makefile diff --git a/docs/Makefile.am b/docs/Makefile.am index 521371f19b..ef08707a40 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_GTK_DOC -SUBDIRS_GTK_DOC = gst libs +SUBDIRS_GTK_DOC = gst libs plugins else SUBDIRS_GTK_DOC = endif @@ -13,7 +13,7 @@ endif BUILT_SOURCES = version.entities SUBDIRS = $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) -DIST_SUBDIRS = gst faq manual pwg libs xsl +DIST_SUBDIRS = gst libs plugins faq manual pwg xsl EXTRA_DIST = \ slides manuals.mak htmlinstall.mak upload.mak \ diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index 872cd083bc..b74f2a95e6 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -53,11 +53,7 @@ DOC_BUILD_DIR = $(top_builddir)/gst HFILE_GLOB=$(top_srcdir)/gst/*.h $(top_srcdir)/libs/gst/*/*.h CFILE_GLOB=$(top_srcdir)/gst/*.c $(top_srcdir)/libs/gst/*/*.c -# Dependencies for the intermediate scanobj tool -#SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \ -# $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la SCANOBJ_DEPS = \ - $(top_builddir)/plugins/elements/libgstelements.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml index 8418d0c7ea..d8e6a524c9 100644 --- a/docs/gst/gstreamer-docs.sgml +++ b/docs/gst/gstreamer-docs.sgml @@ -36,7 +36,6 @@ - @@ -53,10 +52,6 @@ - - - - - - GStreamer Core Elements - - - libgstelements.so provide some basic elements like a file source - and sink. The use of these elements is strictly though the g_object_get() and - g_object_set() functions and the GStreamer Core Library functions. - - - - &GstFakeSrc; - &GstFakeSink; - &GstFileSrc; - &GstFileSink; - - - Object Hierarchy &gstreamer-tree-index; diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 59caa1b28f..85d2add590 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -2171,94 +2171,3 @@ GST_TYPE_XML gst_xml_get_type - -# elements - -
-gstfakesrc -GstFakeSrc -plugins/elements/gstfakesrc.h -GstFakeSrc -GstFakeSrcDataType -GstFakeSrcFillType -GstFakeSrcOutputType -GstFakeSrcSizeType - -GstFakeSrcClass -GST_FAKE_SRC -GST_IS_FAKE_SRC -GST_TYPE_FAKE_SRC -GST_FAKE_SRC_CLASS -GST_IS_FAKE_SRC_CLASS - -gst_fake_src_get_type -
- - -
-gstfakesink -GstFakeSink -plugins/elements/gstfakesink.h -GstFakeSink -GstFakeSinkStateError - -GstFakeSinkClass -GST_FAKE_SINK -GST_IS_FAKE_SINK -GST_TYPE_FAKE_SINK -GST_FAKE_SINK_CLASS -GST_IS_FAKE_SINK_CLASS - -gst_fake_sink_get_type -
- - -
-gstfilesrc -GstFileSrc -plugins/elements/gstfilesrc.h -GstFileSrc - -GstFileSrcClass -GST_FILE_SRC -GST_IS_FILE_SRC -GST_TYPE_FILE_SRC -GST_FILE_SRC_CLASS -GST_IS_FILE_SRC_CLASS - -gst_file_src_get_type -
- - -
-gstfilesink -GstFileSink -plugins/elements/gstfilesink.h -GstFileSink - -GstFileSinkClass -GST_FILE_SINK -GST_IS_FILE_SINK -GST_TYPE_FILE_SINK -GST_FILE_SINK_CLASS -GST_IS_FILE_SINK_CLASS - -gst_file_sink_get_type -
- -
-gstqueue -GstQueue -GstQueue -GstQueueSize - -GstQueueClass -GST_QUEUE -GST_IS_QUEUE -GST_QUEUE_CLASS -GST_IS_QUEUE_CLASS -GST_TYPE_QUEUE - -gst_queue_get_type -
- diff --git a/docs/gst/gstreamer.types b/docs/gst/gstreamer.types index ee98ba26d2..a00c428e9a 100644 --- a/docs/gst/gstreamer.types +++ b/docs/gst/gstreamer.types @@ -54,17 +54,3 @@ gst_push_src_get_type gst_net_client_clock_get_type gst_net_time_provider_get_type - -% elements - -#include -#include -#include -#include -#include - -gst_fake_src_get_type -gst_fake_sink_get_type -gst_file_src_get_type -gst_file_sink_get_type -gst_queue_get_type diff --git a/docs/gst/gstreamer.types.in b/docs/gst/gstreamer.types.in index 6c870e8289..56b56fb65a 100644 --- a/docs/gst/gstreamer.types.in +++ b/docs/gst/gstreamer.types.in @@ -54,17 +54,3 @@ gst_push_src_get_type gst_net_client_clock_get_type gst_net_time_provider_get_type - -% elements - -@GST_REGISTRY_DOC_TYPES@#include -@GST_REGISTRY_DOC_TYPES@#include -@GST_REGISTRY_DOC_TYPES@#include -@GST_REGISTRY_DOC_TYPES@#include -@GST_REGISTRY_DOC_TYPES@#include - -@GST_REGISTRY_DOC_TYPES@gst_fake_src_get_type -@GST_REGISTRY_DOC_TYPES@gst_fake_sink_get_type -@GST_REGISTRY_DOC_TYPES@gst_file_src_get_type -@GST_REGISTRY_DOC_TYPES@gst_file_sink_get_type -@GST_REGISTRY_DOC_TYPES@gst_queue_get_type diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am new file mode 100644 index 0000000000..b32ff68359 --- /dev/null +++ b/docs/plugins/Makefile.am @@ -0,0 +1,105 @@ +GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj + +## Process this file with automake to produce Makefile.in + +# The name of the module, e.g. 'glib'. +#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@ +MODULE=gstreamer +DOC_MODULE=$(MODULE)-plugins + +# for upload.mak +DOC=$(MODULE)-plugins +FORMATS=html +html: html-build.stamp +include $(srcdir)/../upload.mak + +# generated basefiles +#basefiles = \ +## $(DOC_MODULE).types \ +# $(DOC_MODULE)-sections.txt \ +# $(DOC_MODULE)-docs.sgml + +# ugly hack to make -unused.sgml work +#unused-build.stamp: +# BUILDDIR=`pwd` && \ +# cd $(srcdir)/tmpl && \ +# ln -sf gstreamer-libs-unused.sgml \ +# $$BUILDDIR/tmpl/gstreamer-libs-@GST_MAJORMINOR@-unused.sgml +# touch unused-build.stamp + +# these rules are added to create parallel docs using GST_MAJORMINOR +#$(basefiles): gstreamer-libs-@GST_MAJORMINOR@%: gstreamer-libs% +# cp $< $@ + +#CLEANFILES = $(basefiles) + +# The top-level SGML file. Change it if you want. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml + +# The directory containing the source code. Relative to $(top_srcdir). +# gtk-doc will search all .c & .h files beneath here for inline comments +# documenting functions and macros. +DOC_SOURCE_DIR = $(top_srcdir)/plugins + +# Extra options to supply to gtkdoc-scan. +SCAN_OPTIONS= + +# Extra options to supply to gtkdoc-mkdb. +MKDB_OPTIONS=--sgml-mode + +# Extra options to supply to gtkdoc-fixref. +# FIXME get the location of the installed gstreamer docs +#FIXXREF_OPTIONS=--extra-dir=../gst/html + +# Used for dependencies. +HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h +CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c + +# this is a wingo addition +# thomasvs: another nice wingo addition would be an explanation on why +# this is useful ;) + +SCANOBJ_DEPS = + +# Header files to ignore when scanning. +IGNORE_HFILES = +IGNORE_CFILES = + +# we add all .h files of elements that have signals/args we want +# sadly this also pulls in the private methods - maybe we should +# move those around in the source ? +# also, we should add some stuff here conditionally based on whether +# or not the plugin will actually build +# but I'm not sure about that - it might be this Just Works given that +# the registry won't have the element + +EXTRA_HFILES = \ + $(top_srcdir)/plugins/elements/gstfakesrc.h \ + $(top_srcdir)/plugins/elements/gstfakesink.h \ + $(top_srcdir)/plugins/elements/gstfilesrc.h \ + $(top_srcdir)/plugins/elements/gstfilesink.h \ + $(top_srcdir)/plugins/elements/gstqueue.h + +# Images to copy into HTML directory. +HTML_IMAGES = + +# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). +content_files = + +# Other files to distribute. +extra_files = + +# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib +# contains GtkObjects/GObjects and you want to document signals and properties. +GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -I$(top_builddir)/libs +GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_OBJ_LIBS) + +GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) +GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) + +# If you need to override some of the declarations, place them in this file +# and uncomment this line. +#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt +DOC_OVERRIDES = + +include $(top_srcdir)/common/gtk-doc-plugins.mak diff --git a/docs/plugins/gstreamer-plugins-docs.sgml b/docs/plugins/gstreamer-plugins-docs.sgml new file mode 100644 index 0000000000..90a60d2f2a --- /dev/null +++ b/docs/plugins/gstreamer-plugins-docs.sgml @@ -0,0 +1,28 @@ + + +%version-entities; +]> + + + + GStreamer Core Plugins &GST_MAJORMINOR; Plugins Reference Manual + + + + gstreamer Elements + + + + + + + + + gstreamer Plugins + + + + + diff --git a/docs/plugins/gstreamer-plugins-sections.txt b/docs/plugins/gstreamer-plugins-sections.txt new file mode 100644 index 0000000000..c0a8e5d0e5 --- /dev/null +++ b/docs/plugins/gstreamer-plugins-sections.txt @@ -0,0 +1,84 @@ +
+element-fakesrc +fakesrc +GstFakeSrc +GstFakeSrcDataType +GstFakeSrcFillType +GstFakeSrcOutputType +GstFakeSrcSizeType + +GstFakeSrcClass +GST_FAKE_SRC +GST_IS_FAKE_SRC +GST_TYPE_FAKE_SRC +GST_FAKE_SRC_CLASS +GST_IS_FAKE_SRC_CLASS + +gst_fake_src_get_type +
+ + +
+element-fakesink +fakesink +GstFakeSink +GstFakeSinkStateError + +GstFakeSinkClass +GST_FAKE_SINK +GST_IS_FAKE_SINK +GST_TYPE_FAKE_SINK +GST_FAKE_SINK_CLASS +GST_IS_FAKE_SINK_CLASS + +gst_fake_sink_get_type +
+ + +
+element-filesrc +filesrc +GstFileSrc + +GstFileSrcClass +GST_FILE_SRC +GST_IS_FILE_SRC +GST_TYPE_FILE_SRC +GST_FILE_SRC_CLASS +GST_IS_FILE_SRC_CLASS + +gst_file_src_get_type +
+ + +
+element-filesink +filesink +GstFileSink + +GstFileSinkClass +GST_FILE_SINK +GST_IS_FILE_SINK +GST_TYPE_FILE_SINK +GST_FILE_SINK_CLASS +GST_IS_FILE_SINK_CLASS + +gst_file_sink_get_type +
+ +
+element-queue +queue +GstQueue +GstQueueSize + +GstQueueClass +GST_QUEUE +GST_IS_QUEUE +GST_QUEUE_CLASS +GST_IS_QUEUE_CLASS +GST_TYPE_QUEUE + +gst_queue_get_type +
+ diff --git a/docs/plugins/gstreamer-plugins.types b/docs/plugins/gstreamer-plugins.types new file mode 100644 index 0000000000..9f4950e70d --- /dev/null +++ b/docs/plugins/gstreamer-plugins.types @@ -0,0 +1 @@ +#include diff --git a/docs/plugins/inspect.stamp b/docs/plugins/inspect.stamp new file mode 100644 index 0000000000..e0cb13940b --- /dev/null +++ b/docs/plugins/inspect.stamp @@ -0,0 +1 @@ +timestamp \ No newline at end of file diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml new file mode 100644 index 0000000000..6aca9eaad6 --- /dev/null +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -0,0 +1,83 @@ + + coreelements + standard GStreamer elements + ../../plugins/elements/.libs/libgstcoreelements.so + libgstcoreelements.so + 0.9.6.1 + LGPL + gstreamer + GStreamer CVS/prerelease + Unknown package origin + + + capsfilter + CapsFilter + Generic + Pass data without modification, limiting formats + David Schleef <ds@schleef.org> + + + fakesink + Fake Sink + Sink + Black hole for data + Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim@fluendo.com>, Mr. 'frag-me-more' Vanderwingo <wingo@fluendo.com> + + + fakesrc + Fake Source + Source + Push empty (no data) buffers around + Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim.taymans@chello.be> + + + fdsrc + Disk Source + Source/File + Synchronous read from a file + Erik Walthinsen <omega@cse.ogi.edu> + + + filesink + File Sink + Sink/File + Write stream to a file + Thomas <thomas@apestaart.org> + + + filesrc + File Source + Source/File + Read from arbitrary point in a file + Erik Walthinsen <omega@cse.ogi.edu> + + + identity + Identity + Generic + Pass data without modification + Erik Walthinsen <omega@cse.ogi.edu> + + + queue + Queue + Generic + Simple data queue + Erik Walthinsen <omega@cse.ogi.edu> + + + tee + Tee pipe fitting + Generic + 1-to-N pipe fitting + Erik Walthinsen <omega@cse.ogi.edu>, Wim "Tim" Taymans <wim@fluendo.com> + + + typefind + TypeFind + Generic + Finds the media type of a stream + Benjamin Otte <in7y118@public.uni-hamburg.de> + + + \ No newline at end of file diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml new file mode 100644 index 0000000000..b77750e976 --- /dev/null +++ b/docs/plugins/inspect/plugin-coreindexers.xml @@ -0,0 +1,14 @@ + + coreindexers + GStreamer core indexers + ../../plugins/indexers/.libs/libgstcoreindexers.so + libgstcoreindexers.so + 0.9.6.1 + LGPL + gstreamer + GStreamer CVS/prerelease + Unknown package origin + + + + \ No newline at end of file diff --git a/docs/plugins/scanobj-build.stamp b/docs/plugins/scanobj-build.stamp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 016318fff8..10b92c024e 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -196,6 +196,7 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor} %doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor} +%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor} %changelog * Fri Sep 02 2005 Thomas Vander Stichele diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index bd0073efdf..b68d29db79 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -4,7 +4,7 @@ # This requires building libs/gst before this dir, which we currently don't # do. -plugin_LTLIBRARIES = libgstelements.la +plugin_LTLIBRARIES = libgstcoreelements.la if HAVE_SYS_SOCKET_H GSTFDSRC = gstfdsrc.c @@ -12,8 +12,8 @@ else GSTFDSRC = endif -libgstelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la -libgstelements_la_SOURCES = \ +libgstcoreelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la +libgstcoreelements_la_SOURCES = \ gstbufferstore.c \ gstcapsfilter.c \ gstelements.c \ @@ -27,11 +27,11 @@ libgstelements_la_SOURCES = \ gsttee.c \ gsttypefindelement.c -libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS) -libgstelements_la_LIBADD = \ +libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS) +libgstcoreelements_la_LIBADD = \ $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(GST_OBJ_LIBS) -libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ gstbufferstore.h \ diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c index 019cd1bdd1..2ae4e0face 100644 --- a/plugins/elements/gstelements.c +++ b/plugins/elements/gstelements.c @@ -81,6 +81,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstelements", + "coreelements", "standard GStreamer elements", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 35a9396254..abe34ed250 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION:gstfakesink + * SECTION:element-fakesink * @short_description: black hole for data * @see_also: #GstFakeSrc * diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index 36bb47f296..9dc67fd3f9 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION:gstfakesrc + * SECTION:element-fakesrc * @short_description: Push empty (no data) buffers around * @see_also: #GstFakeSink * diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index 576257a60c..6e554890be 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION:gstfilesink + * SECTION:element-filesink * @short_description: write stream to a file * @see_also: #GstFileSrc * diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 82d84c5170..cebf81f2ea 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION:gstfilesrc + * SECTION:element-filesrc * @short_description: read from arbitrary point in a file * @see_also: #GstFileSrc * diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 0ab22ec1e4..7061635d3a 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -23,7 +23,7 @@ */ /** - * SECTION:gstqueue + * SECTION:element-queue * @short_description: Simple asynchronous data queue. * * Data is queued till max_level buffers have been stored. Any subsequent diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am index 637ef4e6db..73e49579e6 100644 --- a/plugins/indexers/Makefile.am +++ b/plugins/indexers/Makefile.am @@ -1,4 +1,4 @@ -plugin_LTLIBRARIES = libgstindexers.la +plugin_LTLIBRARIES = libgstcoreindexers.la # file index uses xml if GST_DISABLE_LOADSAVE GST_LOADSAVE_SRC = @@ -11,8 +11,8 @@ else GST_LOADSAVE_SRC = endif -libgstindexers_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la -libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC) -libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS) -libgstindexers_la_LIBADD = $(GST_OBJ_LIBS) -libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstcoreindexers_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la +libgstcoreindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC) +libgstcoreindexers_la_CFLAGS = $(GST_OBJ_CFLAGS) +libgstcoreindexers_la_LIBADD = $(GST_OBJ_LIBS) +libgstcoreindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c index a42dc8a090..1bcb822142 100644 --- a/plugins/indexers/gstindexers.c +++ b/plugins/indexers/gstindexers.c @@ -39,6 +39,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstindexers", + "coreindexers", "GStreamer core indexers", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);