Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
1d83cf55
Commit
1d83cf55
authored
Aug 15, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "DirectX: use parent object instead of -incorrectly- pl_Get()"
This reverts commit
9797d69d
.
parent
ee00f500
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
modules/video_output/msw/direct3d.c
modules/video_output/msw/direct3d.c
+4
-2
modules/video_output/msw/directx.c
modules/video_output/msw/directx.c
+4
-2
No files found.
modules/video_output/msw/direct3d.c
View file @
1d83cf55
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
#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>
...
@@ -1447,10 +1448,11 @@ static int DesktopCallback(vlc_object_t *object, char const *psz_cmd,
...
@@ -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 */
/* 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
(
object
->
p_paren
t
,
"video-wallpaper"
,
VLC_VAR_BOOL
);
var_Create
(
p_playlis
t
,
"video-wallpaper"
,
VLC_VAR_BOOL
);
var_SetBool
(
object
->
p_paren
t
,
"video-wallpaper"
,
newval
.
b_bool
);
var_SetBool
(
p_playlis
t
,
"video-wallpaper"
,
newval
.
b_bool
);
}
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
modules/video_output/msw/directx.c
View file @
1d83cf55
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#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>
...
@@ -1402,10 +1403,11 @@ static int WallpaperCallback(vlc_object_t *object, char const *cmd,
...
@@ -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 */
/* 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
(
object
->
p_paren
t
,
"video-wallpaper"
,
VLC_VAR_BOOL
);
var_Create
(
p_playlis
t
,
"video-wallpaper"
,
VLC_VAR_BOOL
);
var_SetBool
(
object
->
p_paren
t
,
"video-wallpaper"
,
newval
.
b_bool
);
var_SetBool
(
p_playlis
t
,
"video-wallpaper"
,
newval
.
b_bool
);
}
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment