diff options
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model')
3 files changed, 62 insertions, 4 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs index 23d7d9e2f..716f539f8 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs @@ -7,6 +7,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding {
using System.ComponentModel;
+ using HandBrake.ApplicationServices.Converters;
+
+ [TypeConverter(typeof(EnumToDescConveter))]
public enum AudioEncoder
{
[Description("AAC (faac)")]
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs index 440f72226..6e47d3421 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs @@ -16,17 +16,58 @@ namespace HandBrake.ApplicationServices.Model.Encoding public AudioTrack()
{
// Default Values
- this.Track = 1;
+ this.Encoder = AudioEncoder.Faac;
this.MixDown = Mixdown.DolbyProLogicII;
this.SampleRate = 48;
this.Bitrate = 160;
this.DRC = 1;
+ this.SourceTrack = "Automatic";
}
/// <summary>
- /// Gets or sets Audio Track Name
+ /// Gets the Audio Track Name
/// </summary>
- public int Track { get; set; }
+ public int? Track
+ {
+ get
+ {
+ string[] tempSub = SourceTrack.Split(' ');
+ int value;
+ if (int.TryParse(tempSub[0], out value))
+ {
+ return value;
+ }
+ return null;
+ }
+ }
+
+ /// <summary>
+ /// Gets the The UI display value for sample rate
+ /// </summary>
+ public string SampleRateDisplayValue
+ {
+ get
+ {
+ return SampleRate == 0 ? "Auto" : SampleRate.ToString();
+ }
+ }
+
+ /// <summary>
+ /// Gets the The UI display value for bit rate
+ /// </summary>
+ public string BitRateDisplayValue
+ {
+ get
+ {
+ return Bitrate == 0 ? "Auto" : Bitrate.ToString();
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the Source Track
+ /// Used for display purposes only.
+ /// </summary>
+ public string SourceTrack { get; set; }
/// <summary>
/// Gets or sets Audio Mixdown
@@ -52,5 +93,10 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// Gets or sets Dynamic Range Compression
/// </summary>
public double DRC { get; set; }
+
+ /// <summary>
+ /// Gets or sets the Gain for the audio track
+ /// </summary>
+ public int Gain { get; set; }
}
}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs index 12611b454..8b0cc9005 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs @@ -7,9 +7,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding {
using System.ComponentModel;
+ using HandBrake.ApplicationServices.Converters;
+
/// <summary>
/// The Mixdown Mode
/// </summary>
+ [TypeConverter(typeof(EnumToDescConveter))]
public enum Mixdown
{
[Description("Dolby Pro Logic II")]
@@ -28,6 +31,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding DolbySurround,
[Description("6 Channel Discrete")]
- SixChannelDiscrete
+ SixChannelDiscrete,
+
+ [Description("AC3 Passthru")]
+ Ac3Passthrough,
+
+ [Description("DTS Passthru")]
+ DtsPassthrough,
}
}
|