first bunch of conversions to new plugin_init. Includes libs/gst, gst/id3, sys/oss...

Original commit message from CVS:
first bunch of conversions to new plugin_init. Includes libs/gst, gst/id3, sys/oss, ext/gnomevfs, gst/typefind and ext/mad.
You guessed it, everything Rhythmbox needs ;)
fixed BMP typefind and made gnomevfs one plugin instead of two while doing this

diff --git a/configure.ac b/configure.ac
index 9c653b3d3e49dd0e3f68918473f7c8079c2c5ee4..be345ac65635d0382ceff88c9dbb74a15df3a3af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1149,6 +1149,36 @@ if test "x$HAVE_FFMPEG" = xyes; then
   AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg)
 fi 
 
+dnl ############################
+dnl # Set up some more defines #
+dnl ############################
+
+dnl set license and copyright notice
+AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
+AC_DEFINE(GST_COPYRIGHT, "(c) 1999-2003 The GStreamer Team", [copyright message in plugins])
+dnl package name in plugins
+AC_ARG_WITH(package-name,
+AC_HELP_STRING([--with-package-name],[specify package name to use in plugins]),
+[case "${withval}" in
+  yes) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
+  no) AC_MSG_ERROR(bad value ${withval} for --with-package-name) ;;
+  *) GST_PACKAGE="${withval}" ;;
+esac], 
+[GST_PACKAGE="Gstreamer"]) dnl Default value
+AC_MSG_NOTICE(Using $GST_PACKAGE as package name)
+AC_DEFINE_UNQUOTED(GST_PACKAGE, "$GST_PACKAGE", [package name in plugins])
+dnl package origin URL
+AC_ARG_WITH(package-origin,
+AC_HELP_STRING([--with-package-origin],[specify package origin URL to use in plugins]),
+[case "${withval}" in
+  yes) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
+  no) AC_MSG_ERROR(bad value ${withval} for --with-package-origin) ;;
+  *) GST_ORIGIN="${withval}" ;;
+esac], 
+[GST_ORIGIN="http://gstreamer.net"]) dnl Default value
+AC_MSG_NOTICE(Using $GST_ORIGIN as package origin)
+AC_DEFINE_UNQUOTED(GST_ORIGIN, "$GST_ORIGIN", [package origin])
+
 dnl #########################
 dnl # Make the output files #
 dnl #########################

diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c
index 3190edc2541d12615798f39ea8c4e7689495a2e1..3a723b891b72abc113835c1f6c8fa66136c36fa7 100644 (file)
--- a/gst-libs/gst/audio/audio.c
+++ b/gst-libs/gst/audio/audio.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "audio.h"
 
 int
@@ -175,15 +179,20 @@ gst_audio_is_buffer_framed (GstPad* pad, GstBuffer* buf)
 }
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin, "Support services for audio plugins");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "gstaudio",
-  plugin_init
-};
+  "Support services for audio plugins",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+);

diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 2452aa7f7e00ee65805ec0d497826c2b3a13d54e..8a1c5823f1da087f293de76b0c8b944dfe14d3b4 100644 (file)
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -315,17 +315,3 @@ gst_gconf_get_default_visualization_element (void)
   return ret;
 }
 
-static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
-{
-    gst_plugin_set_longname (plugin, 
-                            "Convenience routines for GConf interaction");
-      return TRUE;
-}
-
-GstPluginDesc plugin_desc = {
-    GST_VERSION_MAJOR,
-      GST_VERSION_MINOR,
-        "gstgconf",
-         plugin_init
-};

diff --git a/gst-libs/gst/idct/idct.c b/gst-libs/gst/idct/idct.c
index f5955c117798166446102f4a5f19448bdbd8e51b..4e62a47176fbaf5fe67d25636babfa5cafba6217 100644 (file)
--- a/gst-libs/gst/idct/idct.c
+++ b/gst-libs/gst/idct/idct.c
@@ -17,8 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gst/idct/idct.h>
@@ -127,15 +128,20 @@ void gst_idct_destroy(GstIDCT *idct)
 }
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin, "Accelerated IDCT routines");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "gstidct",
-  plugin_init
-};
+  "Accelerated IDCT routines",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+)

diff --git a/gst-libs/gst/media-info/media-info-priv.c b/gst-libs/gst/media-info/media-info-priv.c
index eae5853f03dd3803ef16744f39625f9393d007ab..b92371374b671e156b4e65a6fd0f0acd9a8ac574 100644 (file)
--- a/gst-libs/gst/media-info/media-info-priv.c
+++ b/gst-libs/gst/media-info/media-info-priv.c
@@ -182,9 +182,8 @@ gmi_seek_to_track (GstMediaInfo *info, long track)
   res = gst_pad_send_event (info->priv->decoder_pad, event);
   if (!res)
   {
-    g_warning ("seek to logical track on pad %s:%s failed of element %s",
-               GST_DEBUG_PAD_NAME(info->priv->decoder_pad),
-               gst_element_get_factory((gst_pad_get_parent(info->priv->decoder_pad)))->details->longname);
+    g_warning ("seek to logical track on pad %s:%s failed",
+               GST_DEBUG_PAD_NAME(info->priv->decoder_pad));
     return FALSE;
   }
   /* clear structs because of the seek */

diff --git a/gst-libs/gst/resample/resample.c b/gst-libs/gst/resample/resample.c
index 7ced0f54fa62fd87103b4068d766b79db33e2bee..b298e86dcdc65b676131d40a761828d53e52198a 100644 (file)
--- a/gst-libs/gst/resample/resample.c
+++ b/gst-libs/gst/resample/resample.c
@@ -870,16 +870,21 @@ void resample_sinc_ft_float(resample_t * r)
 }
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin, "Resampling routines for use in audio plugins");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "gstresample",
-  plugin_init
-};
+  "Resampling routines for use in audio plugins",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+);
 

diff --git a/gst-libs/gst/riff/riff.c b/gst-libs/gst/riff/riff.c
index 2e77c01a87e7efdcd442866f5b11568a7f396633..bb29150c092b122d76b1c16a355586e185bf8df5 100644 (file)
--- a/gst-libs/gst/riff/riff.c
+++ b/gst-libs/gst/riff/riff.c
@@ -17,19 +17,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <riff.h>
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin, "RIFF convenience routines");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "gstriff",
-  plugin_init
-};
+  "RIFF convenience routines",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+)

diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c
index 11e26c96d264f8651b5cca819b6044469a6641ed..0d4a2ea62ac7a0e6b4ccc2d1582d5b4b29e3bc12 100644 (file)
--- a/gst-libs/gst/video/video.c
+++ b/gst-libs/gst/video/video.c
@@ -18,6 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "video.h"
 
 /* This is simply a convenience function, nothing more or less */
@@ -97,15 +101,20 @@ gst_video_get_size (GstPad *pad,
 }
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin, "Convenience routines for video plugins");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "gstvideo",
-  plugin_init
-};
+  "Convenience routines for video plugins",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+)

diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.c b/gst-libs/gst/xwindowlistener/xwindowlistener.c
index 513e029d44e745f31c0028801f0e5e2c7a7aada7..dda220c0e92ef7a437619c06e7448dad2a3a768c 100644 (file)
--- a/gst-libs/gst/xwindowlistener/xwindowlistener.c
+++ b/gst-libs/gst/xwindowlistener/xwindowlistener.c
@@ -637,17 +637,20 @@ gst_xwin_stop (GstXWindowListener *xwin)
  */
 
 static gboolean
-plugin_init (GModule   *module,
-            GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  gst_plugin_set_longname (plugin,
-                          "X11-based XWindow event/motion listener");
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "xwindowlistener",
-  plugin_init
-};
+  "X11-based XWindow event/motion listener",
+  plugin_init,
+  VERSION,
+  GST_LICENSE,
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+)