From 9f58e030756891595181fa7d48e38cb647ced5f3 Mon Sep 17 00:00:00 2001 From: jdpurcell Date: Sun, 19 Oct 2008 17:58:48 +0000 Subject: [PATCH] Can be compiled with only WAV support (since Mono doesn't support C++/CLI yet). Adjusted control spacing, tab-order, etc. Set Localizable=True on all forms to work around .NET auto-scaling issue. --- CUETools/frmCUETools.resx | 138 +- CUETools/frmFilenameCorrector.Designer.cs | 12 +- CUETools/frmFilenameCorrector.resx | 51 + CUETools/frmReport.Designer.cs | 50 +- CUETools/frmReport.cs | 4 +- CUETools/frmReport.resx | 90 ++ CUETools/frmSettings.Designer.cs | 265 +--- CUETools/frmSettings.resx | 1551 +++++++++++++++++++++ CUEToolsLib/AudioReadWrite.cs | 10 + CUEToolsLib/Main.cs | 8 + 10 files changed, 1857 insertions(+), 322 deletions(-) diff --git a/CUETools/frmCUETools.resx b/CUETools/frmCUETools.resx index 497f2a8..67d42ac 100644 --- a/CUETools/frmCUETools.resx +++ b/CUETools/frmCUETools.resx @@ -119,7 +119,7 @@ - 410, 290 + 412, 307 131, 23 @@ -144,10 +144,10 @@ 11 - 461, 49 + 452, 49 - 62, 23 + 71, 23 5 @@ -168,10 +168,10 @@ 0 - 461, 20 + 452, 20 - 62, 23 + 71, 23 2 @@ -249,7 +249,7 @@ 59, 48 - 396, 21 + 385, 21 4 @@ -270,7 +270,7 @@ 59, 22 - 396, 21 + 385, 21 1 @@ -288,10 +288,10 @@ 5 - 12, 2 + 8, 4 - 534, 84 + 535, 84 0 @@ -319,13 +319,13 @@ NoControl - 12, 19 + 11, 19 75, 17 - 4 + 0 &Embedded @@ -352,13 +352,13 @@ True - 12, 87 + 11, 87 92, 17 - 3 + 4 Gaps Left Out @@ -382,13 +382,13 @@ True - 12, 70 + 11, 70 104, 17 - 2 + 3 Gaps Prepended @@ -412,13 +412,13 @@ True - 12, 53 + 11, 53 101, 17 - 1 + 2 Gaps &Appended @@ -442,13 +442,13 @@ True - 12, 36 + 11, 36 106, 17 - 0 + 1 &Single File + CUE @@ -469,10 +469,10 @@ 4 - 114, 211 + 108, 211 - 119, 118 + 128, 119 3 @@ -493,13 +493,13 @@ 9 - 410, 135 + 412, 152 131, 23 - 9 + 10 About @@ -517,7 +517,7 @@ 8 - 144, 62 + 140, 62 178, 21 @@ -544,7 +544,7 @@ True - 11, 66 + 10, 66 119, 17 @@ -568,7 +568,7 @@ 1 - 144, 20 + 140, 20 178, 21 @@ -595,7 +595,7 @@ True - 11, 89 + 10, 89 59, 17 @@ -622,7 +622,7 @@ True - 12, 20 + 10, 20 125, 17 @@ -649,7 +649,7 @@ True - 12, 43 + 10, 43 122, 17 @@ -673,7 +673,7 @@ 5 - 144, 41 + 140, 41 178, 21 @@ -697,10 +697,10 @@ 6 - 12, 92 + 8, 92 - 328, 113 + 330, 115 1 @@ -724,13 +724,13 @@ True - 11, 51 + 10, 51 44, 17 - 7 + 2 APE @@ -751,13 +751,13 @@ True - 11, 85 + 10, 85 50, 17 - 6 + 4 &None @@ -781,13 +781,13 @@ True - 11, 34 + 10, 34 69, 17 - 3 + 1 Wav&Pack @@ -808,13 +808,13 @@ True - 11, 17 + 10, 17 50, 17 - 2 + 0 &FLAC @@ -835,13 +835,13 @@ True - 11, 68 + 10, 68 48, 17 - 1 + 3 &WAV @@ -859,10 +859,10 @@ 4 - 12, 211 + 8, 211 - 96, 118 + 92, 119 2 @@ -883,7 +883,7 @@ 6 - 410, 259 + 412, 276 131, 23 @@ -907,7 +907,7 @@ 5 - 410, 228 + 412, 245 131, 23 @@ -931,13 +931,13 @@ 4 - 410, 166 + 412, 183 131, 23 - 8 + 9 Advanced Settings... @@ -958,16 +958,16 @@ True - 6, 89 + 8, 89 - 57, 13 + 61, 13 - 5 + 3 - Data track + Data track: label1 @@ -982,7 +982,7 @@ 0 - 68, 86 + 78, 86 00:00:00 @@ -991,7 +991,7 @@ 0 - 53, 21 + 54, 21 4 @@ -1015,13 +1015,13 @@ True - 8, 20 + 10, 20 120, 17 - 3 + 0 Verify, &then encode @@ -1045,13 +1045,13 @@ True - 8, 54 + 10, 54 122, 17 - 1 + 2 &Verify, don't encode @@ -1075,13 +1075,13 @@ True - 8, 37 + 10, 37 123, 17 - 0 + 1 &Don't verify, encode @@ -1102,13 +1102,13 @@ 4 - 238, 211 + 244, 211 - 144, 118 + 144, 119 - 11 + 4 AccurateRip @@ -1129,7 +1129,7 @@ 0, 339 - 254, 17 + 252, 17 MiddleLeft @@ -1150,10 +1150,10 @@ 0, 339 - 553, 22 + 551, 22 - 14 + 11 statusStrip1 @@ -1174,13 +1174,13 @@ NoControl - 410, 197 + 412, 214 131, 23 - 15 + 8 CUE Sheet Creator... @@ -1204,7 +1204,7 @@ 6, 13 - 553, 361 + 551, 361 Tahoma, 8.25pt diff --git a/CUETools/frmFilenameCorrector.Designer.cs b/CUETools/frmFilenameCorrector.Designer.cs index 6d21892..e52e273 100644 --- a/CUETools/frmFilenameCorrector.Designer.cs +++ b/CUETools/frmFilenameCorrector.Designer.cs @@ -29,26 +29,18 @@ namespace JDP { // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(8, 8); + resources.ApplyResources(this.lblDescription, "lblDescription"); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(272, 144); - this.lblDescription.TabIndex = 0; - this.lblDescription.Text = resources.GetString("lblDescription.Text"); - this.lblDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // frmFilenameCorrector // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(286, 159); this.Controls.Add(this.lblDescription); - this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.Name = "frmFilenameCorrector"; - this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; - this.Text = "Filename Corrector"; this.TopMost = true; this.DragDrop += new System.Windows.Forms.DragEventHandler(this.frmFilenameCorrector_DragDrop); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.frmFilenameCorrector_DragEnter); diff --git a/CUETools/frmFilenameCorrector.resx b/CUETools/frmFilenameCorrector.resx index a2d1ab4..5cd3924 100644 --- a/CUETools/frmFilenameCorrector.resx +++ b/CUETools/frmFilenameCorrector.resx @@ -117,7 +117,58 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8, 8 + + + 272, 144 + + + + 0 + Drop CUE sheets here to correct the audio filenames contained inside. The audio files must be located in the same folder as the CUE sheet. The number of audio files in that folder must match the number of files referenced by the CUE sheet. The audio files must be named such that when sorted they are in order by track number. To correct multiple CUE sheets at once, you can drop the search results for *.cue. + + MiddleLeft + + + lblDescription + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 286, 159 + + + Tahoma, 8.25pt + + + + Manual + + + Filename Corrector + + + frmFilenameCorrector + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/CUETools/frmReport.Designer.cs b/CUETools/frmReport.Designer.cs index 4f44c7f..ede315d 100644 --- a/CUETools/frmReport.Designer.cs +++ b/CUETools/frmReport.Designer.cs @@ -28,44 +28,36 @@ namespace JDP /// private void InitializeComponent() { - this.button1 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmReport)); + this.btnClose = new System.Windows.Forms.Button(); + this.txtReport = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // - // button1 + // btnClose // - this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button1.Location = new System.Drawing.Point(254, 322); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Close"; - this.button1.UseVisualStyleBackColor = true; + resources.ApplyResources(this.btnClose, "btnClose"); + this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnClose.Name = "btnClose"; + this.btnClose.UseVisualStyleBackColor = true; // - // textBox1 + // txtReport // - this.textBox1.BackColor = System.Drawing.SystemColors.Control; - this.textBox1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.textBox1.Location = new System.Drawing.Point(21, 16); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox1.Size = new System.Drawing.Size(540, 287); - this.textBox1.TabIndex = 1; + resources.ApplyResources(this.txtReport, "txtReport"); + this.txtReport.BackColor = System.Drawing.SystemColors.Control; + this.txtReport.Name = "txtReport"; + this.txtReport.ReadOnly = true; // // frmReport // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.button1; - this.ClientSize = new System.Drawing.Size(582, 357); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.button1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.CancelButton = this.btnClose; + this.Controls.Add(this.txtReport); + this.Controls.Add(this.btnClose); this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "frmReport"; - this.Text = "Status report"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.ResumeLayout(false); this.PerformLayout(); @@ -73,7 +65,7 @@ namespace JDP #endregion - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Button btnClose; + private System.Windows.Forms.TextBox txtReport; } } \ No newline at end of file diff --git a/CUETools/frmReport.cs b/CUETools/frmReport.cs index 64dfab0..ebc044c 100644 --- a/CUETools/frmReport.cs +++ b/CUETools/frmReport.cs @@ -14,8 +14,8 @@ namespace JDP InitializeComponent(); } public string Message { - get { return textBox1.Text; } - set { textBox1.Text = value; } + get { return txtReport.Text; } + set { txtReport.Text = value; } } } } \ No newline at end of file diff --git a/CUETools/frmReport.resx b/CUETools/frmReport.resx index ff31a6d..f3ab568 100644 --- a/CUETools/frmReport.resx +++ b/CUETools/frmReport.resx @@ -117,4 +117,94 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom + + + + 243, 345 + + + 70, 23 + + + + 0 + + + Close + + + btnClose + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Bottom, Left, Right + + + Courier New, 8.25pt + + + 8, 8 + + + True + + + Vertical + + + 540, 327 + + + 1 + + + txtReport + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 556, 376 + + + Tahoma, 8.25pt + + + 400, 300 + + + Manual + + + Status Report + + + frmReport + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/CUETools/frmSettings.Designer.cs b/CUETools/frmSettings.Designer.cs index 7a0b268..53294a5 100644 --- a/CUETools/frmSettings.Designer.cs +++ b/CUETools/frmSettings.Designer.cs @@ -25,7 +25,9 @@ namespace JDP { private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.Windows.Forms.Button btnCancel; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSettings)); this.grpGeneral = new System.Windows.Forms.GroupBox(); + this.chkFillUpCUE = new System.Windows.Forms.CheckBox(); this.chkEmbedLog = new System.Windows.Forms.CheckBox(); this.numericWriteOffset = new System.Windows.Forms.NumericUpDown(); this.chkAutoCorrectFilenames = new System.Windows.Forms.CheckBox(); @@ -66,7 +68,6 @@ namespace JDP { this.lblTrackFilenameFormat = new System.Windows.Forms.Label(); this.lblSingleFilenameFormat = new System.Windows.Forms.Label(); this.txtSingleFilenameFormat = new System.Windows.Forms.TextBox(); - this.chkFillUpCUE = new System.Windows.Forms.CheckBox(); btnCancel = new System.Windows.Forms.Button(); this.grpGeneral.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit(); @@ -85,11 +86,8 @@ namespace JDP { // btnCancel // btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - btnCancel.Location = new System.Drawing.Point(267, 373); + resources.ApplyResources(btnCancel, "btnCancel"); btnCancel.Name = "btnCancel"; - btnCancel.Size = new System.Drawing.Size(73, 23); - btnCancel.TabIndex = 5; - btnCancel.Text = "Cancel"; btnCancel.UseVisualStyleBackColor = true; // // grpGeneral @@ -100,27 +98,26 @@ namespace JDP { this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames); this.grpGeneral.Controls.Add(this.chkPreserveHTOA); this.grpGeneral.Controls.Add(this.lblWriteOffset); - this.grpGeneral.Location = new System.Drawing.Point(8, 4); + resources.ApplyResources(this.grpGeneral, "grpGeneral"); this.grpGeneral.Name = "grpGeneral"; - this.grpGeneral.Size = new System.Drawing.Size(246, 144); - this.grpGeneral.TabIndex = 0; this.grpGeneral.TabStop = false; - this.grpGeneral.Text = "General"; + // + // chkFillUpCUE + // + resources.ApplyResources(this.chkFillUpCUE, "chkFillUpCUE"); + this.chkFillUpCUE.Name = "chkFillUpCUE"; + this.chkFillUpCUE.UseVisualStyleBackColor = true; // // chkEmbedLog // - this.chkEmbedLog.AutoSize = true; - this.chkEmbedLog.Location = new System.Drawing.Point(12, 78); + resources.ApplyResources(this.chkEmbedLog, "chkEmbedLog"); this.chkEmbedLog.Name = "chkEmbedLog"; - this.chkEmbedLog.Size = new System.Drawing.Size(134, 17); - this.chkEmbedLog.TabIndex = 6; - this.chkEmbedLog.Text = "Embed log file as a tag"; - this.toolTip1.SetToolTip(this.chkEmbedLog, "File should be in the same directory as source file and have a .log extension"); + this.toolTip1.SetToolTip(this.chkEmbedLog, resources.GetString("chkEmbedLog.ToolTip")); this.chkEmbedLog.UseVisualStyleBackColor = true; // // numericWriteOffset // - this.numericWriteOffset.Location = new System.Drawing.Point(133, 20); + resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset"); this.numericWriteOffset.Maximum = new decimal(new int[] { 5000, 0, @@ -132,63 +129,43 @@ namespace JDP { 0, -2147483648}); this.numericWriteOffset.Name = "numericWriteOffset"; - this.numericWriteOffset.Size = new System.Drawing.Size(62, 21); - this.numericWriteOffset.TabIndex = 5; - this.numericWriteOffset.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // chkAutoCorrectFilenames // - this.chkAutoCorrectFilenames.Location = new System.Drawing.Point(12, 61); + resources.ApplyResources(this.chkAutoCorrectFilenames, "chkAutoCorrectFilenames"); this.chkAutoCorrectFilenames.Name = "chkAutoCorrectFilenames"; - this.chkAutoCorrectFilenames.Size = new System.Drawing.Size(232, 17); - this.chkAutoCorrectFilenames.TabIndex = 3; - this.chkAutoCorrectFilenames.Text = "Locate audio files if missing"; - this.toolTip1.SetToolTip(this.chkAutoCorrectFilenames, "Preprocess with filename corrector if unable to locate audio files"); + this.toolTip1.SetToolTip(this.chkAutoCorrectFilenames, resources.GetString("chkAutoCorrectFilenames.ToolTip")); this.chkAutoCorrectFilenames.UseVisualStyleBackColor = true; // // chkPreserveHTOA // - this.chkPreserveHTOA.AutoSize = true; - this.chkPreserveHTOA.Location = new System.Drawing.Point(12, 44); + resources.ApplyResources(this.chkPreserveHTOA, "chkPreserveHTOA"); this.chkPreserveHTOA.Name = "chkPreserveHTOA"; - this.chkPreserveHTOA.Size = new System.Drawing.Size(229, 17); - this.chkPreserveHTOA.TabIndex = 2; - this.chkPreserveHTOA.Text = "Preserve HTOA for gaps appended output"; this.chkPreserveHTOA.UseVisualStyleBackColor = true; // // lblWriteOffset // - this.lblWriteOffset.AutoSize = true; - this.lblWriteOffset.Location = new System.Drawing.Point(9, 23); + resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset"); this.lblWriteOffset.Name = "lblWriteOffset"; - this.lblWriteOffset.Size = new System.Drawing.Size(118, 13); - this.lblWriteOffset.TabIndex = 0; - this.lblWriteOffset.Text = "Write offset (samples):"; // // grpFLAC // this.grpFLAC.Controls.Add(this.numericFLACCompressionLevel); this.grpFLAC.Controls.Add(this.lblFLACCompressionLevel); this.grpFLAC.Controls.Add(this.chkFLACVerify); - this.grpFLAC.Location = new System.Drawing.Point(267, 282); + resources.ApplyResources(this.grpFLAC, "grpFLAC"); this.grpFLAC.Name = "grpFLAC"; - this.grpFLAC.Size = new System.Drawing.Size(259, 48); - this.grpFLAC.TabIndex = 1; this.grpFLAC.TabStop = false; - this.grpFLAC.Text = "FLAC"; // // numericFLACCompressionLevel // - this.numericFLACCompressionLevel.Location = new System.Drawing.Point(213, 15); + resources.ApplyResources(this.numericFLACCompressionLevel, "numericFLACCompressionLevel"); this.numericFLACCompressionLevel.Maximum = new decimal(new int[] { 8, 0, 0, 0}); this.numericFLACCompressionLevel.Name = "numericFLACCompressionLevel"; - this.numericFLACCompressionLevel.Size = new System.Drawing.Size(35, 21); - this.numericFLACCompressionLevel.TabIndex = 4; - this.numericFLACCompressionLevel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numericFLACCompressionLevel.Value = new decimal(new int[] { 5, 0, @@ -197,31 +174,20 @@ namespace JDP { // // lblFLACCompressionLevel // - this.lblFLACCompressionLevel.AutoSize = true; - this.lblFLACCompressionLevel.Location = new System.Drawing.Point(99, 17); + resources.ApplyResources(this.lblFLACCompressionLevel, "lblFLACCompressionLevel"); this.lblFLACCompressionLevel.Name = "lblFLACCompressionLevel"; - this.lblFLACCompressionLevel.Size = new System.Drawing.Size(97, 13); - this.lblFLACCompressionLevel.TabIndex = 0; - this.lblFLACCompressionLevel.Text = "Compression level:"; // // chkFLACVerify // - this.chkFLACVerify.AutoSize = true; - this.chkFLACVerify.Location = new System.Drawing.Point(12, 16); + resources.ApplyResources(this.chkFLACVerify, "chkFLACVerify"); this.chkFLACVerify.Name = "chkFLACVerify"; - this.chkFLACVerify.Size = new System.Drawing.Size(54, 17); - this.chkFLACVerify.TabIndex = 2; - this.chkFLACVerify.Text = "Verify"; this.chkFLACVerify.UseVisualStyleBackColor = true; // // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(185, 373); + resources.ApplyResources(this.btnOK, "btnOK"); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(73, 23); - this.btnOK.TabIndex = 3; - this.btnOK.Text = "OK"; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // @@ -233,16 +199,13 @@ namespace JDP { this.grpWavPack.Controls.Add(this.rbWVHigh); this.grpWavPack.Controls.Add(this.rbWVNormal); this.grpWavPack.Controls.Add(this.rbWVFast); - this.grpWavPack.Location = new System.Drawing.Point(267, 182); + resources.ApplyResources(this.grpWavPack, "grpWavPack"); this.grpWavPack.Name = "grpWavPack"; - this.grpWavPack.Size = new System.Drawing.Size(259, 94); - this.grpWavPack.TabIndex = 2; this.grpWavPack.TabStop = false; - this.grpWavPack.Text = "WavPack"; // // numWVExtraMode // - this.numWVExtraMode.Location = new System.Drawing.Point(212, 19); + resources.ApplyResources(this.numWVExtraMode, "numWVExtraMode"); this.numWVExtraMode.Maximum = new decimal(new int[] { 6, 0, @@ -254,8 +217,6 @@ namespace JDP { 0, 0}); this.numWVExtraMode.Name = "numWVExtraMode"; - this.numWVExtraMode.Size = new System.Drawing.Size(29, 21); - this.numWVExtraMode.TabIndex = 5; this.numWVExtraMode.Value = new decimal(new int[] { 1, 0, @@ -264,55 +225,35 @@ namespace JDP { // // chkWVExtraMode // - this.chkWVExtraMode.AutoSize = true; - this.chkWVExtraMode.Location = new System.Drawing.Point(94, 20); + resources.ApplyResources(this.chkWVExtraMode, "chkWVExtraMode"); this.chkWVExtraMode.Name = "chkWVExtraMode"; - this.chkWVExtraMode.Size = new System.Drawing.Size(112, 17); - this.chkWVExtraMode.TabIndex = 4; - this.chkWVExtraMode.Text = "Extra mode (1-6):"; this.chkWVExtraMode.UseVisualStyleBackColor = true; this.chkWVExtraMode.CheckedChanged += new System.EventHandler(this.chkWVExtraMode_CheckedChanged); // // rbWVVeryHigh // - this.rbWVVeryHigh.AutoSize = true; - this.rbWVVeryHigh.Location = new System.Drawing.Point(13, 70); + resources.ApplyResources(this.rbWVVeryHigh, "rbWVVeryHigh"); this.rbWVVeryHigh.Name = "rbWVVeryHigh"; - this.rbWVVeryHigh.Size = new System.Drawing.Size(71, 17); - this.rbWVVeryHigh.TabIndex = 3; - this.rbWVVeryHigh.Text = "Very High"; this.rbWVVeryHigh.UseVisualStyleBackColor = true; // // rbWVHigh // - this.rbWVHigh.AutoSize = true; - this.rbWVHigh.Location = new System.Drawing.Point(13, 53); + resources.ApplyResources(this.rbWVHigh, "rbWVHigh"); this.rbWVHigh.Name = "rbWVHigh"; - this.rbWVHigh.Size = new System.Drawing.Size(46, 17); - this.rbWVHigh.TabIndex = 1; - this.rbWVHigh.Text = "High"; this.rbWVHigh.UseVisualStyleBackColor = true; // // rbWVNormal // - this.rbWVNormal.AutoSize = true; + resources.ApplyResources(this.rbWVNormal, "rbWVNormal"); this.rbWVNormal.Checked = true; - this.rbWVNormal.Location = new System.Drawing.Point(13, 36); this.rbWVNormal.Name = "rbWVNormal"; - this.rbWVNormal.Size = new System.Drawing.Size(58, 17); - this.rbWVNormal.TabIndex = 2; this.rbWVNormal.TabStop = true; - this.rbWVNormal.Text = "Normal"; this.rbWVNormal.UseVisualStyleBackColor = true; // // rbWVFast // - this.rbWVFast.AutoSize = true; - this.rbWVFast.Location = new System.Drawing.Point(13, 19); + resources.ApplyResources(this.rbWVFast, "rbWVFast"); this.rbWVFast.Name = "rbWVFast"; - this.rbWVFast.Size = new System.Drawing.Size(46, 17); - this.rbWVFast.TabIndex = 0; - this.rbWVFast.Text = "Fast"; this.rbWVFast.UseVisualStyleBackColor = true; // // groupBox1 @@ -329,35 +270,23 @@ namespace JDP { this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.numFixWhenPercent); this.groupBox1.Controls.Add(this.chkArAddCRCs); - this.groupBox1.Location = new System.Drawing.Point(267, 4); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(259, 172); - this.groupBox1.TabIndex = 4; this.groupBox1.TabStop = false; - this.groupBox1.Text = "AccurateRip"; // // chkArFixOffset // - this.chkArFixOffset.AutoSize = true; + resources.ApplyResources(this.chkArFixOffset, "chkArFixOffset"); this.chkArFixOffset.Checked = true; this.chkArFixOffset.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArFixOffset.Location = new System.Drawing.Point(12, 105); this.chkArFixOffset.Name = "chkArFixOffset"; - this.chkArFixOffset.Size = new System.Drawing.Size(81, 17); - this.chkArFixOffset.TabIndex = 12; - this.chkArFixOffset.Text = "Fix offset if"; this.chkArFixOffset.UseVisualStyleBackColor = true; this.chkArFixOffset.CheckedChanged += new System.EventHandler(this.chkArFixOffset_CheckedChanged); // // label4 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(41, 68); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(121, 13); - this.label4.TabIndex = 11; - this.label4.Text = "% of verified tracks >="; // // numEncodeWhenPercent // @@ -366,15 +295,13 @@ namespace JDP { 0, 0, 0}); - this.numEncodeWhenPercent.Location = new System.Drawing.Point(168, 66); + resources.ApplyResources(this.numEncodeWhenPercent, "numEncodeWhenPercent"); this.numEncodeWhenPercent.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numEncodeWhenPercent.Name = "numEncodeWhenPercent"; - this.numEncodeWhenPercent.Size = new System.Drawing.Size(38, 21); - this.numEncodeWhenPercent.TabIndex = 10; this.numEncodeWhenPercent.Value = new decimal(new int[] { 100, 0, @@ -383,25 +310,18 @@ namespace JDP { // // label3 // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(62, 89); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(101, 13); - this.label3.TabIndex = 9; - this.label3.Text = "with confidence >="; // // numEncodeWhenConfidence // - this.numEncodeWhenConfidence.Location = new System.Drawing.Point(168, 87); + resources.ApplyResources(this.numEncodeWhenConfidence, "numEncodeWhenConfidence"); this.numEncodeWhenConfidence.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numEncodeWhenConfidence.Name = "numEncodeWhenConfidence"; - this.numEncodeWhenConfidence.Size = new System.Drawing.Size(38, 21); - this.numEncodeWhenConfidence.TabIndex = 8; this.numEncodeWhenConfidence.Value = new decimal(new int[] { 1, 0, @@ -410,50 +330,35 @@ namespace JDP { // // chkArNoUnverifiedAudio // - this.chkArNoUnverifiedAudio.AutoSize = true; + resources.ApplyResources(this.chkArNoUnverifiedAudio, "chkArNoUnverifiedAudio"); this.chkArNoUnverifiedAudio.Checked = true; this.chkArNoUnverifiedAudio.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArNoUnverifiedAudio.Location = new System.Drawing.Point(12, 44); this.chkArNoUnverifiedAudio.Name = "chkArNoUnverifiedAudio"; - this.chkArNoUnverifiedAudio.Size = new System.Drawing.Size(93, 17); - this.chkArNoUnverifiedAudio.TabIndex = 7; - this.chkArNoUnverifiedAudio.Text = "Encode only if"; this.chkArNoUnverifiedAudio.UseVisualStyleBackColor = true; this.chkArNoUnverifiedAudio.CheckedChanged += new System.EventHandler(this.chkArNoUnverifiedAudio_CheckedChanged); // // chkArSaveLog // - this.chkArSaveLog.AutoSize = true; + resources.ApplyResources(this.chkArSaveLog, "chkArSaveLog"); this.chkArSaveLog.Checked = true; this.chkArSaveLog.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArSaveLog.Location = new System.Drawing.Point(94, 21); this.chkArSaveLog.Name = "chkArSaveLog"; - this.chkArSaveLog.Size = new System.Drawing.Size(69, 17); - this.chkArSaveLog.TabIndex = 6; - this.chkArSaveLog.Text = "Write log"; this.chkArSaveLog.UseVisualStyleBackColor = true; // // label2 // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(62, 146); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(101, 13); - this.label2.TabIndex = 5; - this.label2.Text = "with confidence >="; // // numFixWhenConfidence // - this.numFixWhenConfidence.Location = new System.Drawing.Point(168, 144); + resources.ApplyResources(this.numFixWhenConfidence, "numFixWhenConfidence"); this.numFixWhenConfidence.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numFixWhenConfidence.Name = "numFixWhenConfidence"; - this.numFixWhenConfidence.Size = new System.Drawing.Size(37, 21); - this.numFixWhenConfidence.TabIndex = 4; this.numFixWhenConfidence.Value = new decimal(new int[] { 1, 0, @@ -462,13 +367,8 @@ namespace JDP { // // label1 // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(42, 125); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(121, 13); - this.label1.TabIndex = 3; - this.label1.Text = "% of verified tracks >="; // // numFixWhenPercent // @@ -477,15 +377,13 @@ namespace JDP { 0, 0, 0}); - this.numFixWhenPercent.Location = new System.Drawing.Point(168, 123); + resources.ApplyResources(this.numFixWhenPercent, "numFixWhenPercent"); this.numFixWhenPercent.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numFixWhenPercent.Name = "numFixWhenPercent"; - this.numFixWhenPercent.Size = new System.Drawing.Size(38, 21); - this.numFixWhenPercent.TabIndex = 2; this.numFixWhenPercent.Value = new decimal(new int[] { 51, 0, @@ -494,17 +392,11 @@ namespace JDP { // // chkArAddCRCs // - this.chkArAddCRCs.AutoSize = true; + resources.ApplyResources(this.chkArAddCRCs, "chkArAddCRCs"); this.chkArAddCRCs.Checked = true; this.chkArAddCRCs.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArAddCRCs.Location = new System.Drawing.Point(12, 21); this.chkArAddCRCs.Name = "chkArAddCRCs"; - this.chkArAddCRCs.Size = new System.Drawing.Size(76, 17); - this.chkArAddCRCs.TabIndex = 1; - this.chkArAddCRCs.Text = "Write tags"; - this.toolTip1.SetToolTip(this.chkArAddCRCs, "When using \"apply offset\" AccurateRip mode, also add ACCURATERIPCOUNT tag to flac" + - " files. You can set up foobar2000 to show this value, and see if your music was " + - "ripped correctly or how popular it is."); + this.toolTip1.SetToolTip(this.chkArAddCRCs, resources.GetString("chkArAddCRCs.ToolTip")); this.chkArAddCRCs.UseVisualStyleBackColor = true; // // toolTip1 @@ -523,113 +415,65 @@ namespace JDP { this.grpAudioFilenames.Controls.Add(this.lblTrackFilenameFormat); this.grpAudioFilenames.Controls.Add(this.lblSingleFilenameFormat); this.grpAudioFilenames.Controls.Add(this.txtSingleFilenameFormat); - this.grpAudioFilenames.Location = new System.Drawing.Point(12, 150); + resources.ApplyResources(this.grpAudioFilenames, "grpAudioFilenames"); this.grpAudioFilenames.Name = "grpAudioFilenames"; - this.grpAudioFilenames.Size = new System.Drawing.Size(246, 180); - this.grpAudioFilenames.TabIndex = 6; this.grpAudioFilenames.TabStop = false; - this.grpAudioFilenames.Text = "Audio Filenames"; // // chkKeepOriginalFilenames // - this.chkKeepOriginalFilenames.AutoSize = true; + resources.ApplyResources(this.chkKeepOriginalFilenames, "chkKeepOriginalFilenames"); this.chkKeepOriginalFilenames.Checked = true; this.chkKeepOriginalFilenames.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkKeepOriginalFilenames.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.chkKeepOriginalFilenames.Location = new System.Drawing.Point(12, 20); this.chkKeepOriginalFilenames.Name = "chkKeepOriginalFilenames"; - this.chkKeepOriginalFilenames.Size = new System.Drawing.Size(135, 17); - this.chkKeepOriginalFilenames.TabIndex = 0; - this.chkKeepOriginalFilenames.Text = "Keep original filenames"; this.chkKeepOriginalFilenames.UseVisualStyleBackColor = true; // // txtSpecialExceptions // - this.txtSpecialExceptions.Location = new System.Drawing.Point(92, 123); + resources.ApplyResources(this.txtSpecialExceptions, "txtSpecialExceptions"); this.txtSpecialExceptions.Name = "txtSpecialExceptions"; - this.txtSpecialExceptions.Size = new System.Drawing.Size(136, 21); - this.txtSpecialExceptions.TabIndex = 6; - this.txtSpecialExceptions.Text = "-()"; // // chkRemoveSpecial // - this.chkRemoveSpecial.AutoSize = true; + resources.ApplyResources(this.chkRemoveSpecial, "chkRemoveSpecial"); this.chkRemoveSpecial.Checked = true; this.chkRemoveSpecial.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRemoveSpecial.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.chkRemoveSpecial.Location = new System.Drawing.Point(12, 100); this.chkRemoveSpecial.Name = "chkRemoveSpecial"; - this.chkRemoveSpecial.Size = new System.Drawing.Size(194, 17); - this.chkRemoveSpecial.TabIndex = 5; - this.chkRemoveSpecial.Text = "Remove special characters except:"; this.chkRemoveSpecial.UseVisualStyleBackColor = true; // // chkReplaceSpaces // - this.chkReplaceSpaces.AutoSize = true; + resources.ApplyResources(this.chkReplaceSpaces, "chkReplaceSpaces"); this.chkReplaceSpaces.Checked = true; this.chkReplaceSpaces.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkReplaceSpaces.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.chkReplaceSpaces.Location = new System.Drawing.Point(12, 150); this.chkReplaceSpaces.Name = "chkReplaceSpaces"; - this.chkReplaceSpaces.Size = new System.Drawing.Size(185, 17); - this.chkReplaceSpaces.TabIndex = 7; - this.chkReplaceSpaces.Text = "Replace spaces with underscores"; this.chkReplaceSpaces.UseVisualStyleBackColor = true; // // txtTrackFilenameFormat // - this.txtTrackFilenameFormat.Location = new System.Drawing.Point(92, 72); + resources.ApplyResources(this.txtTrackFilenameFormat, "txtTrackFilenameFormat"); this.txtTrackFilenameFormat.Name = "txtTrackFilenameFormat"; - this.txtTrackFilenameFormat.Size = new System.Drawing.Size(136, 21); - this.txtTrackFilenameFormat.TabIndex = 4; - this.txtTrackFilenameFormat.Text = "%N-%A-%T"; // // lblTrackFilenameFormat // - this.lblTrackFilenameFormat.AutoSize = true; - this.lblTrackFilenameFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lblTrackFilenameFormat.Location = new System.Drawing.Point(10, 76); + resources.ApplyResources(this.lblTrackFilenameFormat, "lblTrackFilenameFormat"); this.lblTrackFilenameFormat.Name = "lblTrackFilenameFormat"; - this.lblTrackFilenameFormat.Size = new System.Drawing.Size(72, 13); - this.lblTrackFilenameFormat.TabIndex = 3; - this.lblTrackFilenameFormat.Text = "Track format:"; // // lblSingleFilenameFormat // - this.lblSingleFilenameFormat.AutoSize = true; - this.lblSingleFilenameFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lblSingleFilenameFormat.Location = new System.Drawing.Point(10, 48); + resources.ApplyResources(this.lblSingleFilenameFormat, "lblSingleFilenameFormat"); this.lblSingleFilenameFormat.Name = "lblSingleFilenameFormat"; - this.lblSingleFilenameFormat.Size = new System.Drawing.Size(74, 13); - this.lblSingleFilenameFormat.TabIndex = 1; - this.lblSingleFilenameFormat.Text = "Single format:"; // // txtSingleFilenameFormat // - this.txtSingleFilenameFormat.Location = new System.Drawing.Point(92, 44); + resources.ApplyResources(this.txtSingleFilenameFormat, "txtSingleFilenameFormat"); this.txtSingleFilenameFormat.Name = "txtSingleFilenameFormat"; - this.txtSingleFilenameFormat.Size = new System.Drawing.Size(136, 21); - this.txtSingleFilenameFormat.TabIndex = 2; - this.txtSingleFilenameFormat.Text = "%F"; - // - // chkFillUpCUE - // - this.chkFillUpCUE.AutoSize = true; - this.chkFillUpCUE.Location = new System.Drawing.Point(12, 95); - this.chkFillUpCUE.Name = "chkFillUpCUE"; - this.chkFillUpCUE.Size = new System.Drawing.Size(187, 17); - this.chkFillUpCUE.TabIndex = 7; - this.chkFillUpCUE.Text = "Fill up missing CUE data from tags"; - this.chkFillUpCUE.UseVisualStyleBackColor = true; // // frmSettings // this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = btnCancel; - this.ClientSize = new System.Drawing.Size(540, 430); this.Controls.Add(this.grpAudioFilenames); this.Controls.Add(btnCancel); this.Controls.Add(this.groupBox1); @@ -637,12 +481,9 @@ namespace JDP { this.Controls.Add(this.btnOK); this.Controls.Add(this.grpFLAC); this.Controls.Add(this.grpGeneral); - this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.Name = "frmSettings"; - this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; - this.Text = "Advanced Settings"; this.Load += new System.EventHandler(this.frmSettings_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmSettings_FormClosing); this.grpGeneral.ResumeLayout(false); diff --git a/CUETools/frmSettings.resx b/CUETools/frmSettings.resx index cc681f1..0d00bba 100644 --- a/CUETools/frmSettings.resx +++ b/CUETools/frmSettings.resx @@ -120,7 +120,1558 @@ False + + + 270, 348 + + + 73, 23 + + + + 6 + + + Cancel + + + btnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + chkFillUpCUE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 0 + + + chkEmbedLog + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 1 + + + numericWriteOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 2 + + + chkAutoCorrectFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 3 + + + chkPreserveHTOA + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 4 + + + lblWriteOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 5 + + + 8, 4 + + + 252, 148 + + + 0 + + + General + + + grpGeneral + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 12, 95 + + + 187, 17 + + + 5 + + + Fill up missing CUE data from tags + + + chkFillUpCUE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 0 + 17, 17 + + True + + + 12, 78 + + + 134, 17 + + + 4 + + + Embed log file as a tag + + + File should be in the same directory as source file and have a .log extension + + + chkEmbedLog + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 1 + + + 133, 20 + + + 62, 21 + + + 1 + + + + Right + + + numericWriteOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 2 + + + True + + + 12, 61 + + + 155, 17 + + + 3 + + + Locate audio files if missing + + + Preprocess with filename corrector if unable to locate audio files + + + chkAutoCorrectFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 3 + + + True + + + 12, 44 + + + 229, 17 + + + 2 + + + Preserve HTOA for gaps appended output + + + chkPreserveHTOA + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 4 + + + True + + + 9, 23 + + + 118, 13 + + + 0 + + + Write offset (samples): + + + lblWriteOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 5 + + + numericFLACCompressionLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 0 + + + lblFLACCompressionLevel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 1 + + + chkFLACVerify + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 2 + + + 268, 284 + + + 256, 52 + + + 4 + + + FLAC + + + grpFLAC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 208, 20 + + + 36, 21 + + + 2 + + + Right + + + numericFLACCompressionLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 0 + + + True + + + 99, 22 + + + 97, 13 + + + 1 + + + Compression level: + + + lblFLACCompressionLevel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 1 + + + True + + + 12, 20 + + + 54, 17 + + + 0 + + + Verify + + + chkFLACVerify + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFLAC + + + 2 + + + 188, 348 + + + 73, 23 + + + 5 + + + OK + + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + numWVExtraMode + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 0 + + + chkWVExtraMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 1 + + + rbWVVeryHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 2 + + + rbWVHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 3 + + + rbWVNormal + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 4 + + + rbWVFast + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 5 + + + 268, 184 + + + 256, 96 + + + 3 + + + WavPack + + + grpWavPack + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 208, 19 + + + 36, 21 + + + 5 + + + Right + + + numWVExtraMode + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 0 + + + True + + + 92, 20 + + + 112, 17 + + + 4 + + + Extra mode (1-6): + + + chkWVExtraMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 1 + + + True + + + 13, 70 + + + 71, 17 + + + 3 + + + Very High + + + rbWVVeryHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 2 + + + True + + + 13, 53 + + + 46, 17 + + + 2 + + + High + + + rbWVHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 3 + + + True + + + 13, 36 + + + 58, 17 + + + 1 + + + Normal + + + rbWVNormal + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 4 + + + True + + + 13, 19 + + + 46, 17 + + + 0 + + + Fast + + + rbWVFast + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 5 + + + chkArFixOffset + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + numEncodeWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + numEncodeWhenConfidence + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + chkArNoUnverifiedAudio + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + chkArSaveLog + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + numFixWhenConfidence + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 9 + + + numFixWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 10 + + + chkArAddCRCs + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 + + + 268, 4 + + + 256, 176 + + + 2 + + + AccurateRip + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 12, 105 + + + 81, 17 + + + 7 + + + Fix offset if + + + chkArFixOffset + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + True + + + 38, 68 + + + 121, 13 + + + 3 + + + % of verified tracks >= + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 168, 66 + + + 38, 21 + + + 4 + + + numEncodeWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + True + + + 59, 89 + + + 101, 13 + + + 5 + + + with confidence >= + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + 168, 87 + + + 38, 21 + + + 6 + + + numEncodeWhenConfidence + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + True + + + 12, 44 + + + 93, 17 + + + 2 + + + Encode only if + + + chkArNoUnverifiedAudio + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + True + + + 94, 21 + + + 69, 17 + + + 1 + + + Write log + + + chkArSaveLog + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + True + + + 59, 146 + + + 101, 13 + + + 10 + + + with confidence >= + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + 168, 144 + + + 37, 21 + + + 11 + + + numFixWhenConfidence + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + True + + + 39, 125 + + + 121, 13 + + + 8 + + + % of verified tracks >= + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 9 + + + 168, 123 + + + 38, 21 + + + 9 + + + numFixWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 10 + + + True + + + 12, 21 + + + 76, 17 + + + 0 + + + Write tags + + + When using "apply offset" AccurateRip mode, also add ACCURATERIPCOUNT tag to flac files. You can set up foobar2000 to show this value, and see if your music was ripped correctly or how popular it is. + + + chkArAddCRCs + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 + + + 17, 17 + + + chkKeepOriginalFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 0 + + + txtSpecialExceptions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 1 + + + chkRemoveSpecial + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 2 + + + chkReplaceSpaces + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 3 + + + txtTrackFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 4 + + + lblTrackFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 5 + + + lblSingleFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 6 + + + txtSingleFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 7 + + + 8, 156 + + + 252, 180 + + + 1 + + + Audio Filenames + + + grpAudioFilenames + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + NoControl + + + 12, 20 + + + 135, 17 + + + 0 + + + Keep original filenames + + + chkKeepOriginalFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 0 + + + 92, 123 + + + 136, 21 + + + 6 + + + -() + + + txtSpecialExceptions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 1 + + + True + + + NoControl + + + 12, 100 + + + 194, 17 + + + 5 + + + Remove special characters except: + + + chkRemoveSpecial + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 2 + + + True + + + NoControl + + + 12, 150 + + + 185, 17 + + + 7 + + + Replace spaces with underscores + + + chkReplaceSpaces + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 3 + + + 92, 72 + + + 136, 21 + + + 4 + + + %N-%A-%T + + + txtTrackFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 4 + + + True + + + NoControl + + + 10, 76 + + + 72, 13 + + + 3 + + + Track format: + + + lblTrackFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 5 + + + True + + + NoControl + + + 10, 48 + + + 74, 13 + + + 1 + + + Single format: + + + lblSingleFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 6 + + + 92, 44 + + + 136, 21 + + + 2 + + + %F + + + txtSingleFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 7 + + + True + + + 6, 13 + + + 532, 379 + + + Tahoma, 8.25pt + + + Manual + + + Advanced Settings + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + frmSettings + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/CUEToolsLib/AudioReadWrite.cs b/CUEToolsLib/AudioReadWrite.cs index d4de66a..bd7f5f7 100644 --- a/CUEToolsLib/AudioReadWrite.cs +++ b/CUEToolsLib/AudioReadWrite.cs @@ -31,12 +31,14 @@ namespace CUEToolsLib { switch (Path.GetExtension(path).ToLower()) { case ".wav": return new WAVReader(path); +#if !MONO case ".flac": return new FLACReader(path); case ".wv": return new WavPackReader(path); case ".ape": return new APEReader(path); +#endif default: throw new Exception("Unsupported audio type."); } @@ -47,6 +49,7 @@ namespace CUEToolsLib { switch (Path.GetExtension(path).ToLower()) { case ".wav": dest = new WAVWriter(path, bitsPerSample, channelCount, sampleRate); break; +#if !MONO case ".flac": dest = new FLACWriter(path, bitsPerSample, channelCount, sampleRate); break; case ".wv": @@ -55,6 +58,7 @@ namespace CUEToolsLib { dest = new APEWriter(path, bitsPerSample, channelCount, sampleRate); break; case ".dummy": dest = new DummyWriter(path, bitsPerSample, channelCount, sampleRate); break; +#endif default: throw new Exception("Unsupported audio type."); } @@ -378,6 +382,7 @@ namespace CUEToolsLib { } } +#if !MONO class FLACReader : IAudioSource { FLACDotNet.FLACReader _flacReader; int[,] _sampleBuffer; @@ -588,7 +593,9 @@ namespace CUEToolsLib { _flacWriter.Write(_sampleBuffer, (int) sampleCount); } } +#endif +#if !MONO class APEReader : IAudioSource { APEDotNet.APEReader _apeReader; int[,] _sampleBuffer; @@ -785,7 +792,9 @@ namespace CUEToolsLib { _apeWriter.Write (buff, sampleCount); } } +#endif +#if !MONO class WavPackReader : IAudioSource { WavPackDotNet.WavPackReader _wavPackReader; @@ -965,4 +974,5 @@ namespace CUEToolsLib { _wavPackWriter.Write(_sampleBuffer, (int) sampleCount); } } +#endif } \ No newline at end of file diff --git a/CUEToolsLib/Main.cs b/CUEToolsLib/Main.cs index a2b53a8..3b04cee 100644 --- a/CUEToolsLib/Main.cs +++ b/CUEToolsLib/Main.cs @@ -1489,8 +1489,10 @@ namespace CUEToolsLib NameValueCollection tags = audioSource.Tags; CleanupTags(tags, "ACCURATERIP"); GenerateAccurateRipTags (tags, 0, bestOffset, -1); +#if !MONO if (audioSource is FLACReader) ((FLACReader)audioSource).UpdateTags(); +#endif audioSource.Close(); audioSource = null; } else if (_hasTrackFilenames) @@ -1499,6 +1501,7 @@ namespace CUEToolsLib { string src = _sourcePaths[iTrack + (_hasHTOAFilename ? 1 : 0)]; IAudioSource audioSource = AudioReadWrite.GetAudioSource(src); +#if !MONO if (audioSource is FLACReader) { NameValueCollection tags = audioSource.Tags; @@ -1506,6 +1509,7 @@ namespace CUEToolsLib GenerateAccurateRipTags (tags, 0, bestOffset, iTrack); ((FLACReader)audioSource).UpdateTags(); } +#endif audioSource.Close(); audioSource = null; } @@ -1679,6 +1683,7 @@ namespace CUEToolsLib if (audioDest != null) audioDest.Close(); iDest++; audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput); +#if !MONO if (audioDest is FLACWriter) { NameValueCollection destTags = new NameValueCollection(); @@ -1729,6 +1734,7 @@ namespace CUEToolsLib } ((FLACWriter)audioDest).SetTags(destTags); } +#endif } if ((style == CUEStyle.GapsAppended) && (iIndex == 0) && (iTrack == 0)) { @@ -1948,6 +1954,7 @@ namespace CUEToolsLib IAudioDest dest = AudioReadWrite.GetAudioDest(path, 16, 2, 44100, finalSampleCount); +#if !MONO if (dest is FLACWriter) { FLACWriter w = (FLACWriter)dest; w.CompressionLevel = (int) _config.flacCompressionLevel; @@ -1958,6 +1965,7 @@ namespace CUEToolsLib w.CompressionMode = _config.wvCompressionMode; w.ExtraMode = _config.wvExtraMode; } +#endif return dest; }