summaryrefslogtreecommitdiffstats
path: root/gtk/src
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-06-14 01:24:34 +0000
committerjstebbins <[email protected]>2011-06-14 01:24:34 +0000
commitd4b5c3e9ea690220fb7e959aed0c68a2e73b0316 (patch)
tree824b35f6b87a1bab96de73f5bcb0eccf43a5e213 /gtk/src
parentb3b9ef3add434b865c3deed92cb9e04a8703f389 (diff)
Add DTS-HD passthru \o/
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4055 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
-rw-r--r--gtk/src/hb-backend.c23
-rw-r--r--gtk/src/presets.c3
2 files changed, 18 insertions, 8 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index e98330155..a55897ab8 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -251,14 +251,15 @@ combo_opts_t vcodec_opts =
static options_map_t d_acodec_opts[] =
{
- {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"},
- {"AAC (ffmpeg)", "ffaac", HB_ACODEC_FFAAC, "ffaac"},
- {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"},
- {"Vorbis", "vorbis", HB_ACODEC_VORBIS, "vorbis"},
- {"AC3 (ffmpeg)", "ac3", HB_ACODEC_AC3, "ac3"},
- {"AC3 (pass-thru)", "ac3pass", HB_ACODEC_AC3_PASS, "ac3pass"},
- {"DTS (pass-thru)", "dtspass", HB_ACODEC_DCA_PASS, "dtspass"},
- {"Choose For Me", "auto", HB_ACODEC_ANY, "auto"},
+ {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"},
+ {"AAC (ffmpeg)", "ffaac", HB_ACODEC_FFAAC, "ffaac"},
+ {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"},
+ {"Vorbis", "vorbis", HB_ACODEC_VORBIS, "vorbis"},
+ {"AC3 (ffmpeg)", "ac3", HB_ACODEC_AC3, "ac3"},
+ {"AC3 (pass-thru)", "ac3pass", HB_ACODEC_AC3_PASS, "ac3pass"},
+ {"DTS (pass-thru)", "dtspass", HB_ACODEC_DCA_PASS, "dtspass"},
+ {"DTS-HD (pass-thru)", "dtshdpass", HB_ACODEC_DCA_HD_PASS, "dtshdpass"},
+ {"Choose For Me", "auto", HB_ACODEC_ANY, "auto"},
};
combo_opts_t acodec_opts =
{
@@ -1568,10 +1569,12 @@ ghb_grey_combo_options(GtkBuilder *builder)
if (allow_dca)
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_PASS, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, FALSE);
}
else
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
}
if (aconfig && aconfig->in.codec != HB_ACODEC_AC3)
@@ -1582,6 +1585,10 @@ ghb_grey_combo_options(GtkBuilder *builder)
{
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
}
+ if (aconfig && aconfig->in.codec != HB_ACODEC_DCA_HD)
+ {
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
+ }
grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, FALSE);
widget = GHB_WIDGET (builder, "AudioEncoder");
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index b3815f032..39d86be9b 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -2001,6 +2001,7 @@ static value_map_t acodec_xlat[] =
{"AAC (CoreAudio)", "faac"},
{"AC3 Passthru", "ac3pass"},
{"DTS Passthru", "dtspass"},
+ {"DTS-HD Passthru", "dtshdpass"},
{"MP3 (lame)", "lame"},
{"Vorbis (vorbis)", "vorbis"},
{NULL,NULL}
@@ -2049,6 +2050,8 @@ value_map_t mix_xlat[] =
{"Dolby Pro Logic II", "dpl2"},
{"6-channel discrete", "6ch"},
{"AC3 Passthru", "none"},
+ {"DTS Passthru", "none"},
+ {"DTS-HD Passthru", "none"},
{NULL, NULL}
};