Skip to content

V
vlc
Commit 3fbf9b48 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: only embed video coming from the playlist (i.e. not VLM)

parent 4c40aec4
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
modules/gui/qt4/qt4.cpp
View file @ 3fbf9b48
...@@ -339,10 +339,9 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) ...@@ -339,10 +339,9 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
if( !p_sys->b_isDialogProvider ) if( !p_sys->b_isDialogProvider )
{ {
vlc_value_t val; playlist_t *pl = pl_Get(p_this);
var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS); var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
val.p_address = p_this; var_SetAddress (pl, "qt4-iface", p_this);
var_Set (p_this->p_libvlc, "qt4-iface", val);
} }
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -365,7 +364,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -365,7 +364,7 @@ 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 (p_this->p_libvlc, "qt4-iface"); var_Destroy (pl_Get(p_this), "qt4-iface");
QVLCApp::triggerQuit(); QVLCApp::triggerQuit();
...@@ -547,8 +546,7 @@ static int WindowOpen( vlc_object_t *p_obj ) ...@@ -547,8 +546,7 @@ static int WindowOpen( vlc_object_t *p_obj )
return VLC_EGENERIC; return VLC_EGENERIC;
vlc_value_t val; vlc_value_t val;
if( var_Inherit( p_obj, "qt4-iface", VLC_VAR_ADDRESS, &val ) )
if( var_Get( p_obj->p_libvlc, "qt4-iface", &val ) )
val.p_address = NULL; val.p_address = NULL;
intf_thread_t *p_intf = (intf_thread_t *)val.p_address; intf_thread_t *p_intf = (intf_thread_t *)val.p_address;
......
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