summaryrefslogtreecommitdiffstats
path: root/sys/osxvideo/osxvideosink.m
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2007-05-17 10:59:00 +0000
committerEdward Hervey <bilboed@bilboed.com>2007-05-17 10:59:00 +0000
commit03897942244788349ef186976c04cb3156498438 (patch)
tree80df2d107a75f634227327218e9f7dba382b9afa /sys/osxvideo/osxvideosink.m
parent284c7f0ff93b6bbc0f6f6e128c53a9b04cbb654b (diff)
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..
Diffstat (limited to 'sys/osxvideo/osxvideosink.m')
-rw-r--r--sys/osxvideo/osxvideosink.m7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 9fb9d89f..45dda334 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);
}