4 files changed, 7 insertions, 26 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index ec470ba2..2626f65c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -58,11 +58,11 @@ else
 JPEG_DIR =
 endif
 
-# if USE_LADSPA
-# LADSPA_DIR = ladspa
-# else
+if USE_LADSPA
+LADSPA_DIR = ladspa
+else
 LADSPA_DIR =
-# endif
+endif
 
 if USE_LIBCACA
 LIBCACA_DIR = libcaca
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index 6a97e23c..2e10f2b1 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -359,15 +359,6 @@ gst_esdmon_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-gboolean
-gst_esdmon_factory_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "esdmon", GST_RANK_NONE, GST_TYPE_ESDMON))
-    return FALSE;
-
-  return TRUE;
-}
-
 static gboolean
 gst_esdmon_open_audio (GstEsdmon * src)
 {
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 6ab2612b..3a868d44 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -470,13 +470,3 @@ gst_esdsink_get_property (GObject * object, guint prop_id, GValue * value,
       break;
   }
 }
-
-gboolean
-gst_esdsink_factory_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "esdsink", GST_RANK_MARGINAL,
-          GST_TYPE_ESDSINK))
-    return FALSE;
-
-  return TRUE;
-}
diff --git a/ext/esd/gstesd.c b/ext/esd/gstesd.c
index 62554d0a..71fc30bb 100644
--- a/ext/esd/gstesd.c
+++ b/ext/esd/gstesd.c
@@ -33,12 +33,12 @@ GST_DEBUG_CATEGORY (esd_debug);
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_esdsink_factory_init (plugin))
+  if (!gst_element_register (plugin, "esdsink", GST_RANK_MARGINAL,
+          GST_TYPE_ESDSINK))
     return FALSE;
 
 #if 0
-  ret = gst_esdmon_factory_init (plugin);
-  if (ret == FALSE)
+  if (!gst_element_register (plugin, "esdmon", GST_RANK_NONE, GST_TYPE_ESDMON))
     return FALSE;
 #endif