Changeset 4cd4bb9d26b0c6a4569f599bc300d84017cddc61

Timestamp:

05/23/07 16:48:08 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1179931688 +0000

git-parent:

[5d57f84d59384a68cfbcdb7eb10075240ee544b0]

git-author:

Damien Fouilleul <damienf@videolan.org> 1179931688 +0000

Message:

- win32: retire --fast-mutex and --win-cv-method completely

Files:

• src/libvlc-module.c (modified) (2 diffs)
• src/misc/threads.c (modified) (2 diffs)

src/libvlc-module.c

@@ -923 +923 @@
-    "all the processor time and render the whole system unresponsive which " \
-    "might require a reboot of your machine.")
-
-#define FAST_MUTEX_TEXT N_("Fast mutex on NT/2K/XP (developers only)")
-#define FAST_MUTEX_LONGTEXT N_( \
-    "On Windows NT/2K/XP we use a slow mutex implementation but which " \
-    "allows us to correctly implement condition variables. " \
-    "You can also use the faster Win9x implementation but you might " \
-    "experience problems with it.")
-
-#define WIN9X_CV_TEXT N_("Condition variables implementation for Win9x " \
-    "(developers only)")
-#define WIN9X_CV_LONGTEXT N_( \
-    "On Windows 9x/Me you can use a fast but incorrect condition variables " \
-    "implementation (more precisely there is a possibility for a race " \
-    "condition to happen). " \
-    "However it is possible to use slower alternatives which are more " \
-    "robust. " \
-    "Currently you can choose between implementation 0 (which is the " \
-    "fastest but slightly incorrect), 1 (default) and 2.")
-
-#define PLAYLISTENQUEUE_TEXT N_( \
@@ -1669 +1651 @@
-    add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
-              HPRIORITY_LONGTEXT, VLC_FALSE );
-        change_need_restart();
-    add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT,
-              FAST_MUTEX_LONGTEXT, VLC_TRUE );
-        change_need_restart();
-    add_integer( "win9x-cv-method", 1, NULL, WIN9X_CV_TEXT,
-                  WIN9X_CV_LONGTEXT, VLC_TRUE );
-        change_need_restart();
-#endif

src/misc/threads.c

@@ -46 +46 @@
-#elif defined( UNDER_CE )
-#elif defined( WIN32 )
+
+/* following is only available on NT/2000/XP and above */
-static SIGNALOBJECTANDWAIT pf_SignalObjectAndWait = NULL;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -77 +95 @@
-    if( IsDebuggerPresent() )
-    {
-API 
+
-        b_fast_mutex = VLC_TRUE;
-        i_win9x_cv = 0;
-    }
-    else
-    {
-        b_fast_mutex = VLC_FALSE;
-        i_win9x_cv = 1;
-    }