grayscale: wingui changes

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
index 6ff3d5bec845c0edaa30c953c2c0a09ebdb124fb..d4164ede6433c48aa71c119ce4ad4a1ca3c72a4b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
@@ -24,6 +24,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         // Finally filters that don't care what order they are in,\r
         // except that they must be after the above filters\r
         HB_FILTER_ROTATE,\r
+        HB_FILTER_GRAYSCALE,\r
         HB_FILTER_QSV_POST, // for QSV - important to have as a last one \r
         HB_FILTER_QSV,  // default MSDK VPP filter \r
     }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs
index a44a5b17baaf2c036603e704c56c186820c44866..2e767b18a840152b0bcb919efbc6aef0b8f7fa1e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs
@@ -20,10 +20,5 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// Gets or sets the filter list.\r
         /// </summary>\r
         public List<Filter> FilterList { get; set; }\r
-\r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether grayscale.\r
-        /// </summary>\r
-        public bool Grayscale { get; set; }\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 0e979f3d9b74ba95cd2f7ecd287d37ca30ff400d..31688c3342777ca49718dc1a03025abd9315a968 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -396,7 +396,6 @@ namespace HandBrakeWPF.Services.Encode.Factories
             Filters filter = new Filters
                             {
                                 FilterList = new List<Filter>(),
-                                Grayscale = job.Grayscale
                             };
 
             // Detelecine
@@ -506,6 +505,12 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 filter.FilterList.Add(filterItem);
             }
 
+            if (job.Grayscale)
+            {
+                Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_GRAYSCALE, Settings = null };
+                filter.FilterList.Add(filterItem);
+            }
+
             // CropScale Filter
             Filter cropScale = new Filter
             {