#ifdef X_DISPLAY_MISSING
# error Xlib required due to PulseAudio bug 799!
#else
- if( !XInitThreads() )
+ if( !var_InheritBool( p_this, "xlib" ) || !XInitThreads() )
return VLC_EGENERIC;
#endif
/* Allocate structures */
intf_sys_t *p_sys;
vlc_value_t val;
- if( !XInitThreads() )
+ if( !var_InheritBool( p_this, "xlib" ) || !XInitThreads() )
return VLC_EGENERIC;
/* Allocate instance and initialize some members */
intf_thread_t *p_intf = (intf_thread_t *)p_this;
#ifdef Q_WS_X11
- if( !XInitThreads() )
+ if( !var_InheritBool( p_this, "xlib" ) || !XInitThreads() )
return VLC_EGENERIC;
char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
bool X11Factory::init()
{
// make sure xlib is safe-thread
- if( !XInitThreads() )
+ if( !var_InheritBool( getIntf(), "xlib" ) || !XInitThreads() )
+ {
msg_Err( getIntf(), "initializing xlib for multi-threading failed" );
+ return false;
+ }
// Create the X11 display
m_pDisplay = new X11Display( getIntf() );
*/
static int Open (vlc_object_t *obj)
{
- if (!XInitThreads ())
+ if (!var_InheritBool (obj, "xlib") || !XInitThreads ())
return VLC_EGENERIC;
vout_display_t *vd = (vout_display_t *)obj;
DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */
add_deprecated_alias( "glx-display" )
+ add_bool( "xlib", true, NULL, "", "", true )
+ change_private ()
add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, true )
/* Used in vout_synchro */