Skip to content

V
vlc-1.1
Commit 0894ff44 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Always set priorities on Mac OS X. 

* Simplify something of [12852]
parent adb3c550
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/libvlc.h
View file @ 0894ff44
...@@ -1253,8 +1253,12 @@ vlc_module_begin(); ...@@ -1253,8 +1253,12 @@ vlc_module_begin();
add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) /* Always set prio's on Darwin */
add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, #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 ); RT_PRIORITY_LONGTEXT, VLC_TRUE );
#endif #endif
......
src/misc/threads.c
View file @ 0894ff44
...@@ -577,9 +577,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, ...@@ -577,9 +577,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
struct sched_param param; struct sched_param param;
memset( &param, 0, sizeof(struct sched_param) ); memset( &param, 0, sizeof(struct sched_param) );
#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
i_priority += config_GetInt( p_this, "rt-offset" ); i_priority += config_GetInt( p_this, "rt-offset" );
#endif
if( i_priority <= 0 ) if( i_priority <= 0 )
{ {
param.sched_priority = (-1) * i_priority; param.sched_priority = (-1) * i_priority;
......
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