[rhythmbox] encoder: close output streams asynchronously to avoid blocking main loop

[Jonathan Matthew <jmatthew src gnome org>]

commit 0c9b4834280b51e3306292c7ef76dc5faa185fe4
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Oct 22 20:44:41 2009 +1000

    encoder: close output streams asynchronously to avoid blocking main loop
    
    When writing large files to slow devices, close() can actually take
    quite a while (up to 10 seconds sometimes), so doing it asynchronously
    helps.

 backends/gstreamer/rb-encoder-gst.c |   44 ++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/backends/gstreamer/rb-encoder-gst.c b/backends/gstreamer/rb-encoder-gst.c
index 7a427d2..b8e40b6 100644
--- a/backends/gstreamer/rb-encoder-gst.c
+++ b/backends/gstreamer/rb-encoder-gst.c
@@ -212,6 +212,25 @@ rb_encoder_gst_emit_completed (RBEncoderGst *encoder)
 	_rb_encoder_emit_completed (RB_ENCODER (encoder));
 }
 
+static void
+output_close_cb (GOutputStream *stream, GAsyncResult *result, RBEncoderGst *encoder)
+{
+	GError *error = NULL;
+	rb_debug ("finished closing output stream");
+	g_output_stream_close_finish (encoder->priv->outstream, result, &error);
+	if (error != NULL) {
+		rb_debug ("error closing output stream: %s", error->message);
+		g_error_free (error);
+	}
+
+	rb_encoder_gst_emit_completed (encoder);
+
+	g_object_unref (encoder->priv->outstream);
+	encoder->priv->outstream = NULL;
+
+	g_object_unref (encoder);
+}
+
 static gboolean
 bus_watch_cb (GstBus *bus, GstMessage *message, gpointer data)
 {
@@ -241,24 +260,23 @@ bus_watch_cb (GstBus *bus, GstMessage *message, gpointer data)
 		break;
 
 	case GST_MESSAGE_EOS:
-		rb_debug ("received EOS");
 
 		gst_element_set_state (encoder->priv->pipeline, GST_STATE_NULL);
 		if (encoder->priv->outstream != NULL) {
-			GError *error = NULL;
-			g_output_stream_close (encoder->priv->outstream, NULL, &error);
-			if (error != NULL) {
-				rb_debug ("error closing output stream: %s", error->message);
-				g_error_free (error);
-			}
-			g_object_unref (encoder->priv->outstream);
-			encoder->priv->outstream = NULL;
-		}
+			rb_debug ("received EOS, closing output stream");
+			g_output_stream_close_async (encoder->priv->outstream,
+						     G_PRIORITY_DEFAULT,
+						     NULL,
+						     (GAsyncReadyCallback) output_close_cb,
+						     g_object_ref (encoder));
+		} else {
+			rb_debug ("received EOS, but there's no output stream");
+			rb_encoder_gst_emit_completed (encoder);
 
-		rb_encoder_gst_emit_completed (encoder);
+			g_object_unref (encoder->priv->pipeline);
+			encoder->priv->pipeline = NULL;
+		}
 
-		g_object_unref (encoder->priv->pipeline);
-		encoder->priv->pipeline = NULL;
 		break;
 
 	default: