[vlc-commits] Revert "macosx: run on first thread directly, like already done by Qt4"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  9 17:52:38 2012 +0300| [c62a7ad8ee148264c06abf699659f06008acfb3b] | committer: Rémi Denis-Courmont

Revert "macosx: run on first thread directly, like already done by Qt4"

This reverts commit a11c642f29bf4f163551d2aece30ff01b329321c.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c62a7ad8ee148264c06abf699659f06008acfb3b
---

 modules/gui/macosx/intf.m         |    6 ++----
 modules/gui/minimal_macosx/intf.m |    5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 59e26ce..90f7c6c 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -43,7 +43,6 @@
 #include <vlc_aout_intf.h>
 #include <vlc_vout_window.h>
 #include <unistd.h> /* execl() */
-#include "../../../lib/libvlc_internal.h"
 
 #import "CompatibilityFixes.h"
 #import "intf.h"
@@ -108,11 +107,10 @@ int OpenIntf ( vlc_object_t *p_this )
 
     /* subscribe to LibVLCCore's messages */
     vlc_Subscribe( &p_intf->p_sys->sub, MsgCallback, NULL );
+    p_intf->pf_run = Run;
+    p_intf->b_should_run_on_first_thread = true;
 
     [o_pool release];
-
-    libvlc_SetExitHandler( p_intf->p_libvlc, vlc_object_kill, p_intf );
-    Run( p_intf );
     return VLC_SUCCESS;
 }
 
diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m
index e31ebb9..b9a13ef 100644
--- a/modules/gui/minimal_macosx/intf.m
+++ b/modules/gui/minimal_macosx/intf.m
@@ -40,7 +40,6 @@
 
 #include <vlc_input.h>
 #import <vlc_interface.h>
-#include "../../../lib/libvlc_internal.h"
 
 #import <intf.h>
 
@@ -64,8 +63,8 @@ int OpenIntf ( vlc_object_t *p_this )
 
     memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
 
-    libvlc_SetExitHandler( p_intf->p_libvlc, vlc_object_kill, p_intf );
-    Run( p_intf );
+    p_intf->pf_run = Run;
+    p_intf->b_should_run_on_first_thread = true;
 
     return VLC_SUCCESS;
 }