From 7438894f77941806cd32f2f83dd853a9f4d7bc37 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 2 Feb 2005 08:14:01 +0000 Subject: configure.ac: Put DEFAULT_AUDIOSINK in config.h and use whereever possible. (Fixes #165997) Original commit message from CVS: * configure.ac: Put DEFAULT_AUDIOSINK in config.h and use whereever possible. (Fixes #165997) * examples/capsfilter/capsfilter1.c: (main): * examples/dynparams/filter.c: (create_ui): * examples/seeking/cdparanoia.c: (get_track_info), (main): * examples/seeking/chained.c: (main): * examples/seeking/seek.c: (make_mod_pipeline), (make_dv_pipeline), (make_wav_pipeline), (make_flac_pipeline), (make_sid_pipeline), (make_vorbis_pipeline), (make_mp3_pipeline), (make_avi_pipeline), (make_mpeg_pipeline), (make_mpegnt_pipeline): * examples/seeking/spider_seek.c: (make_spider_pipeline): * examples/switch/switcher.c: (main): * ext/dv/demo-play.c: (main): * ext/faad/gstfaad.c: (gst_faad_change_state): * ext/mad/gstmad.c: (gst_mad_chain): * ext/smoothwave/demo-osssrc.c: (main): * gst-libs/gst/gconf/gconf.c: (gst_gconf_set_string), (gst_gconf_render_bin_from_description), (gst_gconf_get_default_audio_sink), (gst_gconf_get_default_video_sink), (gst_gconf_get_default_audio_src), (gst_gconf_get_default_video_src), (gst_gconf_get_default_visualization_element): * gst/level/demo.c: (main): * gst/level/plot.c: (main): * gst/playback/gstplaybin.c: (gen_video_element), (gen_audio_element): * gst/playback/test.c: (gen_video_element), (gen_audio_element): * gst/playondemand/demo-mp3.c: (setup_pipeline): * gst/sine/demo-dparams.c: (main): * gst/spectrum/demo-osssrc.c: (main): * gst/speed/demo-mp3.c: (main): * gst/volume/demo.c: (main): * testsuite/embed/embed.c: (main): --- gst/playondemand/demo-mp3.c | 5 ++++- gst/smoothwave/demo-osssrc.c | 5 ++++- gst/spectrum/demo-osssrc.c | 5 ++++- gst/speed/demo-mp3.c | 13 ++++++++----- 4 files changed, 20 insertions(+), 8 deletions(-) (limited to 'gst') 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 #include #include @@ -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 #include @@ -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 #include @@ -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 #include #include @@ -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); -- cgit v1.2.1