[rhythmbox] xfade: simplify the previous hack a bit
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] xfade: simplify the previous hack a bit
- Date: Fri, 8 Jan 2016 12:22:43 +0000 (UTC)
commit c7117a035eeaa8eda527bb73a40fd2d9b8a884c3
Author: Jonathan Matthew <jonathan d14n org>
Date: Fri Jan 8 22:21:46 2016 +1000
xfade: simplify the previous hack a bit
There's no need to use an idle handler to push buffers into the appsrc,
and to make matters worse it deadlocks occasionally.
backends/gstreamer/rb-player-gst-xfade.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index 01bca3b..0548804 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -3221,17 +3221,7 @@ silencesrc_push (RBPlayerGstXFade *player)
static void
silencesrc_need_data_cb (GstElement *appsrc, guint size, RBPlayerGstXFade *player)
{
- if (player->priv->silence_idle_id == 0)
- player->priv->silence_idle_id = g_idle_add ((GSourceFunc) silencesrc_push, player);
-}
-
-static void
-silencesrc_enough_data_cb (GstElement *appsrc, RBPlayerGstXFade *player)
-{
- if (player->priv->silence_idle_id != 0) {
- g_source_remove (player->priv->silence_idle_id);
- player->priv->silence_idle_id = 0;
- }
+ silencesrc_push (player);
}
static gboolean
@@ -3371,7 +3361,6 @@ create_sink (RBPlayerGstXFade *player, GError **error)
g_object_set (player->priv->silencesrc, "caps", caps, "format", GST_FORMAT_TIME, NULL);
g_signal_connect (player->priv->silencesrc, "need-data", G_CALLBACK (silencesrc_need_data_cb),
player);
- g_signal_connect (player->priv->silencesrc, "enough-data", G_CALLBACK (silencesrc_enough_data_cb),
player);
audioconvert = gst_element_factory_make ("audioconvert", "silenceconvert");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]