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
c41b9606
Commit
c41b9606
authored
Oct 29, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
window: handle fullscreen state at initialization
parent
d2d4277c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
5 deletions
+11
-5
include/vlc_vout_window.h
include/vlc_vout_window.h
+4
-3
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+2
-2
modules/gui/minimal_macosx/intf.m
modules/gui/minimal_macosx/intf.m
+1
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-0
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+1
-0
modules/video_output/wayland/shell_surface.c
modules/video_output/wayland/shell_surface.c
+1
-0
modules/video_output/xcb/window.c
modules/video_output/xcb/window.c
+1
-0
No files found.
include/vlc_vout_window.h
View file @
c41b9606
...
@@ -65,12 +65,13 @@ enum {
...
@@ -65,12 +65,13 @@ enum {
};
};
typedef
struct
vout_window_cfg_t
{
typedef
struct
vout_window_cfg_t
{
/* If true, a standalone window is requested */
bool
is_standalone
;
/* Window handle type */
/* Window handle type */
unsigned
type
;
unsigned
type
;
/* If true, a standalone window is requested */
bool
is_standalone
;
bool
is_fullscreen
;
#ifdef __APPLE__
#ifdef __APPLE__
/* Window position hint */
/* Window position hint */
int
x
;
int
x
;
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
c41b9606
...
@@ -87,9 +87,9 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
...
@@ -87,9 +87,9 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
p_wnd
->
type
=
VOUT_WINDOW_TYPE_NSOBJECT
;
p_wnd
->
type
=
VOUT_WINDOW_TYPE_NSOBJECT
;
p_wnd
->
control
=
WindowControl
;
p_wnd
->
control
=
WindowControl
;
return
VLC_SUCCESS
;
}
}
vout_window_SetFullScreen
(
p_wnd
,
cfg
->
is_fullscreen
);
return
VLC_SUCCESS
;
}
}
static
int
WindowControl
(
vout_window_t
*
p_wnd
,
int
i_query
,
va_list
args
)
static
int
WindowControl
(
vout_window_t
*
p_wnd
,
int
i_query
,
va_list
args
)
...
...
modules/gui/minimal_macosx/intf.m
View file @
c41b9606
...
@@ -130,6 +130,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
...
@@ -130,6 +130,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
p
_
wnd
->
control
=
WindowControl
;
p
_
wnd
->
control
=
WindowControl
;
}
}
vout
_
window
_
SetFullScreen
(
p
_
wnd
,
cfg
->
is
_
fullscreen
)
;
return
VLC
_
SUCCESS
;
return
VLC
_
SUCCESS
;
}
}
...
...
modules/gui/qt4/qt4.cpp
View file @
c41b9606
...
@@ -713,6 +713,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
...
@@ -713,6 +713,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
p_wnd
->
control
=
WindowControl
;
p_wnd
->
control
=
WindowControl
;
p_wnd
->
sys
=
(
vout_window_sys_t
*
)
p_mi
;
p_wnd
->
sys
=
(
vout_window_sys_t
*
)
p_mi
;
emit
p_mi
->
askVideoSetFullScreen
(
cfg
->
is_fullscreen
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
modules/gui/skins2/src/skin_main.cpp
View file @
c41b9606
...
@@ -408,6 +408,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
...
@@ -408,6 +408,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
vout_window_SetFullScreen
(
pWnd
,
cfg
->
is_fullscreen
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
modules/video_output/wayland/shell_surface.c
View file @
c41b9606
...
@@ -362,6 +362,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
...
@@ -362,6 +362,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
goto
error
;
goto
error
;
vout_window_ReportSize
(
wnd
,
cfg
->
width
,
cfg
->
height
);
vout_window_ReportSize
(
wnd
,
cfg
->
width
,
cfg
->
height
);
vout_window_SetFullScreen
(
wnd
,
cfg
->
is_fullscreen
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
...
modules/video_output/xcb/window.c
View file @
c41b9606
...
@@ -348,6 +348,7 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
...
@@ -348,6 +348,7 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
}
}
xcb_flush
(
conn
);
/* Make sure map_window is sent (should be useless) */
xcb_flush
(
conn
);
/* Make sure map_window is sent (should be useless) */
vout_window_SetFullScreen
(
wnd
,
cfg
->
is_fullscreen
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
...
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