WinGui: Remove a bunch of CLI handling code.

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

1 files changed, 3 insertions, 24 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 6eff64259..18f994026 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1064,10 +1064,7 @@ namespace HandBrakeWPF.ViewModels
                                     Resources.Notice, MessageBoxButton.OK, MessageBoxImage.Information);

 

             // Queue Recovery

-            if (!AppArguments.IsInstantHandBrake)

-            {

-                QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);

-            }

+            QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);

 

             this.SelectedPreset = this.presetService.DefaultPreset;

 

@@ -1085,7 +1082,7 @@ namespace HandBrakeWPF.ViewModels
         public void Shutdown()

         {

             // Shutdown Service

-            this.encodeService.Shutdown();

+            this.encodeService.Stop();

 

             // Unsubscribe from Events.

             this.scanService.ScanStared -= this.ScanStared;

@@ -1455,18 +1452,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// DEBUG: Show CLI Query for settings+6

-        /// </summary>

-        public void ShowCliQuery()

-        {

-            this.errorService.ShowMessageBox(

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

-                "CLI Query",

-                MessageBoxButton.OK,

-                MessageBoxImage.Information);

-        }

-

-        /// <summary>

         /// The select source window.

         /// </summary>

         public void SelectSourceWindow()

@@ -2065,14 +2050,8 @@ namespace HandBrakeWPF.ViewModels
                 {

                     if (this.queueProcessor.EncodeService.IsEncoding)

                     {

-                        string josPending = string.Empty;

-                        if (!AppArguments.IsInstantHandBrake)

-                        {

-                            josPending = Resources.Main_JobsPending_addon;

-                        }

-

                         this.ProgramStatusLabel =

-                            string.Format("{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss}" + josPending,

+                            string.Format("{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss}" + Resources.Main_JobsPending_addon,

                                 e.PercentComplete,

                                 e.CurrentFrameRate,

                                 e.AverageFrameRate,