use gstcontrol as a lib, not a plugin

Original commit message from CVS:
use gstcontrol as a lib, not a plugin

diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am
index 364146b..09da037 100644 (file)
--- a/gst/sine/Makefile.am
+++ b/gst/sine/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstsinesrc.la
 
 libgstsinesrc_la_SOURCES = gstsinesrc.c
 libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
-libgstsinesrc_la_LIBADD =
+libgstsinesrc_la_LIBADD = $(GST_LIBS) -lgstcontrol
 libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstsinesrc.h

diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 12fb1c8..2993082 100644 (file)
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -436,12 +436,8 @@ plugin_init (GModule *module, GstPlugin *plugin)
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
   
-  /* load dparam support library */
-  if (!gst_library_load ("gstcontrol"))
-  {
-    gst_info ("sinesrc: could not load support library: 'gstcontrol'\n");
-    return FALSE;
-  }
+  /* initialize dparam support library */
+  gst_control_init(NULL,NULL);
   
   return TRUE;
 }

diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index ec0e544..57a55a0 100644 (file)
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstvolume.la
 
 libgstvolume_la_SOURCES = gstvolume.c
 libgstvolume_la_CFLAGS = $(GST_CFLAGS)
-libgstvolume_la_LIBADD =
+libgstvolume_la_LIBADD = $(GST_LIBS) -lgstcontrol
 libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstvolume.h filter.func

diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index fe4059e..841f7dd 100644 (file)
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -433,12 +433,8 @@ plugin_init (GModule *module, GstPlugin *plugin)
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
-  /* load dparam support library */
-  if (!gst_library_load ("gstcontrol"))
-  {
-    gst_info ("volume: could not load support library: 'gstcontrol'\n");
-    return FALSE;
-  }
+  /* initialize dparam support library */
+  gst_control_init(NULL,NULL);
   return TRUE;
 }