summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorritsuka <[email protected]>2008-07-30 19:27:59 +0000
committerritsuka <[email protected]>2008-07-30 19:27:59 +0000
commit95c6abc0b1d61b53f85436067eea08fbc1833a80 (patch)
treeeefb8aa2f7ae52efd43fcac788c679715a4d7317
parentc83cb2bba982d25f8e893b21e129bb0a70631343 (diff)
MacGui: Don't repopulate fVidRatePopUp in titlePopUpChanged. The framerates are always the same.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1595 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.mm33
1 files changed, 2 insertions, 31 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index e87ae61a6..6ef426af4 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2071,7 +2071,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
hb_title_t * title = (hb_title_t*)
hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
-
/* If Auto Naming is on. We create an output filename of dvd name - title number */
if( [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"] > 0 && ( hb_list_count( list ) > 1 ) )
{
@@ -2092,12 +2091,13 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[fSrcChapterEndPopUp addItemWithTitle: [NSString
stringWithFormat: @"%d", i + 1]];
}
+
[fSrcChapterStartPopUp selectItemAtIndex: 0];
[fSrcChapterEndPopUp selectItemAtIndex:
hb_list_count( title->list_chapter ) - 1];
[self chapterPopUpChanged:nil];
-/* Start Get and set the initial pic size for display */
+ /* Start Get and set the initial pic size for display */
hb_job_t * job = title->job;
fTitle = title;
@@ -2178,36 +2178,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[self audioTrackPopUpChanged: fAudLang2PopUp];
[self audioTrackPopUpChanged: fAudLang3PopUp];
[self audioTrackPopUpChanged: fAudLang4PopUp];
-
- /* We repopulate the Video Framerate popup */
- [fVidRatePopUp removeAllItems];
-
- [fVidRatePopUp addItemWithTitle:@"Same as source"];
-
- for( int i = 0; i < hb_video_rates_count; i++ )
- {
- if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.3f",23.976]])
- {
- [fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithCString: hb_video_rates[i].string], @" (NTSC Film)"]];
- }
- else if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%d",25]])
- {
- [fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithCString: hb_video_rates[i].string], @" (PAL Film/Video)"]];
- }
- else if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.2f",29.97]])
- {
- [fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithCString: hb_video_rates[i].string], @" (NTSC Video)"]];
- }
- else
- {
- [fVidRatePopUp addItemWithTitle:
- [NSString stringWithCString: hb_video_rates[i].string]];
- }
- }
[fVidRatePopUp selectItemAtIndex: 0];
/* we run the picture size values through calculatePictureSizing to get all picture setting information*/