X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FFunctions%2FCommon.cs;h=d87e937163b08d9db005e66d3652411c973de869;hb=0ccbbeb84450f1a41ff25c29d939479d1c499ec2;hp=8d70523c3a018ff66bd2fffa28bf825f577785b5;hpb=7b1a165dd1dfd63b1f53c55de0e87fe1eed8b19a;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 8d70523c..d87e9371 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -1,7 +1,7 @@
/* Common.cs $
This file is part of the HandBrake source code.
- Homepage: .
+ Homepage: .
It may be used under the terms of the GNU General Public License. */
using System;
@@ -43,11 +43,11 @@ namespace Handbrake.Functions
catch (Exception exc)
{
if (debug == true)
- MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(),"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
-
+
/*
* Function which generates the filename and path automatically based on the Source Name, DVD title and DVD Chapters
*/
@@ -86,7 +86,7 @@ namespace Handbrake.Functions
{
if (Properties.Settings.Default.autoNamePath.Trim() != "Click 'Browse' to set the default location")
filePath = Properties.Settings.Default.autoNamePath + "\\";
- }
+ }
mainWindow.text_destination.Text = filePath + source + "_T" + title + "_C" + cs + dash + cf + ".mp4";
}
else
@@ -143,7 +143,7 @@ namespace Handbrake.Functions
if (presetQuery.DVDChapterFinish != 0)
mainWindow.drop_chapterFinish.Text = presetQuery.DVDChapterFinish.ToString();
- if (presetQuery.Format != "")
+ if (presetQuery.Format != null)
{
string destination = mainWindow.text_destination.Text;
destination = destination.Replace(".mp4", "." + presetQuery.Format);
@@ -163,12 +163,6 @@ namespace Handbrake.Functions
mainWindow.text_destination.Text = presetQuery.Destination;
mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder;
- mainWindow.drp_audioCodec.Text = presetQuery.AudioEncoder;
-
- if (presetQuery.AudioEncoder == "AAC + AC3")
- {
- mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");
- }
if (presetQuery.IpodAtom == true)
mainWindow.check_iPodAtom.CheckState = CheckState.Checked;
@@ -180,7 +174,7 @@ namespace Handbrake.Functions
else
mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;
- #endregion
+ #endregion
// Picture Settings Tab
#region Picture
@@ -275,7 +269,7 @@ namespace Handbrake.Functions
mainWindow.check_largeFile.BackColor = Color.Transparent;
}
-
+
#endregion
@@ -294,36 +288,138 @@ namespace Handbrake.Functions
// Audio Settings Tab
#region Audio
- mainWindow.drp_audioBitrate.Text = presetQuery.AudioBitrate;
- mainWindow.drp_audioSampleRate.Text = presetQuery.AudioSampleBitrate;
- mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;
- mainWindow.drp_track2Audio.Text = presetQuery.AudioTrack2;
- mainWindow.drp_audioMixDown.Text = presetQuery.AudioTrackMix;
- mainWindow.drp_subtitle.Text = presetQuery.Subtitles;
- if (presetQuery.ForcedSubtitles == true)
+ if (presetQuery.AudioTrack1 == "")
+ mainWindow.drp_track1Audio.Text = "Automatic";
+ else
+ mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;
+
+ if (presetQuery.AudioTrack2 == "None")
{
- mainWindow.check_forced.CheckState = CheckState.Checked;
- mainWindow.check_forced.Enabled = true;
+ mainWindow.drp_track2Audio.SelectedIndex = 0;
+ mainWindow.drp_audsr_2.Enabled = false;
+ mainWindow.drp_audmix_2.Enabled = false;
+ mainWindow.drp_audenc_2.Enabled = false;
+ mainWindow.drp_audbit_2.Enabled = false;
}
else
- mainWindow.check_forced.CheckState = CheckState.Unchecked;
+ {
+ mainWindow.drp_track2Audio.Text = presetQuery.AudioTrack2;
+ mainWindow.drp_audsr_2.Enabled = true;
+ mainWindow.drp_audmix_2.Enabled = true;
+ mainWindow.drp_audenc_2.Enabled = true;
+ mainWindow.drp_audbit_2.Enabled = true;
+ }
+
+ if (presetQuery.AudioTrack3 == "None")
+ {
+ mainWindow.drp_track3Audio.SelectedIndex = 0;
+ mainWindow.drp_audsr_3.Enabled = false;
+ mainWindow.drp_audmix_3.Enabled = false;
+ mainWindow.drp_audenc_3.Enabled = false;
+ mainWindow.drp_audbit_3.Enabled = false;
+
+ }
+ else
+ {
+ mainWindow.drp_track3Audio.Text = presetQuery.AudioTrack3;
+ mainWindow.drp_audsr_3.Enabled = true;
+ mainWindow.drp_audmix_3.Enabled = true;
+ mainWindow.drp_audenc_3.Enabled = true;
+ mainWindow.drp_audbit_3.Enabled = true;
+ }
+
+ if (presetQuery.AudioTrack4 == "None")
+ {
+ mainWindow.drp_track4Audio.SelectedIndex = 0;
+ mainWindow.drp_audsr_4.Enabled = false;
+ mainWindow.drp_audmix_4.Enabled = false;
+ mainWindow.drp_audenc_4.Enabled = false;
+ mainWindow.drp_audbit_4.Enabled = false;
+ }
+ else
+ {
+ mainWindow.drp_track4Audio.Text = presetQuery.AudioTrack4;
+ mainWindow.drp_audsr_4.Enabled = true;
+ mainWindow.drp_audmix_4.Enabled = true;
+ mainWindow.drp_audenc_4.Enabled = true;
+ mainWindow.drp_audbit_4.Enabled = true;
+ }
+
+ if (presetQuery.AudioEncoder1 != null)
+ mainWindow.drp_audenc_1.Text = presetQuery.AudioEncoder1;
+ mainWindow.drp_audenc_2.Text = presetQuery.AudioEncoder2;
+ mainWindow.drp_audenc_3.Text = presetQuery.AudioEncoder3;
+ mainWindow.drp_audenc_4.Text = presetQuery.AudioEncoder4;
+
+ if (presetQuery.AudioBitrate1 != null)
+ mainWindow.drp_audbit_1.Text = presetQuery.AudioBitrate1;
+ mainWindow.drp_audbit_2.Text = presetQuery.AudioBitrate2;
+ mainWindow.drp_audbit_3.Text = presetQuery.AudioBitrate4;
+ mainWindow.drp_audbit_3.Text = presetQuery.AudioBitrate4;
+
+ if (presetQuery.AudioSamplerate1 != null)
+ mainWindow.drp_audsr_1.Text = presetQuery.AudioSamplerate1;
+ mainWindow.drp_audsr_2.Text = presetQuery.AudioSamplerate2;
+ mainWindow.drp_audsr_3.Text = presetQuery.AudioSamplerate3;
+ mainWindow.drp_audsr_4.Text = presetQuery.AudioSamplerate4;
+
+ mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;
+ mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;
+ mainWindow.drp_audmix_3.Text = presetQuery.AudioTrackMix3;
+ mainWindow.drp_audmix_4.Text = presetQuery.AudioTrackMix4;
+
// Dynamic Range Compression (Should be a float but we use double for ease)
- double value = presetQuery.DRC;
+ double value = 0;
+ double actualValue = 0;
+
+ value = presetQuery.DRC1;
+ if (value > 0)
+ value = value - 10;
+ mainWindow.trackBar1.Value = int.Parse(value.ToString());
+ actualValue = presetQuery.DRC1 / 10;
+ mainWindow.lbl_drc1.Text = actualValue.ToString();
+
+ value = presetQuery.DRC2;
if (value > 0)
value = value - 10;
- mainWindow.slider_drc.Value = int.Parse(value.ToString());
+ mainWindow.trackBar2.Value = int.Parse(value.ToString());
+ actualValue = presetQuery.DRC2 / 10;
+ mainWindow.lbl_drc2.Text = actualValue.ToString();
- double actualValue = presetQuery.DRC / 10;
- mainWindow.lbl_drc.Text = actualValue.ToString();
+ value = presetQuery.DRC3;
+ if (value > 0)
+ value = value - 10;
+ mainWindow.trackBar3.Value = int.Parse(value.ToString());
+ actualValue = presetQuery.DRC3 / 10;
+ mainWindow.lbl_drc3.Text = actualValue.ToString();
+
+ value = presetQuery.DRC4;
+ if (value > 0)
+ value = value - 10;
+ mainWindow.trackBar4.Value = int.Parse(value.ToString());
+ actualValue = presetQuery.DRC4 / 10;
+ mainWindow.lbl_drc4.Text = actualValue.ToString();
+
+
+ // Subtitle Stuff
+ mainWindow.drp_subtitle.Text = presetQuery.Subtitles;
+
+ if (presetQuery.ForcedSubtitles == true)
+ {
+ mainWindow.check_forced.CheckState = CheckState.Checked;
+ mainWindow.check_forced.Enabled = true;
+ }
+ else
+ mainWindow.check_forced.CheckState = CheckState.Unchecked;
#endregion
// H264 Tab & Preset Name
#region other
- mainWindow.rtf_h264advanced.Text = presetQuery.H264Query;
+ mainWindow.rtf_x264Query.Text = presetQuery.H264Query;
// Set the preset name
mainWindow.groupBox_output.Text = "Output Settings (Preset: " + name + ")";
@@ -345,8 +441,10 @@ namespace Handbrake.Functions
int totalChapters = mainWindow.drop_chapterFinish.Items.Count - 1;
string dvdChapter = "";
- if ((source != "") || (source != "Click 'Browse' to continue"))
+ if ((source != "") && (source.Trim() != "Click 'Browse' to continue"))
source = " -i " + '"' + source + '"';
+ else
+ source = "";
if (dvdTitle == "Automatic")
dvdTitle = "";
@@ -371,7 +469,6 @@ namespace Handbrake.Functions
string destination = mainWindow.text_destination.Text;
string videoEncoder = mainWindow.drp_videoEncoder.Text;
- string audioEncoder = mainWindow.drp_audioCodec.Text;
string width = mainWindow.text_width.Text;
string height = mainWindow.text_height.Text;
@@ -398,28 +495,6 @@ namespace Handbrake.Functions
break;
}
- switch (audioEncoder)
- {
- case "AAC":
- audioEncoder = " -E faac";
- break;
- case "MP3":
- audioEncoder = " -E lame";
- break;
- case "Vorbis":
- audioEncoder = " -E vorbis";
- break;
- case "AC3":
- audioEncoder = " -E ac3";
- break;
- case "AAC + AC3":
- audioEncoder = " -E aac+ac3";
- break;
- default:
- audioEncoder = " -E faac";
- break;
- }
-
if (width != "")
width = " -w " + width;
@@ -434,7 +509,7 @@ namespace Handbrake.Functions
}
- string queryDestination = destination + videoEncoder + audioEncoder + width + height;
+ string queryDestination = destination + videoEncoder + width + height;
#endregion
// Picture Settings Tab
@@ -463,16 +538,21 @@ namespace Handbrake.Functions
cropOut = " --crop 0:0:0:0 ";
else
{
- if (mainWindow.text_top.Text == "")
- cropTop = "0";
- if (mainWindow.text_bottom.Text == "")
- cropBottom = "0";
- if (mainWindow.text_left.Text == "")
- cropLeft = "0";
- if (mainWindow.text_right.Text == "")
- cropRight = "0";
-
- cropOut = " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;
+ if ((mainWindow.text_top.Text == "") && (mainWindow.text_bottom.Text == "") && (mainWindow.text_left.Text == "") && (mainWindow.text_right.Text == ""))
+ cropOut = "";
+ else
+ {
+ if (mainWindow.text_top.Text == "")
+ cropTop = "0";
+ if (mainWindow.text_bottom.Text == "")
+ cropBottom = "0";
+ if (mainWindow.text_left.Text == "")
+ cropLeft = "0";
+ if (mainWindow.text_right.Text == "")
+ cropRight = "0";
+
+ cropOut = " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;
+ }
}
switch (deInterlace_Option)
@@ -481,16 +561,16 @@ namespace Handbrake.Functions
deinterlace = "";
break;
case "Fast":
- deinterlace = " --deinterlace=fast";
+ deinterlace = " --deinterlace=\"fast\"";
break;
case "Slow":
- deinterlace = " --deinterlace=slow";
+ deinterlace = " --deinterlace=\"slow\"";
break;
case "Slower":
- deinterlace = " --deinterlace=slower";
+ deinterlace = " --deinterlace=\"slower\"";
break;
case "Slowest":
- deinterlace = " --deinterlace=slowest";
+ deinterlace = " --deinterlace=\"slowest\"";
break;
default:
deinterlace = "";
@@ -506,7 +586,7 @@ namespace Handbrake.Functions
pixelRatio = " -P ";
else
pixelRatio = " ";
-
+
if (mainWindow.check_deblock.Checked)
deblock = " --deblock";
@@ -517,7 +597,7 @@ namespace Handbrake.Functions
if (mainWindow.check_vfr.Checked)
vfr = " -V ";
-
+
string queryPictureSettings = cropOut + deinterlace + deblock + detelecine + vfr + grayscale + pixelRatio + lanamorphic;
#endregion
@@ -582,13 +662,13 @@ namespace Handbrake.Functions
denoise = "";
break;
case "Weak":
- denoise = " --denoise=weak";
+ denoise = " --denoise=\"weak\"";
break;
case "Medium":
- denoise = " --denoise=medium";
+ denoise = " --denoise=\"medium\"";
break;
case "Strong":
- denoise = " --denoise=strong";
+ denoise = " --denoise=\"strong\"";
break;
default:
denoise = "";
@@ -608,90 +688,253 @@ namespace Handbrake.Functions
// Audio Settings Tab
#region Audio Settings Tab
- string audioBitrate = mainWindow.drp_audioBitrate.Text;
- string audioSampleRate = mainWindow.drp_audioSampleRate.Text;
- string track1 = mainWindow.drp_track1Audio.Text;
- string track2 = mainWindow.drp_track2Audio.Text;
- string audioChannels = "";
- string Mixdown = mainWindow.drp_audioMixDown.Text;
- string SixChannelAudio = "";
- string subtitles = mainWindow.drp_subtitle.Text;
+ // Query
+ string tracks = "";
+ string aencoder = "";
+ string audioBitrate = "";
+ string audioSampleRate = "";
+ string Mixdown = "";
+ string drc = "";
string subScan = "";
string forced = "";
- string drc = "";
-
- if (audioBitrate != "")
- audioBitrate = " -B " + audioBitrate;
- if (audioSampleRate != "")
- audioSampleRate = " -R " + audioSampleRate;
+ // Track 1
+ string track1 = mainWindow.drp_track1Audio.Text;
+ string aencoder1 = mainWindow.drp_audenc_1.Text;
+ string audioBitrate1 = mainWindow.drp_audbit_1.Text;
+ string audioSampleRate1 = mainWindow.drp_audsr_1.Text;
+ string Mixdown1 = mainWindow.drp_audmix_1.Text;
+ string drc1 = mainWindow.trackBar1.Value.ToString();
- // Audio Track 1
+ // Track 2
+ string track2 = mainWindow.drp_track2Audio.Text;
+ string aencoder2 = mainWindow.drp_audenc_2.Text;
+ string audioBitrate2 = mainWindow.drp_audbit_2.Text;
+ string audioSampleRate2 = mainWindow.drp_audsr_2.Text;
+ string Mixdown2 = mainWindow.drp_audmix_2.Text;
+ string drc2 = mainWindow.trackBar2.Value.ToString();
+
+ // Track 3
+ string track3 = mainWindow.drp_track3Audio.Text;
+ string aencoder3 = mainWindow.drp_audenc_3.Text;
+ string audioBitrate3 = mainWindow.drp_audbit_3.Text;
+ string audioSampleRate3 = mainWindow.drp_audsr_3.Text;
+ string Mixdown3 = mainWindow.drp_audmix_3.Text;
+ string drc3 = mainWindow.trackBar3.Value.ToString();
+
+ // Track 4
+ string track4 = mainWindow.drp_track4Audio.Text;
+ string aencoder4 = mainWindow.drp_audenc_4.Text;
+ string audioBitrate4 = mainWindow.drp_audbit_4.Text;
+ string audioSampleRate4 = mainWindow.drp_audsr_4.Text;
+ string Mixdown4 = mainWindow.drp_audmix_4.Text;
+ string drc4 = mainWindow.trackBar4.Value.ToString();
+
+
+ //
+ // Audio Track Selections
+ //
if (track1 == "Automatic")
- audioChannels = "";
+ tracks = " -a auto";
else if (track1 == "")
- audioChannels = "";
+ tracks = "";
else if (track1 == "None")
- audioChannels = " -a none";
+ tracks = "";
else
{
+ string[] tempSub = track1.Split(' ');
+ tracks = " -a " + tempSub[0];
+ }
+
+ if (track2 != "None")
+ {
string[] tempSub;
- tempSub = track1.Split(' ');
- audioChannels = " -a " + tempSub[0];
+ tempSub = track2.Split(' ');
+ if (tracks == "")
+ tracks = " -a none," + tempSub[0];
+ else
+ tracks = tracks + "," + tempSub[0];
}
- // Audio Track 2
- if (audioChannels != "")
+ if (track3 != "None")
{
- if ((track2 != "") && (track2 != "None"))
- {
- string[] tempSub;
- tempSub = track2.Split(' ');
- audioChannels = audioChannels + "," + tempSub[0];
- }
+ string[] tempSub;
+ tempSub = track3.Split(' ');
+ if (tracks == "")
+ tracks = " -a none,none," + tempSub[0];
+ else
+ tracks = tracks + "," + tempSub[0];
}
- else
+
+ if (track4 != "None")
{
- if ((track2 != "") && (track2 != "None"))
- {
- string[] tempSub;
- tempSub = track2.Split(' ');
- audioChannels = " -a " + tempSub[0];
- }
+ string[] tempSub;
+ tempSub = track4.Split(' ');
+ if (tracks == "")
+ tracks = " -a none,none,none," + tempSub[0];
+ else
+ tracks = tracks + "," + tempSub[0];
}
+ //
+ // Audio Encoder
+ //
+ if (aencoder1 != "")
+ aencoder = " -E " + getAudioEncoder(aencoder1);
+ if (aencoder2 != "")
+ {
+ if (aencoder == "")
+ aencoder = " -E faac," + getAudioEncoder(aencoder2);
+ else
+ aencoder = aencoder + "," + getAudioEncoder(aencoder2);
+ }
- switch (Mixdown)
+ if (aencoder3 != "")
{
- case "Automatic":
- Mixdown = "";
- break;
- case "Mono":
- Mixdown = "mono";
- break;
- case "Stereo":
- Mixdown = "stereo";
- break;
- case "Dolby Surround":
- Mixdown = "dpl1";
- break;
- case "Dolby Pro Logic II":
- Mixdown = "dpl2";
- break;
- case "6 Channel Discrete":
- Mixdown = "6ch";
- break;
- default:
- Mixdown = "";
- break;
+ if (aencoder == "")
+ aencoder = " -E faac,faac," + getAudioEncoder(aencoder3);
+ else
+ aencoder = aencoder + "," + getAudioEncoder(aencoder3);
}
- if (Mixdown != "")
- SixChannelAudio = " -6 " + Mixdown;
- else
- SixChannelAudio = "";
+ if (aencoder4 != "")
+ {
+ if (aencoder == "")
+ aencoder = " -E faac,faac,faac," + getAudioEncoder(aencoder4);
+ else
+ aencoder = aencoder + "," + getAudioEncoder(aencoder4);
+ }
+
+ //
+ // Audio Bitrate Selections
+ //
+ if (audioBitrate1 != "")
+ audioBitrate = " -B " + audioBitrate1;
+
+ if (audioBitrate2 != "")
+ {
+ if (audioBitrate == "")
+ audioBitrate = " -B 160," + audioBitrate2;
+ else
+ audioBitrate = audioBitrate + "," + audioBitrate2;
+ }
+
+ if (audioBitrate3 != "")
+ {
+ if (audioBitrate == "")
+ audioBitrate = " -B 160,160," + audioBitrate3;
+ else
+ audioBitrate = audioBitrate + "," + audioBitrate3;
+ }
+
+ if (audioBitrate4 != "")
+ {
+ if (audioBitrate == "")
+ audioBitrate = " -B 160,160,160," + audioBitrate4;
+ else
+ audioBitrate = audioBitrate + "," + audioBitrate4;
+ }
+
+ //Audio Sample Rate - audioSampleRate
+
+ if (audioSampleRate1 != "")
+ audioSampleRate = " -R " + audioSampleRate1;
+
+ if (audioSampleRate2 != "")
+ {
+ if (audioSampleRate == "")
+ audioSampleRate = " -R 48," + audioSampleRate2;
+ else
+ audioSampleRate = audioSampleRate + "," + audioSampleRate2;
+ }
+
+ if (audioSampleRate3 != "")
+ {
+ if (audioSampleRate == "")
+ audioSampleRate = " -R 48,48," + audioSampleRate3;
+ else
+ audioSampleRate = audioSampleRate + "," + audioSampleRate3;
+ }
+
+ if (audioSampleRate4 != "")
+ {
+ if (audioSampleRate == "")
+ audioSampleRate = " -R 48,48,48," + audioSampleRate4;
+ else
+ audioSampleRate = audioSampleRate + "," + audioSampleRate4;
+ }
+
+ //
+ // Audio Mixdown Selections
+ //
+
+ if ((Mixdown1 != "") && (Mixdown1 != "Automatic"))
+ Mixdown = " -6 " + getMixDown(Mixdown1);
+
+ if ((Mixdown2 != "") && (Mixdown2 != "Automatic"))
+ {
+ if (Mixdown != "")
+ Mixdown = Mixdown + "," + getMixDown(Mixdown2);
+ }
+
+ if ((Mixdown3 != "") && (Mixdown3 != "Automatic"))
+ {
+ if (Mixdown != "")
+ Mixdown = Mixdown + "," + getMixDown(Mixdown3);
+ }
+
+ if ((Mixdown4 != "") && (Mixdown4 != "Automatic"))
+ {
+ if (Mixdown != "")
+ Mixdown = Mixdown + "," + getMixDown(Mixdown4);
+ }
+
+
+ //
+ // DRC
+ //
+ double value = 0;
+
+ value = mainWindow.trackBar1.Value / 10.0;
+ value++;
+
+ if (value > 1.0)
+ drc = " -D " + value;
+
+ value = mainWindow.trackBar2.Value / 10.0;
+ value++;
+ if (drc2 != "0")
+ {
+ if (drc == "")
+ drc = " -D 1," + value;
+ else
+ drc = drc + "," + value;
+ }
+
+ value = mainWindow.trackBar3.Value / 10.0;
+ value++;
+ if (drc3 != "0")
+ {
+ if (drc == "")
+ drc = " -D 1,1," + value;
+ else
+ drc = drc + "," + value;
+ }
+ value = mainWindow.trackBar4.Value / 10.0;
+ value++;
+ if (drc4 != "0")
+ {
+ if (drc == "")
+ drc = " -D 1,1,1," + value;
+ else
+ drc = drc + "," + value;
+ }
+
+
+ // Subtitles
+ string subtitles = mainWindow.drp_subtitle.Text;
if (subtitles == "None")
subtitles = "";
else if (subtitles == "")
@@ -711,12 +954,9 @@ namespace Handbrake.Functions
if (mainWindow.check_forced.Checked)
forced = " -F ";
- //Dynamic Range Compression (expects a float but a double is used for ease)
- double value = mainWindow.slider_drc.Value / 10.0;
- value++;
- drc = " -D " + value;
- string queryAudioSettings = audioBitrate + audioSampleRate + drc + audioChannels + SixChannelAudio + subScan + subtitles + forced;
+ string queryAudioSettings = tracks + aencoder + audioBitrate + audioSampleRate + Mixdown + drc + subScan + subtitles + forced;
+
#endregion
// Chapter Markers Tab
@@ -738,7 +978,7 @@ namespace Handbrake.Functions
if (mainWindow.Check_ChapterMarkers.Checked)
{
- if (source_name.Trim().Replace("-i ", "") != "Click \'Browse\' to continue")
+ if ((source_name.Trim().Replace("-i ", "") != "Click 'Browse' to continue") && (source_name.Trim().Replace("-i ", "") != ""))
{
if (source_title != "Automatic")
{
@@ -771,7 +1011,7 @@ namespace Handbrake.Functions
{
string path = Path.Combine(Path.GetTempPath(), "chapters.csv");
ChapterMarkers = " --markers=" + "\"" + path + "\"";
- }
+ }
}
string chapter_markers = ChapterMarkers;
@@ -780,7 +1020,7 @@ namespace Handbrake.Functions
// H264 Tab
#region H264 Tab
- string h264Advanced = mainWindow.rtf_h264advanced.Text;
+ string h264Advanced = mainWindow.rtf_x264Query.Text;
if ((h264Advanced == ""))
h264Advanced = "";
@@ -854,7 +1094,7 @@ namespace Handbrake.Functions
private Boolean chapterCSVSave(frmMain mainWindow, string file_path_name)
{
try
- {
+ {
StringBuilder csv = new StringBuilder();
foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)
@@ -878,6 +1118,46 @@ namespace Handbrake.Functions
}
}
+
+ private string getMixDown(string selectedAudio)
+ {
+ switch (selectedAudio)
+ {
+ case "Automatic":
+ return "";
+ case "Mono":
+ return "mono";
+ case "Stereo":
+ return "stereo";
+ case "Dolby Surround":
+ return "dpl1";
+ case "Dolby Pro Logic II":
+ return "dpl2";
+ case "6 Channel Discrete":
+ return "6ch";
+ default:
+ return "";
+ }
+ }
+
+ private string getAudioEncoder(string selectedEncoder)
+ {
+ switch (selectedEncoder)
+ {
+ case "AAC":
+ return "faac";
+ case "MP3":
+ return "lame";
+ case "Vorbis":
+ return "vorbis";
+ case "AC3":
+ return "ac3";
+ default:
+ return "";
+ }
+ }
+
+
// End of Functions
}
}