From 1e5c892564e4c2b1218c137e38b455230a932f21 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 3 Dec 2015 15:46:05 +0100 Subject: [PATCH] stream: always listen from messages from pinos Always listen for messages from Pinos, even when we are sending a stream because we want to get the release-fd messages. --- src/client/stream.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/client/stream.c b/src/client/stream.c index 434098518..4457e740b 100644 --- a/src/client/stream.c +++ b/src/client/stream.c @@ -838,9 +838,6 @@ on_socket_condition (GSocket *socket, g_assert (len == sizeof (PinosStackHeader)); - if (num_messages == 0) - break; - /* now we know the total length */ need += hdr->length; @@ -909,11 +906,9 @@ handle_socket (PinosStream *stream, gint fd) case PINOS_STREAM_MODE_BUFFER: { - if (!priv->provide) { - priv->socket_source = g_socket_create_source (priv->socket, G_IO_IN, NULL); - g_source_set_callback (priv->socket_source, (GSourceFunc) on_socket_condition, stream, NULL); - g_source_attach (priv->socket_source, priv->context->priv->context); - } + priv->socket_source = g_socket_create_source (priv->socket, G_IO_IN, NULL); + g_source_set_callback (priv->socket_source, (GSourceFunc) on_socket_condition, stream, NULL); + g_source_attach (priv->socket_source, priv->context->priv->context); break; }