From 59c54c7a661f2b87b3a4a91ba9743641414c4d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 17 Sep 2012 10:53:12 +0100 Subject: [PATCH] cdio: work around cdio headers re-defining VERSION and PACKAGE_VERSION Thanks guys. Fixes plugin version in gst-inspect-1.0 and docs introspection/updating for this plugin. --- ext/cdio/gstcdio.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c index 483ebf5cad..97737dd2b2 100644 --- a/ext/cdio/gstcdio.c +++ b/ext/cdio/gstcdio.c @@ -22,6 +22,17 @@ #include "config.h" #endif +#include + +static gboolean plugin_init (GstPlugin * plugin); + +/* cdio headers redefine VERSION etc., so do this here before including them */ +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + cdio, + "Read audio from audio CDs", + plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) + #include "gstcdio.h" #include "gstcdiocddasrc.h" @@ -136,10 +147,3 @@ plugin_init (GstPlugin * plugin) return TRUE; } - - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - cdio, - "Read audio from audio CDs", - plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)