From 010a68c2c0925a591a6180cd71eb205f74b010fa Mon Sep 17 00:00:00 2001 From: Tichau Date: Mon, 22 Aug 2016 08:26:26 +0200 Subject: [PATCH] Add the possibility to cancel CDA extraction, gif and ico. --- .../ConversionJobs/ConversionJob_ExtractCDA.cs | 15 +++++++++++++++ .../ConversionJobs/ConversionJob_Gif.cs | 9 +++++++++ .../ConversionJobs/ConversionJob_Ico.cs | 9 +++++++++ 3 files changed, 33 insertions(+) diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs index 85e8726..7163569 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs @@ -22,10 +22,12 @@ namespace FileConverter.ConversionJobs public ConversionJob_ExtractCDA() : base() { + this.IsCancelable = true; } public ConversionJob_ExtractCDA(ConversionPreset conversionPreset) : base(conversionPreset) { + this.IsCancelable = true; } protected override InputPostConversionAction InputPostConversionAction @@ -186,6 +188,13 @@ namespace FileConverter.ConversionJobs File.Delete(this.intermediateFilePath); } + public override void Cancel() + { + base.Cancel(); + + this.compressionConversionJob.Cancel(); + } + private void WriteWaveData(object sender, DataReadEventArgs eventArgs) { this.waveWriter?.Write(eventArgs.Data, 0, (int)eventArgs.DataSize); @@ -193,6 +202,12 @@ namespace FileConverter.ConversionJobs private void CdReadProgress(object sender, ReadProgressEventArgs eventArgs) { + if (this.CancelIsRequested) + { + eventArgs.CancelRead = true; + return; + } + this.Progress = (float)eventArgs.BytesRead / (float)eventArgs.Bytes2Read; eventArgs.CancelRead |= this.State != ConversionState.InProgress; diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs index d14f6cd..b8dfe1f 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs @@ -14,6 +14,15 @@ namespace FileConverter.ConversionJobs public ConversionJob_Gif(ConversionPreset conversionPreset) : base(conversionPreset) { + this.IsCancelable = true; + } + + public override void Cancel() + { + base.Cancel(); + + this.pngConversionJob.Cancel(); + this.gifConversionJob.Cancel(); } protected override void Initialize() diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs index e8d0ff5..5f38179 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs @@ -13,6 +13,15 @@ namespace FileConverter.ConversionJobs public ConversionJob_Ico(ConversionPreset conversionPreset) : base(conversionPreset) { + this.IsCancelable = true; + } + + public override void Cancel() + { + base.Cancel(); + + this.pngConversionJob.Cancel(); + this.icoConversionJob.Cancel(); } protected override void Initialize()