From: Derk-Jan Hartman Date: Sun, 16 Oct 2005 15:44:56 +0000 (+0000) Subject: * Always set priorities on Mac OS X. X-Git-Tag: 0.8.4~253 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0894ff443403be47932a6b0dedbaefa9114b36a6;p=vlc * Always set priorities on Mac OS X. * Simplify something of [12852] --- diff --git a/src/libvlc.h b/src/libvlc.h index ab30c8162a..38c65ca305 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -1253,8 +1253,12 @@ vlc_module_begin(); add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); -#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) - add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, + /* Always set prio's on Darwin */ +#if defined(SYS_DARWIN) + add_bool( "rt-priority", VLC_TRUE, NULL, RT_PRIORITY_TEXT, + RT_PRIORITY_LONGTEXT, VLC_TRUE ); +#elif !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) + add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT, RT_PRIORITY_LONGTEXT, VLC_TRUE ); #endif diff --git a/src/misc/threads.c b/src/misc/threads.c index e9b0c7dead..dbe7c590f3 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -577,9 +577,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, struct sched_param param; memset( ¶m, 0, sizeof(struct sched_param) ); -#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) i_priority += config_GetInt( p_this, "rt-offset" ); -#endif if( i_priority <= 0 ) { param.sched_priority = (-1) * i_priority;