Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
c2cb1c3e
Commit
c2cb1c3e
authored
May 10, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: CAS: sync steppers and fields, and add NumberFormatters (fixes #8598)
parent
daff83e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1310 additions
and
66 deletions
+1310
-66
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
...package/macosx/Resources/English.lproj/ConvertAndSave.xib
+1293
-58
modules/gui/macosx/ConvertAndSave.h
modules/gui/macosx/ConvertAndSave.h
+7
-0
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+10
-8
No files found.
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @
c2cb1c3e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
modules/gui/macosx/ConvertAndSave.h
View file @
c2cb1c3e
...
...
@@ -128,6 +128,13 @@
@property
(
readwrite
,
retain
)
NSArray
*
profileValueList
;
@property
(
readwrite
,
retain
)
NSMutableArray
*
currentProfile
;
/* Bindings for field / stepper combis */
@property
(
nonatomic
)
int
vidBitrate
;
@property
(
nonatomic
)
int
vidFramerate
;
@property
(
nonatomic
)
int
audBitrate
;
@property
(
nonatomic
)
int
audChannels
;
+
(
VLCConvertAndSave
*
)
sharedInstance
;
-
(
IBAction
)
toggleWindow
;
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
c2cb1c3e
...
...
@@ -60,6 +60,8 @@
@synthesize
MRL
=
_MRL
,
outputDestination
=
_outputDestination
,
profileNames
=
_profileNames
,
profileValueList
=
_profileValueList
,
currentProfile
=
_currentProfile
;
@synthesize
vidBitrate
,
vidFramerate
,
audBitrate
,
audChannels
;
static
VLCConvertAndSave
*
_o_sharedInstance
=
nil
;
#pragma mark -
...
...
@@ -694,13 +696,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_customize_vid_ckb
setState
:[
components
[
1
]
intValue
]];
[
_customize_aud_ckb
setState
:[
components
[
2
]
intValue
]];
[
_customize_subs_ckb
setState
:[
components
[
3
]
intValue
]];
[
_customize_vid_bitrate_fld
setStringValue
:
components
[
5
]];
[
self
setVidBitrate
:[
components
[
5
]
intValue
]];
[
_customize_vid_scale_pop
selectItemWithTitle
:
components
[
6
]];
[
_customize_vid_framerate_fld
setStringValue
:
components
[
7
]];
[
self
setVidFramerate
:[
components
[
7
]
intValue
]];
[
_customize_vid_width_fld
setStringValue
:
components
[
8
]];
[
_customize_vid_height_fld
setStringValue
:
components
[
9
]];
[
_customize_aud_bitrate_fld
setStringValue
:
components
[
11
]];
[
_customize_aud_channels_fld
setStringValue
:
components
[
12
]];
[
self
setAudBitrate
:[
components
[
11
]
intValue
]];
[
self
setAudChannels
:[
components
[
12
]
intValue
]];
[
_customize_aud_samplerate_pop
selectItemWithTitle
:
components
[
13
]];
[
_customize_subs_overlay_ckb
setState
:[
components
[
15
]
intValue
]];
...
...
@@ -955,9 +957,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
self
.
currentProfile
addObject
:
_videoCodecs
[
1
][
i
]];
else
[
self
.
currentProfile
addObject
:
@"none"
];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_vid_bitrate_fld
intValu
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
self
vidBitrat
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[[[
_customize_vid_scale_pop
selectedItem
]
title
]
intValue
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_vid_framerate_fld
intValu
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
self
vidFramerat
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_vid_width_fld
intValue
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_vid_height_fld
intValue
]]];
i
=
[
_customize_aud_codec_pop
indexOfSelectedItem
];
...
...
@@ -965,8 +967,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
self
.
currentProfile
addObject
:
_audioCodecs
[
1
][
i
]];
else
[
self
.
currentProfile
addObject
:
@"none"
];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_aud_bitrate_fld
intValu
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
_customize_aud_channels_fld
intValue
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
self
audBitrat
e
]]];
[
self
.
currentProfile
addObject
:
[
NSString
stringWithFormat
:
@"%i"
,
[
self
audChannels
]]];
[
self
.
currentProfile
addObject
:
[[
_customize_aud_samplerate_pop
selectedItem
]
title
]];
i
=
[
_customize_subs_pop
indexOfSelectedItem
];
if
(
i
>=
0
)
...
...
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