OSDN Git Service

merge 0.9.4 to jp
[handbrake-jp/handbrake-jp.git] / macosx / HBAdvancedController.m
index 018cb00..f57e05d 100644 (file)
@@ -71,7 +71,7 @@
         fX264optWeightBLabel,fX264optWeightBSwitch, fX264optBPyramidLabel,fX264optBPyramidSwitch,
         fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,fX264optAnalyseLabel,
         fX264optAnalysePopUp,fX264opt8x8dctLabel,fX264opt8x8dctSwitch,fX264optCabacLabel,fX264optCabacSwitch,
-        fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp};
+        fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp, fX264optPsyRDSlider, fX264optPsyRDLabel, fX264optPsyTrellisSlider, fX264optPsyTrellisLabel, fX264optBAdaptPopUp, fX264optBAdaptLabel };
 
     for( i = 0; i < sizeof( controls ) / sizeof( NSControl * ); i++ )
     {
 {
     /*Set opt widget values here*/
     
+    NSString * toolTip = @"";
+    
     /*B-Frames fX264optBframesPopUp*/
     int i;
     [fX264optBframesPopUp removeAllItems];
+    /*
     [fX264optBframesPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
+    */
+    [fX264optBframesPopUp addItemWithTitle:@"Default (3)"];
     for (i=0; i<17;i++)
     {
         [fX264optBframesPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    toolTip =
+        @"Sane values are 1-6. B-Frames are smaller than other frames, so they let you pack in more quality at the same bitrate. Use more of them with animated material.";
+    [fX264optBframesPopUp setToolTip: toolTip];
+    [fX264optBframesLabel setToolTip: toolTip];
     
     /*Reference Frames fX264optRefPopUp*/
     [fX264optRefPopUp removeAllItems];
+    /*
     [fX264optRefPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (1)", @"Advanced", @"")];
+    */
+    [fX264optRefPopUp addItemWithTitle:@"Default (3)"];
     for (i=0; i<17;i++)
     {
         [fX264optRefPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    toolTip =
+        @"Sane values are 1-6. The more you add, the higher the quality — but the slower the encode. Be careful...too many and QuickTime struggle to play the video back.";
+    [fX264optRefPopUp setToolTip: toolTip];
+    [fX264optRefLabel setToolTip: toolTip];
     
     /*No Fast P-Skip fX264optNfpskipSwitch BOOLEAN*/
     [fX264optNfpskipSwitch setState:0];
+    toolTip =
+        @"This can help with blocking on solid colors like blue skies, but it also slows down the encode.";
+    [fX264optNfpskipSwitch setToolTip: toolTip];
+    [fX264optNfpskipLabel setToolTip: toolTip];
     
     /*No Dict Decimate fX264optNodctdcmtSwitch BOOLEAN*/
     [fX264optNodctdcmtSwitch setState:0];    
+    toolTip =
+        @"To save space, x264 will \"zero out\" blocks when it thinks they won't be perceptible by the viewer. This negligibly reduces quality, but in rare cases it can mess up and produce visible artifacts. This situation can be alleviated by telling x264 not to decimate DCT blocks.\n\nIt increases quality but also bitrate/file size, so if you use it when you've specified a target bitrate you will end up with a worse picture than without it. However, when used with constant quality encoding, or if you boost the average bitrate to compensate, you might get a better result.";
+    [fX264optNodctdcmtSwitch setToolTip: toolTip];
+    [fX264optNodctdcmtLabel setToolTip: toolTip];
     
     /*Sub Me fX264optSubmePopUp*/
     [fX264optSubmePopUp removeAllItems];
+    /*
     [fX264optSubmePopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (6)", @"Advanced", @"")];
+    [fX264optSubmePopUp addItemWithTitle:@"Default (7)"];
+    */
     for (i=0; i<10;i++)
     {
         [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    toolTip =
+        @"This setting is finer-grained than the motion estimation settings above. Instead of dealing with whole pixels, it deals with 4 fractional pixels, or quarter pixels (qpel). Higher levels increase quality by further refining the motion prediction for these quarter pixels, but take longer to encode.\n\nLevel 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. 7, the default, enables that rate distortion for B-frames. 8 refines those decisions for I and P frames, and 9 adds on refinement for B-frames as well.";
+    [fX264optSubmePopUp setToolTip: toolTip];
+    [fX264optSubmeLabel setToolTip: toolTip];
     
     /*Trellis fX264optTrellisPopUp*/
     [fX264optTrellisPopUp removeAllItems];
+    /*
     [fX264optTrellisPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
+    */
+    [fX264optTrellisPopUp addItemWithTitle:@"Default (1)"];
     for (i=0; i<3;i++)
     {
         [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
     [fX264optTrellisPopUp setWantsLayer:YES];
+    toolTip =
+        @"Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate or increase quality. A value of 1 means it only fine-tunes the final encode of a block of pixels, while 2 means it is considered during earlier phases of the decision-making process as well.";
+    [fX264optTrellisPopUp setToolTip: toolTip];
+    [fX264optTrellisLabel setToolTip: toolTip];
     
     /*Mixed-references fX264optMixedRefsSwitch BOOLEAN*/
-    [fX264optMixedRefsSwitch setState:0];
+    [fX264optMixedRefsSwitch setState:1];
     [fX264optMixedRefsSwitch setWantsLayer:YES];
+    toolTip =
+        @"With this on, different references can be used for different parts of each 16x16 pixel macroblock, increasing quality.";
+    [fX264optMixedRefsSwitch setToolTip: toolTip];
+    [fX264optMixedRefsLabel setToolTip: toolTip];
     
     /*Motion Estimation fX264optMotionEstPopUp*/
     [fX264optMotionEstPopUp removeAllItems];
+    /*
     [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (Hexagon)", @"Advanced", @"")];
     [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Diamond", @"Advanced", @"")];
     [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Hexagon", @"Advanced", @"")];
     [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Uneven Multi-Hexagon", @"Advanced", @"")];
     [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Exhaustive", @"Advanced", @"")];
+    */
+    [fX264optMotionEstPopUp addItemWithTitle:@"Default (Hexagon)"];
+    [fX264optMotionEstPopUp addItemWithTitle:@"Diamond"];
+    [fX264optMotionEstPopUp addItemWithTitle:@"Hexagon"];
+    [fX264optMotionEstPopUp addItemWithTitle:@"Uneven Multi-Hexagon"];
+    [fX264optMotionEstPopUp addItemWithTitle:@"Exhaustive"];
+    [fX264optMotionEstPopUp addItemWithTitle:@"Transformed Exhaustive"];
+    toolTip =
+        @"Controls the motion estimation method. Motion estimation is how the encoder decides how each block of pixels in a frame has moved, compared to most similar blocks in the other frames it references. There are many ways of finding the most similar blocks, with varying speeds and accuracy.\n\nAt the most basic setting, dia, x264 will only consider a diamond-shaped region around each pixel.\n\nThe default setting, hex, is similar to dia but uses a hexagon shape.\n\nUneven multi-hexagon, umh, searches a number of different patterns across a wider area and thus is slower than hex and dia but further increases compression efficiency and quality.\n\nesa, an exhaustive search of a square around each pixel (whose size is controlled by the me-range parameter), is much slower and offers only minimal quality gains.\n\ntesa, transformed exhaustive search, which performs just as thorough a search, is slower still but offers further slight improvements to quality.";
+    [fX264optMotionEstPopUp setToolTip: toolTip];
+    [fX264optMotionEstLabel setToolTip: toolTip];
     
     /*Motion Estimation range fX264optMERangePopUp*/
     [fX264optMERangePopUp removeAllItems];
     {
         [fX264optMERangePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    toolTip =
+        @"This range is the radius, in pixels, x264 should use for motion estimation searches. It only has an effect when you use Uneven Multi-Hexagonal, Exhaustive, or Transformed Exhaustive searching. 24, 32, and 64 are good values, with each being progressively smaller for progressively less improvement to picture quality.";
+    [fX264optMERangePopUp setToolTip: toolTip];
+    [fX264optMERangeLabel setToolTip: toolTip];
     
     /*Weighted B-Frame Prediction fX264optWeightBSwitch BOOLEAN*/
-    [fX264optWeightBSwitch setState:0];
+    [fX264optWeightBSwitch setState:1];
     [fX264optWeightBSwitch setWantsLayer:YES];
+    toolTip =
+        @"Sometimes x264 will base a B-frame's motion compensation on frames both before and after. With weighted B-frames, the amount of influence each frame has is related to its distance from the frame being encoded, instead of both having equal influence. The AppleTV can have issues with this.";
+    [fX264optWeightBSwitch setToolTip: toolTip];
+    [fX264optWeightBLabel setToolTip: toolTip];
     
     /*B-frame Pyramids fX264optBPyramidSwitch BOOLEAN*/
     [fX264optBPyramidSwitch setState:0];
     [fX264optBPyramidSwitch setWantsLayer:YES];
+    toolTip =
+        @"B-frame pyramids are a High Profile feature. Pyramidal B-frames mean that B-frames don't just reference surrounding reference frames — instead, it also treats a previous B-frame as a reference, improving quality/lowering bitrate at the expense of complexity. Logically, to reference an earlier B-frame, you must tell x264 to use at least 2 B-frames.";
+    [fX264optBPyramidSwitch setToolTip: toolTip];
+    [fX264optBPyramidLabel setToolTip: toolTip];
     
     /*Direct B-Frame Prediction Mode fX264optDirectPredPopUp*/
     [fX264optDirectPredPopUp removeAllItems];
     [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Temporal", @"Advanced", @"")];
     [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Automatic", @"Advanced", @"")];
     [fX264optDirectPredPopUp setWantsLayer:YES];
+    toolTip =
+        @"Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame. It can either look at other parts of the current frame (spatial) or compare against the following P-frameframe (temporal). You're best off setting this to automatic, so x264 decides which method is best on its own. Don't select none assuming it will be faster; instead it will take longer and look worse. If you're going to choose between spatial and temporal, spatial is usually better.";
+    [fX264optDirectPredPopUp setToolTip: toolTip];
+    [fX264optDirectPredLabel setToolTip: toolTip];
+    
+    /* Adaptive B-Frames Mode fX264optBAdaptPopUp */
+    [fX264optBAdaptPopUp removeAllItems];
+    [fX264optBAdaptPopUp addItemWithTitle:@"Default (Fast)"];
+    [fX264optBAdaptPopUp addItemWithTitle:@"Off"];
+    [fX264optBAdaptPopUp addItemWithTitle:@"Fast"];
+    [fX264optBAdaptPopUp addItemWithTitle:@"Optimal"];
+    [fX264optBAdaptPopUp setWantsLayer:YES];
+    toolTip =
+        @"When adaptive B-Frames are disabled, the number of B-Frames you specify is the constant length of every B-Frame sequence. When one of the adaptive modes is enabled, the number of B-Frames is treated as a maximum, with the length of each sequence varying, but never exceeding the max.\n\nFast mode takes the same amount of time no matter how many B-frames you specify. However, it doesn't always make the best decisions on how many B-Frames to use in a sequence.\n\nOptimal mode gets slower as the maximum number of B-Frames increases, but does a much better job at deciding sequence length, which can mean smaller file sizes and better quality.";
+    [fX264optBAdaptPopUp setToolTip: toolTip];
+    [fX264optBAdaptLabel setToolTip: toolTip];
     
     /*Alpha Deblock*/
     [fX264optAlphaDeblockPopUp removeAllItems];
     {
         [fX264optAlphaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    toolTip =
+        @"x264 includes an in-loop deblocking filter. What this means is that blocky compression artifacts are smoothed away when you play back the video. It has two settings: strength and threshold, just like a simple filter in Photoshop.\n\nStrength controls the amount of deblocking applied to the whole frame. If you drop down below 0, you reduce the amount of blurring. Go too negative, and you'll get an effect somewhat like oversharpening an image. Go into positive values, and the image may become too soft.\n\nThreshold controls how sensitive the filter is to whether something in a block is detail that needs to be preserved: lower numbers blur details less.\n\nThe default deblocking values are 0 and 0. This does not mean zero deblocking. It means x264 will apply the regular deblocking strength and thresholds the codec authors have selected as working the best in most cases.\n\nWhile many, many people stick with the default deblocking values of 0,0, and you should never change the deblocking without disabling adaptive quantization, other people disagree. Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.";
+    [fX264optAlphaDeblockPopUp setToolTip: toolTip];
+    [fX264optDeblockLabel setToolTip: toolTip];
 
     /*Beta Deblock*/
     [fX264optBetaDeblockPopUp removeAllItems];
     {
         [fX264optBetaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
     }
+    [fX264optBetaDeblockPopUp setToolTip: toolTip];
+    [fX264optDeblockLabel setToolTip: toolTip];
 
     /* Analysis fX264optAnalysePopUp */
     [fX264optAnalysePopUp removeAllItems];
+    /*
     [fX264optAnalysePopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (some)", @"Advanced", @"")]; /* 0=default */
     [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"None", @"Advanced", @"")]]; /* 1=none */
     [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"All", @"Advanced", @"")]]; /* 2=all */
+    */
+    [fX264optAnalysePopUp addItemWithTitle:@"Default (some)"]; /* 0=default */
+    [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"None"]]; /* 1=none */
+    [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"All"]]; /* 2=all */
+    toolTip =
+        @"Analysis controls how finely x264 divides up a frame to capture detail. Full macroblocks are 16x16 pixels, but x264 can go down all the way to 4x4 blocks if it judges it necessary. By default it only breaks up key frames that much. To give x264 the freedom to make the best decisions for all frames, use \"all\" analysis. If you want to create a high profile H.264 video (which is less compatible with the world at large than main profile), also check the \"8x8 DCT blocks\" box to add yet another block size for analysis.";
+    [fX264optAnalysePopUp setToolTip: toolTip];
+    [fX264optAnalyseLabel setToolTip: toolTip];
 
     /* 8x8 DCT fX264op8x8dctSwitch */
-    [fX264opt8x8dctSwitch setState:0];
+    [fX264opt8x8dctSwitch setState:1];
     [fX264opt8x8dctSwitch setWantsLayer:YES];
+    toolTip =
+        @"Checking this box lets x264 break key frames down into 8x8 blocks of pixels for analysis. This is a high profile feature of H.264, which makes it less compatible. It should slightly decrease bitrate or improve quality. Turn it on whenever possible.";
+    [fX264opt8x8dctSwitch setToolTip: toolTip];
+    [fX264opt8x8dctLabel setToolTip: toolTip];
 
     /* CABAC fX264opCabacSwitch */
     [fX264optCabacSwitch setState:1];
+    toolTip =
+        @"CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15\%. This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod, and makes the AppleTV struggle. So turn it off for those.\n\nCABAC is a kind of entropy coding, which means that it compresses data by making shorthand symbols to represent long streams of data. The \"entropy\" part means that the symbols it uses the most often are the smallest. When you disable CABAC, another entropy coding scheme gets enabled, called CAVLC (context adaptive variable-length coding). CAVLC is a lot less efficient, which is why it needs 15\% more bitrate to achieve the same quality as CABAC.";
+    [fX264optCabacSwitch setToolTip: toolTip];
+    [fX264optCabacLabel setToolTip: toolTip];
+    
+    /* PsyRDO fX264optPsyRDSlider */
+    [fX264optPsyRDSlider setMinValue:0.0];
+    [fX264optPsyRDSlider setMaxValue:1.0];
+    [fX264optPsyRDSlider setTickMarkPosition:NSTickMarkBelow];
+    [fX264optPsyRDSlider setNumberOfTickMarks:11];
+    [fX264optPsyRDSlider setAllowsTickMarkValuesOnly:YES];
+    [fX264optPsyRDSlider setFloatValue:1.0];
+    toolTip =
+        @"Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.";
+    [fX264optPsyRDSlider setToolTip: toolTip];
+    [fX264optPsyRDLabel setToolTip: toolTip];
+
+    /* PsyTrellis fX264optPsyRDSlider */
+    [fX264optPsyTrellisSlider setMinValue:0.0];
+    [fX264optPsyTrellisSlider setMaxValue:1.0];
+    [fX264optPsyTrellisSlider setTickMarkPosition:NSTickMarkBelow];
+    [fX264optPsyTrellisSlider setNumberOfTickMarks:11];
+    [fX264optPsyTrellisSlider setAllowsTickMarkValuesOnly:YES];
+    [fX264optPsyTrellisSlider setFloatValue:0.0];
+    toolTip =
+        @"Psychovisual Trellis tries to retain more sharpness and detail, but can cause artifacting. It is considered experimental, which is why it's off by default. Good values are 0.1 to 0.2.";
+    [fX264optPsyTrellisSlider setToolTip: toolTip];
+    [fX264optPsyTrellisLabel setToolTip: toolTip];
 
     /* Standardize the option string */
     [self X264AdvancedOptionsStandardizeOptString:nil];
 
     /* Set Current GUI Settings based on newly standardized string */
-    [self X264AdvancedOptionsSetCurrentSettings:nil];
+    [self X264AdvancedOptionsSetCurrentSettings:sender];
 
     /* Fade out options that don't apply */
     [self X264AdvancedOptionsAnimate: sender];
     }
     
     /* Change the option string to reflect the new standardized option string */
-    [fDisplayX264Options setStringValue:[NSString stringWithFormat:changedOptString]];
+    [fDisplayX264Options setStringValue:changedOptString];
 }
 
 /**
        - CABAC (when 0 turn off trellis)
        - analysis (if none, turn off 8x8dct)
        - refs (under 2, disable mixed-refs)
+       - subme (if under 6, turn off psy-rd and psy-trel)
+       - trellis (if 0, turn off psy-trel)
     */
     
-    if ( [fX264optBframesPopUp indexOfSelectedItem ] < 2)
+    if( sender == fX264optBframesPopUp || sender == nil || sender == fDisplayX264Options )
     {
-        /* If the b-frame widget is at 0 or 1, the user has chosen
-           not to use b-frames at all. So disable the options
-           that can only be used when b-frames are enabled.        */
-        [[fX264optWeightBSwitch animator] setHidden:YES];
-        [[fX264optWeightBLabel animator] setHidden:YES];
-        if ( [fX264optWeightBSwitch state] == 1 && sender != fX264optWeightBSwitch && sender != fX264optBPyramidSwitch && sender != fX264optDirectPredPopUp)
-            [fX264optWeightBSwitch performClick:self];
-        
-        [[fX264optBPyramidSwitch animator] setHidden:YES];
-        [[fX264optBPyramidLabel animator] setHidden:YES];
-        if ( [fX264optBPyramidSwitch state] == 1 && sender != fX264optWeightBSwitch && sender != fX264optBPyramidSwitch && sender != fX264optDirectPredPopUp)
-            [fX264optBPyramidSwitch performClick:self];
-
-        [[fX264optDirectPredPopUp animator] setHidden:YES];
-        [[fX264optDirectPredLabel animator] setHidden:YES];
-        if ( [fX264optDirectPredPopUp indexOfSelectedItem] > 0 && sender != fX264optWeightBSwitch && sender != fX264optBPyramidSwitch && sender != fX264optDirectPredPopUp)
+        if ( [fX264optBframesPopUp indexOfSelectedItem ] > 0 &&
+             [fX264optBframesPopUp indexOfSelectedItem ] < 2)
         {
-            [fX264optDirectPredPopUp selectItemAtIndex: 0];
-            [[fX264optDirectPredPopUp cell] performClick:self];
+            /* If the b-frame widget is at 0 or 1, the user has chosen
+               not to use b-frames at all. So disable the options
+               that can only be used when b-frames are enabled.        */
             
-        }
-    }
-    else if ( [fX264optBframesPopUp indexOfSelectedItem ] == 2)
-    {
-        /* Only 1 b-frame? Disable b-pyramid. */
-        [[fX264optBPyramidSwitch animator] setHidden:YES];
-        [[fX264optBPyramidLabel animator] setHidden:YES];
-        if ( [fX264optBPyramidSwitch state] == 1 && sender != fX264optBPyramidSwitch)
-            [fX264optBPyramidSwitch performClick:self];
+            if( [fX264optWeightBSwitch isHidden] == false)
+            {
+                [[fX264optWeightBSwitch animator] setHidden:YES];
+                [[fX264optWeightBLabel animator] setHidden:YES];
+                if ( [fX264optWeightBSwitch state] == 1 )
+                    [fX264optWeightBSwitch performClick:self];
+            }
 
-        [[fX264optWeightBSwitch animator] setHidden:NO];
-        [[fX264optWeightBLabel animator] setHidden:NO];
+            if( [fX264optBPyramidSwitch isHidden] == false )
+            {
+                [[fX264optBPyramidSwitch animator] setHidden:YES];
+                [[fX264optBPyramidLabel animator] setHidden:YES];
+                if ( [fX264optBPyramidSwitch state] == 1 )
+                    [fX264optBPyramidSwitch performClick:self];
+            }
 
-        [[fX264optDirectPredPopUp animator] setHidden:NO];
-        [[fX264optDirectPredLabel animator] setHidden:NO];
-    }
-    else
-    {
-        [[fX264optWeightBSwitch animator] setHidden:NO];
-        [[fX264optWeightBLabel animator] setHidden:NO];
+            if( [fX264optDirectPredPopUp isHidden] == false )
+            {
+                [[fX264optDirectPredPopUp animator] setHidden:YES];
+                [[fX264optDirectPredLabel animator] setHidden:YES];
+                if ( [fX264optDirectPredPopUp indexOfSelectedItem] > 0 )
+                {
+                    [fX264optDirectPredPopUp selectItemAtIndex: 0];
+                    [[fX264optDirectPredPopUp cell] performClick:self];
+                }
+            }
 
-        [[fX264optBPyramidSwitch animator] setHidden:NO];
-        [[fX264optBPyramidLabel animator] setHidden:NO];
+            if( [fX264optBAdaptPopUp isHidden] == false )
+            {
+                [[fX264optBAdaptPopUp animator] setHidden:YES];
+                [[fX264optBAdaptLabel animator] setHidden:YES];
+                if ( [fX264optBAdaptPopUp indexOfSelectedItem] > 0 )
+                {
+                    [fX264optBAdaptPopUp selectItemAtIndex: 0];
+                    [[fX264optBAdaptPopUp cell] performClick:self];
+                }
+            }
+        }
+        else if ( [fX264optBframesPopUp indexOfSelectedItem ] == 2)
+        {
+            /* Only 1 b-frame? Disable b-pyramid. */
+            if( [fX264optBPyramidSwitch isHidden] == false )
+            {
+                [[fX264optBPyramidSwitch animator] setHidden:YES];
+                [[fX264optBPyramidLabel animator] setHidden:YES];
+                if ( [fX264optBPyramidSwitch state] == 1 )
+                    [fX264optBPyramidSwitch performClick:self];
+            }
 
-        [[fX264optDirectPredPopUp animator] setHidden:NO];
-        [[fX264optDirectPredLabel animator] setHidden:NO];
+            if( [fX264optWeightBSwitch isHidden] == true )
+            {
+                [[fX264optWeightBSwitch animator] setHidden:NO];
+                [[fX264optWeightBLabel animator] setHidden:NO];
+            }
+            
+            if( [fX264optDirectPredPopUp isHidden] == true )
+            {
+                [[fX264optDirectPredPopUp animator] setHidden:NO];
+                [[fX264optDirectPredLabel animator] setHidden:NO];
+            }
+            
+            if( [fX264optBAdaptPopUp isHidden] == true )
+            {
+                [[fX264optBAdaptPopUp animator] setHidden:NO];
+                [[fX264optBAdaptLabel animator] setHidden:NO];
+            }
+        }
+        else
+        {
+            if( [fX264optBPyramidSwitch isHidden] == true )
+            {
+                [[fX264optBPyramidSwitch animator] setHidden:NO];
+                [[fX264optBPyramidLabel animator] setHidden:NO];
+            }
+
+            if( [fX264optWeightBSwitch isHidden] == true )
+            {
+                [[fX264optWeightBSwitch animator] setHidden:NO];
+                [[fX264optWeightBLabel animator] setHidden:NO];
+            }
+            
+            if( [fX264optDirectPredPopUp isHidden] == true )
+            {
+                [[fX264optDirectPredPopUp animator] setHidden:NO];
+                [[fX264optDirectPredLabel animator] setHidden:NO];
+            }
+            
+            if( [fX264optBAdaptPopUp isHidden] == true )
+            {
+                [[fX264optBAdaptPopUp animator] setHidden:NO];
+                [[fX264optBAdaptLabel animator] setHidden:NO];
+            }
+        }
     }
     
-    if ( [fX264optCabacSwitch state] == false)
+    if( sender == fX264optCabacSwitch || sender == nil || sender == fDisplayX264Options )
     {
-        /* Without CABAC entropy coding, trellis doesn't run. */
-        
-        [[fX264optTrellisPopUp animator] setHidden:YES];
-        [[fX264optTrellisLabel animator] setHidden:YES];
-        [fX264optTrellisPopUp selectItemAtIndex:0];
-        if (sender != fX264optTrellisPopUp)
-            [[fX264optTrellisPopUp cell] performClick:self];
+        if ( [fX264optCabacSwitch state] == false)
+        {
+            if( [fX264optTrellisPopUp isHidden] == false )
+            {
+                /* Without CABAC entropy coding, trellis doesn't run. */
+                [[fX264optTrellisPopUp animator] setHidden:YES];
+                [[fX264optTrellisLabel animator] setHidden:YES];
+                [fX264optTrellisPopUp selectItemAtIndex:0];
+                [[fX264optTrellisPopUp cell] performClick:self];
+            }
+        }
+        else if( [fX264optTrellisPopUp isHidden] == true)
+        {
+            [[fX264optTrellisPopUp animator] setHidden:NO];
+            [[fX264optTrellisLabel animator] setHidden:NO];
+        }
     }
-    else
+    
+    if( sender == fX264optAnalysePopUp || sender == nil || sender == fDisplayX264Options )
     {
-        [[fX264optTrellisPopUp animator] setHidden:NO];
-        [[fX264optTrellisLabel animator] setHidden:NO];
+        if ( [fX264optAnalysePopUp indexOfSelectedItem] == 1)
+        {
+            /* No analysis? Disable 8x8dct */
+            if( [fX264opt8x8dctSwitch isHidden] == false )
+            {
+                [[fX264opt8x8dctSwitch animator] setHidden:YES];
+                [[fX264opt8x8dctLabel animator] setHidden:YES];
+                if ( [fX264opt8x8dctSwitch state] == 1 )
+                    [fX264opt8x8dctSwitch performClick:self];
+            }
+        }
+        else
+        {
+            if( [fX264opt8x8dctSwitch isHidden] == true )
+            {
+                [[fX264opt8x8dctSwitch animator] setHidden:NO];
+                [[fX264opt8x8dctLabel animator] setHidden:NO];
+            }
+        }
     }
     
-    if ( [fX264optAnalysePopUp indexOfSelectedItem] == 1)
+    if( sender == fX264optRefPopUp || sender == nil || sender == fDisplayX264Options )
     {
-        /* No analysis? Disable 8x8dct */
-        [[fX264opt8x8dctSwitch animator] setHidden:YES];
-        [[fX264opt8x8dctLabel animator] setHidden:YES];
-        if ( [fX264opt8x8dctSwitch state] == 1 && sender != fX264opt8x8dctSwitch )
-            [fX264opt8x8dctSwitch performClick:self];
+        if ( [fX264optRefPopUp indexOfSelectedItem] > 0 &&
+             [fX264optRefPopUp indexOfSelectedItem] < 3 )
+        {
+            if( [fX264optMixedRefsSwitch isHidden] == false )
+            {
+                /* Only do mixed-refs when there are at least 2 refs to mix. */
+                [[fX264optMixedRefsSwitch animator] setHidden:YES];
+                [[fX264optMixedRefsLabel animator] setHidden:YES];
+                if( [fX264optMixedRefsSwitch state] == 1 )
+                    [fX264optMixedRefsSwitch performClick:self];
+            }
+        }
+        else
+        {
+            if( [fX264optMixedRefsSwitch isHidden] == true )
+            {
+                [[fX264optMixedRefsSwitch animator] setHidden:NO];
+                [[fX264optMixedRefsLabel animator] setHidden:NO];
+            }
+        }
     }
-    else
+    
+    if( sender == fX264optMotionEstPopUp || sender == nil || sender == fDisplayX264Options )
     {
-        [[fX264opt8x8dctSwitch animator] setHidden:NO];
-        [[fX264opt8x8dctLabel animator] setHidden:NO];
+        if ( [fX264optMotionEstPopUp indexOfSelectedItem] < 3 )
+        {
+            /* ME-range can only be above 16 if me >= umh
+              and changing it to < 16 is idiotic so hide it . */
+            if( [fX264optMERangePopUp isHidden] == false )
+            {
+                [[fX264optMERangePopUp animator] setHidden:YES];
+                [[fX264optMERangeLabel animator] setHidden:YES];
+                if ( [fX264optMERangePopUp indexOfSelectedItem] > 0 )
+                {
+                    [fX264optMERangePopUp selectItemAtIndex:0];
+                    [[fX264optMERangePopUp cell] performClick:self];
+                }
+            }
+        }
+        else
+        {
+            if( [fX264optMERangePopUp isHidden] == true )
+            {
+                [[fX264optMERangePopUp animator] setHidden:NO];
+                [[fX264optMERangeLabel animator] setHidden:NO];
+            }
+        }
     }
     
-    if ( [fX264optRefPopUp indexOfSelectedItem] < 3)
+    if( sender == fX264optSubmePopUp || sender == nil || sender == fDisplayX264Options )
     {
-        /* Only do mixed-refs when there are at least 2 refs to mix. */
-        [[fX264optMixedRefsSwitch animator] setHidden:YES];
-        [[fX264optMixedRefsLabel animator] setHidden:YES];
-        if ( [fX264optMixedRefsSwitch state] == 1 && sender != fX264optMixedRefsSwitch )
-            [fX264optMixedRefsSwitch performClick:self];
+        if( [fX264optSubmePopUp indexOfSelectedItem] != 0 && [fX264optSubmePopUp indexOfSelectedItem] < 7 )
+        {
+            /* No Psy-RDO or Psy=trel if subme < 6. */
+            if( [fX264optPsyRDSlider isHidden] == false )
+            {
+                [[fX264optPsyRDSlider animator] setHidden:YES];
+                [[fX264optPsyRDLabel animator] setHidden:YES];
+                [[fX264optPsyRDSlider animator] setFloatValue:1];
+                if ( [fX264optPsyRDSlider floatValue] < 1.0 )
+                {
+                    [fX264optPsyRDSlider setFloatValue:1.0];
+                    [[fX264optPsyRDSlider cell] performClick:self];            
+                }
+            }
+
+            if( [fX264optPsyTrellisSlider isHidden] == false)
+            {
+                [[fX264optPsyTrellisSlider animator] setHidden:YES];
+                [[fX264optPsyTrellisLabel animator] setHidden:YES];
+                [[fX264optPsyTrellisSlider animator] setFloatValue:0];
+                if ( [fX264optPsyTrellisSlider floatValue] > 0.0 )
+                {
+                    [fX264optPsyTrellisSlider setFloatValue:0.0];
+                    [[fX264optPsyTrellisSlider cell] performClick:self];
+                }
+            }
+        }
+        else
+        {
+            if( [fX264optPsyRDSlider isHidden] == true )
+            {
+                [[fX264optPsyRDSlider animator] setHidden:NO];
+                [[fX264optPsyRDLabel animator] setHidden:NO];
+            }
+
+            if( ( [fX264optTrellisPopUp indexOfSelectedItem] == 0 || [fX264optTrellisPopUp indexOfSelectedItem] >= 2 ) && [fX264optCabacSwitch state] == true && [fX264optPsyTrellisSlider isHidden] == true )
+            {
+                [[fX264optPsyTrellisSlider animator] setHidden:NO];
+                [[fX264optPsyTrellisLabel animator] setHidden:NO];
+            }
+        }
     }
-    else
+    
+    if( sender == fX264optTrellisPopUp || sender == nil || sender == fDisplayX264Options )
     {
-        [[fX264optMixedRefsSwitch animator] setHidden:NO];
-        [[fX264optMixedRefsLabel animator] setHidden:NO];
+        if( [fX264optTrellisPopUp indexOfSelectedItem] > 0 && [fX264optTrellisPopUp indexOfSelectedItem] < 2 )
+        {
+            if( [fX264optPsyTrellisSlider isHidden] == false )
+            {
+                /* No Psy-trellis without trellis. */
+                [[fX264optPsyTrellisSlider animator] setHidden:YES];
+                [[fX264optPsyTrellisLabel animator] setHidden:YES];
+                [[fX264optPsyTrellisSlider animator] setFloatValue:0.0];
+                [[fX264optPsyTrellisSlider cell] performClick:self];
+            }
+        }
+        else
+        {
+            if( ( [fX264optSubmePopUp indexOfSelectedItem] == 0 || [fX264optSubmePopUp indexOfSelectedItem] >= 7 ) && [fX264optCabacSwitch state] == true  && [fX264optPsyTrellisSlider isHidden] == true )
+            {
+                [[fX264optPsyTrellisSlider animator] setHidden:NO];
+                [[fX264optPsyTrellisLabel animator] setHidden:NO];
+            }
+        }
     }
 }
 
                         [fX264optMotionEstPopUp selectItemAtIndex:2];
                     else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"umh", @"Advanced", @"")])
                         [fX264optMotionEstPopUp selectItemAtIndex:3];
+                   /*
                     else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"esa", @"Advanced", @"")])
                         [fX264optMotionEstPopUp selectItemAtIndex:4];                        
+                   */
+                    else if ([optValue isEqualToString:@"esa"])
+                        [fX264optMotionEstPopUp selectItemAtIndex:4];
+                    else if ([optValue isEqualToString:@"tesa"])
+                        [fX264optMotionEstPopUp selectItemAtIndex:5];
                 }
                 /*ME Range NSPopUpButton*/
                 if ([optName isEqualToString:@"merange"])
                 {
                     [fX264optMERangePopUp selectItemAtIndex:[optValue intValue]-3];
                 }
+                /* Adaptive B-Frames NSPopUpButton*/
+                if ([optName isEqualToString:@"b-adapt"])
+                {
+                    [fX264optBAdaptPopUp selectItemAtIndex:[optValue intValue]+1];
+                }
                 /*Weighted B-Frames NSButton*/
                 if ([optName isEqualToString:@"weightb"])
                 {
                 if ([optName isEqualToString:@"cabac"])
                 {
                     [fX264optCabacSwitch setState:[optValue intValue]];
-                }                                                                 
+                }
+                /* Psy-RD and Psy-Trellis NSSliders */
+                if ([optName isEqualToString:@"psy-rd"])
+                {
+                    NSString * rdOpt = @"";
+                    NSString * trellisOpt = @"";
+                    
+                    NSRange splitRD = [optValue rangeOfString:@","];
+                    rdOpt = [optValue substringToIndex:splitRD.location];
+                    trellisOpt = [optValue substringFromIndex:splitRD.location + 1];
+                    
+                    [fX264optPsyRDSlider setFloatValue:[rdOpt floatValue]];
+                    [fX264optPsyTrellisSlider setFloatValue:[trellisOpt floatValue]];
+                }                                                              
             }
         }
     }
 }
 
-/**
- * Resets the option string to mirror the GUI widgets.
- */
-- (IBAction) X264AdvancedOptionsChanged: (id) sender
+- (NSString *) X264AdvancedOptionsOptIDToString: (id) widget
 {
     /*Determine which outlet is being used and set optName to process accordingly */
     NSString * optNameToChange = @""; // The option name such as "bframes"
     
-    if (sender == fX264optBframesPopUp)
+    if (widget == fX264optBframesPopUp)
     {
         optNameToChange = @"bframes";
     }
-    if (sender == fX264optRefPopUp)
+    if (widget == fX264optRefPopUp)
     {
         optNameToChange = @"ref";
     }
-    if (sender == fX264optNfpskipSwitch)
+    if (widget == fX264optNfpskipSwitch)
     {
         optNameToChange = @"no-fast-pskip";
     }
-    if (sender == fX264optNodctdcmtSwitch)
+    if (widget == fX264optNodctdcmtSwitch)
     {
         optNameToChange = @"no-dct-decimate";
     }
-    if (sender == fX264optSubmePopUp)
+    if (widget == fX264optSubmePopUp)
     {
         optNameToChange = @"subq";
     }
-    if (sender == fX264optTrellisPopUp)
+    if (widget == fX264optTrellisPopUp)
     {
         optNameToChange = @"trellis";
     }
-    if (sender == fX264optMixedRefsSwitch)
+    if (widget == fX264optMixedRefsSwitch)
     {
         optNameToChange = @"mixed-refs";
     }
-    if (sender == fX264optMotionEstPopUp)
+    if (widget == fX264optMotionEstPopUp)
     {
         optNameToChange = @"me";
     }
-    if (sender == fX264optMERangePopUp)
+    if (widget == fX264optMERangePopUp)
     {
         optNameToChange = @"merange";
     }
-    if (sender == fX264optWeightBSwitch)
+    if (widget == fX264optBAdaptPopUp)
+    {
+        optNameToChange = @"b-adapt";
+    }
+    if (widget == fX264optWeightBSwitch)
     {
         optNameToChange = @"weightb";
     }
-    if (sender == fX264optBPyramidSwitch)
+    if (widget == fX264optBPyramidSwitch)
     {
         optNameToChange = @"b-pyramid";
     }
-    if (sender == fX264optDirectPredPopUp)
+    if (widget == fX264optDirectPredPopUp)
     {
         optNameToChange = @"direct";
     }
-    if (sender == fX264optAlphaDeblockPopUp)
+    if (widget == fX264optAlphaDeblockPopUp)
     {
         optNameToChange = @"deblock";
     }
-    if (sender == fX264optBetaDeblockPopUp)
+    if (widget == fX264optBetaDeblockPopUp)
     {
         optNameToChange = @"deblock";
     }        
-    if (sender == fX264optAnalysePopUp)
+    if (widget == fX264optAnalysePopUp)
     {
         optNameToChange = @"analyse";
     }
-    if (sender == fX264opt8x8dctSwitch)
+    if (widget == fX264opt8x8dctSwitch)
     {
         optNameToChange = @"8x8dct";
     }
-    if (sender == fX264optCabacSwitch)
+    if (widget == fX264optCabacSwitch)
     {
         optNameToChange = @"cabac";
     }
+    if( widget == fX264optPsyRDSlider)
+    {
+        optNameToChange = @"psy-rd";
+    }
+    if( widget == fX264optPsyTrellisSlider)
+    {
+        optNameToChange = @"psy-rd";
+    }
     
-    /* Set widgets depending on the opt string in field */
-    NSString * thisOpt; // The separated option such as "bframes=3"
-    NSString * optName = @""; // The option name such as "bframes"
-    NSString * optValue = @"";// The option value such as "3"
-    NSArray *currentOptsArray;
+    return optNameToChange;
+}
+
+- (NSString *) X264AdvancedOptionsWidgetToString: (NSString *) optName withID: (id) sender
+{
+    NSString * thisOpt = @""; // The option=value string the method will return
     
-    /*First, we get an opt string to process */
-    NSString *currentOptString = [fDisplayX264Options stringValue];
+    if ([optName isEqualToString:@"deblock"])
+    {
+        if ((([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 7)) && (([fX264optBetaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optBetaDeblockPopUp indexOfSelectedItem] == 7)))
+        {
+            /* When both deblock widgets are 0 or default or a mix of the two,
+               use a blank string, since deblocking defaults to 0,0.           */
+            thisOpt = @"";                                
+        }
+        else
+        {
+            /* Otherwise the format is deblock=a,b, where a and b both have an array
+               offset of 7 because deblocking values start at -6 instead of at zero. */
+            thisOpt = [NSString stringWithFormat:@"%@=%d,%d",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0];
+        }
+    }
     
-    /* There are going to be a few possibilities.
-       - The option might start off the string.
-       - The option might be in the middle of the string.
-       - The option might not be in the string at all yet.
-       - The string itself might not yet exist.
-       
-       Because each of these possibilities means constructing a different kind of string,
-       they're all handled separately in a sea of messy, somewhat redundant code. =(     */
-       
-    /* If the option is in the string but not the beginning of it, it will be in the form of ":optName=value"
-       so we really want to be looking for ":optNameToChange=" rather than "optNameToChange".                 */
+    else if ([optName isEqualToString:@"psy-rd"])
+    {
+        if( [fX264optPsyRDSlider floatValue] == 1.0 && [fX264optPsyTrellisSlider floatValue] == 0.0 ) 
+        {
+            /* When  PsyRD is 1 and PsyTrel is 0 they're default values and can be ignored. */
+            thisOpt = @"";                                
+        }
+        else
+        {
+            /* Otherwise the format is deblock=a,b, where a and b both have an array
+               offset of 7 because deblocking values start at -6 instead of at zero. */
+            thisOpt = [NSString stringWithFormat:@"%@=%0.1f,%0.1f", optName, [fX264optPsyRDSlider floatValue], [fX264optPsyTrellisSlider floatValue] ];
+        }
+    }
+    
+    else if /*Boolean Switches*/ ( [optName isEqualToString:@"b-pyramid"] || [optName isEqualToString:@"no-fast-pskip"] || [optName isEqualToString:@"no-dct-decimate"] )
+    {
+        /* Here is where we take care of the boolean options that work overtly:
+           no-dct-decimate being on means no-dct-decimate=1, etc. Some options
+           require the inverse, but those will be handled a couple lines down. */
+        if ([sender state] == 0)
+        {
+            /* When these options are false, don't include them. They all default
+               to being set off, so they don't need to be mentioned at all.       */
+            thisOpt = @"";
+        }
+        else
+        {
+            /* Otherwise, include them as optioname=1 */
+            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,1];
+        }
+    }
+    
+    else if ( [optName isEqualToString:@"8x8dct"] || [optName isEqualToString:@"weightb"] || [optName isEqualToString:@"mixed-refs"] || [optName isEqualToString:@"cabac"] )
+    {
+        /* These options default to being on. That means they
+           only need to be included in the string when turned off. */
+        if ([sender state] == 1)
+        {
+            /* It's true so don't include it. */
+            thisOpt = @"";
+        }
+        else
+        {
+            /* Otherwise, include cabac=0, etc, in the string. */
+            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,0];
+        }
+    }
+                                            
+    else if (([sender indexOfSelectedItem] == 0) && (sender != fX264optAlphaDeblockPopUp) && (sender != fX264optBetaDeblockPopUp) ) // means that "unspecified" is chosen, lets then remove it from the string
+    {
+        /* When a widget is at index 0, it's default. Default means don't add to the string.
+           The exception for deblocking is because for those, *both* need to at index 0
+           for it to default, so it's handled separately, above this section.                */
+        thisOpt = @"";
+    }
+    
+    else if ([optName isEqualToString:@"me"])
+    {
+        /* Motion estimation uses string values, so this switch
+           pairs the widget index with the right value string.  */
+        switch ([sender indexOfSelectedItem])
+        {   
+            case 1:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"dia"];
+                break;
+                
+            case 2:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"hex"];
+                break;
+                
+            case 3:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"umh"];
+                break;
+                
+            case 4:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"esa"];
+                break;
+            
+            case 5:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"tesa"];
+            
+            default:
+                break;
+        }
+    }
+    
+    else if ([optName isEqualToString:@"direct"])
+    {
+        /* Direct prediction uses string values, so this switch
+           pairs the right string value with the right widget index. */
+        switch ([sender indexOfSelectedItem])
+        {   
+            case 1:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
+                break;
+                
+            case 2:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"spatial"];
+                break;
+                
+            case 3:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"temporal"];
+                break;
+                
+            case 4:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"auto"];
+                break;
+                
+            default:
+                break;
+        }
+    }
+    
+    else if ([optName isEqualToString:@"analyse"])
+    {
+        /* Analysis uses string values as well. */
+        switch ([sender indexOfSelectedItem])
+        {   
+            case 1:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
+                break;
+                
+            case 2:
+                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"all"];
+                break;
+                
+            default:
+                break;
+        }
+    }
+    
+    else if ([optName isEqualToString:@"merange"])
+    {
+        /* Motion estimation range uses an odd array offset because in addition
+           to starting with index 0 as default, index 1 starts at 4 instead of 1,
+           because merange can't go below 4. So it has to be handled separately.  */
+        thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]+3];
+    }
+    
+    else if ([optName isEqualToString:@"b-adapt"])
+    {
+        /* B-adapt starts at index 0 with default then goes 0, 1, 2)*/
+        thisOpt = [NSString stringWithFormat:@"%@=%d", optName, [sender indexOfSelectedItem]-1];
+    }
+    
+    else // we have a valid value to change, so change it
+    {
+        if ( [sender indexOfSelectedItem] != 0 )
+        /* Here's our general case, that catches things like ref frames and b-frames.
+           Basically, any options that are PopUp menus with index 0 as default and
+           index 1 as 1, with numerical values, are all handled right here. All of
+           the above stuff is for the exceptions to the general case.              */
+            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]-1];
+    }
+    
+    return thisOpt;
+}
+
+- (BOOL) X264AdvancedOptionsIsOpt: (NSString *) optNameToChange inString: (NSString *) currentOptString
+{
+    /* If the option is in the string but not the beginning of it,
+       it will be in the form of ":optName=value" so we really want
+       to be looking for ":optNameToChange=" rather than "optNameToChange". */
     NSString *checkOptNameToChange = [NSString stringWithFormat:@":%@=",optNameToChange];
     
     /* Now we store the part of the string up through the option name in currentOptRange. */
         If the range is 0, it's the first option listed in the string.       */        
     NSString *checkOptNameToChangeBeginning = [NSString stringWithFormat:@"%@=",optNameToChange];
     NSRange currentOptRangeBeginning = [currentOptString rangeOfString:checkOptNameToChangeBeginning];
-    
+
     if (currentOptRange.location != NSNotFound || currentOptRangeBeginning.location == 0)
+        return true;
+    else
+        return false;
+} 
+
+/**
+ * Resets the option string to mirror the GUI widgets.
+ */
+- (IBAction) X264AdvancedOptionsChanged: (id) sender
+{
+    /* Look up the equivalent string option name of the calling widget. */
+    NSString * optNameToChange = [self X264AdvancedOptionsOptIDToString: sender];
+    
+    NSString * thisOpt = @"";  // The separated option such as "bframes=3"
+    NSString * optName = @"";  // The option name such as "bframes"
+    NSString * optValue = @""; // The option value such as "3"
+    NSArray *currentOptsArray;
+    
+    /* Get the current opt string being displayed. */
+    NSString *currentOptString = [fDisplayX264Options stringValue];
+    
+    /* There are going to be a few possibilities.
+       - The option might start off the string.
+       - The option might be in the middle of the string.
+       - The option might not be in the string at all yet.
+       - The string itself might not yet exist.             */
+    
+    if( [self X264AdvancedOptionsIsOpt: optNameToChange inString: currentOptString] )
     {
         /* If the option is in the string wth a semicolon, or starts the string, it's time to edit.
            This means parsing the whole string into an array of options and values. From there,
         /* Create new empty opt string*/
         NSString *changedOptString = @"";
         
-        /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/
+        /* Put individual options into an array based on the ":"
+           separator for processing, result is "<opt>=<value>"   */
         currentOptsArray = [currentOptString componentsSeparatedByString:@":"];
         
-        /*iterate through the array and get <opts> and <values*/
+        /* Iterate through the array and get <opts> and <values*/
         int loopcounter;
         int currentOptsArrayCount = [currentOptsArray count];
         for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
                    
                 optName = [thisOpt substringToIndex:splitOptRange.location];
                 optValue = [thisOpt substringFromIndex:splitOptRange.location + 1];
-                
-                /*Run through the available widgets for x264 opts and set them, as you add widgets, 
-                    they need to be added here. This should be moved to its own method probably*/
-                
+
                 /*If the optNameToChange is found, appropriately change the value or delete it if
                     "Unspecified" is set.*/
                 if ([optName isEqualToString:optNameToChange])
                 {
-                    if ([optNameToChange isEqualToString:@"deblock"])
-                    {
-                        if ((([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 7)) && (([fX264optBetaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optBetaDeblockPopUp indexOfSelectedItem] == 7)))
-                        {
-                            /* When both deblock widgets are 0 or default or a mix of the two,
-                               use a blank string, since deblocking defaults to 0,0.           */
-                            thisOpt = @"";                                
-                        }
-                        else
-                        {
-                            /* Otherwise the format is deblock=a,b, where a and b both have an array
-                               offset of 7 because deblocking values start at -6 instead of at zero. */
-                            thisOpt = [NSString stringWithFormat:@"%@=%d,%d",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0];
-                        }
-                    }
-                    else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] ||  [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] )
-                    {
-                        /* Here is where we take care of the boolean options that work overtly:
-                           no-dct-decimate being on means no-dct-decimate=1, etc. Some options
-                           require the inverse, but those will be handled a couple lines down. */
-                        if ([sender state] == 0)
-                        {
-                            /* When these options are false, don't include them. They all default
-                               to being set off, so they don't need to be mentioned at all.       */
-                            thisOpt = @"";
-                        }
-                        else
-                        {
-                            /* Otherwise, include them as optioname=1 */
-                            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,1];
-                        }
-                    }
-                    else if ([optNameToChange isEqualToString:@"cabac"])
-                    {
-                        /* CABAC is odd, in that it defaults to being on. That means
-                           it only needs to be included in the string when turned off. */
-                        if ([sender state] == 1)
-                        {
-                            /* It's true so don't include it. */
-                            thisOpt = @"";
-                        }
-                        else
-                        {
-                            /* Otherwise, include cabac=0 in the string to enable CAVLC. */
-                            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,0];
-                        }
-                    }                                        
-                    else if (([sender indexOfSelectedItem] == 0) && (sender != fX264optAlphaDeblockPopUp) && (sender != fX264optBetaDeblockPopUp) ) // means that "unspecified" is chosen, lets then remove it from the string
-                    {
-                        /* When a widget is at index 0, it's default. Default means don't add to the string.
-                           The exception for deblocking is because for those, *both* need to at index 0
-                           for it to default, so it's handled separately, above this section.                */
-                        thisOpt = @"";
-                    }
-                    else if ([optNameToChange isEqualToString:@"me"])
-                    {
-                        /* Motion estimation uses string values, so this switch
-                           pairs the widget index with the right value string.  */
-                        switch ([sender indexOfSelectedItem])
-                        {   
-                            case 1:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"dia"];
-                                break;
-                                
-                            case 2:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"hex"];
-                                break;
-                                
-                            case 3:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"umh"];
-                                break;
-                                
-                            case 4:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"esa"];
-                                break;
-                                
-                            default:
-                                break;
-                        }
-                    }
-                    else if ([optNameToChange isEqualToString:@"direct"])
-                    {
-                        /* Direct prediction uses string values, so this switch
-                           pairs the right string value with the right widget index. */
-                        switch ([sender indexOfSelectedItem])
-                        {   
-                            case 1:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
-                                break;
-                                
-                            case 2:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"spatial"];
-                                break;
-                                
-                            case 3:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"temporal"];
-                                break;
-                                
-                            case 4:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"auto"];
-                                break;
-                                
-                            default:
-                                break;
-                        }
-                    }
-                    else if ([optNameToChange isEqualToString:@"analyse"])
-                    {
-                        /* Analysis uses string values as well. */
-                        switch ([sender indexOfSelectedItem])
-                        {   
-                            case 1:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
-                                break;
-                                
-                            case 2:
-                                thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"all"];
-                                break;
-                                
-                            default:
-                                break;
-                        }
-                    }
-                    else if ([optNameToChange isEqualToString:@"merange"])
-                    {
-                        /* Motion estimation range uses an odd array offset because in addition
-                           to starting with index 0 as default, index 1 starts at 4 instead of 1,
-                           because merange can't go below 4. So it has to be handled separately.  */
-                        thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]+3];
-                    }
-                    else // we have a valid value to change, so change it
-                    {
-                        if ( [sender indexOfSelectedItem] != 0 )
-                        /* Here's our general case, that catches things like ref frames and b-frames.
-                           Basically, any options that are PopUp menus with index 0 as default and
-                           index 1 as 1, with numerical values, are all handled right here. All of
-                           the above stuff is for the exceptions to the general case.              */
-                            thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]-1];
-                    }
+                    thisOpt = [self X264AdvancedOptionsWidgetToString: optName withID: sender];
                 }
             }
             
         }
         
         /* Change the dislayed option string to reflect the new modified settings */
-        [fDisplayX264Options setStringValue:[NSString stringWithFormat:changedOptString]];    
+        [fDisplayX264Options setStringValue:changedOptString];    
     }
     else // if none exists, add it to the string
     {
         /* This is where options that aren't already in the string are handled. */
         if ([[fDisplayX264Options stringValue] isEqualToString: @""])
         {
-            /* The option might not be in the string because the
-               string is empty. Handle this possibility first.   */
-            if ([optNameToChange isEqualToString:@"me"])
-            {
-                /* Special case for motion estimation, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"dia"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"hex"]]];
-                        break;
-                        
-                    case 3:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"umh"]]];
-                        break;
-                        
-                    case 4:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"esa"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"direct"])
-            {
-                /* Special case for direct prediction, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"spatial"]]];
-                        break;
-                        
-                    case 3:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"temporal"]]];
-                        break;
-                        
-                    case 4:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"auto"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"analyse"])
-            {
-                /* Special case for partition analysis, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"all"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
             
-            else if ([optNameToChange isEqualToString:@"merange"])
-            {
-                /* Special case for motion estimation range, which uses
-                   a widget index offset of 3. This is because the
-                   first valid value after default is four, not zero.   */
-                [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                    [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender indexOfSelectedItem]+3]]];
-            }
-            else if ([optNameToChange isEqualToString:@"deblock"])
-            {
-                /* Very special case for deblock. Uses a weird widget index offset
-                   of 7, because the first value after default is -6, rather than 0.
-                   As well, deblock only goes to default when *both* alpha and beta
-                   are zero. If only one is zero, you can't mark it down as default.
-                   Instead, mark that one down as literally 0. This is because when
-                   widgets are at default values, they aren't included in the string.
-                   If only one filter is at 0, both need to be overtly specified.    */
-                [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d,%d", ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0, ([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0]]];                
-            }
-            else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] )
-            {
-                /* This covers all the boolean options that need to be specified only when true. */
-                if ([sender state] == 0)
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@""]];                    
-                }
-                else
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                        [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"cabac"])
-            {
-                /* CABAC is weird in that you need the inverse. Only include in the string
-                   when cabac=0, because cabac=1 is the default. Turning it off means CAVLC. */
-                if ([sender state] == 1)
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@""]];                                        
-                }
-                else
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                        [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];                    
-                }
-            }            
-            else
-            {
-                if ( [sender indexOfSelectedItem] != 0 )
-                /* General case to cover all the normal PopUp widgets, like ref and b-frames. */
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", 
-                    [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender indexOfSelectedItem]-1]]];
-            }
+            [fDisplayX264Options setStringValue:
+                [self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender]];
         }
         else
         {
-            /* The string isn't empty, and the option isn't already in it,
-               so it will need to be appended to the string with a colon.  */
-            if ([optNameToChange isEqualToString:@"me"])
-            {
-                /* Special case for motion estimation, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"dia"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"hex"]]];
-                        break;
-                        
-                    case 3:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"umh"]]];
-                        break;
-                        
-                    case 4:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"esa"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"direct"])
-            {
-                /* Special case for direct prediction, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"spatial"]]];
-                        break;
-                        
-                    case 3:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"temporal"]]];
-                        break;
-                        
-                    case 4:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"auto"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"analyse"])
-            {
-                /* Special case for partition analysis, which uses string values
-                   that need to be paired up with the equivalent widget index.  */
-                switch ([sender indexOfSelectedItem])
-                {   
-                    case 1:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
-                        break;
-                        
-                    case 2:
-                        [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", 
-                            [NSString stringWithFormat:[fDisplayX264Options stringValue]],
-                            [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"all"]]];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            
-            else if ([optNameToChange isEqualToString:@"merange"])
-            {
-                /* Motion estimation range uses a weird offset since its index goes
-                   0: default, 1: 4, because the first valid value is 4, not 1.     */
-                [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]], 
-                    [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender indexOfSelectedItem]+3]]];
-            }
-            else if ([optNameToChange isEqualToString:@"deblock"])
-            {
-                /* Deblock is really weird because it has two values, and if only one is default, both
-                   still need to be specified directly. with the default one at zero. To make deblock
-                   just a little more fun, values start at -6 instead of at zero.                       */
-                [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", [NSString stringWithFormat:[fDisplayX264Options stringValue]], [NSString stringWithFormat:optNameToChange], [NSString stringWithFormat:@"%d,%d", ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0, ([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0]]];                
-            }
-            else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] )
-            {
-                /* Covers all the normal booleans, that only need to be included in the string when they're true. */
-                if ([sender state] == 0)
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]]]];                    
-                }
-                else
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]], 
-                        [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];                
-                }
-            }
-            else if ([optNameToChange isEqualToString:@"cabac"])
-            {
-                /* CABAC is weird, in that it's an inverse. Only include it in the string when it's false. */
-                if ([sender state] == 1)
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]]]];                    
-                }
-                else
-                {
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]], 
-                        [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
-                }
-            }
-            else
+            /* The string isn't empty, and the option isn't already in it, so
+               it will need to be appended to the current string with a colon,
+               as long as the string to be appended isn't just blank (default). */
+            if( [[self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender] isEqualToString: @""] == false )
             {
-                /* General case to handle the normal PopUp widgets like ref and b-frames. */
-                if ( [sender indexOfSelectedItem] != 0 )
-                    [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]], 
-                    [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender indexOfSelectedItem]-1]]];
+                [fDisplayX264Options setStringValue:
+                    [NSString stringWithFormat:@"%@:%@",
+                        currentOptString,
+                        [self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender] ]];                
             }
         }
     }