Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
551b9f57
Commit
551b9f57
authored
Aug 24, 2013
by
David Fuhrmann
Browse files
macosx: add proper bindings for text/stepper combos in subtitle panel
parent
8ffea4fb
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
extras/package/macosx/Resources/English.lproj/Open.xib
View file @
551b9f57
This diff is collapsed.
Click to expand it.
modules/gui/macosx/open.h
View file @
551b9f57
...
...
@@ -252,6 +252,11 @@
@property
(
readonly
)
NSArray
*
qtkvideoDevices
;
@property
(
readonly
)
NSArray
*
qtkaudioDevices
;
/* text field / stepper binding values - subs panel */
@property
(
nonatomic
)
float
fileSubDelay
;
@property
(
nonatomic
)
float
fileSubFps
;
-
(
void
)
qtkrefreshVideoDevices
;
-
(
void
)
qtkrefreshAudioDevices
;
...
...
@@ -301,8 +306,7 @@
-
(
IBAction
)
subSettings
:(
id
)
sender
;
-
(
IBAction
)
subFileBrowse
:(
id
)
sender
;
-
(
IBAction
)
subOverride
:(
id
)
sender
;
-
(
IBAction
)
subDelayStepperChanged
:(
id
)
sender
;
-
(
IBAction
)
subFpsStepperChanged
:(
id
)
sender
;
-
(
IBAction
)
subCloseSheet
:(
id
)
sender
;
-
(
IBAction
)
panelCancel
:(
id
)
sender
;
...
...
modules/gui/macosx/open.m
View file @
551b9f57
...
...
@@ -71,6 +71,8 @@ struct display_info_t
*****************************************************************************/
@implementation
VLCOpen
@synthesize
fileSubDelay
,
fileSubFps
;
#pragma mark -
#pragma mark Init
...
...
@@ -441,8 +443,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"sub-file=%@"
,
o_sub_path
]];
if
([
o_file_sub_override
state
]
==
NSOnState
)
{
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"sub-delay=%
i
"
,
(
int
)([
o_file_sub_delay
intValue
]
*
10
)]];
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"sub-fps=%f"
,
[
o_file_sub_fps
floatValue
]]];
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"sub-delay=%
f
"
,
(
[
self
fileSubDelay
]
*
10
)]];
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"sub-fps=%f"
,
[
self
fileSubFps
]]];
}
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"subsdec-encoding=%@"
,
[[
o_file_sub_encoding_pop
selectedItem
]
representedObject
]]];
...
...
@@ -1569,16 +1571,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
[
o_file_sub_fps_stp
setEnabled
:
b_state
];
}
-
(
IBAction
)
subDelayStepperChanged
:(
id
)
sender
{
[
o_file_sub_delay
setIntValue
:
[
o_file_sub_delay_stp
intValue
]];
}
-
(
IBAction
)
subFpsStepperChanged
:(
id
)
sender
;
{
[
o_file_sub_fps
setFloatValue
:
[
o_file_sub_fps_stp
floatValue
]];
}
#pragma mark -
#pragma mark Miscellaneous
...
...
Write
Preview
Supports
Markdown
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