diff options
| author | sr55 <[email protected]> | 2011-07-16 15:45:38 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-07-16 15:45:38 +0000 |
| commit | 5045c6feeec292db6b538bfe4363c1e3790997fb (patch) | |
| tree | 4e998dfaf92d9bf80ffbcfea29a0b0122ec909cc /win/CS/HandBrake.ApplicationServices | |
| parent | a3ceaf6979ff137b3e71ebaeee3a52942aeac3fa (diff) | |
WinGui: Another duplicate model removed.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4110 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
7 files changed, 7 insertions, 34 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs index 2b6980466..70dc8ea9c 100644 --- a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs @@ -143,16 +143,7 @@ namespace HandBrake.ApplicationServices.Functions profile.Quality = work.Quality.HasValue ? work.Quality.Value : 0;
profile.UseDisplayWidth = true;
profile.VideoBitrate = work.VideoBitrate.HasValue ? work.VideoBitrate.Value : 0;
-
- switch (work.VideoEncodeRateType)
- {
- case VideoEncodeRateMode.AverageBitrate:
- profile.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
- break;
- case VideoEncodeRateMode.ConstantQuality:
- profile.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;
- break;
- }
+ profile.VideoEncodeRateType = work.VideoEncodeRateType;
switch (work.VideoEncoder)
{
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 4b27081e5..d9fc865ca 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -107,7 +107,6 @@ <Compile Include="Model\Encoding\OutputFormat.cs" />
<Compile Include="Model\Encoding\SubtitleTrack.cs" />
<Compile Include="Model\Encoding\VideoEncoder.cs" />
- <Compile Include="Model\Encoding\VideoEncodeRateMode.cs" />
<Compile Include="Model\General\UpdateCheckInformation.cs" />
<Compile Include="Model\General\UpdateCheckResult.cs" />
<Compile Include="Model\ModelBase.cs" />
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs index 0098ca62b..430700ee1 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs @@ -213,7 +213,7 @@ namespace HandBrake.ApplicationServices.Model /// <summary>
/// Gets or sets VideoEncodeRateType.
/// </summary>
- public VideoEncodeRateMode VideoEncodeRateType { get; set; }
+ public VideoEncodeRateType VideoEncodeRateType { get; set; }
/// <summary>
/// Gets or sets the VideoEncoder
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs deleted file mode 100644 index 636d7829d..000000000 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs +++ /dev/null @@ -1,17 +0,0 @@ -/* VideoEncoderRateMode.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Model.Encoding
-{
- /// <summary>
- /// The Mode of Video Encoding. Bitrate, Filesize or Quality
- /// </summary>
- public enum VideoEncodeRateMode
- {
- TargetSize = 0,
- AverageBitrate,
- ConstantQuality
- }
-}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs index 91d474ab1..bea345106 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs @@ -312,10 +312,10 @@ namespace HandBrake.ApplicationServices.Utilities switch (qualityMode)
{
case "1": // Avg Bitrate
- parsed.VideoEncodeRateType = VideoEncodeRateMode.AverageBitrate;
+ parsed.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
break;
case "2": // CQ
- parsed.VideoEncodeRateType = VideoEncodeRateMode.ConstantQuality;
+ parsed.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;
break;
}
#endregion
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index 7631da7de..934bc6c41 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -301,11 +301,11 @@ namespace HandBrake.ApplicationServices.Utilities switch (task.VideoEncodeRateType)
{
- case VideoEncodeRateMode.AverageBitrate:
+ case VideoEncodeRateType.AverageBitrate:
if (task.VideoBitrate.HasValue)
query += string.Format(" -b {0}", task.VideoBitrate.Value);
break;
- case VideoEncodeRateMode.ConstantQuality:
+ case VideoEncodeRateType.ConstantQuality:
double value;
switch (task.VideoEncoder)
{
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs index 8b6394453..b52d72f56 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs @@ -310,7 +310,7 @@ namespace HandBrake.ApplicationServices.Utilities if (videoBitrate.Success)
{
- parsed.VideoEncodeRateType = VideoEncodeRateMode.AverageBitrate;
+ parsed.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
parsed.VideoBitrate = int.Parse(videoBitrate.ToString().Replace("-b ", string.Empty));
}
|