diff options
| author | sr55 <[email protected]> | 2008-04-12 14:54:33 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-04-12 14:54:33 +0000 |
| commit | bfc5f40ecc86e307db383d8c00428b8fd9234484 (patch) | |
| tree | b17d839a896be1ab3f7eb41c1b398fff76d0ddce | |
| parent | 58b120562cb887b0df4e3d25c1f04d2177a4e2fb (diff) | |
WinGui:
- Expands the audio tab to 4 audio tracks. This will require through testing. Users should avoid track combinations such as 1 & 4, 1 & 3, and 2 & 4. Instead, 1 & 2 & 3 or 1 & 2 or 2 & 3 & 4 should be used.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1406 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Functions/Common.cs | 499 | ||||
| -rw-r--r-- | win/C#/Functions/QueryParser.cs | 481 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 608 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 407 |
4 files changed, 1483 insertions, 512 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index 184fadb30..d87e93716 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -288,7 +288,7 @@ namespace Handbrake.Functions // Audio Settings Tab
#region Audio
-
+
if (presetQuery.AudioTrack1 == "")
mainWindow.drp_track1Audio.Text = "Automatic";
else
@@ -296,44 +296,114 @@ namespace Handbrake.Functions if (presetQuery.AudioTrack2 == "None")
{
- if (presetQuery.AudioEncoder2 != null)
- {
- mainWindow.drp_track2Audio.SelectedIndex = 1;
- mainWindow.drp_audsr_2.Enabled = true;
- mainWindow.drp_audmix_2.Enabled = true;
- mainWindow.drp_audenc_2.Enabled = true;
- mainWindow.drp_audbit_2.Enabled = true;
- }
- else
- {
- 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;
- }
-
+ 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.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_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_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_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 = 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.trackBar2.Value = int.Parse(value.ToString());
+ actualValue = presetQuery.DRC2 / 10;
+ mainWindow.lbl_drc2.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)
@@ -344,15 +414,6 @@ namespace Handbrake.Functions else
mainWindow.check_forced.CheckState = CheckState.Unchecked;
- // Dynamic Range Compression (Should be a float but we use double for ease)
- double value = presetQuery.DRC;
- if (value > 0)
- value = value - 10;
- mainWindow.slider_drc.Value = int.Parse(value.ToString());
-
- double actualValue = presetQuery.DRC / 10;
- mainWindow.lbl_drc.Text = actualValue.ToString();
-
#endregion
@@ -627,223 +688,250 @@ namespace Handbrake.Functions // Audio Settings Tab
#region Audio Settings Tab
- // Used Varibles
+ // Query
+ string tracks = "";
+ string aencoder = "";
string audioBitrate = "";
- string audioChannels = "";
- string SixChannelAudio = "";
+ string audioSampleRate = "";
+ string Mixdown = "";
+ string drc = "";
string subScan = "";
string forced = "";
- string drc = "";
- string audioSampleRate = "";
- string audioEncoder = "";
// Track 1
string track1 = mainWindow.drp_track1Audio.Text;
- string vencoder1 = mainWindow.drp_audenc_1.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();
// Track 2
string track2 = mainWindow.drp_track2Audio.Text;
- string vencoder2 = mainWindow.drp_audenc_2.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;
- tempSub = track1.Split(' ');
- audioChannels = " -a " + tempSub[0];
+ string[] tempSub = track1.Split(' ');
+ tracks = " -a " + tempSub[0];
}
- if (audioChannels != "")
+ if (track2 != "None")
{
- if ((track2 != "") && (track2 != "None"))
- {
- string[] tempSub;
- tempSub = track2.Split(' ');
- audioChannels = audioChannels + "," + tempSub[0];
- }
- }
- else
- {
- if ((track2 != "") && (track2 != "None"))
- {
- string[] tempSub;
- tempSub = track2.Split(' ');
- audioChannels = " -a " + tempSub[0];
- }
+ string[] tempSub;
+ tempSub = track2.Split(' ');
+ if (tracks == "")
+ tracks = " -a none," + tempSub[0];
+ else
+ tracks = tracks + "," + tempSub[0];
}
- // Audio Mixdown Selections
- switch (Mixdown1)
+ if (track3 != "None")
{
- case "Automatic":
- Mixdown1 = "";
- break;
- case "Mono":
- Mixdown1 = "mono";
- break;
- case "Stereo":
- Mixdown1 = "stereo";
- break;
- case "Dolby Surround":
- Mixdown1 = "dpl1";
- break;
- case "Dolby Pro Logic II":
- Mixdown1 = "dpl2";
- break;
- case "6 Channel Discrete":
- Mixdown1 = "6ch";
- break;
- default:
- Mixdown1 = "";
- break;
+ string[] tempSub;
+ tempSub = track3.Split(' ');
+ if (tracks == "")
+ tracks = " -a none,none," + tempSub[0];
+ else
+ tracks = tracks + "," + tempSub[0];
}
- if (Mixdown1 != "")
- SixChannelAudio = " -6 " + Mixdown1;
- else
+ if (track4 != "None")
{
- if (mainWindow.drp_track2Audio.Text == "None")
- SixChannelAudio = "";
+ string[] tempSub;
+ tempSub = track4.Split(' ');
+ if (tracks == "")
+ tracks = " -a none,none,none," + tempSub[0];
else
- {
- if (mainWindow.drp_audmix_2.Text == "Automatic")
- SixChannelAudio = "";
- else
- SixChannelAudio = " -6 dpl2";
- }
+ tracks = tracks + "," + tempSub[0];
}
- switch (Mixdown2)
- {
- case "Automatic":
- Mixdown2 = "";
- break;
- case "Mono":
- Mixdown2 = "mono";
- break;
- case "Stereo":
- Mixdown2 = "stereo";
- break;
- case "Dolby Surround":
- Mixdown2 = "dpl1";
- break;
- case "Dolby Pro Logic II":
- Mixdown2 = "dpl2";
- break;
- case "6 Channel Discrete":
- Mixdown2 = "6ch";
- break;
- default:
- Mixdown2 = "";
- break;
- }
+ //
+ // Audio Encoder
+ //
+ if (aencoder1 != "")
+ aencoder = " -E " + getAudioEncoder(aencoder1);
- if (Mixdown2 != "")
+ if (aencoder2 != "")
{
- if (SixChannelAudio != "")
- SixChannelAudio = SixChannelAudio + "," + Mixdown2;
+ if (aencoder == "")
+ aencoder = " -E faac," + getAudioEncoder(aencoder2);
else
- SixChannelAudio = " -6 " + Mixdown2;
+ aencoder = aencoder + "," + getAudioEncoder(aencoder2);
}
- // Audio Encoder Selections
- switch (mainWindow.drp_audenc_1.Text)
+ if (aencoder3 != "")
{
- 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:
- break;
+ if (aencoder == "")
+ aencoder = " -E faac,faac," + getAudioEncoder(aencoder3);
+ else
+ aencoder = aencoder + "," + getAudioEncoder(aencoder3);
}
- switch (mainWindow.drp_audenc_2.Text)
+ if (aencoder4 != "")
{
- case "AAC":
- if (audioEncoder == "")
- audioEncoder = " -E faac";
- else
- audioEncoder = audioEncoder + ",faac";
- break;
- case "MP3":
- if (audioEncoder == "")
- audioEncoder = " -E lame";
- else
- audioEncoder = audioEncoder + ",lame";
- break;
- case "Vorbis":
- if (audioEncoder == "")
- audioEncoder = " -E vorbis";
- else
- audioEncoder = audioEncoder + ",vorbis";
- break;
- case "AC3":
- if (audioEncoder == "")
- audioEncoder = " -E ac3";
- else
- audioEncoder = audioEncoder + ",ac3";
- break;
- case "AAC + AC3":
- if (audioEncoder == "")
- audioEncoder = " -E aac+ac3";
- else
- audioEncoder = audioEncoder + ",aac+ac3";
- break;
- default:
- break;
+ if (aencoder == "")
+ aencoder = " -E faac,faac,faac," + getAudioEncoder(aencoder4);
+ else
+ aencoder = aencoder + "," + getAudioEncoder(aencoder4);
}
- // Audio BitRate Selections
+ //
+ // Audio Bitrate Selections
+ //
if (audioBitrate1 != "")
audioBitrate = " -B " + audioBitrate1;
if (audioBitrate2 != "")
{
if (audioBitrate == "")
- audioBitrate = " -B " + audioBitrate2;
+ audioBitrate = " -B 160," + audioBitrate2;
else
audioBitrate = audioBitrate + "," + audioBitrate2;
}
- // Audio SampleRate Selections
+ 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 " + audioSampleRate2;
+ audioSampleRate = " -R 48," + audioSampleRate2;
else
audioSampleRate = audioSampleRate + "," + audioSampleRate2;
}
- //Dynamic Range Compression (expects a float but a double is used for ease)
- double value = mainWindow.slider_drc.Value / 10.0;
+ 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++;
- drc = " -D " + 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;
@@ -867,7 +955,8 @@ namespace Handbrake.Functions forced = " -F ";
- string queryAudioSettings = audioChannels + SixChannelAudio + audioEncoder + audioBitrate + audioSampleRate + drc + subScan + subtitles + forced;
+ string queryAudioSettings = tracks + aencoder + audioBitrate + audioSampleRate + Mixdown + drc + subScan + subtitles + forced;
+
#endregion
// Chapter Markers Tab
@@ -1029,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
}
}
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 1599bdbcf..df82fc2cc 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -428,7 +428,7 @@ namespace Handbrake.Functions #region Audio Settings
private string q_audioTrack1;
/// <summary>
- /// Returns a string with the First selected Audio track
+ /// Returns a string with the selected Audio track
/// </summary>
public string AudioTrack1
{
@@ -440,7 +440,7 @@ namespace Handbrake.Functions private string q_audioTrack2;
/// <summary>
- /// Returns a string with the First selected Audio track
+ /// Returns a string with the selected Audio track
/// </summary>
public string AudioTrack2
{
@@ -450,6 +450,30 @@ namespace Handbrake.Functions }
}
+ private string q_audioTrack3;
+ /// <summary>
+ /// Returns a string with the selected Audio track
+ /// </summary>
+ public string AudioTrack3
+ {
+ get
+ {
+ return this.q_audioTrack3;
+ }
+ }
+
+ private string q_audioTrack4;
+ /// <summary>
+ /// Returns a string with the selected Audio track
+ /// </summary>
+ public string AudioTrack4
+ {
+ get
+ {
+ return this.q_audioTrack4;
+ }
+ }
+
private string q_audioTrackMix1;
/// <summary>
/// Returns a string with the First selected Audio track Mix
@@ -474,6 +498,30 @@ namespace Handbrake.Functions }
}
+ private string q_audioTrackMix3;
+ /// <summary>
+ /// Returns a string with the First selected Audio track Mix
+ /// </summary>
+ public string AudioTrackMix3
+ {
+ get
+ {
+ return this.q_audioTrackMix3;
+ }
+ }
+
+ private string q_audioTrackMix4;
+ /// <summary>
+ /// Returns a string with the First selected Audio track Mix
+ /// </summary>
+ public string AudioTrackMix4
+ {
+ get
+ {
+ return this.q_audioTrackMix4;
+ }
+ }
+
private string q_audioEncoder1;
/// <summary>
/// Returns an String
@@ -500,6 +548,32 @@ namespace Handbrake.Functions }
}
+ private string q_audioEncoder3;
+ /// <summary>
+ /// Returns an String
+ /// The Audio Encoder used.
+ /// </summary>
+ public string AudioEncoder3
+ {
+ get
+ {
+ return this.q_audioEncoder3;
+ }
+ }
+
+ private string q_audioEncoder4;
+ /// <summary>
+ /// Returns an String
+ /// The Audio Encoder used.
+ /// </summary>
+ public string AudioEncoder4
+ {
+ get
+ {
+ return this.q_audioEncoder4;
+ }
+ }
+
private string q_audioBitrate1;
/// <summary>
/// Returns a string with the audio bitrate
@@ -524,6 +598,30 @@ namespace Handbrake.Functions }
}
+ private string q_audioBitrate3;
+ /// <summary>
+ /// Returns a string with the audio bitrate
+ /// </summary>
+ public string AudioBitrate3
+ {
+ get
+ {
+ return this.q_audioBitrate3;
+ }
+ }
+
+ private string q_audioBitrate4;
+ /// <summary>
+ /// Returns a string with the audio bitrate
+ /// </summary>
+ public string AudioBitrate4
+ {
+ get
+ {
+ return this.q_audioBitrate4;
+ }
+ }
+
private string q_audioSamplerate1;
/// <summary>
/// Returns a string with the audio sample rate
@@ -548,15 +646,75 @@ namespace Handbrake.Functions }
}
- private double q_drc;
+ private string q_audioSamplerate3;
+ /// <summary>
+ /// Returns a string with the audio sample rate
+ /// </summary>
+ public string AudioSamplerate3
+ {
+ get
+ {
+ return this.q_audioSamplerate3;
+ }
+ }
+
+ private string q_audioSamplerate4;
+ /// <summary>
+ /// Returns a string with the audio sample rate
+ /// </summary>
+ public string AudioSamplerate4
+ {
+ get
+ {
+ return this.q_audioSamplerate4;
+ }
+ }
+
+ private double q_drc1;
+ /// <summary>
+ /// Returns a string with the selected subtitle track
+ /// </summary>
+ public double DRC1
+ {
+ get
+ {
+ return this.q_drc1;
+ }
+ }
+
+ private double q_drc2;
+ /// <summary>
+ /// Returns a string with the selected subtitle track
+ /// </summary>
+ public double DRC2
+ {
+ get
+ {
+ return this.q_drc2;
+ }
+ }
+
+ private double q_drc3;
/// <summary>
/// Returns a string with the selected subtitle track
/// </summary>
- public double DRC
+ public double DRC3
{
get
{
- return this.q_drc;
+ return this.q_drc3;
+ }
+ }
+
+ private double q_drc4;
+ /// <summary>
+ /// Returns a string with the selected subtitle track
+ /// </summary>
+ public double DRC4
+ {
+ get
+ {
+ return this.q_drc4;
}
}
@@ -659,16 +817,34 @@ namespace Handbrake.Functions //Audio Settings Tab
Match audioTrack1 = Regex.Match(input, @"-a ([0-9]*)");
Match audioTrack2 = Regex.Match(input, @"-a ([0-9]*),([0-9]*)");
+ Match audioTrack3 = Regex.Match(input, @"-a ([0-9]*),([0-9]*),([0-9]*)");
+ Match audioTrack4 = Regex.Match(input, @"-a ([0-9]*),([0-9]*),([0-9]*),([0-9]*)");
+
Match audioTrack1Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*)");
- Match audioTrack2Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*)");
+ Match audioTrack2Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*)");
+ Match audioTrack3Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*)");
+ Match audioTrack4Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*)");
+
Match audioEncoder1 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");
Match audioEncoder2 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");
+ Match audioEncoder3 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");
+ Match audioEncoder4 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");
+
Match audioBitrate1 = Regex.Match(input, @"-B ([0-9]*)");
Match audioBitrate2 = Regex.Match(input, @"-B ([0-9]*),([0-9]*)");
+ Match audioBitrate3 = Regex.Match(input, @"-B ([0-9]*),([0-9]*),([0-9]*)");
+ Match audioBitrate4 = Regex.Match(input, @"-B ([0-9]*),([0-9]*),([0-9]*),([0-9]*)");
+
Match audioSampleRate1 = Regex.Match(input, @"-R ([0-9.]*)");
Match audioSampleRate2 = Regex.Match(input, @"-R ([0-9.]*),([0-9.]*)");
+ Match audioSampleRate3 = Regex.Match(input, @"-R ([0-9.]*),([0-9.]*),([0-9.]*)");
+ Match audioSampleRate4 = Regex.Match(input, @"-R ([0-9.]*),([0-9.]*),([0-9.]*),([0-9.]*)");
+
+ Match drc1 = Regex.Match(input, @"-D ([0-9.]*)");
+ Match drc2 = Regex.Match(input, @"-D ([0-9.]*),([0-9.]*)");
+ Match drc3 = Regex.Match(input, @"-D ([0-9.]*),([0-9.]*),([0-9.]*)");
+ Match drc4 = Regex.Match(input, @"-D ([0-9.]*),([0-9.]*),([0-9.]*),([0-9.]*)");
- Match drc = Regex.Match(input, @"-D ([0-9.]*)");
Match subtitles = Regex.Match(input, @"-s ([0-9a-zA-Z]*)");
Match subScan = Regex.Match(input, @"-U");
Match forcedSubtitles = Regex.Match(input, @"-F");
@@ -683,9 +859,7 @@ namespace Handbrake.Functions #region Set Varibles
try
{
- /*
- * Source
- */
+
#region Source Tab
thisQuery.q_source = source.ToString().Replace("-i ", "").Replace("\"", "");
@@ -711,14 +885,10 @@ namespace Handbrake.Functions #endregion
- /*
- * Destination
- */
#region Destination
thisQuery.q_destination = destination.ToString().Replace("-o ", "").Replace("\"", "");
string videoEncoderConvertion;
- string audioEncoderConvertion;
videoEncoderConvertion = videoEncoder.ToString().Replace("-e ", "");
switch (videoEncoderConvertion)
@@ -746,9 +916,6 @@ namespace Handbrake.Functions #endregion
- /*
- * Picture Settings Tab
- */
#region Picture Tab
if (width.Success != false)
@@ -821,11 +988,8 @@ namespace Handbrake.Functions thisQuery.q_looseAnamorphic = lanamorphic.Success;
#endregion
-
- /*
- * Video Settings Tab
- */
- #region Video
+
+ #region Video Settings Tab
thisQuery.q_grayscale = grayscale.Success;
thisQuery.q_twoPass = twoPass.Success;
thisQuery.q_turboFirst = turboFirstPass.Success;
@@ -852,10 +1016,8 @@ namespace Handbrake.Functions #endregion
- /*
- * Audio Settings Tab
- */
- #region Audio
+ #region Audio Tab
+
// Tracks
if (audioTrack1.Success != false)
thisQuery.q_audioTrack1 = audioTrack1.ToString().Replace("-a ", "");
@@ -869,32 +1031,29 @@ namespace Handbrake.Functions }
else
thisQuery.q_audioTrack2 = "None";
+
+ if (audioTrack3.Success != false)
+ {
+ string[] audioChan = audioTrack3.ToString().Split(',');
+ thisQuery.q_audioTrack3 = audioChan[2];
+ }
+ else
+ thisQuery.q_audioTrack3 = "None";
+
+ if (audioTrack4.Success != false)
+ {
+ string[] audioChan = audioTrack4.ToString().Split(',');
+ thisQuery.q_audioTrack4 = audioChan[3];
+ }
+ else
+ thisQuery.q_audioTrack4 = "None";
+
// Mixdowns
thisQuery.q_audioTrackMix1 = "Automatic";
if (audioTrack1Mix.Success != false)
{
- switch (audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""))
- {
- case "mono":
- thisQuery.q_audioTrackMix1 = "Mono";
- break;
- case "stereo":
- thisQuery.q_audioTrackMix1 = "Stereo";
- break;
- case "dpl1":
- thisQuery.q_audioTrackMix1 = "Dolby Surround";
- break;
- case "dpl2":
- thisQuery.q_audioTrackMix1 = "Dolby Pro Logic II";
- break;
- case "6ch":
- thisQuery.q_audioTrackMix1 = "6 Channel Discrete";
- break;
- default:
- thisQuery.q_audioTrackMix1 = "Automatic";
- break;
- }
+ thisQuery.q_audioTrackMix1 = getMixDown(audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""));
}
thisQuery.q_audioTrackMix2 = "Automatic";
@@ -902,84 +1061,46 @@ namespace Handbrake.Functions {
string[] audio2mix = audioTrack2Mix.ToString().Split(',');
audio2mix[1] = audio2mix[1].Trim();
- switch (audio2mix[1])
- {
- case "mono":
- thisQuery.q_audioTrackMix2 = "Mono";
- break;
- case "stereo":
- thisQuery.q_audioTrackMix2 = "Stereo";
- break;
- case "dpl1":
- thisQuery.q_audioTrackMix2 = "Dolby Surround";
- break;
- case "dpl2":
- thisQuery.q_audioTrackMix2 = "Dolby Pro Logic II";
- break;
- case "6ch":
- thisQuery.q_audioTrackMix2 = "6 Channel Discrete";
- break;
- default:
- thisQuery.q_audioTrackMix2 = "Automatic";
- break;
- }
+ thisQuery.q_audioTrackMix2 = getMixDown(audio2mix[1]);
}
- // Audio Encoders
- if (audioEncoder1.Success != false)
+ thisQuery.q_audioTrackMix3 = "Automatic";
+ if (audioTrack3Mix.Success != false)
{
- audioEncoderConvertion = audioEncoder1.ToString().Replace("-E ", "");
- switch (audioEncoderConvertion)
- {
- case "faac":
- audioEncoderConvertion = "AAC";
- break;
- case "lame":
- audioEncoderConvertion = "MP3";
- break;
- case "vorbis":
- audioEncoderConvertion = "Vorbis";
- break;
- case "ac3":
- audioEncoderConvertion = "AC3";
- break;
- case "aac+ac3":
- audioEncoderConvertion = "AAC + AC3";
- break;
- default:
- audioEncoderConvertion = "AAC";
- break;
- }
- thisQuery.q_audioEncoder1 = audioEncoderConvertion;
+ string[] audio3mix = audioTrack3Mix.ToString().Split(',');
+ audio3mix[1] = audio3mix[2].Trim();
+ thisQuery.q_audioTrackMix3 = getMixDown(audio3mix[1]);
}
+ thisQuery.q_audioTrackMix4 = "Automatic";
+ if (audioTrack4Mix.Success != false)
+ {
+ string[] audio4mix = audioTrack4Mix.ToString().Split(',');
+ audio4mix[1] = audio4mix[3].Trim();
+ thisQuery.q_audioTrackMix4 = getMixDown(audio4mix[1]);
+ }
+
+
+ // Audio Encoders
+ if (audioEncoder1.Success != false)
+ thisQuery.q_audioEncoder1 = getAudioEncoder(audioEncoder1.ToString().Replace("-E ", ""));
+
if (audioEncoder2.Success != false)
{
- audioEncoderConvertion = audioEncoder2.ToString().Replace("-E ", "");
string[] audio2enc = audioEncoder2.ToString().Split(',');
- audio2enc[1] = audio2enc[1].Trim();
- switch (audio2enc[1])
- {
- case "faac":
- audioEncoderConvertion = "AAC";
- break;
- case "lame":
- audioEncoderConvertion = "MP3";
- break;
- case "vorbis":
- audioEncoderConvertion = "Vorbis";
- break;
- case "ac3":
- audioEncoderConvertion = "AC3";
- break;
- case "aac+ac3":
- audioEncoderConvertion = "AAC + AC3";
- break;
- default:
- audioEncoderConvertion = "AAC";
- break;
- }
- thisQuery.q_audioEncoder2 = audioEncoderConvertion;
+ thisQuery.q_audioEncoder2 = getAudioEncoder(audio2enc[1].Trim());
+ }
+
+ if (audioEncoder3.Success != false)
+ {
+ string[] audio3enc = audioEncoder3.ToString().Split(',');
+ thisQuery.q_audioEncoder3 = getAudioEncoder(audio3enc[2].Trim());
+ }
+
+ if (audioEncoder4.Success != false)
+ {
+ string[] audio4enc = audioEncoder4.ToString().Split(',');
+ thisQuery.q_audioEncoder4 = getAudioEncoder(audio4enc[3].Trim());
}
@@ -997,6 +1118,23 @@ namespace Handbrake.Functions else
thisQuery.q_audioBitrate2 = "";
+ if (audioBitrate3.Success != false)
+ {
+ string[] audioBitrateSelect = audioBitrate3.ToString().Split(',');
+ thisQuery.q_audioBitrate3 = audioBitrateSelect[2].Trim();
+ }
+ else
+ thisQuery.q_audioBitrate3 = "";
+
+ if (audioBitrate4.Success != false)
+ {
+ string[] audioBitrateSelect = audioBitrate4.ToString().Split(',');
+ thisQuery.q_audioBitrate4 = audioBitrateSelect[3].Trim();
+ }
+ else
+ thisQuery.q_audioBitrate4 = "";
+
+
// Audio Sample Rate
if (audioSampleRate1.Success != false)
thisQuery.q_audioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();
@@ -1007,35 +1145,79 @@ namespace Handbrake.Functions thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();
}
+ if (audioSampleRate3.Success != false)
+ {
+ string[] audioSRSelect = audioSampleRate3.ToString().Split(',');
+ thisQuery.q_audioSamplerate3 = audioSRSelect[2].Trim();
+ }
- if (subtitles.Success != false)
- thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");
+ if (audioSampleRate4.Success != false)
+ {
+ string[] audioSRSelect = audioSampleRate4.ToString().Split(',');
+ thisQuery.q_audioSamplerate4 = audioSRSelect[3].Trim();
+ }
+
+ // DRC
+ if (drc1.Success != false)
+ {
+ string value = drc1.ToString().Replace("-D ", "");
+ float drcValue = float.Parse(value);
+ drcValue = drcValue * 10;
+ thisQuery.q_drc1 = drcValue;
+ }
else
+ thisQuery.q_drc1 = 0;
+
+ if (drc2.Success != false)
{
- if (subScan.Success)
- thisQuery.q_subtitles = "Autoselect";
- else
- thisQuery.q_subtitles = "None";
+ string[] drcPoint = drc2.ToString().Split(',');
+ string value = drcPoint[1];
+ float drcValue = float.Parse(value);
+ drcValue = drcValue * 10;
+ thisQuery.q_drc2 = drcValue;
+ }
+ else
+ thisQuery.q_drc2 = 0;
+
+ if (drc3.Success != false)
+ {
+ string[] drcPoint = drc3.ToString().Split(',');
+ string value = drcPoint[2];
+ float drcValue = float.Parse(value);
+ drcValue = drcValue * 10;
+ thisQuery.q_drc3 = drcValue;
}
+ else
+ thisQuery.q_drc3 = 0;
- if (drc.Success != false)
+ if (drc4.Success != false)
{
- string value = drc.ToString().Replace("-D ", "");
+ string[] drcPoint = drc4.ToString().Split(',');
+ string value = drcPoint[3];
float drcValue = float.Parse(value);
drcValue = drcValue * 10;
- thisQuery.q_drc = drcValue;
+ thisQuery.q_drc4 = drcValue;
}
else
- thisQuery.q_drc = 0;
+ thisQuery.q_drc4 = 0;
+
+
+ // Subtitle Stuff
+ if (subtitles.Success != false)
+ thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");
+ else
+ {
+ if (subScan.Success)
+ thisQuery.q_subtitles = "Autoselect";
+ else
+ thisQuery.q_subtitles = "None";
+ }
thisQuery.q_forcedSubs = forcedSubtitles.Success;
#endregion
- //
- //H264 tab and other
- //
- #region h264 and other
+ #region H.264 and other
//
//H264 Tab
//
@@ -1058,5 +1240,42 @@ namespace Handbrake.Functions return thisQuery;
}
+
+
+ private static string getMixDown(string mixdown)
+ {
+ switch (mixdown)
+ {
+ case "mono":
+ return "Mono";
+ case "stereo":
+ return "Stereo";
+ case "dpl1":
+ return "Dolby Surround";
+ case "dpl2":
+ return "Dolby Pro Logic II";
+ case "6ch":
+ return "6 Channel Discrete";
+ default:
+ return "Automatic";
+ }
+ }
+
+ private static string getAudioEncoder(string audioEnc)
+ {
+ switch (audioEnc)
+ {
+ case "faac":
+ return "AAC";
+ case "lame":
+ return "MP3";
+ case "vorbis":
+ return "Vorbis";
+ case "ac3":
+ return "AC3";
+ default:
+ return "AAC";
+ }
+ }
}
}
\ No newline at end of file diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index c928ac4dc..9ab878b66 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -73,7 +73,14 @@ namespace Handbrake this.drp_audbit_2 = new System.Windows.Forms.ComboBox();
this.drp_audsr_2 = new System.Windows.Forms.ComboBox();
this.check_fileMode = new System.Windows.Forms.CheckBox();
- this.slider_drc = new System.Windows.Forms.TrackBar();
+ this.drp_audsr_3 = new System.Windows.Forms.ComboBox();
+ this.drp_audbit_3 = new System.Windows.Forms.ComboBox();
+ this.drp_audenc_3 = new System.Windows.Forms.ComboBox();
+ this.drp_audmix_3 = new System.Windows.Forms.ComboBox();
+ this.drp_audsr_4 = new System.Windows.Forms.ComboBox();
+ this.drp_audbit_4 = new System.Windows.Forms.ComboBox();
+ this.drp_audenc_4 = new System.Windows.Forms.ComboBox();
+ this.drp_audmix_4 = new System.Windows.Forms.ComboBox();
this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();
this.File_Open = new System.Windows.Forms.OpenFileDialog();
this.ISO_Open = new System.Windows.Forms.OpenFileDialog();
@@ -113,20 +120,26 @@ namespace Handbrake this.Label3 = new System.Windows.Forms.Label();
this.lbl_encode = new System.Windows.Forms.Label();
this.TabPage2 = new System.Windows.Forms.TabPage();
+ this.lbl_drc4 = new System.Windows.Forms.Label();
+ this.lbl_drc3 = new System.Windows.Forms.Label();
+ this.lbl_drc2 = new System.Windows.Forms.Label();
+ this.lbl_drc1 = new System.Windows.Forms.Label();
+ this.trackBar4 = new System.Windows.Forms.TrackBar();
+ this.drp_track4Audio = new System.Windows.Forms.ComboBox();
+ this.label21 = new System.Windows.Forms.Label();
+ this.trackBar3 = new System.Windows.Forms.TrackBar();
+ this.drp_track3Audio = new System.Windows.Forms.ComboBox();
+ this.label18 = new System.Windows.Forms.Label();
+ this.trackBar2 = new System.Windows.Forms.TrackBar();
+ this.label16 = new System.Windows.Forms.Label();
+ this.trackBar1 = new System.Windows.Forms.TrackBar();
this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.label12 = new System.Windows.Forms.Label();
this.label68 = new System.Windows.Forms.Label();
this.label67 = new System.Windows.Forms.Label();
this.label66 = new System.Windows.Forms.Label();
this.label65 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
- this.label30 = new System.Windows.Forms.Label();
- this.label29 = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.lbl_drc = new System.Windows.Forms.Label();
this.check_forced = new System.Windows.Forms.CheckBox();
this.drp_track2Audio = new System.Windows.Forms.ComboBox();
this.label28 = new System.Windows.Forms.Label();
@@ -134,7 +147,6 @@ namespace Handbrake this.Label19 = new System.Windows.Forms.Label();
this.Label20 = new System.Windows.Forms.Label();
this.drp_track1Audio = new System.Windows.Forms.ComboBox();
- this.Label5 = new System.Windows.Forms.Label();
this.Label32 = new System.Windows.Forms.Label();
this.TabPage3 = new System.Windows.Forms.TabPage();
this.label25 = new System.Windows.Forms.Label();
@@ -246,11 +258,14 @@ namespace Handbrake Label38 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).BeginInit();
this.frmMainMenu.SuspendLayout();
this.GroupBox1.SuspendLayout();
this.groupBox_output.SuspendLayout();
this.TabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
this.TabPage3.SuspendLayout();
this.TabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.text_bottom)).BeginInit();
@@ -383,10 +398,10 @@ namespace Handbrake "112",
"128",
"160"});
- this.drp_audbit_1.Location = new System.Drawing.Point(589, 49);
+ this.drp_audbit_1.Location = new System.Drawing.Point(538, 53);
this.drp_audbit_1.Name = "drp_audbit_1";
- this.drp_audbit_1.Size = new System.Drawing.Size(93, 20);
- this.drp_audbit_1.TabIndex = 9;
+ this.drp_audbit_1.Size = new System.Drawing.Size(79, 20);
+ this.drp_audbit_1.TabIndex = 11;
this.drp_audbit_1.Text = "160";
this.ToolTip.SetToolTip(this.drp_audbit_1, "Set the Audio Bit-Rate");
//
@@ -400,10 +415,10 @@ namespace Handbrake "32",
"24",
"22.05"});
- this.drp_audsr_1.Location = new System.Drawing.Point(499, 49);
+ this.drp_audsr_1.Location = new System.Drawing.Point(488, 52);
this.drp_audsr_1.Name = "drp_audsr_1";
- this.drp_audsr_1.Size = new System.Drawing.Size(64, 21);
- this.drp_audsr_1.TabIndex = 11;
+ this.drp_audsr_1.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_1.TabIndex = 9;
this.drp_audsr_1.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");
//
@@ -495,10 +510,10 @@ namespace Handbrake this.drp_subtitle.Items.AddRange(new object[] {
"None",
"Autoselect"});
- this.drp_subtitle.Location = new System.Drawing.Point(393, 221);
+ this.drp_subtitle.Location = new System.Drawing.Point(79, 244);
this.drp_subtitle.Name = "drp_subtitle";
this.drp_subtitle.Size = new System.Drawing.Size(138, 21);
- this.drp_subtitle.TabIndex = 27;
+ this.drp_subtitle.TabIndex = 43;
this.drp_subtitle.Text = "None";
this.ToolTip.SetToolTip(this.drp_subtitle, resources.GetString("drp_subtitle.ToolTip"));
this.drp_subtitle.SelectedIndexChanged += new System.EventHandler(this.drp_subtitle_SelectedIndexChanged);
@@ -530,10 +545,10 @@ namespace Handbrake "Dolby Surround",
"Dolby Pro Logic II",
"6 Channel Discrete"});
- this.drp_audmix_1.Location = new System.Drawing.Point(353, 49);
+ this.drp_audmix_1.Location = new System.Drawing.Point(353, 53);
this.drp_audmix_1.Name = "drp_audmix_1";
this.drp_audmix_1.Size = new System.Drawing.Size(129, 20);
- this.drp_audmix_1.TabIndex = 5;
+ this.drp_audmix_1.TabIndex = 7;
this.drp_audmix_1.Text = "Automatic";
this.ToolTip.SetToolTip(this.drp_audmix_1, "Please note: Some options require a 5.1 audio channel to be selected");
this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);
@@ -665,10 +680,10 @@ namespace Handbrake "Dolby Surround",
"Dolby Pro Logic II",
"6 Channel Discrete"});
- this.drp_audmix_2.Location = new System.Drawing.Point(353, 78);
+ this.drp_audmix_2.Location = new System.Drawing.Point(353, 93);
this.drp_audmix_2.Name = "drp_audmix_2";
this.drp_audmix_2.Size = new System.Drawing.Size(129, 20);
- this.drp_audmix_2.TabIndex = 14;
+ this.drp_audmix_2.TabIndex = 19;
this.drp_audmix_2.Text = "Automatic";
this.ToolTip.SetToolTip(this.drp_audmix_2, "Please note: Some options require a 5.1 audio channel to be selected");
this.drp_audmix_2.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_2_SelectedIndexChanged);
@@ -682,10 +697,10 @@ namespace Handbrake "MP3",
"Vorbis",
"AC3"});
- this.drp_audenc_1.Location = new System.Drawing.Point(236, 49);
+ this.drp_audenc_1.Location = new System.Drawing.Point(236, 53);
this.drp_audenc_1.Name = "drp_audenc_1";
this.drp_audenc_1.Size = new System.Drawing.Size(111, 20);
- this.drp_audenc_1.TabIndex = 7;
+ this.drp_audenc_1.TabIndex = 5;
this.drp_audenc_1.Text = "AAC";
this.ToolTip.SetToolTip(this.drp_audenc_1, "Select an audio encoder.");
this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged);
@@ -699,10 +714,10 @@ namespace Handbrake "MP3",
"Vorbis",
"AC3"});
- this.drp_audenc_2.Location = new System.Drawing.Point(236, 78);
+ this.drp_audenc_2.Location = new System.Drawing.Point(236, 93);
this.drp_audenc_2.Name = "drp_audenc_2";
this.drp_audenc_2.Size = new System.Drawing.Size(111, 20);
- this.drp_audenc_2.TabIndex = 15;
+ this.drp_audenc_2.TabIndex = 18;
this.drp_audenc_2.Text = "AAC";
this.ToolTip.SetToolTip(this.drp_audenc_2, "Select an audio encoder.");
this.drp_audenc_2.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_2_SelectedIndexChanged);
@@ -722,10 +737,10 @@ namespace Handbrake "112",
"128",
"160"});
- this.drp_audbit_2.Location = new System.Drawing.Point(589, 78);
+ this.drp_audbit_2.Location = new System.Drawing.Point(537, 91);
this.drp_audbit_2.Name = "drp_audbit_2";
- this.drp_audbit_2.Size = new System.Drawing.Size(93, 20);
- this.drp_audbit_2.TabIndex = 16;
+ this.drp_audbit_2.Size = new System.Drawing.Size(80, 20);
+ this.drp_audbit_2.TabIndex = 21;
this.drp_audbit_2.Text = "160";
this.ToolTip.SetToolTip(this.drp_audbit_2, "Set the Audio Bit-Rate");
//
@@ -739,10 +754,10 @@ namespace Handbrake "32",
"24",
"22.05"});
- this.drp_audsr_2.Location = new System.Drawing.Point(499, 77);
+ this.drp_audsr_2.Location = new System.Drawing.Point(488, 91);
this.drp_audsr_2.Name = "drp_audsr_2";
- this.drp_audsr_2.Size = new System.Drawing.Size(64, 21);
- this.drp_audsr_2.TabIndex = 17;
+ this.drp_audsr_2.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_2.TabIndex = 20;
this.drp_audsr_2.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");
//
@@ -760,16 +775,155 @@ namespace Handbrake "mpg, .mpeg and .m2t");
this.check_fileMode.UseVisualStyleBackColor = true;
//
- // slider_drc
+ // drp_audsr_3
//
- this.slider_drc.LargeChange = 0;
- this.slider_drc.Location = new System.Drawing.Point(16, 239);
- this.slider_drc.Maximum = 30;
- this.slider_drc.Name = "slider_drc";
- this.slider_drc.Size = new System.Drawing.Size(241, 42);
- this.slider_drc.TabIndex = 19;
- this.slider_drc.TickFrequency = 10;
- this.slider_drc.Scroll += new System.EventHandler(this.slider_drc_Scroll);
+ this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_3.FormattingEnabled = true;
+ this.drp_audsr_3.Items.AddRange(new object[] {
+ "48",
+ "44.1",
+ "32",
+ "24",
+ "22.05"});
+ this.drp_audsr_3.Location = new System.Drawing.Point(488, 128);
+ this.drp_audsr_3.Name = "drp_audsr_3";
+ this.drp_audsr_3.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_3.TabIndex = 28;
+ this.drp_audsr_3.Text = "48";
+ this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");
+ //
+ // drp_audbit_3
+ //
+ this.drp_audbit_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audbit_3.FormattingEnabled = true;
+ this.drp_audbit_3.Items.AddRange(new object[] {
+ "32",
+ "40",
+ "48",
+ "56",
+ "64",
+ "80",
+ "86",
+ "112",
+ "128",
+ "160"});
+ this.drp_audbit_3.Location = new System.Drawing.Point(537, 129);
+ this.drp_audbit_3.Name = "drp_audbit_3";
+ this.drp_audbit_3.Size = new System.Drawing.Size(80, 20);
+ this.drp_audbit_3.TabIndex = 29;
+ this.drp_audbit_3.Text = "160";
+ this.ToolTip.SetToolTip(this.drp_audbit_3, "Set the Audio Bit-Rate");
+ //
+ // drp_audenc_3
+ //
+ this.drp_audenc_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audenc_3.FormattingEnabled = true;
+ this.drp_audenc_3.Items.AddRange(new object[] {
+ "AAC",
+ "MP3",
+ "Vorbis",
+ "AC3"});
+ this.drp_audenc_3.Location = new System.Drawing.Point(236, 129);
+ this.drp_audenc_3.Name = "drp_audenc_3";
+ this.drp_audenc_3.Size = new System.Drawing.Size(111, 20);
+ this.drp_audenc_3.TabIndex = 26;
+ this.drp_audenc_3.Text = "AAC";
+ this.ToolTip.SetToolTip(this.drp_audenc_3, "Select an audio encoder.");
+ this.drp_audenc_3.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_3_SelectedIndexChanged);
+ //
+ // drp_audmix_3
+ //
+ this.drp_audmix_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audmix_3.FormattingEnabled = true;
+ this.drp_audmix_3.Items.AddRange(new object[] {
+ "Automatic",
+ "Mono",
+ "Stereo",
+ "Dolby Surround",
+ "Dolby Pro Logic II",
+ "6 Channel Discrete"});
+ this.drp_audmix_3.Location = new System.Drawing.Point(353, 129);
+ this.drp_audmix_3.Name = "drp_audmix_3";
+ this.drp_audmix_3.Size = new System.Drawing.Size(129, 20);
+ this.drp_audmix_3.TabIndex = 27;
+ this.drp_audmix_3.Text = "Automatic";
+ this.ToolTip.SetToolTip(this.drp_audmix_3, "Please note: Some options require a 5.1 audio channel to be selected");
+ this.drp_audmix_3.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_3_SelectedIndexChanged);
+ //
+ // drp_audsr_4
+ //
+ this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_4.FormattingEnabled = true;
+ this.drp_audsr_4.Items.AddRange(new object[] {
+ "48",
+ "44.1",
+ "32",
+ "24",
+ "22.05"});
+ this.drp_audsr_4.Location = new System.Drawing.Point(488, 166);
+ this.drp_audsr_4.Name = "drp_audsr_4";
+ this.drp_audsr_4.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_4.TabIndex = 36;
+ this.drp_audsr_4.Text = "48";
+ this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");
+ //
+ // drp_audbit_4
+ //
+ this.drp_audbit_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audbit_4.FormattingEnabled = true;
+ this.drp_audbit_4.Items.AddRange(new object[] {
+ "32",
+ "40",
+ "48",
+ "56",
+ "64",
+ "80",
+ "86",
+ "112",
+ "128",
+ "160"});
+ this.drp_audbit_4.Location = new System.Drawing.Point(537, 167);
+ this.drp_audbit_4.Name = "drp_audbit_4";
+ this.drp_audbit_4.Size = new System.Drawing.Size(80, 20);
+ this.drp_audbit_4.TabIndex = 37;
+ this.drp_audbit_4.Text = "160";
+ this.ToolTip.SetToolTip(this.drp_audbit_4, "Set the Audio Bit-Rate");
+ //
+ // drp_audenc_4
+ //
+ this.drp_audenc_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audenc_4.FormattingEnabled = true;
+ this.drp_audenc_4.Items.AddRange(new object[] {
+ "AAC",
+ "MP3",
+ "Vorbis",
+ "AC3"});
+ this.drp_audenc_4.Location = new System.Drawing.Point(236, 167);
+ this.drp_audenc_4.Name = "drp_audenc_4";
+ this.drp_audenc_4.Size = new System.Drawing.Size(111, 20);
+ this.drp_audenc_4.TabIndex = 34;
+ this.drp_audenc_4.Text = "AAC";
+ this.ToolTip.SetToolTip(this.drp_audenc_4, "Select an audio encoder.");
+ this.drp_audenc_4.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_4_SelectedIndexChanged);
+ //
+ // drp_audmix_4
+ //
+ this.drp_audmix_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audmix_4.FormattingEnabled = true;
+ this.drp_audmix_4.Items.AddRange(new object[] {
+ "Automatic",
+ "Mono",
+ "Stereo",
+ "Dolby Surround",
+ "Dolby Pro Logic II",
+ "6 Channel Discrete"});
+ this.drp_audmix_4.Location = new System.Drawing.Point(353, 167);
+ this.drp_audmix_4.Name = "drp_audmix_4";
+ this.drp_audmix_4.Size = new System.Drawing.Size(129, 20);
+ this.drp_audmix_4.TabIndex = 35;
+ this.drp_audmix_4.Text = "Automatic";
+ this.ToolTip.SetToolTip(this.drp_audmix_4, "Please note: Some options require a 5.1 audio channel to be selected");
+ this.drp_audmix_4.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_4_SelectedIndexChanged);
//
// DVD_Open
//
@@ -1115,10 +1269,29 @@ namespace Handbrake // TabPage2
//
this.TabPage2.BackColor = System.Drawing.Color.Transparent;
+ this.TabPage2.Controls.Add(this.lbl_drc4);
+ this.TabPage2.Controls.Add(this.lbl_drc3);
+ this.TabPage2.Controls.Add(this.lbl_drc2);
+ this.TabPage2.Controls.Add(this.lbl_drc1);
+ this.TabPage2.Controls.Add(this.trackBar4);
+ this.TabPage2.Controls.Add(this.drp_audsr_4);
+ this.TabPage2.Controls.Add(this.drp_audbit_4);
+ this.TabPage2.Controls.Add(this.drp_audenc_4);
+ this.TabPage2.Controls.Add(this.drp_audmix_4);
+ this.TabPage2.Controls.Add(this.drp_track4Audio);
+ this.TabPage2.Controls.Add(this.label21);
+ this.TabPage2.Controls.Add(this.trackBar3);
+ this.TabPage2.Controls.Add(this.drp_audsr_3);
+ this.TabPage2.Controls.Add(this.drp_audbit_3);
+ this.TabPage2.Controls.Add(this.drp_audenc_3);
+ this.TabPage2.Controls.Add(this.drp_audmix_3);
+ this.TabPage2.Controls.Add(this.drp_track3Audio);
+ this.TabPage2.Controls.Add(this.label18);
+ this.TabPage2.Controls.Add(this.trackBar2);
+ this.TabPage2.Controls.Add(this.label16);
+ this.TabPage2.Controls.Add(this.trackBar1);
this.TabPage2.Controls.Add(this.groupBox5);
- this.TabPage2.Controls.Add(this.groupBox4);
this.TabPage2.Controls.Add(this.groupBox3);
- this.TabPage2.Controls.Add(this.label12);
this.TabPage2.Controls.Add(this.label68);
this.TabPage2.Controls.Add(this.label67);
this.TabPage2.Controls.Add(this.drp_audsr_2);
@@ -1129,12 +1302,6 @@ namespace Handbrake this.TabPage2.Controls.Add(this.drp_audenc_2);
this.TabPage2.Controls.Add(this.drp_audenc_1);
this.TabPage2.Controls.Add(this.drp_audmix_2);
- this.TabPage2.Controls.Add(this.label30);
- this.TabPage2.Controls.Add(this.label29);
- this.TabPage2.Controls.Add(this.label23);
- this.TabPage2.Controls.Add(this.label7);
- this.TabPage2.Controls.Add(this.lbl_drc);
- this.TabPage2.Controls.Add(this.slider_drc);
this.TabPage2.Controls.Add(this.check_forced);
this.TabPage2.Controls.Add(this.drp_track2Audio);
this.TabPage2.Controls.Add(this.label28);
@@ -1145,7 +1312,6 @@ namespace Handbrake this.TabPage2.Controls.Add(this.drp_audmix_1);
this.TabPage2.Controls.Add(this.drp_track1Audio);
this.TabPage2.Controls.Add(this.drp_audbit_1);
- this.TabPage2.Controls.Add(this.Label5);
this.TabPage2.Controls.Add(this.Label32);
this.TabPage2.Controls.Add(this.drp_audsr_1);
this.TabPage2.Location = new System.Drawing.Point(4, 22);
@@ -1155,41 +1321,171 @@ namespace Handbrake this.TabPage2.TabIndex = 3;
this.TabPage2.Text = "Audio && Subtitles";
//
+ // lbl_drc4
+ //
+ this.lbl_drc4.AutoSize = true;
+ this.lbl_drc4.BackColor = System.Drawing.Color.Transparent;
+ this.lbl_drc4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_drc4.Location = new System.Drawing.Point(665, 165);
+ this.lbl_drc4.Name = "lbl_drc4";
+ this.lbl_drc4.Size = new System.Drawing.Size(19, 13);
+ this.lbl_drc4.TabIndex = 39;
+ this.lbl_drc4.Text = "1:";
+ //
+ // lbl_drc3
+ //
+ this.lbl_drc3.AutoSize = true;
+ this.lbl_drc3.BackColor = System.Drawing.Color.Transparent;
+ this.lbl_drc3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_drc3.Location = new System.Drawing.Point(665, 131);
+ this.lbl_drc3.Name = "lbl_drc3";
+ this.lbl_drc3.Size = new System.Drawing.Size(19, 13);
+ this.lbl_drc3.TabIndex = 31;
+ this.lbl_drc3.Text = "1:";
+ //
+ // lbl_drc2
+ //
+ this.lbl_drc2.AutoSize = true;
+ this.lbl_drc2.BackColor = System.Drawing.Color.Transparent;
+ this.lbl_drc2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_drc2.Location = new System.Drawing.Point(665, 91);
+ this.lbl_drc2.Name = "lbl_drc2";
+ this.lbl_drc2.Size = new System.Drawing.Size(19, 13);
+ this.lbl_drc2.TabIndex = 23;
+ this.lbl_drc2.Text = "1:";
+ //
+ // lbl_drc1
+ //
+ this.lbl_drc1.AutoSize = true;
+ this.lbl_drc1.BackColor = System.Drawing.Color.Transparent;
+ this.lbl_drc1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_drc1.Location = new System.Drawing.Point(665, 53);
+ this.lbl_drc1.Name = "lbl_drc1";
+ this.lbl_drc1.Size = new System.Drawing.Size(19, 13);
+ this.lbl_drc1.TabIndex = 15;
+ this.lbl_drc1.Text = "1:";
+ //
+ // trackBar4
+ //
+ this.trackBar4.LargeChange = 0;
+ this.trackBar4.Location = new System.Drawing.Point(620, 161);
+ this.trackBar4.Margin = new System.Windows.Forms.Padding(0);
+ this.trackBar4.Maximum = 30;
+ this.trackBar4.Name = "trackBar4";
+ this.trackBar4.Size = new System.Drawing.Size(49, 42);
+ this.trackBar4.TabIndex = 38;
+ this.trackBar4.TickFrequency = 10;
+ this.trackBar4.ValueChanged += new System.EventHandler(this.trackBar4_Scroll);
+ //
+ // drp_track4Audio
+ //
+ this.drp_track4Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_track4Audio.FormattingEnabled = true;
+ this.drp_track4Audio.Items.AddRange(new object[] {
+ "None"});
+ this.drp_track4Audio.Location = new System.Drawing.Point(36, 166);
+ this.drp_track4Audio.Name = "drp_track4Audio";
+ this.drp_track4Audio.Size = new System.Drawing.Size(194, 20);
+ this.drp_track4Audio.TabIndex = 33;
+ this.drp_track4Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track4Audio_SelectedIndexChanged);
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Transparent;
+ this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label21.Location = new System.Drawing.Point(13, 169);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(19, 13);
+ this.label21.TabIndex = 32;
+ this.label21.Text = "4:";
+ //
+ // trackBar3
+ //
+ this.trackBar3.LargeChange = 0;
+ this.trackBar3.Location = new System.Drawing.Point(620, 123);
+ this.trackBar3.Margin = new System.Windows.Forms.Padding(0);
+ this.trackBar3.Maximum = 30;
+ this.trackBar3.Name = "trackBar3";
+ this.trackBar3.Size = new System.Drawing.Size(49, 42);
+ this.trackBar3.TabIndex = 30;
+ this.trackBar3.TickFrequency = 10;
+ this.trackBar3.ValueChanged += new System.EventHandler(this.trackBar3_Scroll);
+ //
+ // drp_track3Audio
+ //
+ this.drp_track3Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_track3Audio.FormattingEnabled = true;
+ this.drp_track3Audio.Items.AddRange(new object[] {
+ "None"});
+ this.drp_track3Audio.Location = new System.Drawing.Point(36, 128);
+ this.drp_track3Audio.Name = "drp_track3Audio";
+ this.drp_track3Audio.Size = new System.Drawing.Size(194, 20);
+ this.drp_track3Audio.TabIndex = 25;
+ this.drp_track3Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track3Audio_SelectedIndexChanged);
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.BackColor = System.Drawing.Color.Transparent;
+ this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label18.Location = new System.Drawing.Point(13, 131);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(19, 13);
+ this.label18.TabIndex = 24;
+ this.label18.Text = "3:";
+ //
+ // trackBar2
+ //
+ this.trackBar2.LargeChange = 0;
+ this.trackBar2.Location = new System.Drawing.Point(620, 87);
+ this.trackBar2.Margin = new System.Windows.Forms.Padding(0);
+ this.trackBar2.Maximum = 30;
+ this.trackBar2.Name = "trackBar2";
+ this.trackBar2.Size = new System.Drawing.Size(49, 42);
+ this.trackBar2.TabIndex = 22;
+ this.trackBar2.TickFrequency = 10;
+ this.trackBar2.ValueChanged += new System.EventHandler(this.trackBar2_Scroll);
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.BackColor = System.Drawing.Color.Transparent;
+ this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label16.Location = new System.Drawing.Point(628, 36);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(28, 12);
+ this.label16.TabIndex = 14;
+ this.label16.Text = "DRC";
+ //
+ // trackBar1
+ //
+ this.trackBar1.LargeChange = 0;
+ this.trackBar1.Location = new System.Drawing.Point(619, 48);
+ this.trackBar1.Margin = new System.Windows.Forms.Padding(0);
+ this.trackBar1.Maximum = 30;
+ this.trackBar1.Name = "trackBar1";
+ this.trackBar1.Size = new System.Drawing.Size(49, 42);
+ this.trackBar1.TabIndex = 13;
+ this.trackBar1.TickFrequency = 10;
+ this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_Scroll);
+ //
// groupBox5
//
this.groupBox5.Location = new System.Drawing.Point(107, 13);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(577, 10);
- this.groupBox5.TabIndex = 32;
+ this.groupBox5.TabIndex = 1;
this.groupBox5.TabStop = false;
//
- // groupBox4
- //
- this.groupBox4.Location = new System.Drawing.Point(109, 200);
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(178, 10);
- this.groupBox4.TabIndex = 31;
- this.groupBox4.TabStop = false;
- //
// groupBox3
//
- this.groupBox3.Location = new System.Drawing.Point(397, 200);
+ this.groupBox3.Location = new System.Drawing.Point(83, 219);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(287, 10);
- this.groupBox3.TabIndex = 30;
+ this.groupBox3.Size = new System.Drawing.Size(601, 10);
+ this.groupBox3.TabIndex = 41;
this.groupBox3.TabStop = false;
//
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.BackColor = System.Drawing.Color.Transparent;
- this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(19, 221);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(181, 13);
- this.label12.TabIndex = 29;
- this.label12.Text = "Dynamic Range Compression:";
- //
// label68
//
this.label68.AutoSize = true;
@@ -1205,32 +1501,32 @@ namespace Handbrake //
this.label67.AutoSize = true;
this.label67.BackColor = System.Drawing.Color.Transparent;
- this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label67.Location = new System.Drawing.Point(487, 32);
+ this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label67.Location = new System.Drawing.Point(478, 24);
this.label67.Name = "label67";
- this.label67.Size = new System.Drawing.Size(99, 12);
+ this.label67.Size = new System.Drawing.Size(65, 24);
this.label67.TabIndex = 10;
- this.label67.Text = "Sample Rate (kHz)";
+ this.label67.Text = "Samplerate \r\n(kHz)";
//
// label66
//
this.label66.AutoSize = true;
this.label66.BackColor = System.Drawing.Color.Transparent;
- this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label66.Location = new System.Drawing.Point(594, 32);
+ this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label66.Location = new System.Drawing.Point(542, 36);
this.label66.Name = "label66";
- this.label66.Size = new System.Drawing.Size(78, 12);
- this.label66.TabIndex = 8;
+ this.label66.Size = new System.Drawing.Size(75, 12);
+ this.label66.TabIndex = 12;
this.label66.Text = "Bitrate (Kbps)";
//
// label65
//
this.label65.AutoSize = true;
this.label65.BackColor = System.Drawing.Color.Transparent;
- this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label65.Location = new System.Drawing.Point(255, 32);
+ this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label65.Location = new System.Drawing.Point(255, 36);
this.label65.Name = "label65";
- this.label65.Size = new System.Drawing.Size(66, 12);
+ this.label65.Size = new System.Drawing.Size(69, 12);
this.label65.TabIndex = 6;
this.label65.Text = "Audio Codec";
//
@@ -1238,77 +1534,22 @@ namespace Handbrake //
this.label14.AutoSize = true;
this.label14.BackColor = System.Drawing.Color.Transparent;
- this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(380, 32);
+ this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label14.Location = new System.Drawing.Point(380, 36);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(49, 12);
- this.label14.TabIndex = 4;
+ this.label14.Size = new System.Drawing.Size(48, 12);
+ this.label14.TabIndex = 8;
this.label14.Text = "Mixdown";
//
- // label30
- //
- this.label30.AutoSize = true;
- this.label30.BackColor = System.Drawing.Color.Transparent;
- this.label30.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label30.Location = new System.Drawing.Point(139, 271);
- this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(67, 12);
- this.label30.TabIndex = 23;
- this.label30.Text = "3.0 (Louder)";
- //
- // label29
- //
- this.label29.AutoSize = true;
- this.label29.BackColor = System.Drawing.Color.Transparent;
- this.label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label29.Location = new System.Drawing.Point(74, 271);
- this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(57, 12);
- this.label29.TabIndex = 22;
- this.label29.Text = "2.0 (Loud)";
- //
- // label23
- //
- this.label23.AutoSize = true;
- this.label23.BackColor = System.Drawing.Color.Transparent;
- this.label23.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label23.Location = new System.Drawing.Point(211, 271);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(73, 12);
- this.label23.TabIndex = 24;
- this.label23.Text = "4.0 (Loudest)";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(20, 271);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(48, 12);
- this.label7.TabIndex = 21;
- this.label7.Text = "1.0 (Off)";
- //
- // lbl_drc
- //
- this.lbl_drc.AutoSize = true;
- this.lbl_drc.BackColor = System.Drawing.Color.Transparent;
- this.lbl_drc.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_drc.Location = new System.Drawing.Point(206, 221);
- this.lbl_drc.Name = "lbl_drc";
- this.lbl_drc.Size = new System.Drawing.Size(14, 13);
- this.lbl_drc.TabIndex = 20;
- this.lbl_drc.Text = "1";
- //
// check_forced
//
this.check_forced.AutoSize = true;
this.check_forced.BackColor = System.Drawing.Color.Transparent;
this.check_forced.Enabled = false;
- this.check_forced.Location = new System.Drawing.Point(537, 224);
+ this.check_forced.Location = new System.Drawing.Point(223, 247);
this.check_forced.Name = "check_forced";
this.check_forced.Size = new System.Drawing.Size(147, 17);
- this.check_forced.TabIndex = 28;
+ this.check_forced.TabIndex = 44;
this.check_forced.Text = "Forced Subtitles Only";
this.check_forced.UseVisualStyleBackColor = false;
//
@@ -1317,12 +1558,11 @@ namespace Handbrake this.drp_track2Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drp_track2Audio.FormattingEnabled = true;
this.drp_track2Audio.Items.AddRange(new object[] {
- "None",
- "Automatic"});
- this.drp_track2Audio.Location = new System.Drawing.Point(36, 77);
+ "None"});
+ this.drp_track2Audio.Location = new System.Drawing.Point(36, 92);
this.drp_track2Audio.Name = "drp_track2Audio";
this.drp_track2Audio.Size = new System.Drawing.Size(194, 20);
- this.drp_track2Audio.TabIndex = 13;
+ this.drp_track2Audio.TabIndex = 17;
this.drp_track2Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track2Audio_SelectedIndexChanged);
//
// label28
@@ -1330,21 +1570,21 @@ namespace Handbrake this.label28.AutoSize = true;
this.label28.BackColor = System.Drawing.Color.Transparent;
this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label28.Location = new System.Drawing.Point(13, 80);
+ this.label28.Location = new System.Drawing.Point(13, 95);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(19, 13);
- this.label28.TabIndex = 12;
+ this.label28.TabIndex = 16;
this.label28.Text = "2:";
//
// label27
//
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
- this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label27.Location = new System.Drawing.Point(107, 32);
+ this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label27.Location = new System.Drawing.Point(107, 36);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(38, 12);
- this.label27.TabIndex = 1;
+ this.label27.Size = new System.Drawing.Size(40, 12);
+ this.label27.TabIndex = 4;
this.label27.Text = "Source";
//
// Label19
@@ -1352,10 +1592,10 @@ namespace Handbrake this.Label19.AutoSize = true;
this.Label19.BackColor = System.Drawing.Color.Transparent;
this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label19.Location = new System.Drawing.Point(327, 200);
+ this.Label19.Location = new System.Drawing.Point(13, 219);
this.Label19.Name = "Label19";
this.Label19.Size = new System.Drawing.Size(64, 13);
- this.Label19.TabIndex = 25;
+ this.Label19.TabIndex = 40;
this.Label19.Text = "Subtitles";
//
// Label20
@@ -1363,10 +1603,10 @@ namespace Handbrake this.Label20.AutoSize = true;
this.Label20.BackColor = System.Drawing.Color.Transparent;
this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label20.Location = new System.Drawing.Point(327, 224);
+ this.Label20.Location = new System.Drawing.Point(13, 247);
this.Label20.Name = "Label20";
this.Label20.Size = new System.Drawing.Size(61, 13);
- this.Label20.TabIndex = 26;
+ this.Label20.TabIndex = 42;
this.Label20.Text = "Subtitles:";
//
// drp_track1Audio
@@ -1376,29 +1616,18 @@ namespace Handbrake this.drp_track1Audio.Items.AddRange(new object[] {
"Automatic",
"None"});
- this.drp_track1Audio.Location = new System.Drawing.Point(36, 50);
+ this.drp_track1Audio.Location = new System.Drawing.Point(36, 54);
this.drp_track1Audio.Name = "drp_track1Audio";
this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);
this.drp_track1Audio.TabIndex = 3;
this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);
//
- // Label5
- //
- this.Label5.AutoSize = true;
- this.Label5.BackColor = System.Drawing.Color.Transparent;
- this.Label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label5.Location = new System.Drawing.Point(13, 200);
- this.Label5.Name = "Label5";
- this.Label5.Size = new System.Drawing.Size(93, 13);
- this.Label5.TabIndex = 18;
- this.Label5.Text = "Audio Effects";
- //
// Label32
//
this.Label32.AutoSize = true;
this.Label32.BackColor = System.Drawing.Color.Transparent;
this.Label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label32.Location = new System.Drawing.Point(13, 53);
+ this.Label32.Location = new System.Drawing.Point(13, 57);
this.Label32.Name = "Label32";
this.Label32.Size = new System.Drawing.Size(19, 13);
this.Label32.TabIndex = 2;
@@ -2725,7 +2954,6 @@ namespace Handbrake this.Text = "Handbrake";
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).EndInit();
this.frmMainMenu.ResumeLayout(false);
this.frmMainMenu.PerformLayout();
this.GroupBox1.ResumeLayout(false);
@@ -2734,6 +2962,10 @@ namespace Handbrake this.groupBox_output.PerformLayout();
this.TabPage2.ResumeLayout(false);
this.TabPage2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
this.TabPage3.ResumeLayout(false);
this.TabPage3.PerformLayout();
this.TabPage1.ResumeLayout(false);
@@ -2800,7 +3032,6 @@ namespace Handbrake internal System.Windows.Forms.ComboBox drp_audmix_1;
internal System.Windows.Forms.ComboBox drp_track1Audio;
internal System.Windows.Forms.ComboBox drp_audbit_1;
- internal System.Windows.Forms.Label Label5;
internal System.Windows.Forms.Label Label32;
internal System.Windows.Forms.ComboBox drp_audsr_1;
internal System.Windows.Forms.TabPage TabPage3;
@@ -2867,12 +3098,6 @@ namespace Handbrake internal System.Windows.Forms.Label label27;
internal System.Windows.Forms.ComboBox drp_track2Audio;
internal System.Windows.Forms.Label label28;
- internal System.Windows.Forms.TrackBar slider_drc;
- internal System.Windows.Forms.Label lbl_drc;
- private System.Windows.Forms.Label label30;
- private System.Windows.Forms.Label label29;
- private System.Windows.Forms.Label label23;
- private System.Windows.Forms.Label label7;
private System.Windows.Forms.TabPage tab_chapters;
internal System.Windows.Forms.Label label31;
internal System.Windows.Forms.NumericUpDown text_right;
@@ -2959,13 +3184,32 @@ namespace Handbrake internal System.Windows.Forms.Label label68;
private System.Windows.Forms.DataGridViewTextBoxColumn number;
private System.Windows.Forms.DataGridViewTextBoxColumn name;
- internal System.Windows.Forms.Label label12;
- private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.CheckBox check_fileMode;
private System.Windows.Forms.Button btn_Browse;
private System.Windows.Forms.Button btn_destBrowse;
+ internal System.Windows.Forms.TrackBar trackBar1;
+ internal System.Windows.Forms.Label lbl_drc4;
+ internal System.Windows.Forms.Label lbl_drc3;
+ internal System.Windows.Forms.Label lbl_drc2;
+ internal System.Windows.Forms.TrackBar trackBar4;
+ internal System.Windows.Forms.ComboBox drp_audsr_4;
+ internal System.Windows.Forms.ComboBox drp_audbit_4;
+ internal System.Windows.Forms.ComboBox drp_audenc_4;
+ internal System.Windows.Forms.ComboBox drp_audmix_4;
+ internal System.Windows.Forms.ComboBox drp_track4Audio;
+ internal System.Windows.Forms.Label label21;
+ internal System.Windows.Forms.TrackBar trackBar3;
+ internal System.Windows.Forms.ComboBox drp_audsr_3;
+ internal System.Windows.Forms.ComboBox drp_audbit_3;
+ internal System.Windows.Forms.ComboBox drp_audenc_3;
+ internal System.Windows.Forms.ComboBox drp_audmix_3;
+ internal System.Windows.Forms.ComboBox drp_track3Audio;
+ internal System.Windows.Forms.Label label18;
+ internal System.Windows.Forms.TrackBar trackBar2;
+ internal System.Windows.Forms.Label label16;
+ internal System.Windows.Forms.Label lbl_drc1;
}
}
\ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 06d1e3c29..2c0df3607 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -548,6 +548,18 @@ namespace Handbrake if (drp_track2Audio.Items.Count > 0)
drp_track2Audio.Text = drp_track2Audio.Items[0].ToString();
+ drp_track3Audio.Items.Clear();
+ drp_track3Audio.Items.Add("None");
+ drp_track3Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());
+ if (drp_track3Audio.Items.Count > 0)
+ drp_track3Audio.Text = drp_track3Audio.Items[0].ToString();
+
+ drp_track4Audio.Items.Clear();
+ drp_track4Audio.Items.Add("None");
+ drp_track4Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());
+ if (drp_track4Audio.Items.Count > 0)
+ drp_track4Audio.Text = drp_track4Audio.Items[0].ToString();
+
// Populate the Subtitles dropdown
drp_subtitle.Items.Clear();
drp_subtitle.Items.Add("None");
@@ -892,6 +904,7 @@ namespace Handbrake drp_audsr_1.Text = "48";
drp_audmix_1.Text = "Automatic";
}
+ trackBar1.Value = 0;
}
private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -904,7 +917,7 @@ namespace Handbrake drp_audbit_2.Text = "";
drp_audenc_2.Text = "";
drp_audsr_2.Text = "";
- drp_audmix_2.Text = "";
+ drp_audmix_2.Text = "";
}
else
{
@@ -917,7 +930,61 @@ namespace Handbrake drp_audsr_2.Text = "48";
drp_audmix_2.Text = "Automatic";
}
+ trackBar2.Value = 0;
+ }
+ private void drp_track3Audio_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_track3Audio.SelectedItem.Equals("None"))
+ {
+ drp_audbit_3.Enabled = false;
+ drp_audenc_3.Enabled = false;
+ drp_audsr_3.Enabled = false;
+ drp_audmix_3.Enabled = false;
+ drp_audbit_3.Text = "";
+ drp_audenc_3.Text = "";
+ drp_audsr_3.Text = "";
+ drp_audmix_3.Text = "";
+ }
+ else
+ {
+ drp_audbit_3.Enabled = true;
+ drp_audenc_3.Enabled = true;
+ drp_audsr_3.Enabled = true;
+ drp_audmix_3.Enabled = true;
+ drp_audbit_3.Text = "160";
+ drp_audenc_3.Text = "AAC";
+ drp_audsr_3.Text = "48";
+ drp_audmix_3.Text = "Automatic";
+ }
+ trackBar3.Value = 0;
+ }
+ private void drp_track4Audio_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_track4Audio.SelectedItem.Equals("None"))
+ {
+ drp_audbit_4.Enabled = false;
+ drp_audenc_4.Enabled = false;
+ drp_audsr_4.Enabled = false;
+ drp_audmix_4.Enabled = false;
+ drp_audbit_4.Text = "";
+ drp_audenc_4.Text = "";
+ drp_audsr_4.Text = "";
+ drp_audmix_4.Text = "";
+ }
+ else
+ {
+ drp_audbit_4.Enabled = true;
+ drp_audenc_4.Enabled = true;
+ drp_audsr_4.Enabled = true;
+ drp_audmix_4.Enabled = true;
+ drp_audbit_4.Text = "160";
+ drp_audenc_4.Text = "AAC";
+ drp_audsr_4.Text = "48";
+ drp_audmix_4.Text = "Automatic";
+ }
+ trackBar4.Value = 0;
}
+
private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)
{
if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))
@@ -957,6 +1024,9 @@ namespace Handbrake }
private void drp_audmix_2_SelectedIndexChanged(object sender, EventArgs e)
{
+ if (drp_audmix_1.Text == "Automatic")
+ MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text == "6 Channel Discrete"))
{
drp_audbit_2.Items.Clear();
@@ -976,7 +1046,103 @@ namespace Handbrake drp_audbit_2.Items.Add("320");
drp_audbit_2.Items.Add("384");
}
+ else if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text != "6 Channel Discrete"))
+ {
+ drp_audbit_2.Items.Clear();
+ drp_audbit_2.Items.Add("32");
+ drp_audbit_2.Items.Add("40");
+ drp_audbit_2.Items.Add("48");
+ drp_audbit_2.Items.Add("56");
+ drp_audbit_2.Items.Add("64");
+ drp_audbit_2.Items.Add("80");
+ drp_audbit_2.Items.Add("86");
+ drp_audbit_2.Items.Add("112");
+ drp_audbit_2.Items.Add("128");
+ drp_audbit_2.Items.Add("160");
+ drp_audbit_2.Text = "160";
+ }
}
+ private void drp_audmix_3_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_audmix_2.Text == "Automatic")
+ MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
+ if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text == "6 Channel Discrete"))
+ {
+ drp_audbit_3.Items.Clear();
+ drp_audbit_3.Items.Add("32");
+ drp_audbit_3.Items.Add("40");
+ drp_audbit_3.Items.Add("48");
+ drp_audbit_3.Items.Add("56");
+ drp_audbit_3.Items.Add("64");
+ drp_audbit_3.Items.Add("80");
+ drp_audbit_3.Items.Add("86");
+ drp_audbit_3.Items.Add("112");
+ drp_audbit_3.Items.Add("128");
+ drp_audbit_3.Items.Add("160");
+ drp_audbit_3.Items.Add("192");
+ drp_audbit_3.Items.Add("224");
+ drp_audbit_3.Items.Add("256");
+ drp_audbit_3.Items.Add("320");
+ drp_audbit_3.Items.Add("384");
+ }
+ else if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text != "6 Channel Discrete"))
+ {
+ drp_audbit_3.Items.Clear();
+ drp_audbit_3.Items.Add("32");
+ drp_audbit_3.Items.Add("40");
+ drp_audbit_3.Items.Add("48");
+ drp_audbit_3.Items.Add("56");
+ drp_audbit_3.Items.Add("64");
+ drp_audbit_3.Items.Add("80");
+ drp_audbit_3.Items.Add("86");
+ drp_audbit_3.Items.Add("112");
+ drp_audbit_3.Items.Add("128");
+ drp_audbit_3.Items.Add("160");
+ drp_audbit_3.Text = "160";
+ }
+ }
+ private void drp_audmix_4_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_audmix_3.Text == "Automatic")
+ MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
+ if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text == "6 Channel Discrete"))
+ {
+ drp_audbit_4.Items.Clear();
+ drp_audbit_4.Items.Add("32");
+ drp_audbit_4.Items.Add("40");
+ drp_audbit_4.Items.Add("48");
+ drp_audbit_4.Items.Add("56");
+ drp_audbit_4.Items.Add("64");
+ drp_audbit_4.Items.Add("80");
+ drp_audbit_4.Items.Add("86");
+ drp_audbit_4.Items.Add("112");
+ drp_audbit_4.Items.Add("128");
+ drp_audbit_4.Items.Add("160");
+ drp_audbit_4.Items.Add("192");
+ drp_audbit_4.Items.Add("224");
+ drp_audbit_4.Items.Add("256");
+ drp_audbit_4.Items.Add("320");
+ drp_audbit_4.Items.Add("384");
+ }
+ else if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text != "6 Channel Discrete"))
+ {
+ drp_audbit_4.Items.Clear();
+ drp_audbit_4.Items.Add("32");
+ drp_audbit_4.Items.Add("40");
+ drp_audbit_4.Items.Add("48");
+ drp_audbit_4.Items.Add("56");
+ drp_audbit_4.Items.Add("64");
+ drp_audbit_4.Items.Add("80");
+ drp_audbit_4.Items.Add("86");
+ drp_audbit_4.Items.Add("112");
+ drp_audbit_4.Items.Add("128");
+ drp_audbit_4.Items.Add("160");
+ drp_audbit_4.Text = "160";
+ }
+ }
+
private void drp_audenc_1_SelectedIndexChanged(object sender, EventArgs e)
{
if (drp_audenc_1.Text == "AC3")
@@ -1051,9 +1217,9 @@ namespace Handbrake drp_audbit_2.Enabled = false;
drp_audsr_2.Enabled = false;
- drp_audmix_2.Text = "";
- drp_audbit_2.Text = "";
- drp_audsr_2.Text = "";
+ drp_audmix_2.Text = "Automatic";
+ drp_audbit_2.Text = "160";
+ drp_audsr_2.Text = "48";
}
else
{
@@ -1068,8 +1234,6 @@ namespace Handbrake drp_audbit_2.Text = "160";
drp_audsr_2.Text = "48";
}
-
-
}
if (drp_audenc_2.Text == "AAC")
@@ -1118,13 +1282,184 @@ namespace Handbrake drp_audbit_2.Items.Add("320");
}
}
- private void slider_drc_Scroll(object sender, EventArgs e)
+ private void drp_audenc_3_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_audenc_3.Text == "AC3")
+ {
+ drp_audmix_3.Enabled = false;
+ drp_audbit_3.Enabled = false;
+ drp_audsr_3.Enabled = false;
+
+ drp_audmix_3.Text = "Automatic";
+ drp_audbit_3.Text = "160";
+ drp_audsr_3.Text = "48";
+ }
+ else
+ {
+ // Just make sure not to re-enable the following boxes if the track above is none
+ if (drp_track2Audio.Text != "None")
+ {
+ drp_audmix_3.Enabled = true;
+ drp_audbit_3.Enabled = true;
+ drp_audsr_3.Enabled = true;
+
+ drp_audmix_3.Text = "Automatic";
+ drp_audbit_3.Text = "160";
+ drp_audsr_3.Text = "48";
+ }
+ }
+
+
+ if (drp_audenc_3.Text == "AAC")
+ {
+ drp_audmix_3.Items.Clear();
+ drp_audmix_3.Items.Add("Mono");
+ drp_audmix_3.Items.Add("Stereo");
+ drp_audmix_3.Items.Add("Dolby Surround");
+ drp_audmix_3.Items.Add("Dolby Pro Logic II");
+ drp_audmix_3.Items.Add("6 Channel Discrete");
+
+ drp_audbit_3.Items.Clear();
+ drp_audbit_3.Items.Add("32");
+ drp_audbit_3.Items.Add("40");
+ drp_audbit_3.Items.Add("48");
+ drp_audbit_3.Items.Add("56");
+ drp_audbit_3.Items.Add("64");
+ drp_audbit_3.Items.Add("80");
+ drp_audbit_3.Items.Add("86");
+ drp_audbit_3.Items.Add("112");
+ drp_audbit_3.Items.Add("128");
+ drp_audbit_3.Items.Add("160");
+
+ }
+ else
+ {
+ drp_audmix_3.Items.Clear();
+ drp_audmix_3.Items.Add("Stereo");
+ drp_audmix_3.Items.Add("Dolby Surround");
+ drp_audmix_3.Items.Add("Dolby Pro Logic II");
+
+ drp_audbit_3.Items.Clear();
+ drp_audbit_3.Items.Add("32");
+ drp_audbit_3.Items.Add("40");
+ drp_audbit_3.Items.Add("48");
+ drp_audbit_3.Items.Add("56");
+ drp_audbit_3.Items.Add("64");
+ drp_audbit_3.Items.Add("80");
+ drp_audbit_3.Items.Add("86");
+ drp_audbit_3.Items.Add("112");
+ drp_audbit_3.Items.Add("128");
+ drp_audbit_3.Items.Add("160");
+ drp_audbit_3.Items.Add("192");
+ drp_audbit_3.Items.Add("224");
+ drp_audbit_3.Items.Add("256");
+ drp_audbit_3.Items.Add("320");
+ }
+ }
+ private void drp_audenc_4_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (drp_audenc_4.Text == "AC3")
+ {
+ drp_audmix_4.Enabled = false;
+ drp_audbit_4.Enabled = false;
+ drp_audsr_4.Enabled = false;
+
+ drp_audmix_4.Text = "Automatic";
+ drp_audbit_4.Text = "160";
+ drp_audsr_4.Text = "48";
+ }
+ else
+ {
+ // Just make sure not to re-enable the following boxes if the track above is none
+ if (drp_track2Audio.Text != "None")
+ {
+ drp_audmix_4.Enabled = true;
+ drp_audbit_4.Enabled = true;
+ drp_audsr_4.Enabled = true;
+
+ drp_audmix_4.Text = "Automatic";
+ drp_audbit_4.Text = "160";
+ drp_audsr_4.Text = "48";
+ }
+ }
+
+
+ if (drp_audenc_4.Text == "AAC")
+ {
+ drp_audmix_4.Items.Clear();
+ drp_audmix_4.Items.Add("Mono");
+ drp_audmix_4.Items.Add("Stereo");
+ drp_audmix_4.Items.Add("Dolby Surround");
+ drp_audmix_4.Items.Add("Dolby Pro Logic II");
+ drp_audmix_4.Items.Add("6 Channel Discrete");
+
+ drp_audbit_4.Items.Clear();
+ drp_audbit_4.Items.Add("32");
+ drp_audbit_4.Items.Add("40");
+ drp_audbit_4.Items.Add("48");
+ drp_audbit_4.Items.Add("56");
+ drp_audbit_4.Items.Add("64");
+ drp_audbit_4.Items.Add("80");
+ drp_audbit_4.Items.Add("86");
+ drp_audbit_4.Items.Add("112");
+ drp_audbit_4.Items.Add("128");
+ drp_audbit_4.Items.Add("160");
+
+ }
+ else
+ {
+ drp_audmix_4.Items.Clear();
+ drp_audmix_4.Items.Add("Stereo");
+ drp_audmix_4.Items.Add("Dolby Surround");
+ drp_audmix_4.Items.Add("Dolby Pro Logic II");
+
+ drp_audbit_4.Items.Clear();
+ drp_audbit_4.Items.Add("32");
+ drp_audbit_4.Items.Add("40");
+ drp_audbit_4.Items.Add("48");
+ drp_audbit_4.Items.Add("56");
+ drp_audbit_4.Items.Add("64");
+ drp_audbit_4.Items.Add("80");
+ drp_audbit_4.Items.Add("86");
+ drp_audbit_4.Items.Add("112");
+ drp_audbit_4.Items.Add("128");
+ drp_audbit_4.Items.Add("160");
+ drp_audbit_4.Items.Add("192");
+ drp_audbit_4.Items.Add("224");
+ drp_audbit_4.Items.Add("256");
+ drp_audbit_4.Items.Add("320");
+ }
+ }
+
+ private void trackBar1_Scroll(object sender, EventArgs e)
+ {
+ double value = trackBar1.Value / 10.0;
+ value++;
+
+ lbl_drc1.Text = value.ToString();
+ }
+ private void trackBar2_Scroll(object sender, EventArgs e)
+ {
+ double value = trackBar2.Value / 10.0;
+ value++;
+
+ lbl_drc2.Text = value.ToString();
+ }
+ private void trackBar3_Scroll(object sender, EventArgs e)
+ {
+ double value = trackBar3.Value / 10.0;
+ value++;
+
+ lbl_drc3.Text = value.ToString();
+ }
+ private void trackBar4_Scroll(object sender, EventArgs e)
{
- double value = slider_drc.Value / 10.0;
+ double value = trackBar4.Value / 10.0;
value++;
- lbl_drc.Text = value.ToString();
+ lbl_drc4.Text = value.ToString();
}
+
private void drp_subtitle_SelectedIndexChanged(object sender, EventArgs e)
{
if (drp_subtitle.Text.Contains("None"))
@@ -1413,6 +1748,16 @@ namespace Handbrake drp_audenc_2.Items.Add("AAC");
if (drp_audenc_2.Enabled)
drp_audenc_2.SelectedIndex = 0;
+
+ drp_audenc_3.Items.Clear();
+ drp_audenc_3.Items.Add("AAC");
+ if (drp_audenc_3.Enabled)
+ drp_audenc_3.SelectedIndex = 0;
+
+ drp_audenc_4.Items.Clear();
+ drp_audenc_4.Items.Add("AAC");
+ if (drp_audenc_4.Enabled)
+ drp_audenc_4.SelectedIndex = 0;
}
else if (path.EndsWith(".avi"))
{
@@ -1426,6 +1771,18 @@ namespace Handbrake drp_audenc_2.Items.Add("AC3");
if (drp_audenc_2.Enabled)
drp_audenc_2.SelectedIndex = 0;
+
+ drp_audenc_3.Items.Clear();
+ drp_audenc_3.Items.Add("MP3");
+ drp_audenc_3.Items.Add("AC3");
+ if (drp_audenc_3.Enabled)
+ drp_audenc_3.SelectedIndex = 0;
+
+ drp_audenc_4.Items.Clear();
+ drp_audenc_4.Items.Add("MP3");
+ drp_audenc_4.Items.Add("AC3");
+ if (drp_audenc_4.Enabled)
+ drp_audenc_4.SelectedIndex = 0;
}
else if (path.EndsWith(".ogm"))
{
@@ -1437,6 +1794,16 @@ namespace Handbrake drp_audenc_2.Items.Add("Vorbis");
if (drp_audenc_2.Enabled)
drp_audenc_2.SelectedIndex = 0;
+
+ drp_audenc_3.Items.Clear();
+ drp_audenc_3.Items.Add("Vorbis");
+ if (drp_audenc_3.Enabled)
+ drp_audenc_3.SelectedIndex = 0;
+
+ drp_audenc_4.Items.Clear();
+ drp_audenc_4.Items.Add("Vorbis");
+ if (drp_audenc_4.Enabled)
+ drp_audenc_4.SelectedIndex = 0;
}
else if (path.EndsWith(".mkv"))
{
@@ -1454,6 +1821,22 @@ namespace Handbrake drp_audenc_2.Items.Add("Vorbis");
if (drp_audenc_2.Enabled)
drp_audenc_2.SelectedIndex = 0;
+
+ drp_audenc_3.Items.Clear();
+ drp_audenc_3.Items.Add("AAC");
+ drp_audenc_3.Items.Add("MP3");
+ drp_audenc_3.Items.Add("AC3");
+ drp_audenc_3.Items.Add("Vorbis");
+ if (drp_audenc_3.Enabled)
+ drp_audenc_3.SelectedIndex = 0;
+
+ drp_audenc_4.Items.Clear();
+ drp_audenc_4.Items.Add("AAC");
+ drp_audenc_4.Items.Add("MP3");
+ drp_audenc_4.Items.Add("AC3");
+ drp_audenc_4.Items.Add("Vorbis");
+ if (drp_audenc_4.Enabled)
+ drp_audenc_4.SelectedIndex = 0;
}
}
@@ -1649,11 +2032,7 @@ namespace Handbrake }
#endregion
-
-
-
-
-
+
// This is the END of the road ------------------------------------------------------------------------------
}
}
\ No newline at end of file |