WinGui: Removed the need for the user settings service from IEncode and IScan interfaces and various other places. This makes the API much simpler to use.

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

7 files changed, 93 insertions, 36 deletions

diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
index 8c353bbdb..86f061eca 100644
--- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
+++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
@@ -38,7 +38,17 @@ namespace HandBrakeWPF.Factories
             HBConfiguration config = new HBConfiguration

                                          {

                                              IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav),

-                                             IsLoggingEnabled = isLoggingEnabled

+                                             IsLoggingEnabled = isLoggingEnabled,

+                                             DisableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding),

+                                             EnableDxva = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva),

+                                             ScalingMode = UserSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode),

+                                             PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount),

+                                             Verbosity = UserSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity),

+                                             MinScanDuration = UserSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration),

+                                             ProcessPriority = UserSettingService.GetUserSetting<string>(UserSettingConstants.ProcessPriority),

+                                             SaveLogToCopyDirectory = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory),

+                                             SaveLogWithVideo = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo),

+                                             SaveLogCopyDirectory = UserSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory),

                                          };

 

             return config;

diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
index c7247a7c7..254ccefb9 100644
--- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
@@ -63,7 +63,7 @@ namespace HandBrakeWPF.Services
                     }

                     else

                     {

-                        this.encodeService = new LibEncode(userSettingService);

+                        this.encodeService = new LibEncode();

                     }

                 }

                 catch (Exception exc)

@@ -78,7 +78,7 @@ namespace HandBrakeWPF.Services
             }

             else

             {

-                this.encodeService = new Encode(userSettingService);

+                this.encodeService = new Encode();

             }

 

             this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;

@@ -165,9 +165,12 @@ namespace HandBrakeWPF.Services
         /// <param name="destination">

         /// The destination.

         /// </param>

-        public void ProcessLogs(string destination)

+        /// <param name="configuration">

+        /// The configuration.

+        /// </param>

+        public void ProcessLogs(string destination, HBConfiguration configuration)

         {

-            this.encodeService.ProcessLogs(destination);

+            this.encodeService.ProcessLogs(destination, configuration);

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index ac876e6bf..bf50ec8db 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -251,6 +251,57 @@ namespace HandBrakeWPF
         /// </summary>

         public const string DisableLibDvdNav = "DisableLibDvdNav";

 

+        /// <summary>

+        /// The disable quick sync decoding.

+        /// </summary>

+        public const string DisableQuickSyncDecoding = "DisableQuickSyncDecoding";

+

+        /// <summary>

+        /// The enable dxva.

+        /// </summary>

+        public const string EnableDxva = "EnableDxva";

+

+        /// <summary>

+        /// The scaling mode.

+        /// </summary>

+        public const string ScalingMode = "ScalingMode";

+

+        /// <summary>

+        /// Preview Scan Count

+        /// </summary>

+        public const string PreviewScanCount = "previewScanCount";

+

+        /// <summary>

+        /// The Verbosity

+        /// </summary>

+        public const string Verbosity = "Verbosity";

+

+        /// <summary>

+        /// Min Title Scan Duration

+        /// </summary>

+        public const string MinScanDuration = "MinTitleScanDuration";

+

+        /// <summary>

+        /// Process Priority

+        /// </summary>

+        public const string ProcessPriority = "ProcessPriority";

+

+        /// <summary>

+        /// Save Log Directory

+        /// </summary>

+        public const string SaveLogToCopyDirectory = "SaveLogToCopyDirectory";

+

+        /// <summary>

+        /// Save log with video

+        /// </summary>

+        public const string SaveLogWithVideo = "SaveLogWithVideo";

+

+        /// <summary>

+        /// Save copy of the log to a directory

+        /// </summary>

+        public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";

+

+

         #endregion

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
index 15c5df127..d27ef6694 100644
--- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs
@@ -777,7 +777,6 @@ namespace HandBrakeWPF.ViewModels
                 this.scanService.Scan(

                     filename, 

                     title, 

-                    this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), 

                     null,

                     HBConfigurationFactory.Create());

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 68e4077d7..d20657728 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1301,7 +1301,7 @@ namespace HandBrakeWPF.ViewModels
         {

             // Rescan the source to make sure it's still valid

             this.queueEditTask = task;

-            this.scanService.Scan(task.Source, task.Title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), QueueEditAction, HBConfigurationFactory.Create());

+            this.scanService.Scan(task.Source, task.Title, QueueEditAction, HBConfigurationFactory.Create());

         }

 

         /// <summary>

@@ -1335,13 +1335,7 @@ namespace HandBrakeWPF.ViewModels
         public void ShowCliQuery()

         {

             this.errorService.ShowMessageBox(

-                QueryGeneratorUtility.GenerateQuery(this.CurrentTask,

-                userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),

-                userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),

-                HBConfigurationFactory.Create().IsDvdNavDisabled,

-                    userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableQuickSyncDecoding),

-                                       userSettingService.GetUserSetting<bool>(ASUserSettingConstants.EnableDxva),

-                                       userSettingService.GetUserSetting<VideoScaler>(ASUserSettingConstants.ScalingMode) == VideoScaler.BicubicCl),

+                QueryGeneratorUtility.GenerateQuery(this.CurrentTask, HBConfigurationFactory.Create()),

                 "CLI Query",

                 MessageBoxButton.OK,

                 MessageBoxImage.Information);

@@ -1627,7 +1621,7 @@ namespace HandBrakeWPF.ViewModels
         {

             if (!string.IsNullOrEmpty(filename))

             {

-                this.scanService.Scan(filename, title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), null, HBConfigurationFactory.Create());

+                this.scanService.Scan(filename, title, null, HBConfigurationFactory.Create());

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index fd7f0920c..122914d13 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1911,9 +1911,9 @@ namespace HandBrakeWPF.ViewModels
             // Video

             // #############################

             this.EnableQuickSync = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSync);

-            this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableQuickSyncDecoding);

-            this.EnableDxvaDecoding = this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.EnableDxva);

-            this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(ASUserSettingConstants.ScalingMode);

+            this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding);

+            this.EnableDxvaDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva);

+            this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);

 

             // #############################

             // CLI

@@ -1926,7 +1926,7 @@ namespace HandBrakeWPF.ViewModels
             this.priorityLevelOptions.Add("Normal");

             this.priorityLevelOptions.Add("Below Normal");

             this.priorityLevelOptions.Add("Low");

-            this.SelectedPriority = userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority);

+            this.SelectedPriority = userSettingService.GetUserSetting<string>(UserSettingConstants.ProcessPriority);

 

             this.PreventSleep = userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep);

 

@@ -1935,14 +1935,14 @@ namespace HandBrakeWPF.ViewModels
             this.logVerbosityOptions.Add(0);

             this.logVerbosityOptions.Add(1);

             this.logVerbosityOptions.Add(2);

-            this.SelectedVerbosity = userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);

+            this.SelectedVerbosity = userSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity);

 

             // Logs

-            this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo);

-            this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory);

+            this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo);

+            this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory);

 

             // The saved log path

-            this.LogDirectory = userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;

+            this.LogDirectory = userSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;

 

             this.ClearOldOlgs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);

 

@@ -1969,7 +1969,7 @@ namespace HandBrakeWPF.ViewModels
             this.PreviewPicturesToScan.Add(50);

             this.PreviewPicturesToScan.Add(55);

             this.PreviewPicturesToScan.Add(60);

-            this.SelectedPreviewCount = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);

+            this.SelectedPreviewCount = this.userSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount);

 

             // x264 step

             this.ConstantQualityGranularity.Clear();

@@ -1979,7 +1979,7 @@ namespace HandBrakeWPF.ViewModels
             this.SelectedGranulairty = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);

 

             // Min Title Length

-            this.MinLength = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration);

+            this.MinLength = this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration);

 

             // Use dvdnav

             this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);

@@ -2035,25 +2035,25 @@ namespace HandBrakeWPF.ViewModels
             

             /* Video */

             this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSync, this.EnableQuickSync);

-            this.userSettingService.SetUserSetting(ASUserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);

-            this.userSettingService.SetUserSetting(ASUserSettingConstants.EnableDxva, this.EnableDxvaDecoding);

-            this.userSettingService.SetUserSetting(ASUserSettingConstants.ScalingMode, this.SelectedScalingMode);

+            this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);

+            this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding);

+            this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);

 

 

             /* System and Logging */

-            userSettingService.SetUserSetting(ASUserSettingConstants.ProcessPriority, this.SelectedPriority);

+            userSettingService.SetUserSetting(UserSettingConstants.ProcessPriority, this.SelectedPriority);

             userSettingService.SetUserSetting(UserSettingConstants.PreventSleep, this.PreventSleep);

-            userSettingService.SetUserSetting(ASUserSettingConstants.Verbosity, this.SelectedVerbosity);

-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogWithVideo, this.CopyLogToEncodeDirectory);

-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSepcficedLocation);

-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogCopyDirectory, this.LogDirectory);

+            userSettingService.SetUserSetting(UserSettingConstants.Verbosity, this.SelectedVerbosity);

+            userSettingService.SetUserSetting(UserSettingConstants.SaveLogWithVideo, this.CopyLogToEncodeDirectory);

+            userSettingService.SetUserSetting(UserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSepcficedLocation);

+            userSettingService.SetUserSetting(UserSettingConstants.SaveLogCopyDirectory, this.LogDirectory);

             userSettingService.SetUserSetting(UserSettingConstants.ClearOldLogs, this.ClearOldOlgs);

 

             /* Advanced */

             userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);

             userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);

             userSettingService.SetUserSetting(ASUserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);

-            userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);

+            userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);

             userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));

             userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);

             userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);

@@ -2061,7 +2061,7 @@ namespace HandBrakeWPF.ViewModels
             int value;

             if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))

             {

-                this.userSettingService.SetUserSetting(ASUserSettingConstants.MinScanDuration, value);

+                this.userSettingService.SetUserSetting(UserSettingConstants.MinScanDuration, value);

             }

 

             userSettingService.SetUserSetting(UserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index 9aba8e442..5c0913a37 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -173,7 +173,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 List<int> startPoints = new List<int>();

                 for (int i = 1;

-                     i <= this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);

+                     i <= this.UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount);

                      i++)

                 {

                     startPoints.Add(i);