summaryrefslogtreecommitdiff
path: root/clutter-gst/clutter-gst-playback.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2013-08-05 10:23:32 +0200
committerLionel Landwerlin <llandwerlin@gmail.com>2013-11-18 11:19:27 +0000
commit5db247a74be8495840c361f33ed5aefa5f71cc42 (patch)
treec0c60f4036a17b2ec744bba5c96a19b1363d97c4 /clutter-gst/clutter-gst-playback.c
parente762602e40ffb28df673d2154c2f5f8592a0eea5 (diff)
downloadclutter-gst-5db247a74be8495840c361f33ed5aefa5f71cc42.tar.gz
Leave selection of audiosink to playbin
gconfaudiosink has been deprecated a while ago, so clutter-gst example probably shouldn't use that. >eaving playbin to select the audiosink should just do the right thing on all platforms, so we can simply remove the audio sink selection code.
Diffstat (limited to 'clutter-gst/clutter-gst-playback.c')
-rw-r--r--clutter-gst/clutter-gst-playback.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/clutter-gst/clutter-gst-playback.c b/clutter-gst/clutter-gst-playback.c
index 93e1a25..1aa4163 100644
--- a/clutter-gst/clutter-gst-playback.c
+++ b/clutter-gst/clutter-gst-playback.c
@@ -1939,22 +1939,6 @@ get_pipeline (ClutterGstPlayback *self)
return NULL;
}
- audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
- if (!audio_sink)
- {
- audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
- if (!audio_sink)
- {
- audio_sink = gst_element_factory_make ("alsasink", "audio-sink");
- g_warning ("Could not create a GST audio_sink. "
- "Audio unavailable.");
-
- /* do we even need to bother? */
- if (!audio_sink)
- audio_sink = gst_element_factory_make ("fakesink", "audio-sink");
- }
- }
-
priv->video_sink = cogl_gst_video_sink_new (clutter_gst_get_cogl_context ());
g_signal_connect (priv->video_sink, "new-frame",
@@ -1965,7 +1949,6 @@ get_pipeline (ClutterGstPlayback *self)
G_CALLBACK (_pixel_aspect_ratio_changed), self);
g_object_set (G_OBJECT (pipeline),
- "audio-sink", audio_sink,
"video-sink", priv->video_sink,
"subtitle-font-desc", "Sans 16",
NULL);