cdio: work around cdio headers re-defining VERSION and PACKAGE_VERSION
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 17 Sep 2012 09:53:12 +0000 (10:53 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 17 Sep 2012 11:25:25 +0000 (12:25 +0100)
Thanks guys. Fixes plugin version in gst-inspect-1.0 and docs
introspection/updating for this plugin.

ext/cdio/gstcdio.c

index 483ebf5cadd7a1eef2c4e69920fd263a4e7666d5..97737dd2b2c5cd3eaf0aa175b5580d984577bbd3 100644 (file)
 #include "config.h"
 #endif
 
+#include <gst/gst.h>
+
+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)