From e4476e15e02bdd7c40a4e4404ab6da71ad3ea4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Thu, 13 Mar 2008 14:25:20 +0000
Subject: Use GST_LICENSE, GST_PACKAGE_NAME and GST_PACKAGE_ORIGIN instead of
 hardcoding values where possible. Fixes bug #522212.

Original commit message from CVS:
* ext/alsaspdif/alsaspdifsink.c:
* ext/gsm/gstgsm.c:
* ext/jack/gstjack.c:
* ext/libmms/gstmms.c:
* ext/neon/gstneonhttpsrc.c:
* ext/shout/gstshout.c:
* ext/timidity/gsttimidity.c:
* ext/timidity/gstwildmidi.c:
* gst/nuvdemux/gstnuvdemux.c:
* gst/tta/gsttta.c:
Use GST_LICENSE, GST_PACKAGE_NAME and GST_PACKAGE_ORIGIN instead
of hardcoding values where possible. Fixes bug #522212.
---
 ext/alsaspdif/alsaspdifsink.c | 3 +--
 ext/gsm/gstgsm.c              | 3 +--
 ext/jack/gstjack.c            | 3 +--
 ext/libmms/gstmms.c           | 2 +-
 ext/neon/gstneonhttpsrc.c     | 2 +-
 ext/shout/gstshout.c          | 3 +--
 ext/timidity/gsttimidity.c    | 2 +-
 ext/timidity/gstwildmidi.c    | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'ext')

diff --git a/ext/alsaspdif/alsaspdifsink.c b/ext/alsaspdif/alsaspdifsink.c
index 18c26ab9..a6ce440e 100644
--- a/ext/alsaspdif/alsaspdifsink.c
+++ b/ext/alsaspdif/alsaspdifsink.c
@@ -841,5 +841,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "alsaspdif",
     "Alsa plugin for S/PDIF output",
-    plugin_init,
-    VERSION, GST_LICENSE_UNKNOWN, PACKAGE, "http://www.fluendo.com");
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/gsm/gstgsm.c b/ext/gsm/gstgsm.c
index 0aec2bd5..ef984003 100644
--- a/ext/gsm/gstgsm.c
+++ b/ext/gsm/gstgsm.c
@@ -42,5 +42,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gsm",
     "GSM encoder/decoder",
-    plugin_init,
-    VERSION, "LGPL", "Gstreamer", "http://gstreamer.freedesktop.org")
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 52b4b245..72f501d0 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -37,5 +37,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "jack",
     "Jack elements",
-    plugin_init,
-    VERSION, "LGPL", "Gstreamer", "http://gstreamer.freedesktop.org")
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index 0951e590..2faa1973 100644
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -475,4 +475,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "mms",
     "Microsoft Multi Media Server streaming protocol support",
-    plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/")
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index aef0d69d..0d3fac02 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -1051,4 +1051,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "neon",
     "lib neon http client src",
-    plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/")
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c
index 96ee63ee..1fbbc098 100644
--- a/ext/shout/gstshout.c
+++ b/ext/shout/gstshout.c
@@ -440,5 +440,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "icecastsend",
     "Sends data to an icecast server using libshout",
-    plugin_init,
-    VERSION, "GPL", "libshout", "http://developer.icecast.org/libshout/")
+    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c
index 0561b03c..7dd89e90 100644
--- a/ext/timidity/gsttimidity.c
+++ b/ext/timidity/gsttimidity.c
@@ -813,4 +813,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "timidity",
     "Timidity Plugin",
-    plugin_init, VERSION, "GPL", "GStreamer", "http://gstreamer.net/")
+    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index d6f88d87..66d545f2 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -911,4 +911,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "wildmidi",
     "Wildmidi Plugin",
-    plugin_init, VERSION, "GPL", "GStreamer", "http://gstreamer.net/")
+    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-- 
cgit v1.2.1