4 files changed, 20 insertions, 8 deletions
diff --git a/gst/playondemand/demo-mp3.c b/gst/playondemand/demo-mp3.c
index efae8ebf..ca41a9eb 100644
--- a/gst/playondemand/demo-mp3.c
+++ b/gst/playondemand/demo-mp3.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -78,7 +81,7 @@ setup_pipeline (gchar * filename)
   src = gst_element_factory_make ("filesrc", "source");
   dec = gst_element_factory_make ("vorbisfile", "decoder");
   pod = gst_element_factory_make ("playondemand", "sequencer");
-  sink = gst_element_factory_make ("alsasink", "sink");
+  sink = gst_element_factory_make (DEFAULT_AUDIOSINK, "sink");
 
   g_object_set (G_OBJECT (src), "location", filename, NULL);
   g_object_set (G_OBJECT (sink), "period-count", 64, "period-size", 512, NULL);
diff --git a/gst/smoothwave/demo-osssrc.c b/gst/smoothwave/demo-osssrc.c
index 6e5d2760..9c55a3b3 100644
--- a/gst/smoothwave/demo-osssrc.c
+++ b/gst/smoothwave/demo-osssrc.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gtk/gtk.h>
 #include <gst/gst.h>
 
@@ -23,7 +26,7 @@ main (int argc, char *argv[])
 
   src = gst_element_factory_make ("sinesrc", "src");
   wave = gst_element_factory_make ("smoothwave", "wave");
-  ximage = gst_element_factory_make ("ximagesink", "sink");
+  ximage = gst_element_factory_make (DEFAULT_VIDEOSINK, "sink");
   g_return_val_if_fail (src != NULL, -1);
   g_return_val_if_fail (wave != NULL, -1);
   g_return_val_if_fail (ximage != NULL, -1);
diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c
index bba27b3a..b51e8c2a 100644
--- a/gst/spectrum/demo-osssrc.c
+++ b/gst/spectrum/demo-osssrc.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <gtk/gtk.h>
 
@@ -38,7 +41,7 @@ main (int argc, char *argv[])
 
   bin = gst_pipeline_new ("bin");
 
-  src = gst_element_factory_make ("osssrc", "src");
+  src = gst_element_factory_make (DEFAULT_AUDIOSRC, "src");
   g_object_set (G_OBJECT (src), "buffersize", (gulong) 1024, NULL);
   spectrum = gst_element_factory_make ("spectrum", "spectrum");
   g_object_set (G_OBJECT (spectrum), "width", 256, NULL);
diff --git a/gst/speed/demo-mp3.c b/gst/speed/demo-mp3.c
index f9a169ae..3b551941 100644
--- a/gst/speed/demo-mp3.c
+++ b/gst/speed/demo-mp3.c
@@ -18,6 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <gst/gst.h>
@@ -34,7 +37,7 @@ int
 main (int argc, char **argv)
 {
   GtkWidget *window, *vbox, *hscale, *button;
-  GstElement *filesrc, *mad, *stereo2mono, *speed, *osssink, *pipeline;
+  GstElement *filesrc, *mad, *stereo2mono, *speed, *audiosink, *pipeline;
 
   gst_init (&argc, &argv);
   gtk_init (&argc, &argv);
@@ -64,16 +67,16 @@ main (int argc, char **argv)
   mad = gst_element_factory_make ("mad", "mad");
   stereo2mono = gst_element_factory_make ("stereo2mono", "stereo2mono");
   speed = gst_element_factory_make ("speed", "speed");
-  osssink = gst_element_factory_make ("osssink", "osssink");
-  g_object_set (osssink, "fragment", 0x00180008, NULL);
+  audiosink = gst_element_factory_make (DEFAULT_AUDIOSINK, "audiosink");
+  g_object_set (audiosink, "fragment", 0x00180008, NULL);
 
   gtk_signal_connect (GTK_OBJECT (gtk_range_get_adjustment (GTK_RANGE
               (hscale))), "value_changed", G_CALLBACK (set_speed), speed);
 
   pipeline = gst_pipeline_new ("app");
   gst_bin_add_many (GST_BIN (pipeline), filesrc, mad, stereo2mono, speed,
-      osssink, NULL);
-  gst_element_link_many (filesrc, mad, stereo2mono, speed, osssink, NULL);
+      audiosink, NULL);
+  gst_element_link_many (filesrc, mad, stereo2mono, speed, audiosink, NULL);
   g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);