From: dynaflash Date: Tue, 1 Mar 2011 18:45:17 +0000 (+0000) Subject: MacGui: Remove Target Size as a rate control option as it doesn't really work correct... X-Git-Url: http://git.osdn.net/view?p=handbrake-jp%2Fhandbrake-jp-git.git;a=commitdiff_plain;h=5f1337b0149ef0a9f208adcff3ec73e79a36ad1a MacGui: Remove Target Size as a rate control option as it doesn't really work correctly and should die an overdue death. - Also rearranged the video quality layout a bit. - Moved Constant Quality above Average Bitrate - Moved the entire Video Quality matrix down below frame rate where it belongs. - Presets are mapped accordingly internally in the macgui code so that they are unchanged across platforms. git-svn-id: svn://localhost/HandBrake/trunk@3823 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/macosx/Controller.h b/macosx/Controller.h index 7bdc3c37..3695405a 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -127,8 +127,6 @@ BOOL fIsDragging; IBOutlet NSTextField * fVidQualityRFLabel; IBOutlet NSTextField * fVidQualityRFField; IBOutlet NSMatrix * fVidQualityMatrix; - IBOutlet NSButtonCell * fVidTargetCell; - IBOutlet NSTextField * fVidTargetSizeField; IBOutlet NSButtonCell * fVidBitrateCell; IBOutlet NSTextField * fVidBitrateField; IBOutlet NSButtonCell * fVidConstantCell; diff --git a/macosx/Controller.m b/macosx/Controller.m index a744ad21..8d458b06 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -525,9 +525,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It /* Video quality */ - [fVidTargetSizeField setIntValue: 700]; [fVidBitrateField setIntValue: 1000]; - [fVidQualityMatrix selectCell: fVidBitrateCell]; [self videoMatrixChanged:nil]; @@ -2326,8 +2324,7 @@ fWorkingCount = 0; /* x264 Option String */ [queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"]; - [queueFileJob setObject:[NSNumber numberWithInt:[fVidQualityMatrix selectedRow]] forKey:@"VideoQualityType"]; - [queueFileJob setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"]; + [queueFileJob setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] + 1] forKey:@"VideoQualityType"]; [queueFileJob setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"]; [queueFileJob setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"]; /* Framerate */ @@ -2755,7 +2752,6 @@ fWorkingCount = 0; /* Video quality */ [fVidQualityMatrix selectCellAtRow:[[queueToApply objectForKey:@"VideoQualityType"] intValue] column:0]; - [fVidTargetSizeField setStringValue:[queueToApply objectForKey:@"VideoTargetSize"]]; [fVidBitrateField setStringValue:[queueToApply objectForKey:@"VideoAvgBitrate"]]; /* Since we are now using RF Values for the slider, we detect if the preset uses an old quality float. * So, check to see if the quality value is less than 1.0 which should indicate the old ".062" type @@ -3076,17 +3072,15 @@ fWorkingCount = 0; } } - switch( [fVidQualityMatrix selectedRow] ) + switch( [[fVidQualityMatrix selectedCell] tag] ) { case 0: - /* Target size. - Bitrate should already have been calculated and displayed - in fVidBitrateField, so let's just use it */ - case 1: + /* ABR */ job->vquality = -1.0; job->vbitrate = [fVidBitrateField intValue]; break; - case 2: + case 1: + /* Constant Quality */ job->vquality = [fVidQualityRFField floatValue]; job->vbitrate = 0; break; @@ -3576,9 +3570,6 @@ bool one_burned = FALSE; if ( [[queueToApply objectForKey:@"VideoQualityType"] intValue] != 2 ) { - /* Target size. - Bitrate should already have been calculated and displayed - in fVidBitrateField, so let's just use it same as abr*/ job->vquality = -1.0; job->vbitrate = [[queueToApply objectForKey:@"VideoAvgBitrate"] intValue]; } @@ -4418,7 +4409,7 @@ bool one_burned = FALSE; @"%02lld:%02lld:%02lld", duration / 3600, ( duration / 60 ) % 60, duration % 60]]; - [self calculateBitrate: sender]; + //[self calculateBitrate: sender]; if ( [fSrcChapterStartPopUp indexOfSelectedItem] == [fSrcChapterEndPopUp indexOfSelectedItem] ) { @@ -4683,33 +4674,33 @@ the user is using "Custom" settings by determining the sender*/ /* We call method method to change UI to reflect whether a preset is used or not*/ [self customSettingUsed: sender]; } + - (IBAction) videoMatrixChanged: (id) sender; { - bool target, bitrate, quality; - - target = bitrate = quality = false; + /* We use the selectedCell: tag of the fVidQualityMatrix instead of selectedRow + * so that the order of the video controls can be switched around. + * Constant quality is 1 and Average bitrate is 0 for reference. */ + bool bitrate, quality; + bitrate = quality = false; if( [fVidQualityMatrix isEnabled] ) { - switch( [fVidQualityMatrix selectedRow] ) + switch( [[fVidQualityMatrix selectedCell] tag] ) { case 0: - target = true; - break; - case 1: bitrate = true; break; - case 2: + case 1: quality = true; break; } } - [fVidTargetSizeField setEnabled: target]; + [fVidBitrateField setEnabled: bitrate]; [fVidQualitySlider setEnabled: quality]; [fVidQualityRFField setEnabled: quality]; [fVidQualityRFLabel setEnabled: quality]; [fVidTwoPassCheck setEnabled: !quality && - [fVidQualityMatrix isEnabled]]; + [fVidQualityMatrix isEnabled]]; if( quality ) { [fVidTwoPassCheck setState: NSOffState]; @@ -4718,7 +4709,7 @@ the user is using "Custom" settings by determining the sender*/ } [self qualitySliderChanged: sender]; - [self calculateBitrate: sender]; + //[self calculateBitrate: sender]; [self customSettingUsed: sender]; } @@ -4811,7 +4802,7 @@ the user is using "Custom" settings by determining the sender*/ - (IBAction) calculateBitrate: (id) sender { - if( !fHandle || [fVidQualityMatrix selectedRow] != 0 || !SuccessfulScan ) + if( !fHandle || ![fVidQualityMatrix selectedRow] || !SuccessfulScan ) { return; } @@ -4836,7 +4827,6 @@ the user is using "Custom" settings by determining the sender*/ /* Audio goes here */ [fAudioDelegate prepareAudioForJob: job]; -[fVidBitrateField setIntValue: hb_calc_bitrate( job, [fVidTargetSizeField intValue] )]; } #pragma mark - @@ -5517,9 +5507,19 @@ return YES; [self calculateBitrate:nil]; /* Video quality */ - [fVidQualityMatrix selectCellAtRow:[[chosenPreset objectForKey:@"VideoQualityType"] intValue] column:0]; - [fVidTargetSizeField setStringValue:[chosenPreset objectForKey:@"VideoTargetSize"]]; + int qualityType = [[chosenPreset objectForKey:@"VideoQualityType"] intValue] - 1; + /* Note since the removal of Target Size encoding, the possible values for VideoQuality type are 0 - 1. + * Therefore any preset that uses the old 2 for Constant Quality would now use 1 since there is one less index + * for the fVidQualityMatrix. It should also be noted that any preset that used the deprecated Target Size + * setting of 0 would set us to 0 or ABR since ABR is now tagged 0. Fortunately this does not affect any built-in + * presets since they all use Constant Quality or Average Bitrate.*/ + if (qualityType == -1) + { + qualityType = 0; + } + [fVidQualityMatrix selectCellWithTag:qualityType]; + [fVidBitrateField setStringValue:[chosenPreset objectForKey:@"VideoAvgBitrate"]]; /* Since we are now using RF Values for the slider, we detect if the preset uses an old quality float. @@ -6013,8 +6013,10 @@ return YES; /* x264 Option String */ [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"]; - [preset setObject:[NSNumber numberWithInt:[fVidQualityMatrix selectedRow]] forKey:@"VideoQualityType"]; - [preset setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"]; + /* though there are actually only 0 - 1 types available in the ui we need to map to the old 0 - 2 + * set of indexes from when we had 0 == Target , 1 == Abr and 2 == Constant Quality for presets + * to take care of any legacy presets. */ + [preset setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] +1 ] forKey:@"VideoQualityType"]; [preset setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"]; [preset setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"]; diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 15919d7c..b33e89d4 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -2,10 +2,10 @@ 1050 - 10H574 + 10J567 732 1038.35 - 461.00 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin 732 @@ -105,7 +105,7 @@ 264 - {{13, 28}, {734, 343}} + {{13, 26}, {734, 343}} YES @@ -119,122 +119,40 @@ 256 - {{289, 259}, {46, 14}} + {{14, 205}, {94, 19}} YES 67239424 4194304 - Quality: + Video Quality: - - - 256 - {{343, 211}, {167, 63}} - - YES - 3 - 1 - - YES - - -2080244224 - 131072 - Target size (MB): - - - 1211912703 - 0 - - NSRadioButton - - - - - - 200 - 25 - - - 67239424 - 131072 - Average bitrate (kbps): - - - 1 - 1211912703 - 0 - - - - 200 - 25 - - - 67239424 - 131072 - Constant quality: - - - 1211912703 - 0 - - - - 400 - 75 - - - {167, 15} - {4, 9} - 1143472128 - NSActionCell - - 67239424 - 0 - Radio - - LucidaGrande - 13 - 1044 - - 1211912703 - 0 - - 400 - 75 - - - - - 3 - MQA - - - - + 256 - {{512, 257}, {84, 19}} + {{170, 166}, {84, 19}} YES - + -1804468671 4326400 - + YES 6 System textBackgroundColor - + + 3 + MQA + 6 @@ -244,27 +162,10 @@ - - - 256 - {{512, 233}, {84, 19}} - - YES - - -1804468671 - 4326400 - - - - YES - - - - 256 - {{292, 186}, {405, 16}} + {{272, 186}, {425, 16}} YES @@ -308,7 +209,7 @@ 256 - {{531, 211}, {169, 14}} + {{192, 188}, {65, 14}} YES @@ -391,7 +292,7 @@ 256 - {{509, 211}, {28, 14}} + {{167, 188}, {28, 14}} YES @@ -439,7 +340,7 @@ 256 - {{106, 229}, {149, 22}} + {{372, 254}, {158, 22}} YES @@ -493,7 +394,7 @@ 256 - {{106, 183}, {124, 18}} + {{270, 166}, {124, 18}} YES @@ -516,7 +417,7 @@ -2147483392 - {{106, 206}, {148, 18}} + {{536, 257}, {143, 18}} YES @@ -537,7 +438,7 @@ 256 - {{123, 165}, {107, 16}} + {{407, 167}, {107, 16}} YES @@ -562,7 +463,7 @@ 256 - {{106, 254}, {149, 22}} + {{98, 254}, {149, 22}} YES @@ -610,7 +511,7 @@ 256 - {{9, 231}, {92, 17}} + {{278, 256}, {92, 17}} YES @@ -626,12 +527,12 @@ 256 - {{14, 256}, {87, 17}} + {{14, 256}, {79, 17}} YES 67239424 - 71303168 + 4194304 Video Codec: @@ -639,6 +540,207 @@ + + + 268 + {{17, 166}, {145, 38}} + + YES + 2 + 1 + + YES + + -2080244224 + 131072 + Constant Quality + + + 1 + 1211912703 + 0 + + NSRadioButton + + + + 200 + 25 + + + 67239424 + 131072 + Average Bitrate (kbps): + + + 1211912703 + 0 + + 549453824 + {18, 18} + + YES + + YES + + + + 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 +AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA +AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1 +cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD +AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH +SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF +hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8 +vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt +7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq +Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo +aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e +n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX +2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW +FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O +Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6 +ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt +rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA +AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA +AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl +A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq +DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU +HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8 +MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v +UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/ +eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj +rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn +5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh +AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK +CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY +GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95 +MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S +UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2 +d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV +pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK +0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf// +AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw +BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA +FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H +LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh +Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ +h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp +svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb +1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX +8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE +AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg +QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA + + + + + + 3 + MCAwAA + + + + 400 + 75 + + + {145, 18} + {4, 2} + 1151868928 + NSActionCell + + 67239424 + 0 + Radio + + LucidaGrande + 13 + 1044 + + 1211912703 + 0 + + 549453824 + {18, 18} + + YES + + YES + + + + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw +IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ +29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 +dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA +AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG +AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ +0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ +7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ +5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ +3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD +AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns +AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ +6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ +/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ +///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl +YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA +AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD +AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu +AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + + + + + + 400 + 75 + + + + + + {{10, 25}, {714, 305}} @@ -4545,14 +4647,6 @@ - fVidBitrateCell - - - - 1598 - - - fVidBitrateField @@ -4561,14 +4655,6 @@ - fVidConstantCell - - - - 1600 - - - fVidEncoderPopUp @@ -4609,22 +4695,6 @@ - fVidTargetCell - - - - 1609 - - - - fVidTargetSizeField - - - - 1610 - - - fVidTwoPassCheck @@ -4633,14 +4703,6 @@ - videoMatrixChanged: - - - - 1612 - - - formatPopUpChanged: @@ -5089,14 +5151,6 @@ - calculateBitrate: - - - - 2689 - - - customSettingUsed: @@ -5105,14 +5159,6 @@ - delegate - - - - 2692 - - - fOpenSourceTitleMMenu @@ -5504,14 +5550,6 @@ 5508 - - fVidQualityMatrix - - - - 5512 - - encodeStartStopPopUpChanged: @@ -6134,6 +6172,46 @@ 5793 + + + fVidQualityMatrix + + + + 5812 + + + + fVidBitrateCell + + + + 5813 + + + + fVidConstantCell + + + + 5814 + + + + videoMatrixChanged: + + + + 5815 + + + + videoMatrixChanged: + + + + 5816 + @@ -6179,7 +6257,6 @@ YES - @@ -6212,6 +6289,7 @@ + @@ -6274,23 +6352,22 @@ YES - - - - - - - - - + + - - + + + + + + + + @@ -6304,42 +6381,6 @@ - 1500 - - - YES - - - - - - - - - 1501 - - - - - 1502 - - - - - 1503 - - - - - 1504 - - - YES - - - - - 1505 @@ -7613,11 +7654,6 @@ - 4873 - - - - 4874 @@ -7916,11 +7952,6 @@ - 4954 - - - - 4955 @@ -8967,6 +8998,32 @@ + + 5808 + + + YES + + + + + + + + 5809 + + + + + 5810 + + + + + 5811 + + + @@ -9022,16 +9079,6 @@ 1478.ImportedFromIB2 1499.IBPluginDependency 1499.ImportedFromIB2 - 1500.IBPluginDependency - 1500.ImportedFromIB2 - 1501.IBPluginDependency - 1501.ImportedFromIB2 - 1502.IBPluginDependency - 1502.ImportedFromIB2 - 1503.IBPluginDependency - 1503.ImportedFromIB2 - 1504.IBPluginDependency - 1504.ImportedFromIB2 1505.IBPluginDependency 1505.ImportedFromIB2 1506.IBPluginDependency @@ -9380,7 +9427,6 @@ 4579.ImportedFromIB2 4846.IBPluginDependency 4872.IBPluginDependency - 4873.IBPluginDependency 4874.IBPluginDependency 4875.IBPluginDependency 4876.IBPluginDependency @@ -9435,7 +9481,6 @@ 4951.IBPluginDependency 4952.IBPluginDependency 4953.IBPluginDependency - 4954.IBPluginDependency 4955.IBPluginDependency 4955.IBShouldRemoveOnLegacySave 4956.IBPluginDependency @@ -9611,6 +9656,10 @@ 5724.IBPluginDependency 58.IBPluginDependency 58.ImportedFromIB2 + 5808.IBPluginDependency + 5809.IBPluginDependency + 5810.IBPluginDependency + 5811.IBPluginDependency 970.IBPluginDependency 970.ImportedFromIB2 971.IBPluginDependency @@ -9754,16 +9803,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{476, 687}, {253, 243}} com.apple.InterfaceBuilder.CocoaPlugin @@ -9899,10 +9938,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{329, 210}, {754, 556}} + {{-1188, 187}, {754, 556}} com.apple.InterfaceBuilder.CocoaPlugin - {{329, 210}, {754, 556}} + {{-1188, 187}, {754, 556}} {{65, 541}, {760, 550}} @@ -10103,8 +10142,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10287,6 +10324,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10310,7 +10351,7 @@ - 5793 + 5816 @@ -10529,8 +10570,6 @@ fVidQualitySlider fVidRateField fVidRatePopUp - fVidTargetCell - fVidTargetSizeField fVidTurboPassCheck fVidTwoPassCheck fVideoFiltersField @@ -10614,8 +10653,6 @@ NSSlider NSTextField NSPopUpButton - NSButtonCell - NSTextField NSButton NSButton NSTextField diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 4a20105b..a39496c8 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -540,7 +540,6 @@ }; buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */; compatibilityVersion = "Xcode 3.1"; - developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English,