Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe

If the video player tries to play an unknown type file, it will enter
the error_cb() function, which is called in another thread.
Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
multi-thread operation.

This fixes [BUGID #474]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

diff --git a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
new file mode 100644 (file)
index 0000000..e153c5e
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
@@ -0,0 +1,38 @@
+Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
+
+If the video player tries to play an unknown type file, it will enter
+the error_cb() function, which is called in another thread.
+Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
+multi-thread operation.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN video-orig/src/video.c video/src/video.c
+--- video-orig/src/video.c     2010-10-15 16:07:26.522346398 +0800
++++ video/src/video.c  2010-10-15 16:25:51.780296717 +0800
+@@ -96,6 +96,7 @@
+ {
+         GtkWidget *dialog;
+ 
++        gdk_threads_enter();
+         dialog = gtk_message_dialog_new (data->window,
+                                          GTK_DIALOG_NO_SEPARATOR,
+                                          GTK_MESSAGE_ERROR,
+@@ -103,6 +104,7 @@
+                                          error->message);
+         gtk_dialog_run (GTK_DIALOG (dialog));
+         gtk_widget_destroy (dialog);
++        gdk_threads_leave();
+ }
+ 
+ /**
+@@ -606,7 +608,9 @@
+         
+         gtk_widget_show_all (GTK_WIDGET (data->window));
+ 
++        gdk_threads_enter();
+         gtk_main ();
++        gdk_threads_leave();
+ 
+         /**
+          * Cleanup.

diff --git a/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop
rename to meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop

diff --git a/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/owl-video-widget.png
rename to meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png

diff --git a/meta/recipes-sato/owl-video-widget/files/stock_media-play.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/stock_media-play.png
rename to meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png

diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/stock_volume-0.png
rename to meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png

diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/stock_volume-max.png
rename to meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png

diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/stock_volume-med.png
rename to meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png

diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png
similarity index 100%
rename from meta/recipes-sato/owl-video-widget/files/stock_volume-min.png
rename to meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png

diff --git a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
index 50027f5f20ecd42ef07d50aa6578bb31c225425a..07c52ef327287305dac719ef429d79d6d95990c3 100644 (file)
--- a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
@@ -9,11 +9,12 @@ SECTION = "x11"
 DEPENDS = "libowl-av"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/video"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \
+           file://gtk_multithread_safe.patch \
            file://owl-video-widget.png \
            file://stock_media-play.png \
            file://stock_volume-0.png \