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

2 files changed, 4 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index 693d7a459..f117b9ef5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -302,9 +302,9 @@ namespace HandBrakeWPF.ViewModels
 

             // Setup the encode task as a preview encode

             encodeTask.IsPreviewEncode = true;

-            encodeTask.PreviewEncodeStartAt = this.StartAt.ToString(CultureInfo.InvariantCulture);

+            encodeTask.PreviewEncodeStartAt = this.StartAt;

             encodeTask.PreviewEncodeDuration = this.Duration;

-            QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create(false));

+            QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create());

             ThreadPool.QueueUserWorkItem(this.CreatePreview, task);

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index a910c272b..7f94f5d4c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -20,6 +20,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Services.Scan.Interfaces;

     using HandBrake.Interop.Model.Encoding;

 

+    using HandBrakeWPF.Factories;

     using HandBrakeWPF.ViewModels.Interfaces;

 

     /// <summary>

@@ -250,7 +251,7 @@ namespace HandBrakeWPF.ViewModels
             BitmapImage image = null;

             try

             {

-                image = this.scanService.GetPreview(this.Task, this.SelectedPreviewImage);

+                image = this.scanService.GetPreview(this.Task, this.SelectedPreviewImage, HBConfigurationFactory.Create());

             }

             catch (Exception exc)

             {