Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
d0f5b18e
Commit
d0f5b18e
authored
Mar 29, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout wrapper: fix creation of vout with window on top
parent
86974813
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/video_output/display.c
src/video_output/display.c
+4
-3
No files found.
src/video_output/display.c
View file @
d0f5b18e
...
@@ -1044,8 +1044,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
...
@@ -1044,8 +1044,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
vout_display_cfg_t
*
cfg
=
&
osys
->
cfg
;
vout_display_cfg_t
*
cfg
=
&
osys
->
cfg
;
*
cfg
=
state
->
cfg
;
*
cfg
=
state
->
cfg
;
osys
->
wm_state_initial
=
state
->
is_on_top
osys
->
wm_state_initial
=
VOUT_WINDOW_STATE_NORMAL
;
?
VOUT_WINDOW_STATE_ABOVE
:
VOUT_WINDOW_STATE_NORMAL
;
osys
->
sar_initial
.
num
=
state
->
sar
.
num
;
osys
->
sar_initial
.
num
=
state
->
sar
.
num
;
osys
->
sar_initial
.
den
=
state
->
sar
.
den
;
osys
->
sar_initial
.
den
=
state
->
sar
.
den
;
vout_display_GetDefaultDisplaySize
(
&
cfg
->
display
.
width
,
&
cfg
->
display
.
height
,
vout_display_GetDefaultDisplaySize
(
&
cfg
->
display
.
width
,
&
cfg
->
display
.
height
,
...
@@ -1069,6 +1068,8 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
...
@@ -1069,6 +1068,8 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
osys
->
is_display_filled
=
cfg
->
is_display_filled
;
osys
->
is_display_filled
=
cfg
->
is_display_filled
;
osys
->
zoom
.
num
=
cfg
->
zoom
.
num
;
osys
->
zoom
.
num
=
cfg
->
zoom
.
num
;
osys
->
zoom
.
den
=
cfg
->
zoom
.
den
;
osys
->
zoom
.
den
=
cfg
->
zoom
.
den
;
osys
->
wm_state
=
state
->
is_on_top
?
VOUT_WINDOW_STATE_ABOVE
:
VOUT_WINDOW_STATE_NORMAL
;
osys
->
source
=
*
source_org
;
osys
->
source
=
*
source_org
;
...
@@ -1118,7 +1119,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
...
@@ -1118,7 +1119,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
if
(
osys
->
sar
.
num
!=
source_org
->
i_sar_num
||
if
(
osys
->
sar
.
num
!=
source_org
->
i_sar_num
||
osys
->
sar
.
den
!=
source_org
->
i_sar_den
)
osys
->
sar
.
den
!=
source_org
->
i_sar_den
)
osys
->
ch_sar
=
true
;
osys
->
ch_sar
=
true
;
if
(
osys
->
wm_state
!=
VOUT_WINDOW_STATE_NORMAL
)
if
(
osys
->
wm_state
!=
osys
->
wm_state_initial
)
osys
->
ch_wm_state
=
true
;
osys
->
ch_wm_state
=
true
;
if
(
osys
->
crop
.
x
!=
source_org
->
i_x_offset
||
if
(
osys
->
crop
.
x
!=
source_org
->
i_x_offset
||
osys
->
crop
.
y
!=
source_org
->
i_y_offset
||
osys
->
crop
.
y
!=
source_org
->
i_y_offset
||
...
...
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