WinGui: Remove deprecated variable to avoid confusion.

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

6 files changed, 7 insertions, 13 deletions

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 4eb01fba2..48c165158 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -190,7 +190,7 @@ namespace Handbrake.Controls
             ClearAudioList();

 

             ObservableCollection<AudioTrack> tracks = new ObservableCollection<AudioTrack>(preset.Task.AudioTracks);

-            this.PassthruSettings = preset.AudioPassthruSettings != null ? new AllowedPassthru(preset.AudioPassthruSettings) : new AllowedPassthru(false);

+            this.PassthruSettings = preset.Task.AllowedPassthruOptions != null ? new AllowedPassthru(preset.Task.AllowedPassthruOptions) : new AllowedPassthru(false);

             this.SetPassthruSettings(this.PassthruSettings);

 

             if (this.drp_audioTrack.SelectedItem != null && this.drp_audioTrack.SelectedItem.ToString() == AudioHelper.NoneFound.Description)

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
index 8770e6d03..177b3c267 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
@@ -72,11 +72,6 @@ namespace HandBrake.ApplicationServices.Model
         public EncodeTask Task { get; set; }

 

         /// <summary>

-        /// Gets or sets AudioPassthruSettings.

-        /// </summary>

-        public AllowedPassthru AudioPassthruSettings { get; set; }

-

-        /// <summary>

         ///  Override the ToString Method

         /// </summary>

         /// <returns>

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index ea2794fe7..f22f84596 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -151,7 +151,6 @@ namespace HandBrake.ApplicationServices.Services
                 {

                     preset.Query = update.Query;

                     preset.Task = update.Task;

-                    preset.AudioPassthruSettings = update.AudioPassthruSettings;

                     preset.CropSettings = update.CropSettings;

                     preset.UsePictureFilters = update.UsePictureFilters;

 

@@ -316,7 +315,7 @@ namespace HandBrake.ApplicationServices.Services
                                     Task = QueryParserUtility.Parse(presetName[2])

                                 };

 

-                            newPreset.AudioPassthruSettings = new AllowedPassthru(false); // We don't want to override the built-in preset

+                            newPreset.Task.AllowedPassthruOptions = new AllowedPassthru(false); // We don't want to override the built-in preset

                             

                             if (newPreset.Name == "Normal")

                             {

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index e2d71b354..c26dd0c73 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -140,7 +140,7 @@ namespace HandBrakeWPF.ViewModels
         public void SetPreset(Preset preset, EncodeTask task)

         {

             this.Task = task;

- 

+

             if (preset != null && preset.Task != null)

             {

                 this.AddTracksFromPreset(preset);

diff --git a/win/CS/frmAddPreset.cs b/win/CS/frmAddPreset.cs
index da3b1baf4..6bbfb3918 100644
--- a/win/CS/frmAddPreset.cs
+++ b/win/CS/frmAddPreset.cs
@@ -10,6 +10,7 @@ namespace Handbrake
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services;

+    using HandBrake.ApplicationServices.Utilities;

 

     using Handbrake.Functions;

     using Handbrake.Model;

@@ -88,7 +89,7 @@ namespace Handbrake
                     Query = query,

                     CropSettings = pictureSettingsMode != QueryPictureSettingsMode.None,

                     Description = string.Empty,

-                    AudioPassthruSettings = mainWindow.AudioSettings.PassthruSettings          

+                    Task = QueryParserUtility.Parse(query),    

                 };

 

             if (presetCode.Add(preset))

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 930828b7d..9b7d5540b 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -561,7 +561,6 @@ namespace Handbrake
                     Name = this.treeView_presets.SelectedNode.Text,

                     Query = query,

                     CropSettings = (result == DialogResult.Yes),

-                    AudioPassthruSettings = this.AudioSettings.PassthruSettings,

                     Task = QueryParserUtility.Parse(query),

                 };

 

@@ -869,7 +868,7 @@ namespace Handbrake
                     if (result == DialogResult.Yes)

                     {

                         parsed.Query = QueryGeneratorUtility.GenerateQuery(parsed.Task);

-                        parsed.AudioPassthruSettings = parsed.Task.AllowedPassthruOptions;

+                        parsed.Task.AllowedPassthruOptions = parsed.Task.AllowedPassthruOptions;

                         parsed.CropSettings = false;

 

                         presetHandler.Update(parsed);

@@ -878,7 +877,7 @@ namespace Handbrake
                 else

                 {

                     parsed.Query = QueryGeneratorUtility.GenerateQuery(parsed.Task);

-                    parsed.AudioPassthruSettings = parsed.Task.AllowedPassthruOptions;

+                    parsed.Task.AllowedPassthruOptions = parsed.Task.AllowedPassthruOptions;

                     parsed.CropSettings = false;

         

                     if (presetHandler.Add(parsed))