Commit 9797d69d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

DirectX: use parent object instead of -incorrectly- pl_Get()

parent 4ba6b7da
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_vout_display.h> #include <vlc_vout_display.h>
#include <windows.h> #include <windows.h>
...@@ -1450,11 +1449,10 @@ static int DesktopCallback(vlc_object_t *object, char const *psz_cmd, ...@@ -1450,11 +1449,10 @@ static int DesktopCallback(vlc_object_t *object, char const *psz_cmd,
/* FIXME we should have a way to export variable to be saved */ /* FIXME we should have a way to export variable to be saved */
if (ch_desktop) { if (ch_desktop) {
playlist_t *p_playlist = pl_Get(vd);
/* Modify playlist as well because the vout might have to be /* Modify playlist as well because the vout might have to be
* restarted */ * restarted */
var_Create(p_playlist, "video-wallpaper", VLC_VAR_BOOL); var_Create(object->p_parent, "video-wallpaper", VLC_VAR_BOOL);
var_SetBool(p_playlist, "video-wallpaper", newval.b_bool); var_SetBool(object->p_parent, "video-wallpaper", newval.b_bool);
} }
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_vout_display.h> #include <vlc_vout_display.h>
#include <vlc_playlist.h> /* needed for wallpaper */
#include <vlc_charset.h> #include <vlc_charset.h>
#include <windows.h> #include <windows.h>
...@@ -1396,11 +1395,10 @@ static int WallpaperCallback(vlc_object_t *object, char const *cmd, ...@@ -1396,11 +1395,10 @@ static int WallpaperCallback(vlc_object_t *object, char const *cmd,
/* FIXME we should have a way to export variable to be saved */ /* FIXME we should have a way to export variable to be saved */
if (ch_wallpaper) { if (ch_wallpaper) {
playlist_t *p_playlist = pl_Get(vd);
/* Modify playlist as well because the vout might have to be /* Modify playlist as well because the vout might have to be
* restarted */ * restarted */
var_Create(p_playlist, "video-wallpaper", VLC_VAR_BOOL); var_Create(object->p_parent, "video-wallpaper", VLC_VAR_BOOL);
var_SetBool(p_playlist, "video-wallpaper", newval.b_bool); var_SetBool(object->p_parent, "video-wallpaper", newval.b_bool);
} }
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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