diff options
| author | Javier Jardón <jjardon@gnome.org> | 2012-05-07 16:11:29 +0800 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2012-05-07 16:19:44 +0800 |
| commit | 69f31706a888ba65374c15c61489a3d6db0b0752 (patch) | |
| tree | 086ccaeaca44af828409e6b8d01b39572c8e39fe /src | |
| parent | 36f10a0030d0292111db9ca0b7c7b135f9738ab5 (diff) | |
| download | gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar.gz gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar.bz2 gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar.lz gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar.xz gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.tar.zst gsoc2013-empathy-69f31706a888ba65374c15c61489a3d6db0b0752.zip | |
Use gst_object_ref_sink()
Instead call both gst_object_ref() and gst_object_sink()
https://bugzilla.gnome.org/show_bug.cgi?id=675590
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 9 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 9 | ||||
| -rw-r--r-- | src/empathy-video-widget.c | 3 |
3 files changed, 7 insertions, 14 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 3b05d4d7a..083bdb175 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -423,8 +423,7 @@ create_video_input (EmpathyCallWindow *self) g_assert (priv->video_input == NULL); priv->video_input = empathy_video_src_new (); - gst_object_ref (priv->video_input); - gst_object_sink (priv->video_input); + gst_object_ref_sink (priv->video_input); } static gboolean @@ -468,8 +467,7 @@ create_audio_input (EmpathyCallWindow *self) g_assert (priv->audio_input == NULL); priv->audio_input = empathy_audio_src_new (); - gst_object_ref (priv->audio_input); - gst_object_sink (priv->audio_input); + gst_object_ref_sink (priv->audio_input); g_object_bind_property (priv->mic_button, "active", priv->audio_input, "mute", @@ -1333,8 +1331,7 @@ create_pipeline (EmpathyCallWindow *self) priv->pipeline_playing = FALSE; priv->video_tee = gst_element_factory_make ("tee", NULL); - gst_object_ref (priv->video_tee); - gst_object_sink (priv->video_tee); + gst_object_ref_sink (priv->video_tee); gst_bin_add (GST_BIN (priv->pipeline), priv->video_tee); diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index deaae10d6..0984e5bb8 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -602,8 +602,7 @@ create_video_input (EmpathyStreamedMediaWindow *self) g_assert (priv->video_input == NULL); priv->video_input = empathy_video_src_new (); - gst_object_ref (priv->video_input); - gst_object_sink (priv->video_input); + gst_object_ref_sink (priv->video_input); } static void @@ -613,8 +612,7 @@ create_audio_input (EmpathyStreamedMediaWindow *self) g_assert (priv->audio_input == NULL); priv->audio_input = empathy_audio_src_new (); - gst_object_ref (priv->audio_input); - gst_object_sink (priv->audio_input); + gst_object_ref_sink (priv->audio_input); tp_g_signal_connect_object (priv->audio_input, "peak-level-changed", G_CALLBACK (empathy_streamed_media_window_audio_input_level_changed_cb), @@ -689,8 +687,7 @@ create_video_preview (EmpathyStreamedMediaWindow *self) priv->video_preview, TRUE, TRUE, 0); priv->video_tee = gst_element_factory_make ("tee", NULL); - gst_object_ref (priv->video_tee); - gst_object_sink (priv->video_tee); + gst_object_ref_sink (priv->video_tee); g_object_unref (bus); } diff --git a/src/empathy-video-widget.c b/src/empathy-video-widget.c index adca53ef6..43ea212d5 100644 --- a/src/empathy-video-widget.c +++ b/src/empathy-video-widget.c @@ -127,8 +127,7 @@ empathy_video_widget_constructed (GObject *object) priv->videosink = gst_bin_new (NULL); - gst_object_ref (priv->videosink); - gst_object_sink (priv->videosink); + gst_object_ref_sink (priv->videosink); sink = gst_element_factory_make ("gconfvideosink", NULL); g_assert (sink != NULL); |