diff options
| author | sr55 <[email protected]> | 2011-06-22 17:31:53 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-06-22 17:31:53 +0000 |
| commit | 18a1a18f43a9f90eaae4eb288885e5b19048454d (patch) | |
| tree | 085a06997335af23a56516fb68743c6f4b9b9716 /win/CS/HandBrake.ApplicationServices | |
| parent | f9a3d3cd8dbb41d95e4d37c4e54f7a3c3bee9edd (diff) | |
WinGui: Add DTS-HD Passthru support and a bit of code tidy-up.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4076 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
4 files changed, 18 insertions, 6 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs index c973128d6..b1d92f5d1 100644 --- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs @@ -88,6 +88,8 @@ namespace HandBrake.ApplicationServices.Functions return Mixdown.DolbyProLogicII;
case "6 Channel Discrete":
return Mixdown.SixChannelDiscrete;
+ case "Passthru":
+ return Mixdown.Passthrough;
default:
return Mixdown.Auto;
}
@@ -103,6 +105,7 @@ namespace HandBrake.ApplicationServices.Functions switch (selectedAudio)
{
case Mixdown.Auto:
+ case Mixdown.Passthrough:
return "auto";
case Mixdown.Mono:
return "mono";
@@ -140,6 +143,8 @@ namespace HandBrake.ApplicationServices.Functions return "AC3 Passthru";
case "copy:dts":
return "DTS Passthru";
+ case "copy:dtshd":
+ return "DTS-HD Passthru";
case "ffaac":
return "AAC (ffmpeg)";
default:
@@ -170,6 +175,8 @@ namespace HandBrake.ApplicationServices.Functions return AudioEncoder.Ac3Passthrough;
case "copy:dts":
return AudioEncoder.DtsPassthrough;
+ case "copy:dtshd":
+ return AudioEncoder.DtsHDPassthrough;
default:
return AudioEncoder.Faac;
}
@@ -200,6 +207,8 @@ namespace HandBrake.ApplicationServices.Functions return AudioEncoder.Ac3Passthrough;
case "DTS Passthru":
return AudioEncoder.DtsPassthrough;
+ case "DTS-HD Passthru":
+ return AudioEncoder.DtsHDPassthrough;
default:
return AudioEncoder.Faac;
}
@@ -230,6 +239,8 @@ namespace HandBrake.ApplicationServices.Functions return "copy:ac3";
case AudioEncoder.DtsPassthrough:
return "copy:dts";
+ case AudioEncoder.DtsHDPassthrough:
+ return "copy:dtshd";
case AudioEncoder.Ac3:
return "ac3";
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs index 9925c4298..8b030070f 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs @@ -33,6 +33,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding [Description("DTS Passthru")]
DtsPassthrough,
+ [Description("DTS-HD Passthru")]
+ DtsHDPassthrough,
+
[Description("Vorbis (vorbis)")]
Vorbis
}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs index 738670aea..a6e83735b 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs @@ -112,7 +112,8 @@ namespace HandBrake.ApplicationServices.Model.Encoding {
get
{
- if (this.Encoder == AudioEncoder.Ac3Passthrough || this.Encoder == AudioEncoder.DtsPassthrough)
+ if (this.Encoder == AudioEncoder.Ac3Passthrough || this.Encoder == AudioEncoder.DtsPassthrough ||
+ this.Encoder == AudioEncoder.DtsHDPassthrough)
{
return "Auto";
}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs index 8b0cc9005..d2e13e52e 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs @@ -33,10 +33,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding [Description("6 Channel Discrete")]
SixChannelDiscrete,
- [Description("AC3 Passthru")]
- Ac3Passthrough,
-
- [Description("DTS Passthru")]
- DtsPassthrough,
+ [Description("Passthru")]
+ Passthrough,
}
}
|