Skip to content

V
vlc-2-2
Commit c2cb1c3e authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: CAS: sync steppers and fields, and add NumberFormatters (fixes #8598)

parent daff83e0
Show whitespace changes
Inline Side-by-side
Showing with 1310 additions and 66 deletions
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 @@ ...@@ -128,6 +128,13 @@
@property (readwrite, retain) NSArray * profileValueList; @property (readwrite, retain) NSArray * profileValueList;
@property (readwrite, retain) NSMutableArray * currentProfile; @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; + (VLCConvertAndSave *)sharedInstance;
- (IBAction)toggleWindow; - (IBAction)toggleWindow;
......
modules/gui/macosx/ConvertAndSave.m
View file @ c2cb1c3e
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
@synthesize MRL=_MRL, outputDestination=_outputDestination, profileNames=_profileNames, profileValueList=_profileValueList, currentProfile=_currentProfile; @synthesize MRL=_MRL, outputDestination=_outputDestination, profileNames=_profileNames, profileValueList=_profileValueList, currentProfile=_currentProfile;
@synthesize vidBitrate, vidFramerate, audBitrate, audChannels;
static VLCConvertAndSave *_o_sharedInstance = nil; static VLCConvertAndSave *_o_sharedInstance = nil;
#pragma mark - #pragma mark -
...@@ -694,13 +696,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -694,13 +696,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_customize_vid_ckb setState:[components[1] intValue]]; [_customize_vid_ckb setState:[components[1] intValue]];
[_customize_aud_ckb setState:[components[2] intValue]]; [_customize_aud_ckb setState:[components[2] intValue]];
[_customize_subs_ckb setState:[components[3] 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_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_width_fld setStringValue:components[8]];
[_customize_vid_height_fld setStringValue:components[9]]; [_customize_vid_height_fld setStringValue:components[9]];
[_customize_aud_bitrate_fld setStringValue:components[11]]; [self setAudBitrate:[components[11] intValue]];
[_customize_aud_channels_fld setStringValue:components[12]]; [self setAudChannels:[components[12] intValue]];
[_customize_aud_samplerate_pop selectItemWithTitle:components[13]]; [_customize_aud_samplerate_pop selectItemWithTitle:components[13]];
[_customize_subs_overlay_ckb setState:[components[15] intValue]]; [_customize_subs_overlay_ckb setState:[components[15] intValue]];
...@@ -955,9 +957,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -955,9 +957,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[self.currentProfile addObject: _videoCodecs[1][i]]; [self.currentProfile addObject: _videoCodecs[1][i]];
else else
[self.currentProfile addObject: @"none"]; [self.currentProfile addObject: @"none"];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_bitrate_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self vidBitrate]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [[[_customize_vid_scale_pop selectedItem] title] intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [[[_customize_vid_scale_pop selectedItem] title] intValue]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_framerate_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self vidFramerate]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_width_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_width_fld intValue]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_height_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_height_fld intValue]]];
i = [_customize_aud_codec_pop indexOfSelectedItem]; i = [_customize_aud_codec_pop indexOfSelectedItem];
...@@ -965,8 +967,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -965,8 +967,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[self.currentProfile addObject: _audioCodecs[1][i]]; [self.currentProfile addObject: _audioCodecs[1][i]];
else else
[self.currentProfile addObject: @"none"]; [self.currentProfile addObject: @"none"];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_aud_bitrate_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self audBitrate]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_aud_channels_fld intValue]]]; [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self audChannels]]];
[self.currentProfile addObject: [[_customize_aud_samplerate_pop selectedItem] title]]; [self.currentProfile addObject: [[_customize_aud_samplerate_pop selectedItem] title]];
i = [_customize_subs_pop indexOfSelectedItem]; i = [_customize_subs_pop indexOfSelectedItem];
if (i >= 0) if (i >= 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment