Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
6444fb21
Commit
6444fb21
authored
Oct 12, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: eliminate dead window state code
parent
8ae8abfe
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
58 deletions
+9
-58
modules/hw/vdpau/display.c
modules/hw/vdpau/display.c
+0
-5
modules/video_output/gl.c
modules/video_output/gl.c
+0
-7
modules/video_output/kva.c
modules/video_output/kva.c
+1
-6
modules/video_output/macosx.m
modules/video_output/macosx.m
+0
-5
modules/video_output/msw/common.c
modules/video_output/msw/common.c
+8
-13
modules/video_output/wayland/shm.c
modules/video_output/wayland/shm.c
+0
-6
modules/video_output/xcb/glx.c
modules/video_output/xcb/glx.c
+0
-6
modules/video_output/xcb/x11.c
modules/video_output/xcb/x11.c
+0
-5
modules/video_output/xcb/xvideo.c
modules/video_output/xcb/xvideo.c
+0
-5
No files found.
modules/hw/vdpau/display.c
View file @
6444fb21
...
...
@@ -367,11 +367,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
const
vout_display_cfg_t
*
c
=
va_arg
(
ap
,
const
vout_display_cfg_t
*
);
return
vout_window_SetFullScreen
(
sys
->
embed
,
c
->
is_fullscreen
);
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
embed
,
state
);
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
{
const
vout_display_cfg_t
*
cfg
=
va_arg
(
ap
,
const
vout_display_cfg_t
*
);
...
...
modules/video_output/gl.c
View file @
6444fb21
...
...
@@ -251,13 +251,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return
vout_window_SetFullScreen
(
sys
->
gl
->
surface
,
c
->
is_fullscreen
);
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
gl
->
surface
,
state
);
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
case
VOUT_DISPLAY_CHANGE_ZOOM
:
...
...
modules/video_output/kva.c
View file @
6444fb21
...
...
@@ -463,12 +463,7 @@ static int Control( vout_display_t *vd, int query, va_list args )
const
unsigned
state
=
va_arg
(
args
,
unsigned
);
const
bool
is_on_top
=
(
state
&
VOUT_WINDOW_STATE_ABOVE
)
!=
0
;
if
(
sys
->
parent_window
)
{
if
(
vout_window_SetState
(
sys
->
parent_window
,
state
))
return
VLC_EGENERIC
;
}
else
if
(
is_on_top
)
if
(
is_on_top
)
WinSetWindowPos
(
sys
->
frame
,
HWND_TOP
,
0
,
0
,
0
,
0
,
SWP_ZORDER
);
sys
->
is_on_top
=
is_on_top
;
...
...
modules/video_output/macosx.m
View file @
6444fb21
...
...
@@ -330,11 +330,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return
VLC_SUCCESS
;
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
embed
,
state
);
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
case
VOUT_DISPLAY_CHANGE_ZOOM
:
case
VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
:
...
...
modules/video_output/msw/common.c
View file @
6444fb21
...
...
@@ -595,19 +595,14 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
if
(
sys
->
use_desktop
&&
is_on_top
)
return
VLC_EGENERIC
;
#endif
if
(
sys
->
parent_window
)
{
if
(
vout_window_SetState
(
sys
->
parent_window
,
state
))
return
VLC_EGENERIC
;
}
else
{
HMENU
hMenu
=
GetSystemMenu
(
sys
->
hwnd
,
FALSE
);
if
(
is_on_top
&&
!
(
GetWindowLong
(
sys
->
hwnd
,
GWL_EXSTYLE
)
&
WS_EX_TOPMOST
))
{
CheckMenuItem
(
hMenu
,
IDM_TOGGLE_ON_TOP
,
MF_BYCOMMAND
|
MFS_CHECKED
);
SetWindowPos
(
sys
->
hwnd
,
HWND_TOPMOST
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
}
else
if
(
!
is_on_top
&&
(
GetWindowLong
(
sys
->
hwnd
,
GWL_EXSTYLE
)
&
WS_EX_TOPMOST
))
{
CheckMenuItem
(
hMenu
,
IDM_TOGGLE_ON_TOP
,
MF_BYCOMMAND
|
MFS_UNCHECKED
);
SetWindowPos
(
sys
->
hwnd
,
HWND_NOTOPMOST
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
}
HMENU
hMenu
=
GetSystemMenu
(
sys
->
hwnd
,
FALSE
);
if
(
is_on_top
&&
!
(
GetWindowLong
(
sys
->
hwnd
,
GWL_EXSTYLE
)
&
WS_EX_TOPMOST
))
{
CheckMenuItem
(
hMenu
,
IDM_TOGGLE_ON_TOP
,
MF_BYCOMMAND
|
MFS_CHECKED
);
SetWindowPos
(
sys
->
hwnd
,
HWND_TOPMOST
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
}
else
if
(
!
is_on_top
&&
(
GetWindowLong
(
sys
->
hwnd
,
GWL_EXSTYLE
)
&
WS_EX_TOPMOST
))
{
CheckMenuItem
(
hMenu
,
IDM_TOGGLE_ON_TOP
,
MF_BYCOMMAND
|
MFS_UNCHECKED
);
SetWindowPos
(
sys
->
hwnd
,
HWND_NOTOPMOST
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
}
sys
->
is_on_top
=
is_on_top
;
return
VLC_SUCCESS
;
...
...
modules/video_output/wayland/shm.c
View file @
6444fb21
...
...
@@ -278,12 +278,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
return
vout_window_SetFullScreen
(
sys
->
embed
,
cfg
->
is_fullscreen
);
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
embed
,
state
);
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
case
VOUT_DISPLAY_CHANGE_ZOOM
:
...
...
modules/video_output/xcb/glx.c
View file @
6444fb21
...
...
@@ -221,12 +221,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return
vout_window_SetFullScreen
(
sys
->
gl
->
surface
,
c
->
is_fullscreen
);
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
gl
->
surface
,
state
);
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
case
VOUT_DISPLAY_CHANGE_ZOOM
:
...
...
modules/video_output/xcb/x11.c
View file @
6444fb21
...
...
@@ -495,11 +495,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
values
);
return
VLC_SUCCESS
;
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
sys
->
embed
,
state
);
}
case
VOUT_DISPLAY_CHANGE_ZOOM
:
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
...
...
modules/video_output/xcb/xvideo.c
View file @
6444fb21
...
...
@@ -788,11 +788,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
xcb_flush
(
p_sys
->
conn
);
return
VLC_SUCCESS
;
}
case
VOUT_DISPLAY_CHANGE_WINDOW_STATE
:
{
unsigned
state
=
va_arg
(
ap
,
unsigned
);
return
vout_window_SetState
(
p_sys
->
embed
,
state
);
}
/* Hide the mouse. It will be send when
* vout_display_t::info.b_hide_mouse is false */
...
...
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