diff options
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r-- | macosx/Controller.mm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 51a712a0b..a22128f7f 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -179,13 +179,16 @@ static int FormatSettings[3][4] = /* Video framerate */ [fVidRatePopUp removeAllItems]; - [fVidRatePopUp addItemWithTitle: _( @"Same as source" )]; + /* Lets deprecate Same as Source for now, will leave it + here but commented out in case we change our minds */ + //[fVidRatePopUp addItemWithTitle: _( @"Same as source" )]; for( int i = 0; i < hb_video_rates_count; i++ ) { [fVidRatePopUp addItemWithTitle: [NSString stringWithCString: hb_video_rates[i].string]]; } - [fVidRatePopUp selectItemAtIndex: 0]; + /* we default to the most common film framerate */ + [fVidRatePopUp selectItemWithTitle: @"23.976"]; /* Picture Settings */ [fPicLabelPAROutp setStringValue: @""]; @@ -2015,8 +2018,14 @@ the user is using "Custom" settings by determining the sender*/ [self VideoMatrixChanged: NULL]; /* Video framerate */ + if ([[chosenPreset objectForKey:@"VideoFramerate"] isEqualToString: @"Same as source"]) + { + [fVidRatePopUp selectItemWithTitle: @"23.976"]; + } + else + { [fVidRatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoFramerate"]]]; - + } /* GrayScale */ [fVidGrayscaleCheck setState:[[chosenPreset objectForKey:@"VideoGrayScale"] intValue]]; |