summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-10-31 20:03:29 +0000
committerBenjamin Otte <otte@gnome.org>2003-10-31 20:03:29 +0000
commit7c1ac98ca4b3b52c5c7d7ba005972803fab0b7e9 (patch)
tree5d60bef2e36bc94ce2939dd797fee190e2467f28
parent5bc252df9e2a4ac868a62f3b39327dfa32ecc0ee (diff)
downloadgst-plugins-bad-7c1ac98ca4b3b52c5c7d7ba005972803fab0b7e9.tar.gz
gst-plugins-bad-7c1ac98ca4b3b52c5c7d7ba005972803fab0b7e9.tar.bz2
gst-plugins-bad-7c1ac98ca4b3b52c5c7d7ba005972803fab0b7e9.zip
first bunch of conversions to new plugin_init. Includes libs/gst, gst/id3, sys/oss, ext/gnomevfs, gst/typefind and ex...
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
-rw-r--r--configure.ac30
-rw-r--r--gst-libs/gst/audio/audio.c19
-rw-r--r--gst-libs/gst/gconf/gconf.c14
-rw-r--r--gst-libs/gst/idct/idct.c20
-rw-r--r--gst-libs/gst/media-info/media-info-priv.c5
-rw-r--r--gst-libs/gst/resample/resample.c15
-rw-r--r--gst-libs/gst/riff/riff.c18
-rw-r--r--gst-libs/gst/video/video.c19
-rw-r--r--gst-libs/gst/xwindowlistener/xwindowlistener.c17
9 files changed, 106 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac
index 9c653b3d..be345ac6 100644
--- 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 3190edc2..3a723b89 100644
--- 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 2452aa7f..8a1c5823 100644
--- 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 f5955c11..4e62a471 100644
--- 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 eae5853f..b9237137 100644
--- 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 7ced0f54..b298e86d 100644
--- 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 2e77c01a..bb29150c 100644
--- 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 11e26c96..0d4a2ea6 100644
--- 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 513e029d..dda220c0 100644
--- 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
+)