From 47adcf2e93b19ea525d01d9f9a7a9df32f7fe145 Mon Sep 17 00:00:00 2001 From: sr55 Date: Wed, 1 Apr 2015 20:34:27 +0000 Subject: [PATCH] WinGui: Rename some of the models in the JSON encode folder. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7035 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrake.ApplicationServices.csproj | 6 ++-- .../Interop/Json/Encode/Filter.cs | 14 ++++---- .../Json/Encode/{FilterList.cs => Filters.cs} | 18 +++++----- .../Interop/Json/Encode/JsonEncodeObject.cs | 5 ++- .../Encode/{Search.cs => SubtitleSearch.cs} | 4 +-- .../Json/Encode/{Subtitle.cs => Subtitles.cs} | 6 ++-- .../Encode/Factories/EncodeFactory.cs | 35 +++++++++---------- 7 files changed, 42 insertions(+), 46 deletions(-) rename win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/{FilterList.cs => Filters.cs} (59%) rename win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/{Search.cs => SubtitleSearch.cs} (87%) rename win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/{Subtitle.cs => Subtitles.cs} (81%) diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 6f32ad6b1..e0bf5cd97 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -114,16 +114,16 @@ + - - + - + diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs index 9082ff8a2..87bb43190 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs @@ -3,27 +3,25 @@ // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. // // -// The filter. +// The filter list. // // -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Interop.Json.Encode { - using System.Collections.Generic; - /// - /// The filter. + /// The filter list. /// public class Filter { /// - /// Gets or sets the filter list. + /// Gets or sets the id. /// - public List FilterList { get; set; } + public int ID { get; set; } /// - /// Gets or sets a value indicating whether grayscale. + /// Gets or sets the settings. /// - public bool Grayscale { get; set; } + public string Settings { get; set; } } } \ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/FilterList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs similarity index 59% rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/FilterList.cs rename to win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs index e08a76ba8..a44a5b17b 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/FilterList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs @@ -1,27 +1,29 @@ // -------------------------------------------------------------------------------------------------------------------- -// +// // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. // // -// The filter list. +// The filter. // // -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Interop.Json.Encode { + using System.Collections.Generic; + /// - /// The filter list. + /// The filter. /// - public class FilterList + public class Filters { /// - /// Gets or sets the id. + /// Gets or sets the filter list. /// - public int ID { get; set; } + public List FilterList { get; set; } /// - /// Gets or sets the settings. + /// Gets or sets a value indicating whether grayscale. /// - public string Settings { get; set; } + public bool Grayscale { get; set; } } } \ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs index cb9494c0d..b6b12a7eb 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs @@ -9,7 +9,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode { - using HandBrake.ApplicationServices.Interop.Json.Anamorphic; using HandBrake.ApplicationServices.Interop.Json.Shared; /// @@ -30,7 +29,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// /// Gets or sets the filter. /// - public Filter Filter { get; set; } + public Filters Filter { get; set; } /// /// Gets or sets the PAR @@ -55,7 +54,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// /// Gets or sets the subtitle. /// - public Subtitle Subtitle { get; set; } + public Subtitles Subtitle { get; set; } /// /// Gets or sets the video. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Search.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleSearch.cs similarity index 87% rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Search.cs rename to win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleSearch.cs index 8e5625f00..b6c5cbd63 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Search.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleSearch.cs @@ -1,5 +1,5 @@ // -------------------------------------------------------------------------------------------------------------------- -// +// // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. // // @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// /// The search. /// - public class Search + public class SubtitleSearch { /// /// Gets or sets a value indicating whether burn. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitle.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs similarity index 81% rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitle.cs rename to win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs index c5e8d56f7..5d38ba51d 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitle.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs @@ -1,5 +1,5 @@ // -------------------------------------------------------------------------------------------------------------------- -// +// // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. // // @@ -14,12 +14,12 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// /// The subtitle. /// - public class Subtitle + public class Subtitles { /// /// Gets or sets the search. /// - public Search Search { get; set; } + public SubtitleSearch Search { get; set; } /// /// Gets or sets the subtitle list. diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs index c3283e275..bebfeca18 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs @@ -17,7 +17,6 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories using HandBrake.ApplicationServices.Interop; using HandBrake.ApplicationServices.Interop.HbLib; using HandBrake.ApplicationServices.Interop.Helpers; - using HandBrake.ApplicationServices.Interop.Json.Anamorphic; using HandBrake.ApplicationServices.Interop.Json.Encode; using HandBrake.ApplicationServices.Interop.Json.Shared; using HandBrake.ApplicationServices.Interop.Model.Encoding; @@ -26,8 +25,6 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories using HandBrake.ApplicationServices.Services.Encode.Model.Models; using HandBrake.ApplicationServices.Utilities; - using AudioTrack = HandBrake.ApplicationServices.Services.Encode.Model.Models.AudioTrack; - using Subtitle = HandBrake.ApplicationServices.Interop.Json.Encode.Subtitle; /// /// This factory takes the internal EncodeJob object and turns it into a set of JSON models @@ -174,14 +171,14 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories /// The job. /// /// - /// The . + /// The . /// - private static Subtitle CreateSubtitle(EncodeTask job) + private static Subtitles CreateSubtitle(EncodeTask job) { - Subtitle subtitle = new Subtitle + Subtitles subtitle = new Subtitles { Search = - new Search + new SubtitleSearch { Enable = false, Default = false, @@ -387,20 +384,20 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories /// The job. /// /// - /// The . + /// The . /// - private static Filter CreateFilter(EncodeTask job) + private static Filters CreateFilter(EncodeTask job) { - Filter filter = new Filter + Filters filter = new Filters { - FilterList = new List(), + FilterList = new List(), Grayscale = job.Grayscale }; // Detelecine if (job.Detelecine != Detelecine.Off) { - FilterList filterItem = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_DETELECINE, Settings = job.CustomDetelecine }; + Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DETELECINE, Settings = job.CustomDetelecine }; filter.FilterList.Add(filterItem); } @@ -421,7 +418,7 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories options = job.CustomDecomb; } - FilterList filterItem = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_DECOMB, Settings = options }; + Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DECOMB, Settings = options }; filter.FilterList.Add(filterItem); } @@ -450,7 +447,7 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories options = job.CustomDeinterlace; } - FilterList filterItem = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_DEINTERLACE, Settings = options }; + Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DEINTERLACE, Settings = options }; filter.FilterList.Add(filterItem); } @@ -469,13 +466,13 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories string framerateString = num.HasValue ? string.Format("{0}:{1}:{2}", fm, num, den) : string.Format("{0}", fm); // filter_cfr, filter_vrate.num, filter_vrate.den - FilterList framerateShaper = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_VFR, Settings = framerateString }; + Filter framerateShaper = new Filter { ID = (int)hb_filter_ids.HB_FILTER_VFR, Settings = framerateString }; filter.FilterList.Add(framerateShaper); // Deblock if (job.Deblock >= 5) { - FilterList filterItem = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_DEBLOCK, Settings = job.Deblock.ToString() }; + Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DEBLOCK, Settings = job.Deblock.ToString() }; filter.FilterList.Add(filterItem); } @@ -497,12 +494,12 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories settings = Marshal.PtrToStringAnsi(settingsPtr); } - FilterList filterItem = new FilterList { ID = (int)id, Settings = settings }; + Filter filterItem = new Filter { ID = (int)id, Settings = settings }; filter.FilterList.Add(filterItem); } // CropScale Filter - FilterList cropScale = new FilterList + Filter cropScale = new Filter { ID = (int)hb_filter_ids.HB_FILTER_CROP_SCALE, Settings = @@ -530,7 +527,7 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories /// The job. /// /// - /// The . + /// The . /// private static MetaData CreateMetaData(EncodeTask job) { -- 2.40.0