summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-04-05 03:14:48 +0000
committermarcus <marcus@FreeBSD.org>2004-04-05 03:14:48 +0000
commit6309030b70b4694e7ac6d97710214d0953c58849 (patch)
tree9a65627d31fed614414e2e82146e51636c446ac1 /multimedia
parent1709e979938b20a74c25412059b770b9f26e23ec (diff)
downloadFreeBSD-ports-6309030b70b4694e7ac6d97710214d0953c58849.zip
FreeBSD-ports-6309030b70b4694e7ac6d97710214d0953c58849.tar.gz
Add a patch forgotten by the merge script.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c
new file mode 100644
index 0000000..e1acf76
--- /dev/null
+++ b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c
@@ -0,0 +1,36 @@
+2004-03-20 Joe Marcus Clarke <marcus@FreeBSD.org>
+
+* thumbnail/gst-thumbnail.c (*global*), (end_of_snap),
+ (gst_thumbnail_pngenc_get):
+
+Make sure the pipeline has completely finished before quitting the main
+gst event loop.
+--- thumbnail/gst-thumbnail.c.orig Sat Mar 20 19:49:01 2004
++++ thumbnail/gst-thumbnail.c Sat Mar 20 19:49:04 2004
+@@ -23,11 +23,13 @@
+ #define TIMEOUT 9999 /* how long before we give up, msec */
+
+ gboolean finished = FALSE;
++gboolean can_finish = FALSE;
+
+ void end_of_snap (GstElement *pipeline)
+ {
+ g_print ("Snapped.\n");
+- gst_element_set_state (pipeline, GST_STATE_READY);
++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
++ while (!can_finish) ;
+ gst_main_quit ();
+ finished = TRUE;
+ }
+@@ -97,9 +99,9 @@
+ /* commit suicide in due time if necessary */
+ g_timeout_add (TIMEOUT, (GSourceFunc) timeout, pipeline);
+ g_idle_add ((GSourceFunc) iterator, pipeline);
+- gst_main ();
+
+- gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
++ can_finish = TRUE;
++ gst_main ();
+ }
+ int
+ main (int argc, char *argv[])
OpenPOWER on IntegriCloud