Commit 4cd4bb9d authored by damienf's avatar damienf
Browse files

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

parent 5d57f84d
......@@ -923,24 +923,6 @@ static const char *ppsz_clock_descriptions[] =
"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_( \
"Enqueue items to playlist when in one instance mode")
#define PLAYLISTENQUEUE_LONGTEXT N_( \
......@@ -1669,12 +1651,6 @@ vlc_module_begin();
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
/* Playlist options */
......
......@@ -45,9 +45,27 @@ static vlc_object_t *p_root;
#elif defined( ST_INIT_IN_ST_H )
#elif defined( UNDER_CE )
#elif defined( WIN32 )
/* following is only available on NT/2000/XP and above */
static SIGNALOBJECTANDWAIT pf_SignalObjectAndWait = NULL;
static vlc_bool_t b_fast_mutex = 0;
static int i_win9x_cv = 0;
/*
** 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.
*/
static vlc_bool_t b_fast_mutex = VLC_FALSE;
/*
** 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.
*/
static int i_win9x_cv = 1;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
......@@ -76,13 +94,8 @@ int __vlc_threads_init( vlc_object_t *p_this )
#elif defined( WIN32 )
if( IsDebuggerPresent() )
{
/* SignalObjectAndWait() API is problematic under a debugger */
/* SignalObjectAndWait() is problematic under a debugger */
b_fast_mutex = VLC_TRUE;
i_win9x_cv = 0;
}
else
{
b_fast_mutex = VLC_FALSE;
i_win9x_cv = 1;
}
#elif defined( HAVE_KERNEL_SCHEDULER_H )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment