Commit 6eb5f075 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: drop window provider priority to zero

Mapping the Qt4 plugin requires a particularly long time and much
memory. So we had better avoid doing this everytime we create a new
video window (if the Qt4 interface is _not_ used).
parent 0a64cb09
...@@ -251,9 +251,9 @@ vlc_module_begin () ...@@ -251,9 +251,9 @@ vlc_module_begin ()
#if defined(Q_WS_X11) || defined(Q_WS_WIN) #if defined(Q_WS_X11) || defined(Q_WS_WIN)
add_submodule () add_submodule ()
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
set_capability( "vout window xid", 50 ) set_capability( "vout window xid", 0 )
#elif defined(Q_WS_WIN) #elif defined(Q_WS_WIN)
set_capability( "vout window hwnd", 50 ) set_capability( "vout window hwnd", 0 )
#endif #endif
set_callbacks( WindowOpen, WindowClose ) set_callbacks( WindowOpen, WindowClose )
#endif #endif
...@@ -341,6 +341,8 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) ...@@ -341,6 +341,8 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
playlist_t *pl = pl_Get(p_this); playlist_t *pl = pl_Get(p_this);
var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS); var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
var_SetAddress (pl, "qt4-iface", p_this); var_SetAddress (pl, "qt4-iface", p_this);
var_Create (pl, "window", VLC_VAR_STRING);
var_SetString (pl, "window", "qt4,any");
} }
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -363,7 +365,10 @@ static void Close( vlc_object_t *p_this ) ...@@ -363,7 +365,10 @@ static void Close( vlc_object_t *p_this )
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
if( !p_sys->b_isDialogProvider ) if( !p_sys->b_isDialogProvider )
{
var_Destroy (pl_Get(p_this), "window");
var_Destroy (pl_Get(p_this), "qt4-iface"); var_Destroy (pl_Get(p_this), "qt4-iface");
}
QVLCApp::triggerQuit(); QVLCApp::triggerQuit();
......
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