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
22798cab
Commit
22798cab
authored
Oct 12, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caca: remove dummy resize code
Resizing is handled via the Refresh() function - only.
parent
6d62ce57
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
21 deletions
+5
-21
include/vlc_vout_display.h
include/vlc_vout_display.h
+1
-1
modules/hw/vdpau/display.c
modules/hw/vdpau/display.c
+1
-8
modules/video_output/caca.c
modules/video_output/caca.c
+3
-12
No files found.
include/vlc_vout_display.h
View file @
22798cab
...
...
@@ -151,7 +151,7 @@ enum {
/* Ask the module to acknowledge/refuse the display size change requested
* (externally or by VOUT_DISPLAY_EVENT_DISPLAY_SIZE) */
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
,
/* const vout_display_cfg_t *p_cfg
, int is_forced
*/
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
,
/* const vout_display_cfg_t *p_cfg */
/* Ask the module to acknowledge/refuse fill display state change after
* being requested externally */
...
...
modules/hw/vdpau/display.c
View file @
22798cab
...
...
@@ -375,15 +375,8 @@ static int Control(vout_display_t *vd, int query, va_list ap)
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
{
const
vout_display_cfg_t
*
cfg
=
va_arg
(
ap
,
const
vout_display_cfg_t
*
);
bool
forced
=
va_arg
(
ap
,
int
);
if
(
forced
)
{
vout_window_SetSize
(
sys
->
embed
,
cfg
->
display
.
width
,
cfg
->
display
.
height
);
return
VLC_EGENERIC
;
/* Always fail. See x11.c for rationale. */
}
vout_display_place_t
place
;
vout_display_PlacePicture
(
&
place
,
&
vd
->
source
,
cfg
,
false
);
if
(
place
.
width
!=
vd
->
fmt
.
i_visible_width
||
place
.
height
!=
vd
->
fmt
.
i_visible_height
)
...
...
modules/video_output/caca.c
View file @
22798cab
...
...
@@ -311,23 +311,14 @@ static int Control(vout_display_t *vd, int query, va_list args)
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
(
void
)
args
;
switch
(
query
)
{
case
VOUT_DISPLAY_HIDE_MOUSE
:
caca_set_mouse
(
sys
->
dp
,
0
);
return
VLC_SUCCESS
;
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
{
const
vout_display_cfg_t
*
cfg
=
va_arg
(
args
,
const
vout_display_cfg_t
*
);
caca_refresh_display
(
sys
->
dp
);
/* Not quite good but not sure how to resize it */
if
((
int
)
cfg
->
display
.
width
!=
caca_get_display_width
(
sys
->
dp
)
||
(
int
)
cfg
->
display
.
height
!=
caca_get_display_height
(
sys
->
dp
))
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
}
case
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
:
case
VOUT_DISPLAY_CHANGE_ZOOM
:
case
VOUT_DISPLAY_CHANGE_DISPLAY_FILLED
:
case
VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
:
...
...
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