WinGui: Part 1 - Restructuring the AppServices library in preparation for the new JSON API. Taking the opportunity to improve and simplify the API.

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

26 files changed, 54 insertions, 31 deletions

diff --git a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
index b00061068..32a53277b 100644
--- a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs
@@ -13,6 +13,8 @@ namespace HandBrakeWPF.Commands
     using System.Windows.Input;

 

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.EventArgs;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

 

     /// <summary>

     /// Command to cancel a scan that is in progress

@@ -47,7 +49,7 @@ namespace HandBrakeWPF.Commands
         /// <param name="e">

         /// The ScanCompletedEventArgs.

         /// </param>

-        private void ScanServiceWrapperScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)

+        private void ScanServiceWrapperScanCompleted(object sender, ScanCompletedEventArgs e)

         {

             Caliburn.Micro.Execute.OnUIThread(this.OnCanExecuteChanged);    

         }

diff --git a/win/CS/HandBrakeWPF/Model/SelectionTitle.cs b/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
index 8983fb971..a8abe54f4 100644
--- a/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
+++ b/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Model
 {

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     /// <summary>

     /// A model for the multiple selection window for adding to the queue.

diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
index 0f2fa702c..7c679d033 100644
--- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
@@ -12,19 +12,17 @@
 namespace HandBrakeWPF.Services

 {

     using System;

-    using System.Windows.Forms;

 

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Isolation;

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Services;

+    using HandBrake.ApplicationServices.Services.Encode;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Services.Interfaces;

 

-    using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;

-    using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;

-

     /// <summary>

     /// We have multiple implementations of Iencode. This is a wrapper class for the GUI so that the 

     /// implementation used is controllable via user settings.

@@ -81,7 +79,7 @@ namespace HandBrakeWPF.Services
             }

             else

             {

-                this.encodeService = new Encode();

+                this.encodeService = new EncodeService();

             }

 

             this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;

diff --git a/win/CS/HandBrakeWPF/Services/NotificationService.cs b/win/CS/HandBrakeWPF/Services/NotificationService.cs
index e451460d8..ba3c0cf99 100644
--- a/win/CS/HandBrakeWPF/Services/NotificationService.cs
+++ b/win/CS/HandBrakeWPF/Services/NotificationService.cs
@@ -9,6 +9,8 @@
 

 namespace HandBrakeWPF.Services

 {

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Services.Interfaces;

@@ -68,7 +70,7 @@ namespace HandBrakeWPF.Services
         /// <param name="e">

         /// The EncodeCompletedEventArgs.

         /// </param>

-        private void EncodeServiceEncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)

+        private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)

         {

             if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode))

             {

diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
index f6e4fc800..c57935239 100644
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.Services
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

 

@@ -92,7 +93,7 @@ namespace HandBrakeWPF.Services
         /// <param name="e">

         /// The EncodeCompletedEventArgs.

         /// </param>

-        private void EncodeService_EncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)

+        private void EncodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)

         {

             // Send the file to the users requested applicaiton

             if (e.Successful)

diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
index c22d881cb..435228315 100644
--- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
@@ -22,7 +22,10 @@ namespace HandBrakeWPF.Startup
 

     using HandBrake.ApplicationServices;

     using HandBrake.ApplicationServices.Services;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

 

     using HandBrakeWPF.Commands;

     using HandBrakeWPF.Commands.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 94ce1c851..359dd1f3d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -15,9 +15,9 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Audio;

     using HandBrake.ApplicationServices.Model.Subtitle;

-    using HandBrake.ApplicationServices.Parsing;

     using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
index e8f48e825..5726b0da5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
@@ -10,7 +10,7 @@
 namespace HandBrakeWPF.ViewModels

 {

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.Interop.Model.Encoding;

 

     using HandBrakeWPF.Services.Presets.Model;

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index f26424315..830dfb3ee 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Audio;

     using HandBrake.ApplicationServices.Model.Encoding;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index e877c0479..df55219ea 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Services.Presets.Model;

diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
index 014885606..8922f912a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Generic;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.Interop.Model.Encoding;

 

     using HandBrakeWPF.Services.Presets.Model;

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 16e6c177c..5a46eaa9b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
index 3d4781276..ab108a2f6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
@@ -24,8 +24,12 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices;

     using HandBrake.ApplicationServices.EventArgs;

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.EventArgs;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

 

     using HandBrakeWPF.Commands;

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
index 3ea543b1f..c97be32c6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Audio;

     using HandBrake.ApplicationServices.Model.Subtitle;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     /// <summary>

     /// The Add Preset View Model

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs
index c9c0e38bd..67e8f14d0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     using System.Collections.Generic;

     using System.ComponentModel;

 

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     using HandBrakeWPF.Model;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
index ff0b7313a..d66ce5fb4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
@@ -10,7 +10,7 @@
 namespace HandBrakeWPF.ViewModels.Interfaces

 {

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     using HandBrakeWPF.Services.Presets.Model;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 8356b124b..84a3fbf0a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -13,7 +13,12 @@ namespace HandBrakeWPF.ViewModels
     using System.Diagnostics;

     using System.Windows;

 

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.EventArgs;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

+

     using Interfaces;

 

     using HandBrake.ApplicationServices.EventArgs;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index b7e78739d..040ef883d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -25,8 +25,12 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model.Audio;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Model.Subtitle;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.EventArgs;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop;

 

@@ -1973,7 +1977,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The EventArgs

         /// </param>

-        private void ScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e)

+        private void ScanStatusChanged(object sender, ScanProgressEventArgs e)

         {

             this.SourceLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);

             this.StatusLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);

@@ -1988,7 +1992,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The EventArgs

         /// </param>

-        private void ScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)

+        private void ScanCompleted(object sender, ScanCompletedEventArgs e)

         {

             this.scanService.SouceData.CopyTo(this.ScannedSource);

             Execute.OnUIThread(() =>

@@ -2053,7 +2057,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The Encode Progress Event Args

         /// </param>

-        private void EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)

+        private void EncodeStatusChanged(object sender, EncodeProgressEventArgs e)

         {

             int percent;

             int.TryParse(

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index d1ca9e65a..a01447fc0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index 7c046a393..1802dab50 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -19,6 +19,8 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Factories;

@@ -401,7 +403,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The EncodeProgressEventArgs.

         /// </param>

-        private void encodeService_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)

+        private void encodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)

         {

             this.Percentage = string.Format("{0} %", Math.Round(e.PercentComplete, 2).ToString(CultureInfo.InvariantCulture));

             this.PercentageValue = e.PercentComplete;

@@ -416,7 +418,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The EncodeCompletedEventArgs.

         /// </param>

-        private void encodeService_EncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)

+        private void encodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)

         {

             this.Percentage = "0.00%";

             this.PercentageValue = 0;

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
index 70fda03cb..c175056a4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;

     using System.Linq;

 

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

 

     using HandBrakeWPF.Model;

     using HandBrakeWPF.Services.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index c7ddac82c..763738abd 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -17,6 +17,7 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.EventArgs;

     using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Properties;

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 2424008bb..0968ac7a8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -16,6 +16,7 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services.Interfaces;

+    using HandBrake.ApplicationServices.Services.Scan.Interfaces;

     using HandBrake.Interop.Model.Encoding;

 

     using HandBrakeWPF.ViewModels.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 661b8f679..f16a0979b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Model.Subtitle;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

 

     using HandBrakeWPF.Services.Presets.Model;

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index a1fb19c9f..a6796fe72 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -20,7 +20,7 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop;

     using HandBrake.Interop.Model.Encoding;

diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
index 846cc58c1..aa65bb090 100644
--- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Linq;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.Interop.Model.Encoding;

 

     using HandBrakeWPF.Commands.Interfaces;