From d9b030c21a0b104fb85400d9fc1526e6dc31acc0 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 4 Jan 2015 20:54:02 +0000 Subject: WinGui: Refracting some of the modelling around the Encode Services git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6685 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Converters/Audio/AudioBehaviourConverter.cs | 3 +- .../Converters/Audio/AudioEncoderConverter.cs | 1 + .../HandBrakeWPF/Converters/EnumComboConverter.cs | 2 + .../Subtitles/SubtitleBehaviourConverter.cs | 3 +- .../Video/EncoderOptionsTooltipConverter.cs | 1 + .../Converters/Video/VideoEncoderConverter.cs | 1 + win/CS/HandBrakeWPF/Extensions/StringExtensions.cs | 41 +++++ win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 6 + win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs | 3 +- .../Model/Audio/AudioBehaviourModes.cs | 28 ++++ win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs | 115 ++++++++++++++ .../Model/Picture/PresetPictureSettingsMode.cs | 26 ++++ .../Model/Subtitles/SubtitleBehaviourModes.cs | 28 ++++ .../Model/Subtitles/SubtitleBehaviours.cs | 166 +++++++++++++++++++++ .../Services/Presets/Factories/PlistFactory.cs | 1 + .../Presets/Factories/PlistPresetFactory.cs | 7 +- .../HandBrakeWPF/Services/Presets/Model/Preset.cs | 8 +- .../HandBrakeWPF/ViewModels/AddPresetViewModel.cs | 7 +- .../HandBrakeWPF/ViewModels/AdvancedViewModel.cs | 1 + win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs | 3 +- .../HandBrakeWPF/ViewModels/ChaptersViewModel.cs | 1 + .../ViewModels/EncoderOptionsViewModel.cs | 1 + win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs | 1 + .../ViewModels/Interfaces/IAddPresetViewModel.cs | 6 +- .../ViewModels/Interfaces/IAudioViewModel.cs | 2 +- .../ViewModels/Interfaces/IMainViewModel.cs | 1 + .../ViewModels/Interfaces/IPreviewViewModel.cs | 1 + .../Interfaces/IStaticPreviewViewModel.cs | 1 + .../ViewModels/Interfaces/ISubtitlesViewModel.cs | 2 +- .../ViewModels/Interfaces/ITabInterface.cs | 1 + win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 5 +- .../ViewModels/PictureSettingsViewModel.cs | 2 + win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs | 1 + win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 1 + .../ViewModels/StaticPreviewViewModel.cs | 1 + .../HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 3 +- win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 1 + win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs | 1 + 38 files changed, 466 insertions(+), 17 deletions(-) create mode 100644 win/CS/HandBrakeWPF/Extensions/StringExtensions.cs create mode 100644 win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs create mode 100644 win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs create mode 100644 win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs create mode 100644 win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs create mode 100644 win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs (limited to 'win/CS/HandBrakeWPF') diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs index a53c4e7e9..7763a49d1 100644 --- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs @@ -15,9 +15,10 @@ namespace HandBrakeWPF.Converters.Audio using System.Linq; using System.Windows.Data; - using HandBrake.ApplicationServices.Model.Audio; using HandBrake.ApplicationServices.Utilities; + using HandBrakeWPF.Model.Audio; + /// /// Audio Behaviour Converter /// diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs index 3c105bb26..2857559b6 100644 --- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs @@ -17,6 +17,7 @@ namespace HandBrakeWPF.Converters.Audio using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs index e0aceaf25..f746e07c3 100644 --- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs @@ -20,6 +20,8 @@ namespace HandBrakeWPF.Converters using HandBrake.Interop.Model.Encoding; using HandBrake.Interop.Model.Encoding.x264; + using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode; + /// /// Enum Combo Converter /// diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs index 251565d80..e9acbe728 100644 --- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs @@ -15,9 +15,10 @@ namespace HandBrakeWPF.Converters.Subtitles using System.Linq; using System.Windows.Data; - using HandBrake.ApplicationServices.Model.Subtitle; using HandBrake.ApplicationServices.Utilities; + using HandBrakeWPF.Model.Subtitles; + /// /// Subtitle Behaviour Converter /// diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs index dc78ad1ca..18b246510 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs @@ -14,6 +14,7 @@ namespace HandBrakeWPF.Converters.Video using System.Windows.Data; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; using HandBrake.Interop.Model.Encoding.x264; diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 12699236d..063f616cf 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -17,6 +17,7 @@ namespace HandBrakeWPF.Converters.Video using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs b/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs new file mode 100644 index 000000000..35cf4b128 --- /dev/null +++ b/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs @@ -0,0 +1,41 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// String Extensions +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Extensions +{ + using System.Text; + + /// + /// String Extensions + /// + public static class StringExtensions + { + /// + /// Change the input string to title case + /// + /// the input string + /// the input string in title case + public static string ToTitleCase(this string input) + { + string[] tokens = input.Split(' '); + StringBuilder sb = new StringBuilder(input.Length); + foreach (string s in tokens) + { + if (!string.IsNullOrEmpty(s)) + { + sb.Append(s[0].ToString().ToUpper()); + sb.Append(s.Substring(1).ToLower()); + sb.Append(" "); + } + } + + return sb.ToString().Trim(); + } + } +} diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 3041a20b3..a0beeab50 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -160,6 +160,12 @@ + + + + + + diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs index 1c5a2f955..49f958e55 100644 --- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs +++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs @@ -15,11 +15,12 @@ namespace HandBrakeWPF.Helpers using Caliburn.Micro; - using HandBrake.ApplicationServices.Extensions; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.Interop.Model.Encoding; + using HandBrakeWPF.Extensions; using HandBrakeWPF.Services.Interfaces; /// diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs new file mode 100644 index 000000000..811ba154b --- /dev/null +++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs @@ -0,0 +1,28 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The audio behaviours. +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Model.Audio +{ + using System.ComponentModel.DataAnnotations; + + /// + /// The audio behaviours. + /// + public enum AudioBehaviourModes + { + [Display(Name = "None")] + None = 0, + + [Display(Name = "First Matching Selected Language")] + FirstMatch, + + [Display(Name = "All Matching Selected Languages")] + AllMatching, + } +} diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs new file mode 100644 index 000000000..e6bb5a398 --- /dev/null +++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs @@ -0,0 +1,115 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Audio Behaviours +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Model.Audio +{ + using System.ComponentModel; + + using Caliburn.Micro; + + /// + /// Audio Behaviours + /// + public class AudioBehaviours : PropertyChangedBase + { + /// + /// The selected behaviour. + /// + private AudioBehaviourModes selectedBehaviour; + + /// + /// The selected langauges. + /// + private BindingList selectedLangauges; + + /// + /// Initializes a new instance of the class. + /// + public AudioBehaviours() + { + this.SelectedBehaviour = AudioBehaviourModes.None; + this.SelectedLangauges = new BindingList(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + /// The behaviours. + /// + public AudioBehaviours(AudioBehaviours behaviours) + { + this.SelectedBehaviour = behaviours.SelectedBehaviour; + this.SelectedLangauges = new BindingList(behaviours.selectedLangauges); + } + + /// + /// Gets or sets the selected behaviour. + /// + public AudioBehaviourModes SelectedBehaviour + { + get + { + return this.selectedBehaviour; + } + + set + { + if (value == this.selectedBehaviour) + { + return; + } + this.selectedBehaviour = value; + this.NotifyOfPropertyChange(() => this.SelectedBehaviour); + } + } + + /// + /// Gets or sets the selected langauges. + /// + public BindingList SelectedLangauges + { + get + { + return this.selectedLangauges; + } + set + { + if (Equals(value, this.selectedLangauges)) + { + return; + } + this.selectedLangauges = value; + this.NotifyOfPropertyChange(() => this.SelectedLangauges); + } + } + + /// + /// Clone this object + /// + /// + /// The . + /// + public AudioBehaviours Clone() + { + AudioBehaviours cloned = new AudioBehaviours + { + SelectedBehaviour = this.selectedBehaviour, + SelectedLangauges = new BindingList() + }; + + foreach (var item in this.SelectedLangauges) + { + cloned.SelectedLangauges.Add(item); + } + + return cloned; + } + } +} diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs new file mode 100644 index 000000000..567945300 --- /dev/null +++ b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs @@ -0,0 +1,26 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Picture Settings Mode when adding presets +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Model.Picture +{ + using System.ComponentModel.DataAnnotations; + + /// + /// Picture Settings Mode when adding presets + /// + public enum PresetPictureSettingsMode + { + [Display(Name = "None")] + None = 0, + [Display(Name = "Custom")] + Custom = 1, + [Display(Name = "Source Max Size")] + SourceMaximum = 2, + } +} \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs new file mode 100644 index 000000000..004190a5f --- /dev/null +++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs @@ -0,0 +1,28 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The subtitle behaviours modes. +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Model.Subtitles +{ + using System.ComponentModel.DataAnnotations; + + /// + /// The subtitle behaviours modes. + /// + public enum SubtitleBehaviourModes + { + [Display(Name = "None")] + None = 0, + + [Display(Name = "First Matching Selected Language")] + FirstMatch, + + [Display(Name = "All Matching Selected Languages")] + AllMatching, + } +} diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs new file mode 100644 index 000000000..8bf58fb60 --- /dev/null +++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs @@ -0,0 +1,166 @@ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// A class to track the behaviours of audio track selection +// +// -------------------------------------------------------------------------------------------------------------------- + +namespace HandBrakeWPF.Model.Subtitles +{ + using System.ComponentModel; + + using Caliburn.Micro; + + /// + /// A class to track the behaviours of audio track selection + /// + public class SubtitleBehaviours : PropertyChangedBase + { + /// + /// The selected behaviour. + /// + private SubtitleBehaviourModes selectedBehaviour; + + /// + /// The selected langauges. + /// + private BindingList selectedLangauges; + + /// + /// The add foreign audio scan track. + /// + private bool addForeignAudioScanTrack; + + /// + /// The add closed captions. + /// + private bool addClosedCaptions; + + /// + /// Initializes a new instance of the class. + /// + public SubtitleBehaviours() + { + this.SelectedBehaviour = SubtitleBehaviourModes.None; + this.SelectedLangauges = new BindingList(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + /// The behaviours. + /// + public SubtitleBehaviours(SubtitleBehaviours behaviours) + { + this.SelectedBehaviour = behaviours.selectedBehaviour; + this.SelectedLangauges = new BindingList(behaviours.SelectedLangauges); + } + + /// + /// Gets or sets the selected behaviour. + /// + public SubtitleBehaviourModes SelectedBehaviour + { + get + { + return this.selectedBehaviour; + } + set + { + if (value == this.selectedBehaviour) + { + return; + } + this.selectedBehaviour = value; + this.NotifyOfPropertyChange(() => this.SelectedBehaviour); + } + } + + /// + /// Gets or sets the selected langages. + /// + public BindingList SelectedLangauges + { + get + { + return this.selectedLangauges; + } + set + { + if (Equals(value, this.selectedLangauges)) + { + return; + } + this.selectedLangauges = value; + this.NotifyOfPropertyChange(() => this.SelectedLangauges); + } + } + + /// + /// Gets or sets a value indicating whether add foreign audio scan track. + /// + public bool AddForeignAudioScanTrack + { + get + { + return this.addForeignAudioScanTrack; + } + set + { + if (value.Equals(this.addForeignAudioScanTrack)) + { + return; + } + this.addForeignAudioScanTrack = value; + this.NotifyOfPropertyChange(() => this.AddForeignAudioScanTrack); + } + } + + /// + /// Gets or sets a value indicating whether add closed captions. + /// + public bool AddClosedCaptions + { + get + { + return this.addClosedCaptions; + } + set + { + if (value.Equals(this.addClosedCaptions)) + { + return; + } + this.addClosedCaptions = value; + this.NotifyOfPropertyChange(() => this.AddClosedCaptions); + } + } + + /// + /// Clone this object + /// + /// + /// The . + /// + public SubtitleBehaviours Clone() + { + SubtitleBehaviours cloned = new SubtitleBehaviours + { + SelectedBehaviour = this.selectedBehaviour, + SelectedLangauges = new BindingList(), + AddClosedCaptions = this.addClosedCaptions, + AddForeignAudioScanTrack = this.addForeignAudioScanTrack, + }; + + foreach (var item in this.SelectedLangauges) + { + cloned.SelectedLangauges.Add(item); + } + + return cloned; + } + } +} diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs index 86fb8c6bc..7508d3061 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs @@ -14,6 +14,7 @@ namespace HandBrakeWPF.Services.Presets.Factories using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs index 7edf71836..96fe6fb13 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs @@ -16,18 +16,21 @@ namespace HandBrakeWPF.Services.Presets.Factories using System.Linq; using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; using HandBrake.ApplicationServices.Model.Encoding; - using HandBrake.ApplicationServices.Model.Subtitle; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; using HandBrake.Interop.Model.Encoding.x264; using HandBrake.Interop.Model.Encoding.x265; + using HandBrakeWPF.Model.Audio; + using HandBrakeWPF.Model.Subtitles; using HandBrakeWPF.Services.Presets; using HandBrakeWPF.Services.Presets.Model; using HandBrakeWPF.Utilities; + using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode; + /// /// A Factory to translate a Plist object into a Preset. /// diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs index aa50ec7de..e1b3d0e4d 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs @@ -12,8 +12,12 @@ namespace HandBrakeWPF.Services.Presets.Model using Caliburn.Micro; using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; - using HandBrake.ApplicationServices.Model.Subtitle; + using HandBrake.ApplicationServices.Services.Encode.Model; + + using HandBrakeWPF.Model.Audio; + using HandBrakeWPF.Model.Subtitles; + + using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode; /// /// A Preset for encoding with. diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs index 359dd1f3d..719b873f8 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs @@ -13,14 +13,15 @@ namespace HandBrakeWPF.ViewModels using System.Windows; using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; - using HandBrake.ApplicationServices.Model.Subtitle; using HandBrake.ApplicationServices.Services; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; + using HandBrakeWPF.Model.Audio; + using HandBrakeWPF.Model.Subtitles; using HandBrakeWPF.Properties; using HandBrakeWPF.Services; using HandBrakeWPF.Services.Interfaces; @@ -29,6 +30,8 @@ namespace HandBrakeWPF.ViewModels using HandBrakeWPF.Services.Presets.Model; using HandBrakeWPF.ViewModels.Interfaces; + using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode; + /// /// The Add Preset View Model /// diff --git a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs index 5726b0da5..6f2dee1a0 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs @@ -10,6 +10,7 @@ namespace HandBrakeWPF.ViewModels { using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs index 830dfb3ee..e05df3be4 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs @@ -17,12 +17,13 @@ namespace HandBrakeWPF.ViewModels using Caliburn.Micro; using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; + using HandBrakeWPF.Model.Audio; using HandBrakeWPF.Services.Interfaces; using HandBrakeWPF.Services.Presets.Model; using HandBrakeWPF.ViewModels.Interfaces; diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs index df55219ea..295091011 100644 --- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs @@ -19,6 +19,7 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Exceptions; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrakeWPF.Services.Interfaces; diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs index 8922f912a..12ba85a49 100644 --- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs @@ -12,6 +12,7 @@ namespace HandBrakeWPF.ViewModels using System.Collections.Generic; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs index 5a46eaa9b..0b2af3464 100644 --- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs @@ -16,6 +16,7 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs index c97be32c6..beee9d226 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs @@ -10,10 +10,12 @@ namespace HandBrakeWPF.ViewModels.Interfaces { using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; - using HandBrake.ApplicationServices.Model.Subtitle; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; + using HandBrakeWPF.Model.Audio; + using HandBrakeWPF.Model.Subtitles; + /// /// The Add Preset View Model /// diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs index 41d7f4940..bc970c558 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs @@ -9,7 +9,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces { - using HandBrake.ApplicationServices.Model.Audio; + using HandBrakeWPF.Model.Audio; /// /// The Audio View Model Interface diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs index b610d140b..a580eb86c 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs @@ -12,6 +12,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces using System.Windows; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrakeWPF.Services.Presets.Model; diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs index ba20434e5..748395023 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs @@ -10,6 +10,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces { using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; /// /// The Preview View Model Interface diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs index 6d42d4d55..448faca36 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs @@ -10,6 +10,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces { using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; /// /// The Static Preview View Model Interface diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs index 27d096fb5..46086836b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs @@ -9,7 +9,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces { - using HandBrake.ApplicationServices.Model.Subtitle; + using HandBrakeWPF.Model.Subtitles; /// /// The Subtiles View Model Interface diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs index d66ce5fb4..437534181 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs @@ -10,6 +10,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces { using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrakeWPF.Services.Presets.Model; diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 040ef883d..362089ed4 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -22,11 +22,10 @@ namespace HandBrakeWPF.ViewModels using Caliburn.Micro; using HandBrake.ApplicationServices.Model; - using HandBrake.ApplicationServices.Model.Audio; using HandBrake.ApplicationServices.Model.Encoding; - using HandBrake.ApplicationServices.Model.Subtitle; using HandBrake.ApplicationServices.Services.Encode.EventArgs; using HandBrake.ApplicationServices.Services.Encode.Interfaces; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrake.ApplicationServices.Services.Scan.EventArgs; using HandBrake.ApplicationServices.Services.Scan.Interfaces; @@ -38,6 +37,8 @@ namespace HandBrakeWPF.ViewModels using HandBrakeWPF.Factories; using HandBrakeWPF.Helpers; using HandBrakeWPF.Model; + using HandBrakeWPF.Model.Audio; + using HandBrakeWPF.Model.Subtitles; using HandBrakeWPF.Properties; using HandBrakeWPF.Services.Interfaces; using HandBrakeWPF.Services.Presets.Factories; diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs index a01447fc0..728286798 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs @@ -14,6 +14,7 @@ namespace HandBrakeWPF.ViewModels using System.Globalization; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.Interop.Model; using HandBrake.Interop.Model.Encoding; @@ -23,6 +24,7 @@ namespace HandBrakeWPF.ViewModels using HandBrakeWPF.Utilities; using HandBrakeWPF.ViewModels.Interfaces; + using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode; using Size = System.Drawing.Size; /// diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs index 1802dab50..bf6322b10 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -21,6 +21,7 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Model.Encoding; using HandBrake.ApplicationServices.Services.Encode.EventArgs; using HandBrake.ApplicationServices.Services.Encode.Interfaces; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrakeWPF.Factories; diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index 763738abd..2159a2e22 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -18,6 +18,7 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.EventArgs; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Services.Encode.EventArgs; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrakeWPF.Properties; diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs index 0968ac7a8..a910c272b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs @@ -15,6 +15,7 @@ namespace HandBrakeWPF.ViewModels using System.Windows.Media.Imaging; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrake.ApplicationServices.Services.Scan.Interfaces; using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index f16a0979b..74d2c0d64 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -16,10 +16,11 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; - using HandBrake.ApplicationServices.Model.Subtitle; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.ApplicationServices.Utilities; + using HandBrakeWPF.Model.Subtitles; using HandBrakeWPF.Services.Presets.Model; using HandBrakeWPF.ViewModels.Interfaces; diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index a6796fe72..6b38c5209 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -20,6 +20,7 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop; diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs index aa65bb090..69e4a0f33 100644 --- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs @@ -15,6 +15,7 @@ namespace HandBrakeWPF.ViewModels using System.Linq; using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services.Encode.Model; using HandBrake.ApplicationServices.Services.Scan.Model; using HandBrake.Interop.Model.Encoding; -- cgit v1.2.3