summaryrefslogtreecommitdiff
path: root/gst/camerabin2
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.com>2011-11-28 16:35:48 -0300
committerThiago Santos <thiago.sousa.santos@collabora.com>2011-11-28 18:48:51 -0300
commitf6d47a4206c277ea3842db1bf03c0b6e3e2cad99 (patch)
tree005a9ed253e75343fd9142cd55fb18b6dde630d7 /gst/camerabin2
parent9eb79984a88d7eac96806c8b9999f16fa90c80a6 (diff)
downloadgstreamer-plugins-bad-f6d47a4206c277ea3842db1bf03c0b6e3e2cad99.tar.gz
camerabin2: micro optimize linking some more
Diffstat (limited to 'gst/camerabin2')
-rw-r--r--gst/camerabin2/camerabingeneral.c3
-rw-r--r--gst/camerabin2/gstcamerabin2.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/gst/camerabin2/camerabingeneral.c b/gst/camerabin2/camerabingeneral.c
index 35148f027..0aaa647ad 100644
--- a/gst/camerabin2/camerabingeneral.c
+++ b/gst/camerabin2/camerabingeneral.c
@@ -125,7 +125,8 @@ gst_camerabin_try_add_element (GstBin * bin, const gchar * srcpad,
GST_DEBUG_PAD_NAME (bin_pad));
bin_elem = gst_pad_get_parent_element (bin_pad);
gst_object_unref (bin_pad);
- if (!gst_element_link_pads (bin_elem, srcpad, new_elem, dstpad)) {
+ if (!gst_element_link_pads_full (bin_elem, srcpad, new_elem, dstpad,
+ GST_PAD_LINK_CHECK_CAPS)) {
gst_object_ref (new_elem);
gst_bin_remove (bin, new_elem);
ret = FALSE;
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index dc310302c..b8b6aa348 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -1794,8 +1794,10 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
gst_bin_add (GST_BIN_CAST (camera),
gst_object_ref (camera->audio_capsfilter));
- gst_element_link_many (camera->audio_src, camera->audio_volume,
- camera->audio_capsfilter, NULL);
+ gst_element_link_pads_full (camera->audio_src, "src",
+ camera->audio_volume, "sink", GST_PAD_LINK_CHECK_CAPS);
+ gst_element_link_pads_full (camera->audio_volume, "src",
+ camera->audio_capsfilter, "sink", GST_PAD_LINK_CHECK_CAPS);
srcpad = gst_element_get_static_pad (camera->audio_src, "src");