diff options
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs | 5 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/Scan/LibScan.cs | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs index f8bd78fb7..b6b811454 100644 --- a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs +++ b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs @@ -16,6 +16,7 @@ namespace HandBrakeWPF.Services.Encode using HandBrake.ApplicationServices.Interop; using HandBrake.ApplicationServices.Interop.EventArgs; using HandBrake.ApplicationServices.Interop.Interfaces; + using HandBrake.ApplicationServices.Interop.Json.State; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Services.Logging; using HandBrake.ApplicationServices.Services.Logging.Interfaces; @@ -183,8 +184,8 @@ namespace HandBrakeWPF.Services.Encode TaskCount = e.PassCount, ElapsedTime = DateTime.Now - this.startTime, PassId = e.PassId, - IsMuxing = e.IsMuxing, - IsSearching = e.IsSearching + IsMuxing = e.StateCode == TaskState.Muxing.Code, + IsSearching = e.StateCode == TaskState.Searching.Code }; this.InvokeEncodeStatusChanged(args); diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs index 287732224..beceb9361 100644 --- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs +++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs @@ -207,13 +207,7 @@ namespace HandBrakeWPF.Services.Scan PixelAspectY = job.PixelAspectY }; - int deinterlaceOn = 0; - if (job.DeinterlaceFilter != DeinterlaceFilter.Off) - { - deinterlaceOn = 1; - } - - bitmapImage = BitmapUtilities.ConvertToBitmapImage(this.instance.GetPreview(settings, preview, deinterlaceOn)); + bitmapImage = BitmapUtilities.ConvertToBitmapImage(this.instance.GetPreview(settings, preview, job.DeinterlaceFilter != DeinterlaceFilter.Off)); } catch (AccessViolationException e) { |