Commit 1d83cf55 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

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

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