WinGui:

- Numerous fixes to the JSON api code. 
  Live preview should now work again.
  Possible fix for issue where queued jobs where stopping at a random point and not continuing. 
- Fix Clear button on the audio tab.

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

1 files changed, 12 insertions, 28 deletions

diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
index 8be9bcd41..c0ba00633 100644
--- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
+++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
@@ -12,7 +12,6 @@ namespace HandBrakeWPF.Factories
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Services.Interfaces;

 

@@ -29,42 +28,27 @@ namespace HandBrakeWPF.Factories
         /// <summary>

         /// The create.

         /// </summary>

-        /// <param name="isLoggingEnabled">

-        /// The is logging enabled.

-        /// </param>

         /// <returns>

         /// The <see cref="HBConfiguration"/>.

         /// </returns>

-        public static HBConfiguration Create(bool isLoggingEnabled)

+        public static HBConfiguration Create()

         {

             HBConfiguration config = new HBConfiguration

                                          {

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

-                                             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),

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

+                                             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;

         }

-

-        /// <summary>

-        /// The create.

-        /// </summary>

-        /// <returns>

-        /// The <see cref="HBConfiguration"/>.

-        /// </returns>

-        public static HBConfiguration Create()

-        {

-            return Create(true);

-        }

     }

 }