diff options
| author | sr55 <[email protected]> | 2015-05-31 13:45:18 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-05-31 13:45:18 +0000 |
| commit | 7e778cf7bf897b692754745862598fbc12cf877c (patch) | |
| tree | 8b2caa61bc3d7e3a824d6a86cdf6ce95c11753bf /win/CS/HandBrake.ApplicationServices | |
| parent | d2be4a57668e8399a4b60f5d9e96554336abe157 (diff) | |
WinGui: Use the new libhb preset management code to fetch built-in presets on startup. Note, the preset update notice is now gone so anyone hacking the preset dat files will not be notified when it gets overwritten now.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7252 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs index 0c40a858d..6bfeadcdd 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs @@ -219,12 +219,12 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets /// <summary>
/// Gets or sets the picture width.
/// </summary>
- public int PictureWidth { get; set; }
+ public int? PictureWidth { get; set; }
/// <summary>
/// Gets or sets the picture height.
/// </summary>
- public int PictureHeight { get; set; }
+ public int? PictureHeight { get; set; }
/// <summary>
/// Gets or sets the picture force height.
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs b/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs index 72e65adeb..0de767b85 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs @@ -81,12 +81,13 @@ namespace HandBrake.ApplicationServices.Utilities {
string currDescription = GetDescription(val);
string currDisplay = GetDisplay(val);
- if (currDescription == description || currDisplay == description)
+ string shortName = GetShortName(val);
+ if (currDescription == description || currDisplay == description || shortName == description)
{
return val;
}
-
- if (insensitiveCase && (currDescription.ToLower() == description.ToLower() || currDisplay.ToLower() == description.ToLower()))
+
+ if (insensitiveCase && (currDescription.ToLower() == description.ToLower() || currDisplay.ToLower() == description.ToLower() || shortName.ToLower() == description.ToLower()))
{
return val;
}
|