Changeset 36ca011c05a6d034c37ee881519daa78e5e89c39

Timestamp:

24/07/08 21:00:26 (4 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1216926026 +0300

git-parent:

[4794bb1e1b0c9fec3cbf24b84421a67e081b680f]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1216926026 +0300

Message:

Remove the main thread hack on platforms with non-idiotic toolkits

Files:

• include/vlc_interface.h (modified) (1 diff)
• src/interface/interface.c (modified) (6 diffs)

include/vlc_interface.h

@@ -51 +51 @@
-
-    /* Thread properties and locks */
+#ifdef __APPLE__
-    bool          b_should_run_on_first_thread;
+#endif
-
-    /* Specific interfaces */

src/interface/interface.c

@@ -51 +51 @@
- *****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf );
+#ifdef __APPLE__
-static void MonitorLibVLCDeath( intf_thread_t *p_intf );
-
+
-static int AddIntfCallback( vlc_object_t *, char const *,
-                            vlc_value_t , vlc_value_t , void * );
@@ -96 +97 @@
-        return NULL;
-    p_intf->b_interaction = false;
+#ifdef __APPLE__
-    p_intf->b_should_run_on_first_thread = false;
+#endif
-
-    /* Choose the best module */
@@ -137 +140 @@
-int intf_RunThread( intf_thread_t *p_intf )
-{
+#ifdef __APPLE__
-    /* Hack to get Mac OS X Cocoa runtime running
-     * (it needs access to the main thread) */
@@ -159 +163 @@
-        return VLC_SUCCESS;
-    }
-
+
-    /* Run the interface in a separate thread */
-    if( vlc_thread_create( p_intf, "interface", RunInterface,
@@ -255 +259 @@
-}
-
+#ifdef __APPLE__
-/*****************************************************************************
- * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
@@ -284 +289 @@
-    }
-    vlc_list_release( p_list );
-
-
+
+
-
-static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,