/pidgin/main: 70b6e5921fc1: Remove Gstreamer pipeline after play...

Jorge Villase?or salinasv at pidgin.im
Wed Oct 7 00:33:35 EDT 2015


Changeset: 70b6e5921fc17fd1035f7ed468d148d907d8c71d
Author:	 Jorge Villase?or <salinasv at pidgin.im>
Date:	 2015-10-06 21:15 -0700
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/70b6e5921fc1

Description:

Remove Gstreamer pipeline after playing a sound

When receiving an error or stream finished message, we can free the
Gstreamer pipeline so we don't leak it for each sound.

Patch from Sorokin Alexei, modified by me because the mediamanager
subsystem uses a different approach to watch the bus.
Fixes #16752

diffstat:

 COPYRIGHT         |  1 +
 finch/gntsound.c  |  1 +
 pidgin/gtksound.c |  1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diffs (33 lines):

diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -22,6 +22,7 @@ Saleem Abdulrasool
 Jakub Adam
 Dave Ahlswede
 Haval A. Ahmed
+Sorokin Alexei
 Thijs Alkemade
 Manuel Amador
 Matt Amato
diff --git a/finch/gntsound.c b/finch/gntsound.c
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -439,6 +439,7 @@ bus_call (GstBus *bus, GstMessage *msg, 
 	case GST_MESSAGE_EOS:
 		gst_element_set_state(play, GST_STATE_NULL);
 		gst_object_unref(GST_OBJECT(play));
+		return FALSE;
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -388,6 +388,7 @@ bus_call (GstBus     *bus,
 	case GST_MESSAGE_EOS:
 		gst_element_set_state(play, GST_STATE_NULL);
 		gst_object_unref(GST_OBJECT(play));
+		return FALSE;
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);



More information about the Commits mailing list