vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Nov 27 19:27:16 2012 +0200| [9797d69d29097a598384a5d87c35f1d859aab4b4] | committer: Rémi Denis-Courmont
DirectX: use parent object instead of -incorrectly- pl_Get() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9797d69d29097a598384a5d87c35f1d859aab4b4 --- modules/video_output/msw/direct3d.c | 6 ++---- modules/video_output/msw/directx.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c index 004d084..af9757a 100644 --- a/modules/video_output/msw/direct3d.c +++ b/modules/video_output/msw/direct3d.c @@ -39,7 +39,6 @@ #include <vlc_common.h> #include <vlc_plugin.h> -#include <vlc_playlist.h> #include <vlc_vout_display.h> #include <windows.h> @@ -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 */ if (ch_desktop) { - playlist_t *p_playlist = pl_Get(vd); /* Modify playlist as well because the vout might have to be * restarted */ - var_Create(p_playlist, "video-wallpaper", VLC_VAR_BOOL); - var_SetBool(p_playlist, "video-wallpaper", newval.b_bool); + var_Create(object->p_parent, "video-wallpaper", VLC_VAR_BOOL); + var_SetBool(object->p_parent, "video-wallpaper", newval.b_bool); } return VLC_SUCCESS; } diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c index 49aa36d..fc881ac 100644 --- a/modules/video_output/msw/directx.c +++ b/modules/video_output/msw/directx.c @@ -42,7 +42,6 @@ #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> @@ -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 */ if (ch_wallpaper) { - playlist_t *p_playlist = pl_Get(vd); /* Modify playlist as well because the vout might have to be * restarted */ - var_Create(p_playlist, "video-wallpaper", VLC_VAR_BOOL); - var_SetBool(p_playlist, "video-wallpaper", newval.b_bool); + var_Create(object->p_parent, "video-wallpaper", VLC_VAR_BOOL); + var_SetBool(object->p_parent, "video-wallpaper", newval.b_bool); } return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
