mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 21:48:55 +00:00
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..
This commit is contained in:
parent
284c7f0ff9
commit
0389794224
2 changed files with 1 additions and 8 deletions
|
@ -84,8 +84,6 @@ struct _GstOSXVideoSink {
|
||||||
gboolean embed;
|
gboolean embed;
|
||||||
gboolean fullscreen;
|
gboolean fullscreen;
|
||||||
gboolean sw_scaling_failed;
|
gboolean sw_scaling_failed;
|
||||||
GstTask *event_loop;
|
|
||||||
GStaticRecMutex loop_lock;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GstOSXVideoSinkClass {
|
struct _GstOSXVideoSinkClass {
|
||||||
|
|
|
@ -259,10 +259,7 @@ gst_osx_video_sink_osxwindow_new (GstOSXVideoSink * osxvideosink, gint width,
|
||||||
|
|
||||||
[NSApp setRunning];
|
[NSApp setRunning];
|
||||||
// insert event dispatch in the glib main loop
|
// insert event dispatch in the glib main loop
|
||||||
g_static_rec_mutex_init (&osxvideosink->loop_lock);
|
g_idle_add ((GSourceFunc) cocoa_event_loop, osxvideosink);
|
||||||
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);
|
|
||||||
} else {
|
} else {
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
GstMessage *msg;
|
GstMessage *msg;
|
||||||
|
@ -302,8 +299,6 @@ gst_osx_video_sink_osxwindow_destroy (GstOSXVideoSink * osxvideosink,
|
||||||
g_return_if_fail (GST_IS_OSX_VIDEO_SINK (osxvideosink));
|
g_return_if_fail (GST_IS_OSX_VIDEO_SINK (osxvideosink));
|
||||||
|
|
||||||
[osxwindow->pool release];
|
[osxwindow->pool release];
|
||||||
if (osxvideosink->event_loop)
|
|
||||||
gst_task_stop (osxvideosink->event_loop);
|
|
||||||
|
|
||||||
g_free (osxwindow);
|
g_free (osxwindow);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue