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
e48f48a8
Commit
e48f48a8
authored
Oct 05, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use var_Get* when applicable.
parent
1f9d1546
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
modules/video_output/msw/directx.c
modules/video_output/msw/directx.c
+12
-12
No files found.
modules/video_output/msw/directx.c
View file @
e48f48a8
...
...
@@ -599,20 +599,20 @@ BOOL WINAPI DirectXEnumCallback( GUID* p_guid, LPTSTR psz_desc,
HMONITOR
hmon
)
{
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_context
;
vlc_value_t
device
;
char
*
psz_
device
;
msg_Dbg
(
p_vout
,
"DirectXEnumCallback: %s, %s"
,
psz_desc
,
psz_drivername
);
if
(
hmon
)
{
var_Get
(
p_vout
,
"directx-device"
,
&
device
);
psz_device
=
var_GetString
(
p_vout
,
"directx-device"
);
if
(
(
!
device
.
psz_string
||
!*
device
.
psz_string
)
&&
if
(
(
!
psz_device
||
!*
psz_device
)
&&
hmon
==
p_vout
->
p_sys
->
hmonitor
)
{
free
(
device
.
psz_string
);
free
(
psz_device
);
}
else
if
(
strcmp
(
psz_drivername
,
device
.
psz_string
)
==
0
)
else
if
(
strcmp
(
psz_drivername
,
psz_device
)
==
0
)
{
MONITORINFO
monitor_info
;
monitor_info
.
cbSize
=
sizeof
(
MONITORINFO
);
...
...
@@ -636,11 +636,11 @@ BOOL WINAPI DirectXEnumCallback( GUID* p_guid, LPTSTR psz_desc,
}
p_vout
->
p_sys
->
hmonitor
=
hmon
;
free
(
device
.
psz_string
);
free
(
psz_device
);
}
else
{
free
(
device
.
psz_string
);
free
(
psz_device
);
return
TRUE
;
/* Keep enumerating */
}
...
...
@@ -691,13 +691,13 @@ static int DirectXInitDDraw( vout_thread_t *p_vout )
if
(
OurDirectDrawEnumerateEx
&&
p_vout
->
p_sys
->
MonitorFromWindow
)
{
vlc_value_t
device
;
char
*
psz_
device
;
var_Get
(
p_vout
,
"directx-device"
,
&
device
);
if
(
device
.
psz_string
)
psz_device
=
var_GetString
(
p_vout
,
"directx-device"
);
if
(
psz_device
)
{
msg_Dbg
(
p_vout
,
"directx-device: %s"
,
device
.
psz_string
);
free
(
device
.
psz_string
);
msg_Dbg
(
p_vout
,
"directx-device: %s"
,
psz_device
);
free
(
psz_device
);
}
p_vout
->
p_sys
->
hmonitor
=
...
...
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