summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-01-09 20:21:13 +0000
committersr55 <[email protected]>2015-01-09 20:21:13 +0000
commit9772731f48920014d889e9e8bcf4035b120a6e42 (patch)
treedf0f2ca198ab3f4c0e234899f5cf57a5a1d1b2ef
parent6301bd5b63dd8c7e095331d22fe196210c79f316 (diff)
WinGui: Remove "Aspect Ratio" Display on the Picture tab. It's not really useful to anyone.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6702 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs1
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs2
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs1
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs5
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs3
5 files changed, 2 insertions, 10 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index 972924a50..90998ecc7 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -480,7 +480,6 @@ namespace HandBrake.ApplicationServices.Services.Scan
TitleNumber = title.TitleNumber,
Duration = title.Duration,
Resolution = new Size(title.Resolution.Width, title.Resolution.Height),
- AspectRatio = (decimal)title.AspectRatio,
AngleCount = title.AngleCount,
ParVal = new Size(title.ParVal.Width, title.ParVal.Height),
AutoCropDimensions = title.AutoCropDimensions,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
index 7a7aaab5c..a62fb82fe 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
@@ -616,7 +616,7 @@ namespace HandBrake.Interop
lastScan = scanObject;
foreach (Title title in ScanFactory.CreateTitleSet(scanObject))
- {
+ {
// Set the Main Title.
this.featureTitle = title.IsMainFeature ? title.TitleNumber : 0;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
index e8153b239..61ffa892e 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
@@ -78,7 +78,6 @@ namespace HandBrake.Interop.Json.Factories
Left = title.Crop[2],
Right = title.Crop[3]
},
- //AspectRatio = (double)title.Geometry.DAR.Width / title.Geometry.DAR.Height,
AngleCount = title.AngleCount,
VideoCodecName = title.VideoCodec,
Framerate = ((double)title.FrameRate.Num) / title.FrameRate.Den,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs
index 8f5880123..3b2baa27d 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs
@@ -94,11 +94,6 @@ namespace HandBrake.Interop.Model.Scan
public Size Resolution { get; set; }
/// <summary>
- /// Gets or sets the aspect ratio of this Title
- /// </summary>
- public decimal AspectRatio { get; set; }
-
- /// <summary>
/// Gets or sets the number of angles on the title.
/// </summary>
public int AngleCount { get; set; }
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 728286798..1cfe67bae 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -786,10 +786,9 @@ namespace HandBrakeWPF.ViewModels
// Set Screen Controls
this.SourceInfo = string.Format(
- "{0}x{1}, Aspect Ratio: {2:0.00}, PAR: {3}/{4}",
+ "{0}x{1}, PAR: {2}/{3}",
title.Resolution.Width,
title.Resolution.Height,
- title.AspectRatio,
title.ParVal.Width,
title.ParVal.Height);