WinGui: Some further refactoring of the services library. Moving all the queueing functionality up to app layer for now.

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

4 files changed, 7 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 4c9921459..2ba9744f6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -44,6 +44,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Services.Presets.Factories;

     using HandBrakeWPF.Services.Presets.Interfaces;

     using HandBrakeWPF.Services.Presets.Model;

+    using HandBrakeWPF.Services.Queue.Model;

     using HandBrakeWPF.Utilities;

     using HandBrakeWPF.ViewModels.Interfaces;

     using HandBrakeWPF.Views;

@@ -53,7 +54,7 @@ namespace HandBrakeWPF.ViewModels
     using Ookii.Dialogs.Wpf;

 

     using Execute = Caliburn.Micro.Execute;

-    using IQueueProcessor = HandBrakeWPF.Services.Interfaces.IQueueProcessor;

+    using IQueueProcessor = HandBrakeWPF.Services.Queue.Interfaces.IQueueProcessor;

 

     /// <summary>

     /// HandBrakes Main Window

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 7191ad9b5..52c51419b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -22,6 +22,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.EventArgs;

     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Interfaces;

+    using HandBrakeWPF.Services.Queue.Interfaces;

+    using HandBrakeWPF.Services.Queue.Model;

     using HandBrakeWPF.ViewModels.Interfaces;

 

     using Microsoft.Win32;

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index 4d505b83d..11a9d8715 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -18,7 +18,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.ViewModels.Interfaces;

 

-    using IQueueProcessor = HandBrakeWPF.Services.Interfaces.IQueueProcessor;

+    using IQueueProcessor = HandBrakeWPF.Services.Queue.Interfaces.IQueueProcessor;

 

     /// <summary>

     /// The Shell View Model

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 3a3b4e6eb..7e6cc2525 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -33,6 +33,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services;

     using HandBrakeWPF.Services.Interfaces;

+    using HandBrakeWPF.Services.Queue.Model;

     using HandBrakeWPF.ViewModels.Interfaces;

 

     /// <summary>

@@ -638,7 +639,7 @@ namespace HandBrakeWPF.ViewModels
             this.encodeService.EncodeCompleted += this.encodeService_EncodeCompleted;

             this.encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;

 

-            this.encodeService.Start((QueueTask)state);

+            this.encodeService.Start(((QueueTask)state).Task, ((QueueTask)state).Configuration);

             this.userSettingService.SetUserSetting(UserSettingConstants.LastPreviewDuration, this.Duration);

         }

         #endregion