[vlc-commits] commit: Win32: run on first thread is not needed ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Sun Jul 25 12:26:50 CEST 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 25 13:26:37 2010 +0300| [cc82ee52dfa8c7958e2226b8b2ebf163daea4933] | committer: Rémi Denis-Courmont
Win32: run on first thread is not needed
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cc82ee52dfa8c7958e2226b8b2ebf163daea4933
---
include/vlc_interface.h | 2 +-
src/interface/interface.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 1a8cba3..ed9b64e 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -53,7 +53,7 @@ typedef struct intf_thread_t
struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */
/* Thread properties and locks */
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
bool b_should_run_on_first_thread;
#endif
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 5c674d2..af2f097 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -53,7 +53,7 @@
* Local prototypes
*****************************************************************************/
static void* RunInterface( vlc_object_t *p_this );
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
static void * MonitorLibVLCDeath( vlc_object_t *p_this );
#endif
static int AddIntfCallback( vlc_object_t *, char const *,
@@ -108,7 +108,7 @@ int intf_Create( vlc_object_t *p_this, const char *psz_module )
/* Attach interface to LibVLC */
vlc_object_attach( p_intf, p_libvlc );
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
p_intf->b_should_run_on_first_thread = false;
#endif
@@ -129,7 +129,7 @@ int intf_Create( vlc_object_t *p_this, const char *psz_module )
}
vlc_mutex_lock( &lock );
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
if( p_intf->b_should_run_on_first_thread )
@@ -225,7 +225,7 @@ static void* RunInterface( vlc_object_t *p_this )
return NULL;
}
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
#include "control/libvlc_internal.h" /* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
More information about the vlc-commits
mailing list