}\r
}\r
\r
+ private Boolean q_ipodAtom;\r
+ /// <summary>\r
+ /// Returns a boolean to indicate wither Larger MP4 files is on or off.\r
+ /// </summary>\r
+ public Boolean IpodAtom\r
+ {\r
+ get\r
+ {\r
+ return this.q_ipodAtom;\r
+ }\r
+ }\r
+\r
+ private Boolean q_optimizeMp4;\r
+ /// <summary>\r
+ /// Returns a boolean to indicate wither Larger MP4 files is on or off.\r
+ /// </summary>\r
+ public Boolean OptimizeMP4\r
+ {\r
+ get\r
+ {\r
+ return this.q_optimizeMp4;\r
+ }\r
+ }\r
+\r
private string q_videoFramerate;\r
/// <summary>\r
/// Returns a string with the video Framerate\r
Match turboFirstPass = Regex.Match(input, @"-T");\r
Match grayscale = Regex.Match(input, @"-g");\r
Match largerMp4 = Regex.Match(input, @"-4");\r
-\r
+ Match ipodAtom = Regex.Match(input, @"-I");\r
+ Match optimizeMP4 = Regex.Match(input, @"-O");\r
+ \r
//Audio Settings Tab\r
Match subtitles = Regex.Match(input, @"-s ([0-9]*)");\r
Match audioBitrate = Regex.Match(input, @"-B ([0-9]*)");\r
\r
thisQuery.q_source = source.ToString().Replace("-i ", "").Replace("\"", "");\r
if (title.Success != false)\r
- {\r
thisQuery.q_dvdTitle = int.Parse(title.ToString().Replace("-t ", ""));\r
- }\r
\r
if (chapters.Success != false)\r
{\r
}\r
\r
if (format.Success != false)\r
- {\r
- \r
thisQuery.q_format = format.ToString().Replace("-f ", "");\r
- }\r
+\r
#endregion\r
\r
//\r
\r
\r
if (width.Success != false)\r
- {\r
thisQuery.q_videoWidth = int.Parse(width.ToString().Replace("-w ", ""));\r
- }\r
+\r
if (height.Success != false)\r
- {\r
thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));\r
- }\r
+\r
#endregion\r
\r
//\r
thisQuery.q_turboFirst = turboFirstPass.Success;\r
thisQuery.q_largeMp4 = largerMp4.Success;\r
if (videoFramerate.Success != false)\r
- {\r
thisQuery.q_videoFramerate = videoFramerate.ToString().Replace("-r ", "");\r
- }\r
else\r
- {\r
thisQuery.q_videoFramerate = "Automatic";\r
- }\r
+\r
if (videoBitrate.Success != false)\r
- {\r
thisQuery.q_avgBitrate = videoBitrate.ToString().Replace("-b ", "");\r
- }\r
if (videoFilesize.Success != false)\r
- {\r
thisQuery.q_videoTargetSize = videoFilesize.ToString().Replace("-S ", "");\r
- }\r
\r
double qConvert = 0;\r
if (videoQuality.Success != false)\r
thisQuery.q_videoQuality = int.Parse(qConvert.ToString());\r
}\r
thisQuery.q_crf = CRF.Success;\r
+ thisQuery.q_ipodAtom = ipodAtom.Success;\r
+ thisQuery.q_optimizeMp4 = optimizeMP4.Success;\r
+\r
#endregion\r
\r
//\r
//\r
#region Audio\r
if (audioBitrate.Success != false)\r
- {\r
thisQuery.q_audioBitrate = audioBitrate.ToString().Replace("-B ", "");\r
- }\r
+\r
if (audioSampleRate.Success != false)\r
- {\r
thisQuery.q_audioSamplerate = audioSampleRate.ToString().Replace("-R ", "");\r
- }\r
+\r
if (audioChannel.Success != false)\r
- {\r
thisQuery.q_audioTrack1 = audioChannel.ToString().Replace("-a ", "");\r
- }\r
else\r
- {\r
thisQuery.q_audioTrack1 = "Automatic";\r
- }\r
\r
thisQuery.q_audioTrackMix = "Automatic";\r
if (audioChannelsMix.Success != false)\r
\r
}\r
if (subtitles.Success != false)\r
- {\r
thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");\r
- }\r
else\r
- {\r
thisQuery.q_subtitles = "None";\r
- }\r
+\r
#endregion\r
\r
//\r
this.Label32 = new System.Windows.Forms.Label();\r
this.Label18 = new System.Windows.Forms.Label();\r
this.TabPage3 = new System.Windows.Forms.TabPage();\r
+ this.lbl_ipodAtom = new System.Windows.Forms.Label();\r
+ this.label25 = new System.Windows.Forms.Label();\r
+ this.lbl_vfr = new System.Windows.Forms.Label();\r
this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
this.check_grayscale = new System.Windows.Forms.CheckBox();\r
this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
this.groupBox2 = new System.Windows.Forms.GroupBox();\r
this.treeView_presets = new System.Windows.Forms.TreeView();\r
- this.lbl_vfr = new System.Windows.Forms.Label();\r
+ this.lbl_optimize = new System.Windows.Forms.Label();\r
Label38 = new System.Windows.Forms.Label();\r
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
this.frmMainMenu.SuspendLayout();\r
"24",\r
"25",\r
"29.97"});\r
- this.drp_videoFramerate.Location = new System.Drawing.Point(133, 189);\r
+ this.drp_videoFramerate.Location = new System.Drawing.Point(446, 185);\r
this.drp_videoFramerate.Name = "drp_videoFramerate";\r
this.drp_videoFramerate.Size = new System.Drawing.Size(81, 21);\r
this.drp_videoFramerate.TabIndex = 7;\r
// TabPage3\r
// \r
this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
+ this.TabPage3.Controls.Add(this.lbl_optimize);\r
+ this.TabPage3.Controls.Add(this.lbl_ipodAtom);\r
+ this.TabPage3.Controls.Add(this.label25);\r
this.TabPage3.Controls.Add(this.lbl_vfr);\r
this.TabPage3.Controls.Add(this.check_iPodAtom);\r
this.TabPage3.Controls.Add(this.check_optimiseMP4);\r
this.TabPage3.TabIndex = 2;\r
this.TabPage3.Text = "Video Settings";\r
// \r
+ // lbl_ipodAtom\r
+ // \r
+ this.lbl_ipodAtom.AutoSize = true;\r
+ this.lbl_ipodAtom.BackColor = System.Drawing.Color.Transparent;\r
+ this.lbl_ipodAtom.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.lbl_ipodAtom.ForeColor = System.Drawing.Color.Red;\r
+ this.lbl_ipodAtom.Location = new System.Drawing.Point(132, 169);\r
+ this.lbl_ipodAtom.Name = "lbl_ipodAtom";\r
+ this.lbl_ipodAtom.Size = new System.Drawing.Size(91, 12);\r
+ this.lbl_ipodAtom.TabIndex = 29;\r
+ this.lbl_ipodAtom.Text = "x264 && mp4 only";\r
+ this.lbl_ipodAtom.Visible = false;\r
+ // \r
+ // label25\r
+ // \r
+ this.label25.AutoSize = true;\r
+ this.label25.BackColor = System.Drawing.Color.Transparent;\r
+ this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.label25.Location = new System.Drawing.Point(304, 164);\r
+ this.label25.Name = "label25";\r
+ this.label25.Size = new System.Drawing.Size(76, 13);\r
+ this.label25.TabIndex = 28;\r
+ this.label25.Text = "Framerate";\r
+ // \r
+ // lbl_vfr\r
+ // \r
+ this.lbl_vfr.AutoSize = true;\r
+ this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
+ this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.lbl_vfr.Location = new System.Drawing.Point(533, 189);\r
+ this.lbl_vfr.Name = "lbl_vfr";\r
+ this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
+ this.lbl_vfr.TabIndex = 27;\r
+ this.lbl_vfr.Text = "(VFR On)";\r
+ this.lbl_vfr.Visible = false;\r
+ // \r
// check_iPodAtom\r
// \r
this.check_iPodAtom.AutoSize = true;\r
- this.check_iPodAtom.BackColor = System.Drawing.Color.DarkRed;\r
+ this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.check_iPodAtom.Location = new System.Drawing.Point(16, 167);\r
this.check_iPodAtom.Name = "check_iPodAtom";\r
this.check_iPodAtom.TabIndex = 26;\r
this.check_iPodAtom.Text = "Add iPod Atom";\r
this.check_iPodAtom.UseVisualStyleBackColor = false;\r
+ this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
// \r
// check_optimiseMP4\r
// \r
this.check_optimiseMP4.AutoSize = true;\r
- this.check_optimiseMP4.BackColor = System.Drawing.Color.DarkRed;\r
+ this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.check_optimiseMP4.Location = new System.Drawing.Point(16, 144);\r
this.check_optimiseMP4.Name = "check_optimiseMP4";\r
this.check_optimiseMP4.TabIndex = 25;\r
this.check_optimiseMP4.Text = "Optimize MP4 for streaming";\r
this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
+ this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);\r
// \r
// check_grayscale\r
// \r
this.Label46.AutoSize = true;\r
this.Label46.BackColor = System.Drawing.Color.Transparent;\r
this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Label46.Location = new System.Drawing.Point(13, 192);\r
+ this.Label46.Location = new System.Drawing.Point(304, 188);\r
this.Label46.Name = "Label46";\r
this.Label46.Size = new System.Drawing.Size(107, 13);\r
this.Label46.TabIndex = 6;\r
this.treeView_presets.TabIndex = 2;\r
this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
// \r
- // lbl_vfr\r
+ // lbl_optimize\r
// \r
- this.lbl_vfr.AutoSize = true;\r
- this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
- this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.lbl_vfr.Location = new System.Drawing.Point(220, 193);\r
- this.lbl_vfr.Name = "lbl_vfr";\r
- this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
- this.lbl_vfr.TabIndex = 27;\r
- this.lbl_vfr.Text = "(VFR On)";\r
- this.lbl_vfr.Visible = false;\r
+ this.lbl_optimize.AutoSize = true;\r
+ this.lbl_optimize.BackColor = System.Drawing.Color.Transparent;\r
+ this.lbl_optimize.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.lbl_optimize.ForeColor = System.Drawing.Color.Red;\r
+ this.lbl_optimize.Location = new System.Drawing.Point(206, 146);\r
+ this.lbl_optimize.Name = "lbl_optimize";\r
+ this.lbl_optimize.Size = new System.Drawing.Size(91, 12);\r
+ this.lbl_optimize.TabIndex = 30;\r
+ this.lbl_optimize.Text = "x264 && mp4 only";\r
+ this.lbl_optimize.Visible = false;\r
// \r
// frmMain\r
// \r
internal System.Windows.Forms.CheckBox check_iPodAtom;\r
private System.Windows.Forms.CheckBox check_optimiseMP4;\r
internal System.Windows.Forms.Label lbl_vfr;\r
+ internal System.Windows.Forms.Label lbl_ipodAtom;\r
+ internal System.Windows.Forms.Label label25;\r
+ internal System.Windows.Forms.Label lbl_optimize;\r
\r
}\r
}
\ No newline at end of file
}\r
}\r
\r
+ private void check_iPodAtom_CheckedChanged(object sender, EventArgs e)\r
+ {\r
+ if (!text_destination.Text.Contains(".mp4"))\r
+ {\r
+ lbl_ipodAtom.Visible = true;\r
+ check_iPodAtom.CheckState = CheckState.Unchecked;\r
+ }\r
+ else\r
+ {\r
+ lbl_ipodAtom.Visible = false;\r
+ }\r
+ }\r
+\r
+ private void check_optimiseMP4_CheckedChanged(object sender, EventArgs e)\r
+ {\r
+ if (!text_destination.Text.Contains(".mp4"))\r
+ {\r
+ lbl_optimize.Visible = true;\r
+ check_optimiseMP4.CheckState = CheckState.Unchecked;\r
+ }\r
+ else\r
+ {\r
+ lbl_optimize.Visible = false;\r
+ }\r
+ }\r
+\r
private void drp_dvdtitle_Click(object sender, EventArgs e)\r
{\r
if (drp_dvdtitle.Items.Count == 0)\r
check_turbo.Enabled = false;\r
h264Tab.Enabled = false;\r
rtf_h264advanced.Text = "";\r
+ check_iPodAtom.Enabled = false;\r
+ check_iPodAtom.Checked = false;\r
+ lbl_ipodAtom.Visible = false;\r
}\r
else\r
{\r
check_turbo.Enabled = true;\r
}\r
h264Tab.Enabled = true;\r
+ check_iPodAtom.Enabled = true;\r
+ lbl_ipodAtom.Visible = false;\r
}\r
\r
}\r
string turboH264 = "";\r
string largeFile = "";\r
string denoise = "";\r
- string CRF = CheckCRF.CheckState.ToString();\r
+ string CRF = "";\r
+ string ipodAtom = "";\r
+ string optimizeMP4 = "";\r
\r
- if (CRF == "Checked")\r
+ if (CheckCRF.Checked)\r
CRF = " -Q ";\r
else\r
CRF = "";\r
break;\r
}\r
\r
- string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + largeFile + denoise;\r
+ if (check_iPodAtom.Checked)\r
+ ipodAtom = " -I ";\r
+\r
+ if (check_optimiseMP4.Checked)\r
+ optimizeMP4 = " -O ";\r
+\r
+\r
+ string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + ipodAtom + optimizeMP4 + largeFile + denoise;\r
#endregion\r
\r
// Audio Settings Tab\r
drp_videoEncoder.Text = presetQuery.VideoEncoder;\r
drp_audioCodec.Text = presetQuery.AudioEncoder;\r
if (presetQuery.Width != 0)\r
- {\r
text_width.Text = presetQuery.Width.ToString();\r
-\r
- }\r
else\r
{\r
text_width.Text = "";\r
}\r
\r
if (presetQuery.Height != 0)\r
- {\r
text_height.Text = presetQuery.Height.ToString();\r
- }\r
else\r
{\r
text_height.Text = "";\r
drp_deNoise.Text = presetQuery.DeNoise;\r
\r
if (presetQuery.DeTelecine == true)\r
- {\r
check_detelecine.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_detelecine.CheckState = CheckState.Unchecked;\r
- }\r
\r
\r
if (presetQuery.DeBlock == true)\r
- {\r
check_deblock.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_deblock.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.ChapterMarkers == true)\r
- {\r
Check_ChapterMarkers.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.Anamorphic == true)\r
- {\r
CheckPixelRatio.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
CheckPixelRatio.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.LooseAnamorphic == true)\r
- {\r
check_lAnamorphic.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_lAnamorphic.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.VFR == true)\r
- {\r
check_vfr.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_vfr.CheckState = CheckState.Unchecked;\r
- }\r
#endregion\r
\r
// Video Settings Tab\r
}\r
\r
if (presetQuery.TwoPass == true)\r
- {\r
check_2PassEncode.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_2PassEncode.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.Grayscale == true)\r
- {\r
check_grayscale.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_grayscale.CheckState = CheckState.Unchecked;\r
- }\r
\r
drp_videoFramerate.Text = presetQuery.VideoFramerate;\r
\r
if (presetQuery.TurboFirstPass == true)\r
- {\r
check_turbo.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_turbo.CheckState = CheckState.Unchecked;\r
- }\r
\r
if (presetQuery.LargeMP4 == true)\r
- {\r
check_largeFile.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
check_largeFile.CheckState = CheckState.Unchecked;\r
- }\r
+\r
if (presetQuery.CRF == true)\r
- {\r
CheckCRF.CheckState = CheckState.Checked;\r
- }\r
else\r
- {\r
CheckCRF.CheckState = CheckState.Unchecked;\r
- }\r
+\r
+ if (presetQuery.IpodAtom == true)\r
+ check_iPodAtom.CheckState = CheckState.Checked;\r
+ else\r
+ check_iPodAtom.CheckState = CheckState.Unchecked;\r
+\r
+ if (presetQuery.OptimizeMP4 == true)\r
+ check_optimiseMP4.CheckState = CheckState.Checked;\r
+ else\r
+ check_optimiseMP4.CheckState = CheckState.Unchecked;\r
+\r
#endregion\r
\r
// Audio Settings Tab\r
\r
#endregion\r
\r
+\r
// This is the END of the road ------------------------------------------------------------------------------\r
}\r
}
\ No newline at end of file
projects / handbrake / commitdiff