OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 14 Apr 2009 21:48:34 +0000 (21:48 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 14 Apr 2009 21:48:34 +0000 (21:48 +0000)
- Move some files around. Removes frmMain folder. Removes old x264panel file which is no longer used. Fixes namespace errors.

git-svn-id: svn://localhost/HandBrake/trunk@2327 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/Functions/PresetLoader.cs [moved from win/C#/frmMain/PresetLoader.cs with 97% similarity]
win/C#/Functions/QueryGenerator.cs [moved from win/C#/frmMain/QueryGenerator.cs with 97% similarity]
win/C#/HandBrakeCS.csproj
win/C#/frmMain.cs
win/C#/frmMain/x264Panel.cs [deleted file]
win/C#/frmPreview.cs
win/C#/frmTestWindow.Designer.cs [moved from win/C#/Functions/QueryParserTester.Designer.cs with 100% similarity]
win/C#/frmTestWindow.cs [moved from win/C#/Functions/QueryParserTester.cs with 100% similarity]
win/C#/frmTestWindow.resx [moved from win/C#/Functions/QueryParserTester.resx with 100% similarity]

similarity index 97%
rename from win/C#/frmMain/PresetLoader.cs
rename to win/C#/Functions/PresetLoader.cs
index 7d4f639..21bd5f9 100644 (file)
@@ -2,7 +2,7 @@
 using System.Windows.Forms;\r
 using System.Drawing;\r
 \r
-namespace Handbrake\r
+namespace Handbrake.Functions\r
 {\r
     class PresetLoader\r
     {\r
similarity index 97%
rename from win/C#/frmMain/QueryGenerator.cs
rename to win/C#/Functions/QueryGenerator.cs
index 96f2cda..c3f66fc 100644 (file)
@@ -11,7 +11,7 @@ using System.Globalization;
 using System.IO;\r
 using System.Collections.Generic;\r
 \r
-namespace Handbrake\r
+namespace Handbrake.Functions\r
 {\r
     class QueryGenerator\r
     {\r
index f892112..9d50b94 100644 (file)
     <Compile Include="frmUpdater.designer.cs">\r
       <DependentUpon>frmUpdater.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="frmMain\PresetLoader.cs" />\r
-    <Compile Include="frmMain\QueryGenerator.cs" />\r
+    <Compile Include="Functions\PresetLoader.cs" />\r
+    <Compile Include="Functions\QueryGenerator.cs" />\r
     <Compile Include="Functions\Main.cs" />\r
-    <Compile Include="Functions\QueryParserTester.cs">\r
+    <Compile Include="frmTestWindow.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="Functions\QueryParserTester.Designer.cs">\r
-      <DependentUpon>QueryParserTester.cs</DependentUpon>\r
+    <Compile Include="frmTestWindow.Designer.cs">\r
+      <DependentUpon>frmTestWindow.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Presets\preset.cs" />\r
     <Compile Include="Presets\PresetsHandler.cs" />\r
       <DependentUpon>frmUpdater.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Functions\QueryParserTester.resx">\r
-      <DependentUpon>QueryParserTester.cs</DependentUpon>\r
+    <EmbeddedResource Include="frmTestWindow.resx">\r
+      <DependentUpon>frmTestWindow.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r
index 887effb..ded2390 100644 (file)
@@ -29,7 +29,6 @@ namespace Handbrake
         Parsing.DVD thisDVD;\r
 \r
         // Objects belonging to this window only\r
-        PresetLoader presetLoader = new PresetLoader();\r
         QueryGenerator queryGen = new QueryGenerator();\r
 \r
         // Globals: Mainly used for tracking.\r
diff --git a/win/C#/frmMain/x264Panel.cs b/win/C#/frmMain/x264Panel.cs
deleted file mode 100644 (file)
index be47041..0000000
+++ /dev/null
@@ -1,949 +0,0 @@
-using System;\r
-using System.Windows.Forms;\r
-\r
-namespace Handbrake\r
-{\r
-    class x264Panel\r
-    {\r
-        /// <summary>\r
-        /// Reset all components to defaults and clears the x264 rtf box\r
-        /// </summary>\r
-        public void reset2Defaults(frmMain mainWindow)\r
-        {\r
-            mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_Cabac.CheckState = CheckState.Checked;\r
-            mainWindow.check_mixedReferences.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_noDCTDecimate.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_noFastPSkip.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_weightedBFrames.CheckState = CheckState.Unchecked;\r
-            mainWindow.drop_analysis.SelectedIndex = 0;\r
-            mainWindow.drop_bFrames.SelectedIndex = 0;\r
-            mainWindow.drop_deblockAlpha.SelectedIndex = 0;\r
-            mainWindow.drop_deblockBeta.SelectedIndex = 0;\r
-            mainWindow.drop_directPrediction.SelectedIndex = 0;\r
-            mainWindow.drop_MotionEstimationMethod.SelectedIndex = 0;\r
-            mainWindow.drop_MotionEstimationRange.SelectedIndex = 0;\r
-            mainWindow.drop_refFrames.SelectedIndex = 0;\r
-            mainWindow.drop_subpixelMotionEstimation.SelectedIndex = 0;\r
-            mainWindow.drop_trellis.SelectedIndex = 0;\r
-            mainWindow.slider_psyrd.Value = 0;\r
-            mainWindow.slider_psytrellis.Value = 0;\r
-            mainWindow.drop_adaptBFrames.SelectedIndex = 0;\r
-\r
-            mainWindow.rtf_x264Query.Text = "";\r
-        }\r
-\r
-        /// <summary>\r
-        /// Update GUI componets from the current x264 rtf string\r
-        /// </summary>\r
-        public void X264_SetCurrentSettingsInPanel(frmMain mainWindow)\r
-        {\r
-            /* Set widgets depending on the opt string in field */\r
-            String thisOpt; // The separated option such as "bframes=3"\r
-            String optName; // The option name such as "bframes"\r
-            String optValue;// The option value such as "3"\r
-            String[] currentOptsArray;\r
-\r
-            //Set currentOptString to the contents of the text box.\r
-            String currentOptString = mainWindow.rtf_x264Query.Text.Replace("\n", "");\r
-\r
-            /*verify there is an opt string to process */\r
-            if (currentOptString.Contains("="))\r
-            {\r
-                /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/\r
-                currentOptsArray = currentOptString.Split(':');\r
-\r
-                /*iterate through the array and get <opts> and <values*/\r
-                int loopcounter;\r
-                int currentOptsArrayCount = currentOptsArray.Length;\r
-\r
-\r
-                /*iterate through the array and get <opts> and <values*/\r
-                for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)\r
-                {\r
-\r
-                    thisOpt = currentOptsArray[loopcounter];\r
-                    String[] splitOptRange = thisOpt.Split('=');\r
-\r
-                    if (thisOpt.Contains("="))\r
-                    {\r
-                        optName = splitOptRange[0];\r
-                        optValue = splitOptRange[1];\r
-\r
-                        /*Run through the available widgets for x264 opts and set them, as you add widgets, \r
-                            they need to be added here. This should be moved to its own method probably*/\r
-\r
-                        /*bframes NSPopUpButton*/\r
-                        if (optName.Equals("bframes"))\r
-                            mainWindow.drop_bFrames.SelectedItem = optValue;\r
-\r
-                        /*ref NSPopUpButton*/\r
-                        else if (optName.Equals("ref"))\r
-                            mainWindow.drop_refFrames.SelectedItem = optValue;\r
-\r
-                        /*No Fast PSkip NSPopUpButton*/\r
-                        else if (optName.Equals("no-fast-pskip"))\r
-                            mainWindow.check_noFastPSkip.CheckState = CheckState.Checked;\r
-\r
-                        /*No Dict Decimate NSPopUpButton*/\r
-                        else if (optName.Equals("no-dct-decimate"))\r
-                            mainWindow.check_noDCTDecimate.CheckState = CheckState.Checked;\r
-\r
-                        /*Sub Me NSPopUpButton*/\r
-                        else if (optName.Equals("subq"))\r
-                            mainWindow.drop_subpixelMotionEstimation.SelectedItem = optValue;\r
-\r
-                        /*Trellis NSPopUpButton*/\r
-                        else if (optName.Equals("trellis"))\r
-                            mainWindow.drop_trellis.SelectedItem = optValue;\r
-\r
-                        /*Mixed Refs NSButton*/\r
-                        else if (optName.Equals("mixed-refs"))\r
-                            mainWindow.check_mixedReferences.CheckState = CheckState.Checked;\r
-\r
-                        /*Motion Estimation NSPopUpButton*/\r
-                        else if (optName.Equals("me"))\r
-                        {\r
-                            if (optValue.Equals("dia"))\r
-                                mainWindow.drop_MotionEstimationMethod.SelectedItem = "Diamond";\r
-                            else if (optValue.Equals("hex"))\r
-                                mainWindow.drop_MotionEstimationMethod.SelectedItem = "Hexagon";\r
-                            else if (optValue.Equals("umh"))\r
-                                mainWindow.drop_MotionEstimationMethod.SelectedItem = "Uneven Multi-Hexagon";\r
-                            else if (optValue.Equals("esa"))\r
-                                mainWindow.drop_MotionEstimationMethod.SelectedItem = "Exhaustive";\r
-                            else if (optValue.Equals("tesa"))\r
-                                mainWindow.drop_MotionEstimationMethod.SelectedItem = "Transformed Exhaustive";\r
-\r
-                        }\r
-                        /*ME Range NSPopUpButton*/\r
-                        else if (optName.Equals("merange"))\r
-                            mainWindow.drop_MotionEstimationRange.SelectedItem = optValue;\r
-\r
-                        else if (optName.Equals("b-adapt"))\r
-                            mainWindow.drop_adaptBFrames.SelectedItem = optValue; \r
-\r
-                        /*Weighted B-Frames NSPopUpButton*/\r
-                        else if (optName.Equals("weightb"))\r
-                            mainWindow.check_weightedBFrames.CheckState = CheckState.Checked;\r
-\r
-                        /*B Pyramid NSPopUpButton*/\r
-                        else if (optName.Equals("b-pyramid"))\r
-                            mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Checked;\r
-\r
-                        /*Direct B-frame Prediction NSPopUpButton*/\r
-                        else if (optName.Equals("direct"))\r
-                        {\r
-                            if (optValue == "auto")\r
-                                optValue = "Automatic";\r
-\r
-                            if (optValue != "")\r
-                            {\r
-                                Char[] letters = optValue.ToCharArray();\r
-                                letters[0] = Char.ToUpper(letters[0]);\r
-                                optValue = new string(letters);\r
-                            }\r
-\r
-                            mainWindow.drop_directPrediction.SelectedItem = optValue;\r
-                        }\r
-\r
-                        /*Deblocking NSPopUpButtons*/\r
-                        else if (optName.Equals("deblock"))\r
-                        {\r
-                            string[] splitDeblock = optValue.Split(',');\r
-                            string alphaDeblock = splitDeblock[0];\r
-                            string betaDeblock = splitDeblock[1];\r
-\r
-                            if (alphaDeblock.Equals("0") && betaDeblock.Replace("\n", "").Equals("0"))\r
-                            {\r
-                                mainWindow.drop_deblockAlpha.SelectedItem = "Default (0)";\r
-                                mainWindow.drop_deblockBeta.SelectedItem = "Default (0)";\r
-                            }\r
-                            else\r
-                            {\r
-                                if (!alphaDeblock.Equals("0"))\r
-                                    mainWindow.drop_deblockAlpha.SelectedItem = alphaDeblock;\r
-                                else\r
-                                    mainWindow.drop_deblockAlpha.SelectedItem = "0";\r
-\r
-                                if (!betaDeblock.Replace("\n", "").Equals("0"))\r
-                                    mainWindow.drop_deblockBeta.SelectedItem = betaDeblock.Replace("\n", "");\r
-                                else\r
-                                    mainWindow.drop_deblockBeta.SelectedItem = "0";\r
-                            }\r
-                        }\r
-                        /* Analysis NSPopUpButton */\r
-                        else if (optName.Equals("analyse"))\r
-                        {\r
-\r
-                            if (optValue.Equals("p8x8,b8x8,i8x8,i4x4"))\r
-                                mainWindow.drop_analysis.SelectedItem = "Default (some)";\r
-                            if (optValue.Equals("none"))\r
-                                mainWindow.drop_analysis.SelectedItem = "None";\r
-                            if (optValue.Equals("all"))\r
-                                mainWindow.drop_analysis.SelectedItem = "All";\r
-                        }\r
-                        /* 8x8 DCT NSButton */\r
-                        else if (optName.Equals("8x8dct"))\r
-                            mainWindow.check_8x8DCT.CheckState = CheckState.Checked;\r
-\r
-                        /* CABAC NSButton */\r
-                        else if (optName.Equals("cabac"))\r
-                            mainWindow.check_Cabac.CheckState = CheckState.Unchecked;\r
-\r
-                        /* Psy-RD and Psy-Trellis NSSliders */\r
-                        else if (optName.Equals("psy-rd"))\r
-                        {\r
-                            string[] x = optValue.Split(',');\r
-\r
-                            double psyrd = 0, psytrellis = 0;\r
-                            int val, val2;\r
-                            double.TryParse(x[0], out psyrd);\r
-                            double.TryParse(x[1], out psytrellis);\r
-\r
-                            psyrd = psyrd * 10;\r
-                            psytrellis = psytrellis * 10;\r
-\r
-                            int.TryParse(psyrd.ToString(), out val);\r
-                            int.TryParse(psytrellis.ToString(), out val2);\r
-\r
-                            mainWindow.slider_psyrd.Value = val;\r
-                            mainWindow.slider_psytrellis.Value = val2;\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Iterate over every x264 option, standardize it, write the full string to the x264 rtf box\r
-        /// </summary>\r
-        public void X264_StandardizeOptString(frmMain mainWindow)\r
-        {\r
-            /* Set widgets depending on the opt string in field */\r
-            String thisOpt; // The separated option such as "bframes=3"\r
-            String optName; // The option name such as "bframes"\r
-            String optValue;// The option value such as "3"\r
-            String changedOptString = "";\r
-            String[] currentOptsArray;\r
-\r
-            /*First, we get an opt string to process */\r
-            String currentOptString = mainWindow.rtf_x264Query.Text;\r
-\r
-            /*verify there is an opt string to process */\r
-            if (currentOptString.Contains("="))\r
-            {\r
-                /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/\r
-                currentOptsArray = currentOptString.Split(':');\r
-\r
-                /*iterate through the array and get <opts> and <values*/\r
-                //NSEnumerator * enumerator = [currentOptsArray objectEnumerator];\r
-                int loopcounter;\r
-                int currentOptsArrayCount = currentOptsArray.Length;\r
-                for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)\r
-                {\r
-                    thisOpt = currentOptsArray[loopcounter];\r
-                    if (currentOptsArray[currentOptsArrayCount - 1] == string.Empty)\r
-                        break;\r
-\r
-                    String[] splitOptRange = thisOpt.Split('=');\r
-                    if (thisOpt != "")\r
-                    {\r
-                        if (thisOpt.Contains("="))\r
-                        {\r
-                            optName = splitOptRange[0];\r
-                            optValue = splitOptRange[1];\r
-\r
-                            /* Standardize the names here depending on whats in the string */\r
-                            optName = X264_StandardizeOptNames(optName);\r
-                            thisOpt = optName + "=" + optValue;\r
-                        }\r
-                        else // No value given so we use a default of "1"\r
-                        {\r
-                            optName = thisOpt;\r
-                            /* Standardize the names here depending on whats in the string */\r
-                            optName = X264_StandardizeOptNames(optName);\r
-                            thisOpt = optName + "=1";\r
-                        }\r
-                    }\r
-\r
-                    /* Construct New String for opts here */\r
-                    if (thisOpt == string.Empty)\r
-                        changedOptString = changedOptString + thisOpt;\r
-                    else\r
-                    {\r
-                        if (changedOptString == string.Empty)\r
-                            changedOptString = thisOpt;\r
-                        else\r
-                            changedOptString = changedOptString + ":" + thisOpt;\r
-                    }\r
-                }\r
-            }\r
-\r
-            /* Change the option string to reflect the new standardized option string */\r
-            if (changedOptString != "")\r
-                mainWindow.rtf_x264Query.Text = changedOptString;\r
-        }\r
-        /*\r
-         * Take a single option and standardize it. Returns as a String\r
-         * Input: String. - Single X264 Option. Name only\r
-         * Output: String - Single X264 Option. Name only. Changed to standard format\r
-         */\r
-        private string X264_StandardizeOptNames(String cleanOptNameString)\r
-        {\r
-            String input = cleanOptNameString;\r
-\r
-            if (input.Equals("ref") || input.Equals("frameref"))\r
-                cleanOptNameString = "ref";\r
-\r
-            /*No Fast PSkip nofast_pskip*/\r
-            if (input.Equals("no-fast-pskip") || input.Equals("no_fast_pskip") || input.Equals("nofast_pskip"))\r
-                cleanOptNameString = "no-fast-pskip";\r
-\r
-            /*No Dict Decimate*/\r
-            if (input.Equals("no-dct-decimate") || input.Equals("no_dct_decimate") || input.Equals("nodct_decimate"))\r
-                cleanOptNameString = "no-dct-decimate";\r
-\r
-            /*Subme*/\r
-            if (input.Equals("subme"))\r
-                cleanOptNameString = "subq";\r
-\r
-            /*ME Range*/\r
-            if (input.Equals("me-range") || input.Equals("me_range"))\r
-                cleanOptNameString = "merange";\r
-\r
-            /*WeightB*/\r
-            if (input.Equals("weight-b") || input.Equals("weight_b"))\r
-                cleanOptNameString = "weightb";\r
-\r
-            /*B Pyramid*/\r
-            if (input.Equals("b_pyramid"))\r
-                cleanOptNameString = "b-pyramid";\r
-\r
-            /*Direct Prediction*/\r
-            if (input.Equals("direct-pred") || input.Equals("direct_pred"))\r
-                cleanOptNameString = "direct";\r
-\r
-            /*Deblocking*/\r
-            if (input.Equals("filter"))\r
-                cleanOptNameString = "deblock";\r
-\r
-            /*Analysis*/\r
-            if (input.Equals("partitions"))\r
-                cleanOptNameString = "analyse";\r
-\r
-            return cleanOptNameString;\r
-        }\r
-\r
-        /// <summary>\r
-        /// This function will update the X264 Query when one of the GUI widgets changes.\r
-        /// </summary>\r
-        public void on_x264_WidgetChange(string sender, frmMain mainWindow)\r
-        {\r
-            animate(mainWindow, sender);\r
-            String optNameToChange = sender;\r
-            String currentOptString = mainWindow.rtf_x264Query.Text;\r
-\r
-            /*First, we create a pattern to check for ":"optNameToChange"=" to modify the option if the name falls after\r
-                the first character of the opt string (hence the ":") */\r
-            String checkOptNameToChange = ":" + optNameToChange + "=";\r
-            String checkOptNameToChangeBegin = optNameToChange + "=";\r
-\r
-            // IF the current H264 Option String Contains Multiple Items or Just 1 Item\r
-            if ((currentOptString.Contains(checkOptNameToChange)) || (currentOptString.StartsWith(checkOptNameToChangeBegin)))\r
-                hasOptions(currentOptString, optNameToChange, mainWindow);\r
-            else // IF there is no options in the rich text box!\r
-                hasNoOptions(optNameToChange, mainWindow);\r
-        }\r
-        /*\r
-         * Used by on_x264_WidgetChange()\r
-         ** hasOptions - Called when the current x264 option string contains multiple (or a single) item(s) in it seperated by :\r
-         * it updates the current option that the widget corrosponds to, if it is already in thes string.\r
-         ** hasNoOptions - Add's an option to the x264 query string.\r
-         * Handles 2 cases.  1 Where rtf_x264Query.Text is empty, and one where there is an option with no value,\r
-         * e.g no-fast-pskip\r
-         */\r
-        private void hasOptions(string currentOptString, string optNameToChange, frmMain mainWindow)\r
-        {\r
-            String thisOpt;             // The separated option such as "bframes=3"\r
-            String optName;        // The option name such as "bframes"\r
-            String[] currentOptsArray;\r
-\r
-            /* Create new empty opt string*/\r
-            String changedOptString = "";\r
-\r
-            /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/\r
-            currentOptsArray = currentOptString.Split(':');\r
-\r
-            /*iterate through the array and get <opts> and <values*/\r
-            for (int loopcounter = 0; loopcounter < currentOptsArray.Length; loopcounter++)\r
-            {\r
-                thisOpt = currentOptsArray[loopcounter];\r
-\r
-                if (thisOpt.Contains("="))\r
-                {\r
-                    string[] splitOptRange = thisOpt.Split('=');\r
-\r
-                    optName = splitOptRange[0];     // e.g bframes\r
-\r
-                    /* \r
-                     * Run through the available widgets for x264 opts and set them, as you add widgets,\r
-                     * they need to be added here. This should be moved to its own method probably\r
-                     * If the optNameToChange is found, appropriately change the value or delete it if\r
-                     * "unspecified" is set.\r
-                     */\r
-                    if (optName.Equals(optNameToChange))\r
-                    {\r
-                        if (optNameToChange.Equals("deblock"))\r
-                        {\r
-                            String da = mainWindow.drop_deblockAlpha.SelectedItem.ToString();\r
-                            String db = mainWindow.drop_deblockBeta.SelectedItem.ToString();\r
-\r
-                            if (((da.Contains("Default")) && (db.Contains("Default"))) || ((da.Contains("0")) && (db.Contains("0"))))\r
-                            {\r
-                                mainWindow.drop_deblockBeta.SelectedItem = "Default (0)";\r
-                                mainWindow.drop_deblockAlpha.SelectedItem = "Default (0)";\r
-                                thisOpt = "";\r
-                            }\r
-                            else if ((!da.Contains("Default")) && (db.Contains("Default")))\r
-                            {\r
-                                mainWindow.drop_deblockBeta.SelectedItem = "0";\r
-                                thisOpt = "deblock=" + da + ",0";\r
-                            }\r
-                            else if ((da.Contains("Default")) && (!db.Contains("Default")))\r
-                            {\r
-                                mainWindow.drop_deblockAlpha.SelectedItem = "0";\r
-                                thisOpt = "deblock=0," + db;\r
-                            }\r
-                            else if ((!da.Contains("Default")) && (!db.Contains("Default")))\r
-                                thisOpt = "deblock=" + da + "," + db;\r
-                        }\r
-                        else if (optNameToChange.Equals("psy-rd"))\r
-                        {\r
-                            if (mainWindow.slider_psyrd.Value == 10 && mainWindow.slider_psytrellis.Value == 0)\r
-                                thisOpt = "";\r
-                            else\r
-                            {\r
-                                double psyrd = mainWindow.slider_psyrd.Value * 0.1;\r
-                                double psytre = mainWindow.slider_psytrellis.Value * 0.1;\r
-                                string rd, rt;\r
-                                if (psyrd == 1)\r
-                                    rd = "1.0";\r
-                                else\r
-                                    rd = psyrd.ToString();\r
-\r
-                                if (psytre == 1)\r
-                                    rt = "1.0";\r
-                                else\r
-                                    rt = psytre.ToString();\r
-\r
-                                thisOpt = "psy-rd=" + rd + "," + rt;\r
-                            }\r
-                        }\r
-                        else if (optNameToChange.Equals("mixed-refs"))\r
-                        {\r
-                            if (mainWindow.check_mixedReferences.CheckState == CheckState.Checked)\r
-                                thisOpt = "mixed-refs=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("weightb"))\r
-                        {\r
-                            if (mainWindow.check_weightedBFrames.CheckState == CheckState.Checked)\r
-                                thisOpt = "weightb=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("b-pyramid"))\r
-                        {\r
-                            if (mainWindow.check_pyrmidalBFrames.CheckState == CheckState.Checked)\r
-                                thisOpt = "b-pyramid=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("no-fast-pskip"))\r
-                        {\r
-                            if (mainWindow.check_noFastPSkip.CheckState == CheckState.Checked)\r
-                                thisOpt = "no-fast-pskip=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("no-dct-decimate"))\r
-                        {\r
-                            if (mainWindow.check_noDCTDecimate.CheckState == CheckState.Checked)\r
-                                thisOpt = "no-dct-decimate=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("8x8dct"))\r
-                        {\r
-                            if (mainWindow.check_8x8DCT.CheckState == CheckState.Checked)\r
-                                thisOpt = "8x8dct=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("cabac"))\r
-                        {\r
-                            if (mainWindow.check_Cabac.CheckState == CheckState.Checked)\r
-                                thisOpt = "";\r
-                            else\r
-                                thisOpt = "cabac=0";\r
-                        }\r
-                        else if (optNameToChange.Equals("me"))\r
-                        {\r
-                            switch (mainWindow.drop_MotionEstimationMethod.SelectedIndex)\r
-                            {\r
-                                case 1:\r
-                                    thisOpt = "me=dia";\r
-                                    break;\r
-\r
-                                case 2:\r
-                                    thisOpt = "me=hex";\r
-                                    break;\r
-\r
-                                case 3:\r
-                                    thisOpt = "me=umh";\r
-                                    break;\r
-\r
-                                case 4:\r
-                                    thisOpt = "me=esa";\r
-                                    break;\r
-\r
-                                case 5:\r
-                                    thisOpt = "me=tesa";\r
-                                    break;\r
-\r
-                                default:\r
-                                    thisOpt = "";\r
-                                    break;\r
-                            }\r
-                        }\r
-                        else if (optNameToChange.Equals("direct"))\r
-                        {\r
-                            switch (mainWindow.drop_directPrediction.SelectedIndex)\r
-                            {\r
-                                case 1:\r
-                                    thisOpt = "direct=none";\r
-                                    break;\r
-\r
-                                case 2:\r
-                                    thisOpt = "direct=spatial";\r
-                                    break;\r
-\r
-                                case 3:\r
-                                    thisOpt = "direct=temporal";\r
-                                    break;\r
-\r
-                                case 4:\r
-                                    thisOpt = "direct=auto";\r
-                                    break;\r
-\r
-                                default:\r
-                                    thisOpt = "";\r
-                                    break;\r
-                            }\r
-                        }\r
-                        else if (optNameToChange.Equals("analyse"))\r
-                        {\r
-                            switch (mainWindow.drop_analysis.SelectedIndex)\r
-                            {\r
-                                case 1:\r
-                                    thisOpt = "analyse=none";\r
-                                    break;\r
-\r
-                                case 2:\r
-                                    thisOpt = "analyse=all";\r
-                                    break;\r
-\r
-                                default:\r
-                                    thisOpt = "";\r
-                                    break;\r
-                            }\r
-                        }\r
-                        else if (optNameToChange.Equals("merange"))\r
-                        {\r
-                            if (!mainWindow.drop_MotionEstimationRange.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "merange=" + mainWindow.drop_MotionEstimationRange.SelectedItem;\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("b-adapt"))\r
-                        {\r
-                            if (!mainWindow.drop_adaptBFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "b-adapt=" + (mainWindow.drop_adaptBFrames.SelectedIndex - 1);\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("ref"))\r
-                        {\r
-                            if (!mainWindow.drop_refFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "ref=" + mainWindow.drop_refFrames.SelectedItem;\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("bframes"))\r
-                        {\r
-                            String value = mainWindow.drop_bFrames.SelectedItem.ToString();\r
-                            if (!mainWindow.drop_bFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "bframes=" + value;\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("subq"))\r
-                        {\r
-                            String value = mainWindow.drop_subpixelMotionEstimation.SelectedItem.ToString();\r
-                            if (!mainWindow.drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "subq=" + value;\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("trellis"))\r
-                        {\r
-                            String value = mainWindow.drop_trellis.SelectedItem.ToString();\r
-                            if (!mainWindow.drop_trellis.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "trellis=" + value;\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                    }\r
-                }\r
-\r
-                /* Construct New String for opts here */\r
-                if (!thisOpt.Equals(""))\r
-                {\r
-                    if (changedOptString.Equals(""))\r
-                        changedOptString = thisOpt;\r
-                    else\r
-                        changedOptString = changedOptString + ":" + thisOpt;\r
-                }\r
-            }\r
-\r
-            /* Change the option string to reflect the new mod settings */\r
-            mainWindow.rtf_x264Query.Text = changedOptString;\r
-        }\r
-        private void hasNoOptions(string optNameToChange, frmMain mainWindow)\r
-        {\r
-            string colon = "";\r
-            if (mainWindow.rtf_x264Query.Text != "")\r
-                colon = ":";\r
-\r
-            string query = mainWindow.rtf_x264Query.Text;\r
-            if (optNameToChange.Equals("me"))\r
-            {\r
-                switch (mainWindow.drop_MotionEstimationMethod.SelectedIndex)\r
-                {\r
-                    case 1:\r
-                        query = query + colon + "me=dia";\r
-                        break;\r
-\r
-                    case 2:\r
-                        query = query + colon + "me=hex";\r
-                        break;\r
-\r
-                    case 3:\r
-                        query = query + colon + "me=umh";\r
-                        break;\r
-\r
-                    case 4:\r
-                        query = query + colon + "me=esa";\r
-                        break;\r
-\r
-                    case 5:\r
-                        query = query + colon + "me=tesa";\r
-                        break;\r
-\r
-                    default:\r
-                        break;\r
-                }\r
-            }\r
-            else if (optNameToChange.Equals("direct"))\r
-            {\r
-                switch (mainWindow.drop_directPrediction.SelectedIndex)\r
-                {\r
-                    case 1:\r
-                        query = query + colon + "direct=none";\r
-                        break;\r
-\r
-                    case 2:\r
-                        query = query + colon + "direct=spatial";\r
-                        break;\r
-\r
-                    case 3:\r
-                        query = query + colon + "direct=temporal";\r
-                        break;\r
-\r
-                    case 4:\r
-                        query = query + colon + "direct=auto";\r
-                        break;\r
-\r
-                    default:\r
-                        break;\r
-                }\r
-            }\r
-            else if (optNameToChange.Equals("analyse"))\r
-            {\r
-                switch (mainWindow.drop_analysis.SelectedIndex)\r
-                {\r
-                    case 1:\r
-                        query = query + colon + "analyse=none";\r
-                        break;\r
-\r
-                    case 2:\r
-                        query = query + colon + "analyse=all";\r
-                        break;\r
-\r
-                    default:\r
-                        break;\r
-                }\r
-            }\r
-            else if (optNameToChange.Equals("merange"))\r
-            {\r
-                int value = mainWindow.drop_MotionEstimationRange.SelectedIndex + 3;\r
-                query = query + colon + "merange=" + value;\r
-            }\r
-            else if (optNameToChange.Equals("b-adapt"))\r
-            {\r
-                int value = mainWindow.drop_adaptBFrames.SelectedIndex -1;\r
-                query = query + colon + "b-adapt=" + value;\r
-            }\r
-\r
-            else if (optNameToChange.Equals("deblock"))\r
-            {\r
-                String da = mainWindow.drop_deblockAlpha.SelectedItem.ToString();\r
-                String db = mainWindow.drop_deblockBeta.Text;\r
-\r
-                if (((da.Contains("Default")) && (db.Contains("Default"))) || ((da.Contains("0")) && (db.Contains("0"))))\r
-                {\r
-                    mainWindow.drop_deblockBeta.SelectedItem = "Default (0)";\r
-                    mainWindow.drop_deblockAlpha.SelectedItem = "Default (0)";\r
-                }\r
-                else\r
-                {\r
-                    if (db.Contains("Default"))\r
-                        db = "0";\r
-\r
-                    if (da.Contains("Default"))\r
-                        da = "0";\r
-\r
-                    query = query + colon + "deblock=" + da + "," + db;\r
-                }\r
-            }\r
-            else if (optNameToChange.Equals("psy-rd"))\r
-            {\r
-                if (mainWindow.slider_psyrd.Value == 10 && mainWindow.slider_psytrellis.Value == 0)\r
-                    query += "";\r
-                else\r
-                {\r
-                    double psyrd = mainWindow.slider_psyrd.Value * 0.1;\r
-                    double psytre = mainWindow.slider_psytrellis.Value * 0.1;\r
-                    string rd, rt;\r
-                    if (psyrd == 1)\r
-                        rd = "1.0";\r
-                    else\r
-                        rd = psyrd.ToString();\r
-\r
-                    if (psytre == 1)\r
-                        rt = "1.0";\r
-                    else\r
-                        rt = psytre.ToString();\r
-\r
-                    query += colon + "psy-rd=" + rd + "," + rt;\r
-                }\r
-            }\r
-            else if (optNameToChange.Equals("mixed-refs"))\r
-            {\r
-                if (mainWindow.check_mixedReferences.CheckState == CheckState.Checked)\r
-                    query = query + colon + "mixed-refs=1";\r
-            }\r
-            else if (optNameToChange.Equals("weightb"))\r
-            {\r
-                if (mainWindow.check_weightedBFrames.CheckState == CheckState.Checked)\r
-                    query = query + colon + "weightb=1";\r
-            }\r
-            else if (optNameToChange.Equals("b-pyramid"))\r
-            {\r
-                if (mainWindow.check_pyrmidalBFrames.CheckState == CheckState.Checked)\r
-                    query = query + colon + "b-pyramid=1";\r
-            }\r
-            else if (optNameToChange.Equals("no-fast-pskip"))\r
-            {\r
-                if (mainWindow.check_noFastPSkip.CheckState == CheckState.Checked)\r
-                    query = query + colon + "no-fast-pskip=1";\r
-            }\r
-            else if (optNameToChange.Equals("no-dct-decimate"))\r
-            {\r
-                if (mainWindow.check_noDCTDecimate.CheckState == CheckState.Checked)\r
-                    query = query + colon + "no-dct-decimate=1";\r
-            }\r
-            else if (optNameToChange.Equals("8x8dct"))\r
-            {\r
-                if (mainWindow.check_8x8DCT.CheckState == CheckState.Checked)\r
-                    query = query + colon + "8x8dct=1";\r
-            }\r
-            else if (optNameToChange.Equals("cabac"))\r
-            {\r
-                if (mainWindow.check_Cabac.CheckState != CheckState.Checked)\r
-                    query = query + colon + "cabac=0";\r
-            }\r
-            else if (optNameToChange.Equals("ref"))\r
-            {\r
-                if (!mainWindow.drop_refFrames.SelectedItem.ToString().Contains("Default"))\r
-                    query = query + colon + "ref=" + mainWindow.drop_refFrames.SelectedItem;\r
-            }\r
-            else if (optNameToChange.Equals("bframes"))\r
-            {\r
-                String value = mainWindow.drop_bFrames.SelectedItem.ToString();\r
-                if (!mainWindow.drop_bFrames.SelectedItem.ToString().Contains("Default"))\r
-                    query = query + colon + "bframes=" + value;\r
-            }\r
-            else if (optNameToChange.Equals("subq"))\r
-            {\r
-                String value = mainWindow.drop_subpixelMotionEstimation.SelectedItem.ToString();\r
-                if (!mainWindow.drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default"))\r
-                    query = query + colon + "subq=" + value;\r
-            }\r
-            else if (optNameToChange.Equals("trellis"))\r
-            {\r
-                if (!mainWindow.drop_trellis.SelectedItem.ToString().Contains("Default"))\r
-                    query = query + colon + "trellis=" + mainWindow.drop_trellis.SelectedItem;\r
-            }\r
-\r
-            mainWindow.rtf_x264Query.Text = query;\r
-        }\r
-        private void animate(frmMain mainWindow, string sender)\r
-        {\r
-            /* Lots of situations to cover.\r
-               - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)\r
-               - CABAC (when 0 turn off trellis)\r
-               - analysis (if none, turn off 8x8dct)\r
-               - refs (under 2, disable mixed-refs)\r
-            */\r
-            if (mainWindow.drop_bFrames.SelectedIndex < 2)\r
-            {\r
-                /* If the b-frame widget is at 0 or 1, the user has chosen\r
-                   not to use b-frames at all. So disable the options\r
-                   that can only be used when b-frames are enabled.        */\r
-                mainWindow.check_weightedBFrames.Visible = false;\r
-                mainWindow.check_pyrmidalBFrames.Visible = false;\r
-                mainWindow.drop_directPrediction.Visible = false;\r
-                mainWindow.lbl_direct_prediction.Visible = false;\r
-\r
-                mainWindow.check_weightedBFrames.CheckState = CheckState.Unchecked;\r
-                mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-                mainWindow.drop_directPrediction.SelectedIndex = 0;\r
-\r
-                mainWindow.drop_adaptBFrames.Visible = false;\r
-                mainWindow.lbl_adaptBFrames.Visible = false;\r
-                mainWindow.drop_adaptBFrames.SelectedIndex = 0;\r
-            }\r
-            else if (mainWindow.drop_bFrames.SelectedIndex == 2)\r
-            {\r
-                /* Only 1 b-frame? Disable b-pyramid. */\r
-                mainWindow.check_pyrmidalBFrames.Visible = false;\r
-                mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-\r
-                mainWindow.check_weightedBFrames.Visible = true;\r
-                mainWindow.drop_directPrediction.Visible = true;\r
-                mainWindow.lbl_direct_prediction.Visible = true;\r
-\r
-                mainWindow.drop_adaptBFrames.Visible = true;\r
-                mainWindow.lbl_adaptBFrames.Visible = true;\r
-            }\r
-            else\r
-            {\r
-                mainWindow.check_weightedBFrames.Visible = true;\r
-                mainWindow.check_pyrmidalBFrames.Visible = true;\r
-                mainWindow.drop_directPrediction.Visible = true;\r
-                mainWindow.lbl_direct_prediction.Visible = true;\r
-\r
-                mainWindow.drop_adaptBFrames.Visible = true;\r
-                mainWindow.lbl_adaptBFrames.Visible = true;\r
-            }\r
-\r
-            if (mainWindow.check_Cabac.Checked == false)\r
-            {\r
-                /* Without CABAC entropy coding, trellis doesn't run. */\r
-                mainWindow.drop_trellis.Visible = false;\r
-                mainWindow.drop_trellis.SelectedIndex = 0;\r
-                mainWindow.lbl_trellis.Visible = false;\r
-            }\r
-            else\r
-            {\r
-                mainWindow.drop_trellis.Visible = true;\r
-                mainWindow.lbl_trellis.Visible = true;\r
-            }\r
-\r
-            if (mainWindow.drop_analysis.SelectedIndex == 1)\r
-            {\r
-                /* No analysis? Disable 8x8dct */\r
-                mainWindow.check_8x8DCT.Visible = false;\r
-                if (sender != "8x8dct")\r
-                    mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;\r
-            }\r
-            else\r
-                mainWindow.check_8x8DCT.Visible = true;\r
-\r
-            if (mainWindow.drop_refFrames.SelectedIndex < 3)\r
-            {\r
-                mainWindow.check_mixedReferences.Visible = false;\r
-                if (sender != "mixed-refs")\r
-                    mainWindow.check_mixedReferences.CheckState = CheckState.Unchecked;\r
-            }\r
-            else\r
-                mainWindow.check_mixedReferences.Visible = true;\r
-\r
-            if (mainWindow.drop_MotionEstimationMethod.SelectedIndex < 3)\r
-            {\r
-                mainWindow.drop_MotionEstimationRange.Visible = false;\r
-                mainWindow.lbl_merange.Visible = false;\r
-                mainWindow.drop_MotionEstimationRange.SelectedIndex = 0;\r
-            }\r
-            else\r
-            {\r
-                mainWindow.drop_MotionEstimationRange.Visible = true;\r
-                mainWindow.lbl_merange.Visible = true;\r
-            }\r
-\r
-            if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex != 0 && mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7)\r
-            {\r
-                mainWindow.slider_psyrd.Visible = false;\r
-                mainWindow.slider_psyrd.Value = 10;\r
-                mainWindow.lbl_psyrd.Visible = false;\r
-\r
-\r
-                mainWindow.slider_psytrellis.Visible = false;\r
-                mainWindow.slider_psytrellis.Value = 0;\r
-                mainWindow.lbl_psytrellis.Visible = false;\r
-            }\r
-            else\r
-            {\r
-                mainWindow.slider_psyrd.Visible = true;\r
-                mainWindow.lbl_psyrd.Visible = true;\r
-\r
-                if (mainWindow.drop_trellis.SelectedIndex >= 2 && mainWindow.check_Cabac.Checked && mainWindow.slider_psytrellis.Visible == false)\r
-                {\r
-                    mainWindow.slider_psytrellis.Visible = true;\r
-                    mainWindow.lbl_psytrellis.Visible = true;\r
-                }\r
-            }\r
-\r
-            if (mainWindow.drop_trellis.SelectedIndex < 2)\r
-            {\r
-                mainWindow.slider_psytrellis.Visible = false;\r
-                mainWindow.slider_psytrellis.Value = 0;\r
-                mainWindow.lbl_psytrellis.Visible = false;\r
-            }\r
-            else\r
-            {\r
-                if ((mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7) && mainWindow.check_Cabac.Checked && mainWindow.slider_psytrellis.Visible == false)\r
-                {\r
-                    mainWindow.slider_psytrellis.Visible = true;\r
-                    mainWindow.lbl_psytrellis.Visible = true;\r
-                }\r
-            }\r
-\r
-        }\r
-\r
-    }\r
-}
\ No newline at end of file
index 37407c8..748d638 100644 (file)
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;\r
 using System.IO;\r
 using AxQTOControlLib;\r
+using Handbrake.Functions;\r
 using QTOControlLib;\r
 using QTOLibrary;\r
 \r