summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.Interop/HandBrakeInterop/Model
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-09-11 13:27:36 +0000
committersr55 <[email protected]>2011-09-11 13:27:36 +0000
commit44ba40eb45932d432fd51aec058b4b7d08957857 (patch)
treed831bb86ff6506f7f90a6c22fe1456adfa7a53b5 /win/CS/HandBrake.Interop/HandBrakeInterop/Model
parent2fe0f06304879d6f1ee044ad714afb8e564e6bd1 (diff)
WinGui: Update the Interop Mixdown and Audio Encoder objects
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4214 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop/HandBrakeInterop/Model')
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs15
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs10
2 files changed, 23 insertions, 2 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
index 2069e0b53..a215474ec 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
@@ -16,6 +16,9 @@ namespace HandBrake.Interop.Model.Encoding
[Display(Name = "AAC (faac)")]
Faac = 0,
+ [Display(Name = "AAC (ffmpeg)")]
+ ffaac,
+
[Display(Name = "MP3 (lame)")]
Lame,
@@ -28,6 +31,18 @@ namespace HandBrake.Interop.Model.Encoding
[Display(Name = "Passthrough (AC3)")]
Ac3Passthrough,
+ [Display(Name = "DTS Passthru")]
+ DtsPassthrough,
+
+ [Display(Name = "DTS-HD Passthru")]
+ DtsHDPassthrough,
+
+ [Display(Name = "AAC Passthru")]
+ AacPassthru,
+
+ [Display(Name = "MP3 Passthru")]
+ Mp3Passthru,
+
[Display(Name = "Vorbis (vorbis)")]
Vorbis
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
index 89923c7c3..5138bbeb9 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
@@ -11,7 +11,10 @@ namespace HandBrake.Interop.Model.Encoding
{
using System.ComponentModel.DataAnnotations;
- public enum Mixdown
+ /// <summary>
+ /// The Audio Mixdown Enumeration
+ /// </summary>
+ public enum Mixdown
{
[Display(Name = "Dolby Pro Logic II")]
DolbyProLogicII = 0,
@@ -29,6 +32,9 @@ namespace HandBrake.Interop.Model.Encoding
DolbySurround,
[Display(Name = "6 Channel Discrete")]
- SixChannelDiscrete
+ SixChannelDiscrete,
+
+ [Display(Name = "Passthru")]
+ Passthrough,
}
}