From 03897942244788349ef186976c04cb3156498438 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Thu, 17 May 2007 10:59:00 +0000
Subject: sys/osxvideo/osxvideosink.*: Remove the event-loop-in-separate-thread
 modifications, because MacOSX is $#@(*%$# ! For...

Original commit message from CVS:
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
Remove the event-loop-in-separate-thread modifications, because MacOSX
is $#@(*%$# ! For those wondering, the event handling needs to be done
in the main thread after all..
---
 sys/osxvideo/osxvideosink.h | 2 --
 sys/osxvideo/osxvideosink.m | 7 +------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'sys/osxvideo')

diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h
index 4aef99f48..d7fba9665 100644
--- a/sys/osxvideo/osxvideosink.h
+++ b/sys/osxvideo/osxvideosink.h
@@ -84,8 +84,6 @@ struct _GstOSXVideoSink {
   gboolean embed;
   gboolean fullscreen; 
   gboolean sw_scaling_failed;
-  GstTask *event_loop;
-  GStaticRecMutex loop_lock;
 };
 
 struct _GstOSXVideoSinkClass {
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 9fb9d89f3..45dda3346 100644
--- a/sys/osxvideo/osxvideosink.m
+++ b/sys/osxvideo/osxvideosink.m
@@ -259,10 +259,7 @@ gst_osx_video_sink_osxwindow_new (GstOSXVideoSink * osxvideosink, gint width,
 
     [NSApp setRunning];
     // insert event dispatch in the glib main loop
-    g_static_rec_mutex_init (&osxvideosink->loop_lock);
-    osxvideosink->event_loop = gst_task_create ((GstTaskFunction) cocoa_event_loop, osxvideosink);
-    gst_task_set_lock (osxvideosink->event_loop, &osxvideosink->loop_lock);
-    gst_task_start (osxvideosink->event_loop);
+    g_idle_add ((GSourceFunc) cocoa_event_loop, osxvideosink);
   } else {
     GstStructure *s;
     GstMessage *msg;
@@ -302,8 +299,6 @@ gst_osx_video_sink_osxwindow_destroy (GstOSXVideoSink * osxvideosink,
   g_return_if_fail (GST_IS_OSX_VIDEO_SINK (osxvideosink));
 
   [osxwindow->pool release];
-  if (osxvideosink->event_loop)
-    gst_task_stop (osxvideosink->event_loop);
 
   g_free (osxwindow);
 }
-- 
cgit v1.2.3