diff options
Diffstat (limited to 'win/CS/HandBrake.Interop')
17 files changed, 25 insertions, 47 deletions
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs index acf30fad0..33712955d 100644 --- a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs @@ -715,7 +715,7 @@ namespace HandBrake.Interop.Interop public static List<int> GetQsvAdaptorList() { - if (SystemInfo.IsQsvAvailable) + if (HandBrakeHardwareEncoderHelper.IsQsvAvailable) { IntPtr gpuListPtr = HBFunctions.hb_qsv_adapters_list(); diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs index 9cc765770..d2285b818 100644 --- a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs @@ -19,7 +19,7 @@ namespace HandBrake.Interop.Interop using HandBrake.Interop.Interop.Helpers; using HandBrake.Interop.Interop.Interfaces.Model.Filters; using HandBrake.Interop.Interop.Json.Filters; - using HandBrake.Interop.Json; + using HandBrake.Interop.Utilities; /// <summary> /// The hand brake filter helpers. diff --git a/win/CS/HandBrake.Interop/Utilities/SystemInfo.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs index 952d0b1c5..f0e55062a 100644 --- a/win/CS/HandBrake.Interop/Utilities/SystemInfo.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs @@ -1,5 +1,5 @@ // -------------------------------------------------------------------------------------------------------------------- -// <copyright file="SystemInfo.cs" company="HandBrake Project (https://handbrake.fr)"> +// <copyright file="HandBrakeHardwareEncoderHelper.cs" company="HandBrake Project (https://handbrake.fr)"> // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. // </copyright> // <summary> @@ -7,14 +7,14 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Utilities +namespace HandBrake.Interop.Interop { using System; using System.Diagnostics; - using Interop.HbLib; + using HandBrake.Interop.Interop.HbLib; - public class SystemInfo + public class HandBrakeHardwareEncoderHelper { private static bool? isNvencH264Available; // Local cache to prevent log spam. private static bool? isNvencH265Available; diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs index 440983f14..15f34fd14 100644 --- a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs @@ -19,10 +19,10 @@ namespace HandBrake.Interop.Interop using System.Timers; using System.Xml; - using HandBrake.Interop.Interop.EventArgs; using HandBrake.Interop.Interop.HbLib; using HandBrake.Interop.Interop.Helpers; using HandBrake.Interop.Interop.Interfaces; + using HandBrake.Interop.Interop.Interfaces.EventArgs; using HandBrake.Interop.Interop.Interfaces.Model; using HandBrake.Interop.Interop.Interfaces.Model.Encoders; using HandBrake.Interop.Interop.Interfaces.Model.Picture; @@ -30,7 +30,7 @@ namespace HandBrake.Interop.Interop using HandBrake.Interop.Interop.Json.Encode; using HandBrake.Interop.Interop.Json.Scan; using HandBrake.Interop.Interop.Json.State; - using HandBrake.Interop.Json; + using HandBrake.Interop.Utilities; public class HandBrakeInstance : IHandBrakeInstance, IDisposable { diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs index 2443a24b4..fdd987336 100644 --- a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs @@ -19,7 +19,7 @@ namespace HandBrake.Interop.Interop using HandBrake.Interop.Interop.Helpers; using HandBrake.Interop.Interop.Interfaces.Model.Presets; using HandBrake.Interop.Interop.Json.Presets; - using HandBrake.Interop.Json; + using HandBrake.Interop.Utilities; /// <summary> /// The hand brake preset service. diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs index e2f1fd868..653cbcd64 100644 --- a/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs @@ -16,11 +16,11 @@ namespace HandBrake.Interop.Interop using System.Text.Json; using System.Xml; - using HandBrake.Interop.Interop.EventArgs; using HandBrake.Interop.Interop.HbLib; + using HandBrake.Interop.Interop.Interfaces.EventArgs; using HandBrake.Interop.Interop.Json.Anamorphic; using HandBrake.Interop.Interop.Json.Shared; - using HandBrake.Interop.Json; + using HandBrake.Interop.Utilities; /// <summary> /// HandBrake Interop Utilities diff --git a/win/CS/HandBrake.Interop/Utilities/VersionHelper.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeVersionHelper.cs index 6b381a6ee..6d40ddf04 100644 --- a/win/CS/HandBrake.Interop/Utilities/VersionHelper.cs +++ b/win/CS/HandBrake.Interop/Interop/HandBrakeVersionHelper.cs @@ -14,7 +14,7 @@ namespace HandBrake.Interop.Utilities using HandBrake.Interop.Interop.HbLib; - public class VersionHelper + public class HandBrakeVersionHelper { /// <summary> /// Gets the HandBrake version string. diff --git a/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeCompletedEventArgs.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeCompletedEventArgs.cs index 98368cd93..158d2eb84 100644 --- a/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeCompletedEventArgs.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeCompletedEventArgs.cs @@ -7,7 +7,7 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Interop.EventArgs +namespace HandBrake.Interop.Interop.Interfaces.EventArgs { using System; diff --git a/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeProgressEventArgs.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeProgressEventArgs.cs index bad483d78..54e9d6f5d 100644 --- a/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeProgressEventArgs.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeProgressEventArgs.cs @@ -7,7 +7,7 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Interop.EventArgs +namespace HandBrake.Interop.Interop.Interfaces.EventArgs { using System; diff --git a/win/CS/HandBrake.Interop/Interop/EventArgs/MessageLoggedEventArgs.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/MessageLoggedEventArgs.cs index 22f74b0b3..7fb6b314e 100644 --- a/win/CS/HandBrake.Interop/Interop/EventArgs/MessageLoggedEventArgs.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/MessageLoggedEventArgs.cs @@ -7,7 +7,7 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Interop.EventArgs +namespace HandBrake.Interop.Interop.Interfaces.EventArgs { using System; diff --git a/win/CS/HandBrake.Interop/Interop/EventArgs/ScanProgressEventArgs.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/ScanProgressEventArgs.cs index 274210a9b..c16f0fd0a 100644 --- a/win/CS/HandBrake.Interop/Interop/EventArgs/ScanProgressEventArgs.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/ScanProgressEventArgs.cs @@ -7,7 +7,7 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Interop.EventArgs +namespace HandBrake.Interop.Interop.Interfaces.EventArgs { using System; diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs index e7a52fbfa..88e151838 100644 --- a/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs @@ -11,7 +11,7 @@ namespace HandBrake.Interop.Interop.Interfaces { using System; - using HandBrake.Interop.Interop.EventArgs; + using HandBrake.Interop.Interop.Interfaces.EventArgs; using HandBrake.Interop.Interop.Json.Encode; using HandBrake.Interop.Interop.Json.State; diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs index 283dfe01f..3d2c8693b 100644 --- a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs @@ -11,9 +11,7 @@ namespace HandBrake.Interop.Interop.Interfaces { using System; - using HandBrake.Interop.Interop.EventArgs; - using HandBrake.Interop.Interop.Interfaces.Model; - using HandBrake.Interop.Interop.Interfaces.Model.Picture; + using HandBrake.Interop.Interop.Interfaces.EventArgs; using HandBrake.Interop.Interop.Interfaces.Model.Preview; using HandBrake.Interop.Interop.Json.Scan; @@ -27,7 +25,7 @@ namespace HandBrake.Interop.Interop.Interfaces /// <summary> /// Fires when a scan has completed. /// </summary> - event EventHandler<EventArgs> ScanCompleted; + event EventHandler<System.EventArgs> ScanCompleted; /// <summary> /// Fires for progress updates when scanning. diff --git a/win/CS/HandBrake.Interop/Model/HBConfiguration.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBConfiguration.cs index 837f0d94a..9777e56b7 100644 --- a/win/CS/HandBrake.Interop/Model/HBConfiguration.cs +++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBConfiguration.cs @@ -7,7 +7,7 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Model +namespace HandBrake.Interop.Interop.Interfaces.Model { public class HBConfiguration { diff --git a/win/CS/HandBrake.Interop/Model/VideoScaler.cs b/win/CS/HandBrake.Interop/Model/VideoScaler.cs deleted file mode 100644 index cf08f33c2..000000000 --- a/win/CS/HandBrake.Interop/Model/VideoScaler.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="VideoScaler.cs" company="HandBrake Project (https://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> -// <summary> -// The different scaling modes available in HandBrake -// </summary> -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrake.Interop.Model -{ - using HandBrake.Interop.Attributes; - - /// <summary> - /// The different scaling modes available in HandBrake - /// </summary> - public enum VideoScaler - { - [DisplayName("Lanczos (default)")] - [ShortName("swscale")] - Lanczos = 0, - } -} diff --git a/win/CS/HandBrake.Interop/Json/JsonSettings.cs b/win/CS/HandBrake.Interop/Utilities/JsonSettings.cs index 56cb229cc..8911e2d51 100644 --- a/win/CS/HandBrake.Interop/Json/JsonSettings.cs +++ b/win/CS/HandBrake.Interop/Utilities/JsonSettings.cs @@ -7,12 +7,15 @@ // </summary> // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.Interop.Json +namespace HandBrake.Interop.Utilities { using System.Text.Json; public class JsonSettings { + /// <summary> + /// For consistent use of JSON settings between this library and the consumers. + /// </summary> public static JsonSerializerOptions Options = new JsonSerializerOptions { IgnoreNullValues = true, diff --git a/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs index fad0307b5..96c4e6ba9 100644 --- a/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs +++ b/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs @@ -266,7 +266,7 @@ namespace HandBrake.Interop.Utilities List<string> names = new List<string>(); foreach (var item in languageCodes) { - KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item); // Slightly inefficient but small set anyway so not a big issue. + KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item); // Slightly inefficient but small set anyway so not a big issue. names.Add(name.Key); } |