WinGui: Fix a bug that was causing the incorrect quality setting to be set.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4672 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 4e98f2da3490ae77764d23394e80236030b259c3..acba0ce3cedaec9dbb8df123363aa28e038a8965 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -409,8 +409,6 @@ namespace HandBrake.ApplicationServices.Utilities
                     break;\r
             }\r
 \r
-            double x264CqStep = UserSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);\r
-\r
             switch (task.VideoEncodeRateType)\r
             {\r
                 case VideoEncodeRateType.AverageBitrate:\r
@@ -422,17 +420,14 @@ namespace HandBrake.ApplicationServices.Utilities
                     switch (task.VideoEncoder)\r
                     {\r
                         case VideoEncoder.FFMpeg:\r
-                            value = 31 - (task.Quality.Value - 1);\r
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));\r
+                        case VideoEncoder.FFMpeg2:\r
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));\r
                             break;\r
                         case VideoEncoder.X264:\r
-                            value = 51 - (task.Quality.Value * x264CqStep);\r
-                            value = Math.Round(value, 2);\r
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));\r
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));\r
                             break;\r
                         case VideoEncoder.Theora:\r
-                            value = task.Quality.Value;\r
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));\r
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));\r
                             break;\r
                     }\r
                     break;\r