fpsdisplaysink: rename plugin (not element) to debugutilsbad

Makes it easier to add further utils here without creating yet another plugin.

diff --git a/docs/plugins/inspect/plugin-fpsdisplaysink.xml b/docs/plugins/inspect/plugin-debugutilsbad.xml
similarity index 55%
rename from docs/plugins/inspect/plugin-fpsdisplaysink.xml
rename to docs/plugins/inspect/plugin-debugutilsbad.xml
index ef1d33e..9edeaf0 100644 (file)
--- a/docs/plugins/inspect/plugin-fpsdisplaysink.xml
+++ b/docs/plugins/inspect/plugin-debugutilsbad.xml
@@ -1,19 +1,19 @@
 <plugin>
-  <name>fpsdisplaysink</name>
-  <description>A custom sink that show the current FPS of the sink on the video screen</description>
-  <filename>../../gst/debugutils/.libs/libgstfpsdisplaysink.so</filename>
-  <basename>libgstfpsdisplaysink.so</basename>
+  <name>debugutilsbad</name>
+  <description>Collection of elements that may or may not be useful for debugging</description>
+  <filename>../../gst/debugutils/.libs/libgstdebugutilsbad.so</filename>
+  <basename>libgstdebugutilsbad.so</basename>
   <version>0.10.11.1</version>
   <license>LGPL</license>
   <source>gst-plugins-bad</source>
-  <package>Nokia Real-time Communications</package>
-  <origin></origin>
+  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
+  <origin>Unknown package origin</origin>
   <elements>
     <element>
       <name>fpsdisplaysink</name>
-      <longname>Wrapper for xvimagesink's frame-rate display</longname>
+      <longname>Measure and show framerate on videosink</longname>
       <class>Sink/Video</class>
-      <description>Shows the current frame-rate and drop-rate of the xvimagesink on the xvimagesink's video output</description>
+      <description>Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout</description>
       <author>Zeeshan Ali &lt;zeeshan.ali@nokia.com&gt;, Stefan Kost &lt;stefan.kost@nokia.com&gt;</author>
       <pads>
         <caps>

diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index 0d2a989..d1e1430 100644 (file)
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -1,10 +1,10 @@
-plugin_LTLIBRARIES = libgstfpsdisplaysink.la
+plugin_LTLIBRARIES = libgstdebugutilsbad.la
 
-libgstfpsdisplaysink_la_SOURCES = fpsdisplaysink.c
-libgstfpsdisplaysink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstfpsdisplaysink_la_LIBADD = $(GST_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstfpsdisplaysink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfpsdisplaysink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdebugutilsbad_la_SOURCES = fpsdisplaysink.c debugutilsbad.c
+libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
+libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = fpsdisplaysink.h
 

diff --git a/gst/debugutils/debugutilsbad.c b/gst/debugutils/debugutilsbad.c
new file mode 100644 (file)
index 0000000..b1fb6e0
--- /dev/null
+++ b/gst/debugutils/debugutilsbad.c
@@ -0,0 +1,39 @@
+/* GStreamer
+ * Copyright (C) 2009 Tim-Philipp Müller <tim centricular net>
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <gst/gst.h>
+
+GType fps_display_sink_get_type (void);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "fpsdisplaysink", GST_RANK_NONE,
+      fps_display_sink_get_type ());
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "debugutilsbad",
+    "Collection of elements that may or may not be useful for debugging",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c
index d22dfad..4873e98 100644 (file)
--- a/gst/debugutils/fpsdisplaysink.c
+++ b/gst/debugutils/fpsdisplaysink.c
@@ -452,23 +452,10 @@ fps_display_sink_get_type (void)
 
     fps_display_sink_type = g_type_register_static (GST_TYPE_BIN,
         "FPSDisplaySink", &fps_display_sink_info, 0);
+
+    GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0,
+        "FPS Display Sink");
   }
 
   return fps_display_sink_type;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0,
-      "FPS Display Sink");
-
-  return gst_element_register (plugin, "fpsdisplaysink",
-      GST_RANK_NONE, FPS_TYPE_DISPLAY_SINK);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "fpsdisplaysink",
-    "A custom sink that show the current FPS of the sink on the video screen",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)