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
8a202039
Commit
8a202039
authored
Oct 23, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hotkeys: use "zoom" rather than "scale" (like the GUI do)
parent
2f1fdf01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/control/hotkeys.c
modules/control/hotkeys.c
+6
-6
No files found.
modules/control/hotkeys.c
View file @
8a202039
...
@@ -895,10 +895,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
...
@@ -895,10 +895,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
case
ACTIONID_TOGGLE_AUTOSCALE
:
case
ACTIONID_TOGGLE_AUTOSCALE
:
if
(
p_vout
)
if
(
p_vout
)
{
{
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
scale
"
);
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
zoom
"
);
if
(
f_scalefactor
!=
1
.
f
)
if
(
f_scalefactor
!=
1
.
f
)
{
{
var_SetFloat
(
p_vout
,
"
scale
"
,
1
.
f
);
var_SetFloat
(
p_vout
,
"
zoom
"
,
1
.
f
);
DisplayMessage
(
p_vout
,
_
(
"Zooming reset"
)
);
DisplayMessage
(
p_vout
,
_
(
"Zooming reset"
)
);
}
}
else
else
...
@@ -915,21 +915,21 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
...
@@ -915,21 +915,21 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
case
ACTIONID_SCALE_UP
:
case
ACTIONID_SCALE_UP
:
if
(
p_vout
)
if
(
p_vout
)
{
{
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
scale
"
);
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
zoom
"
);
if
(
f_scalefactor
<
10
.
f
)
if
(
f_scalefactor
<
10
.
f
)
f_scalefactor
+=
.
1
f
;
f_scalefactor
+=
.
1
f
;
var_SetFloat
(
p_vout
,
"
scale
"
,
f_scalefactor
);
var_SetFloat
(
p_vout
,
"
zoom
"
,
f_scalefactor
);
}
}
break
;
break
;
case
ACTIONID_SCALE_DOWN
:
case
ACTIONID_SCALE_DOWN
:
if
(
p_vout
)
if
(
p_vout
)
{
{
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
scale
"
);
float
f_scalefactor
=
var_GetFloat
(
p_vout
,
"
zoom
"
);
if
(
f_scalefactor
>
.
3
f
)
if
(
f_scalefactor
>
.
3
f
)
f_scalefactor
-=
.
1
f
;
f_scalefactor
-=
.
1
f
;
var_SetFloat
(
p_vout
,
"
scale
"
,
f_scalefactor
);
var_SetFloat
(
p_vout
,
"
zoom
"
,
f_scalefactor
);
}
}
break
;
break
;
...
...
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