From 8b196650386d965c9a0a41ab2ae8ea60dc14478d Mon Sep 17 00:00:00 2001 From: chudov Date: Thu, 8 Sep 2011 18:25:54 +0000 Subject: [PATCH] * support for new metadata sources via CTDB * CUETools: GUI tweaks for large screen resolutions on windows 7 * CUETools.Codecs.LAMEEncoder: fix VBR header update for filenames with unicode characters * CUERipper: more string messages for SCSI errors when ripping --- Bwg.Scsi/Device.cs | 8 + Bwg.Scsi/Messages.resx | 53 +- Bwg.Scsi/Messages.ru-RU.resx | 42 + CUERipper/frmCUERipper.cs | 2 +- CUETools.AccurateRip/AccurateRip.cs | 45 +- .../FormMetadata.Designer.cs | 50 +- CUETools.CTDB.EACPlugin/FormMetadata.cs | 10 +- CUETools.CTDB.EACPlugin/FormMetadata.resx | 55 + CUETools.CTDB.EACPlugin/FormSubmitParity.cs | 2 +- CUETools.CTDB.EACPlugin/Metadata.cs | 4 +- CUETools.CTDB.EACPlugin/Options.Designer.cs | 288 +- CUETools.CTDB.EACPlugin/Options.cs | 73 +- CUETools.CTDB.EACPlugin/Plugin.cs | 4 +- CUETools.CTDB/CUEToolsDB.cs | 15 +- CUETools.Codecs.LAME/Encoder.cs | 9 +- CUETools.Processor/Processor.cs | 12 +- CUETools.Ripper.Console/Program.cs | 2 +- CUETools.Ripper.SCSI/Resource1.Designer.cs | 2 +- CUETools.Ripper.SCSI/SCSIDrive.cs | 2 +- CUETools/Resources/discogs.png | Bin 0 -> 424 bytes CUETools/frmCUETools.Designer.cs | 10 +- CUETools/frmCUETools.cs | 8 +- CUETools/frmCUETools.resx | 3283 +++++++++------- CUETools/frmChoice.Designer.cs | 194 +- CUETools/frmChoice.cs | 268 +- CUETools/frmChoice.resx | 589 +-- CUETools/frmSettings.Designer.cs | 5 +- CUETools/frmSettings.resx | 3386 +++++++---------- 28 files changed, 4316 insertions(+), 4105 deletions(-) create mode 100644 CUETools/Resources/discogs.png diff --git a/Bwg.Scsi/Device.cs b/Bwg.Scsi/Device.cs index e9ca210..a0b492e 100644 --- a/Bwg.Scsi/Device.cs +++ b/Bwg.Scsi/Device.cs @@ -690,6 +690,14 @@ namespace Bwg.Scsi #region Private Functions + public string GetErrorString() + { + string res = messages.GetString(string.Format("SCSISenseKey_{0:X2}", (int)this.GetSenseKey())) ?? this.GetSenseKey().ToString(); + if (this.GetSenseKey() == SenseKeyType.NoSense) + return res; + return res + ": " + Device.LookupSenseError(this.GetSenseAsc(), this.GetSenseAscq()); + } + /// /// Return a string associated with the ASC/ASCQ bytes /// diff --git a/Bwg.Scsi/Messages.resx b/Bwg.Scsi/Messages.resx index 99eb4de..250e2b0 100644 --- a/Bwg.Scsi/Messages.resx +++ b/Bwg.Scsi/Messages.resx @@ -127,11 +127,14 @@ NO INDEX/SECTOR SIGNAL - NO SEEK COMPLETE + no seek complete PERIPHERAL DEVICE WRITE FAULT + + NO SEEK COMPLETE + LOGICAL UNIT NOT READY, CAUSE NOT REPORTABLE @@ -310,13 +313,13 @@ CANNOT WRITE MEDIUM - UNSUPPORTED MEDIUM VERSION - MEDIUM NOT PRESENT + medium not present - MEDIUM NOT PRESENT - TRAY CLOSED + medium not present - tray closed - MEDIUM NOT PRESENT - TRAY OPEN + medium not present - tray open MEDIUM DESTINATION ELEMENT FULL @@ -489,6 +492,48 @@ RMA/PMA IS ALMOST FULL + + unknown error + + + recovered error + + + not ready + + + medium error + + + hardware error + + + illegal request + + + unit attention + + + data protect + + + blank check + + + vendor specific + + + copy aborted + + + aborted command + + + volume overflow + + + miscompare + NO SENSE STRING FOR diff --git a/Bwg.Scsi/Messages.ru-RU.resx b/Bwg.Scsi/Messages.ru-RU.resx index 3ac2d62..12c9db8 100644 --- a/Bwg.Scsi/Messages.ru-RU.resx +++ b/Bwg.Scsi/Messages.ru-RU.resx @@ -126,4 +126,46 @@ отсутствует носитель - лоток закрыт + + неизвестная ошибка + + + recovered error + + + устройство не готово + + + ошибка носителя + + + аппаратная ошибка + + + некорректный запрос + + + unit attention + + + data protect + + + blank check + + + vendor specific + + + copy aborted + + + aborted command + + + volume overflow + + + miscompare + \ No newline at end of file diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs index 4ac704e..e098e12 100644 --- a/CUERipper/frmCUERipper.cs +++ b/CUERipper/frmCUERipper.cs @@ -635,7 +635,7 @@ namespace CUERipper cueSheet.Action = CUEAction.Encode; this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " CTDB..."; }); - cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, CTDBPriority.High, CTDBPriority.Medium, CTDBPriority.Low); + cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, CTDBMetadataSearch.Default); cueSheet.CTDB.UploadHelper.onProgress += new EventHandler(UploadProgress); this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " AccurateRip..."; }); cueSheet.UseAccurateRip(); diff --git a/CUETools.AccurateRip/AccurateRip.cs b/CUETools.AccurateRip/AccurateRip.cs index 71780bf..af151dc 100644 --- a/CUETools.AccurateRip/AccurateRip.cs +++ b/CUETools.AccurateRip/AccurateRip.cs @@ -1124,16 +1124,17 @@ namespace CUETools.AccurateRip get { throw new Exception("unsupported"); } } - public void GenerateLog(TextWriter sw, int oi, bool v2) + public void GenerateLog(TextWriter sw, int oi) { uint maxTotal = 0; for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++) maxTotal = Math.Max(maxTotal, Total(iTrack)); - uint maxConf = 0; + uint maxConf = 0, maxConf2 = 0; for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++) { - uint crcOI = v2 ? CRCV2(iTrack) : CRC(iTrack, oi); + uint crcOI = CRC(iTrack, oi); + uint crcOI2 = CRCV2(iTrack); for (int di = 0; di < (int)AccDisks.Count; di++) { int trno = iTrack + _toc.FirstAudio - 1; @@ -1142,12 +1143,14 @@ namespace CUETools.AccurateRip && 0 != AccDisks[di].tracks[trno].CRC ) maxConf = Math.Max(maxConf, AccDisks[di].tracks[trno].count); + if (trno < AccDisks[di].tracks.Count + && 0 == oi + && crcOI2 == AccDisks[di].tracks[trno].CRC + && 0 != AccDisks[di].tracks[trno].CRC + ) + maxConf2 = Math.Max(maxConf, AccDisks[di].tracks[trno].count); } } - if (maxConf == 0 && v2) - return; - if (v2) - sw.WriteLine("AccurateRip v2:"); string ifmt = maxTotal < 10 ? ":0" : maxTotal < 100 ? ":00" : ":000"; //string ifmt = maxTotal < 10 ? ",1" : maxTotal < 100 ? ",2" : ",3"; for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++) @@ -1155,7 +1158,9 @@ namespace CUETools.AccurateRip uint count = 0; uint partials = 0; uint conf = 0; - uint crcOI = v2 ? CRCV2(iTrack) : CRC(iTrack, oi); + uint conf2 = 0; + uint crcOI = CRC(iTrack, oi); + uint crcOI2 = CRCV2(iTrack); uint crc450OI = CRC450(iTrack, oi); for (int di = 0; di < (int)AccDisks.Count; di++) { @@ -1166,20 +1171,29 @@ namespace CUETools.AccurateRip if (crcOI == AccDisks[di].tracks[trno].CRC && 0 != AccDisks[di].tracks[trno].CRC) conf += AccDisks[di].tracks[trno].count; + if (crcOI2 == AccDisks[di].tracks[trno].CRC + && 0 == oi + && 0 != AccDisks[di].tracks[trno].CRC) + conf2 += AccDisks[di].tracks[trno].count; if (crc450OI == AccDisks[di].tracks[trno].Frame450CRC && 0 != AccDisks[di].tracks[trno].Frame450CRC) partials++; } string status; - if (conf > 0) + if (conf + conf2 > 0) status = "Accurately ripped"; else if (count == 0 && crcOI == 0) status = "Silent track"; + else if (partials > 0 && 0 != oi) + status = "No match (V2 was not tested)"; else if (partials > 0) - status = "No match but offset"; + status = "No match"; else status = "No match"; - sw.WriteLine(String.Format(" {0:00} [{1:x8}] ({3" + ifmt + "}/{2" + ifmt + "}) {4}", iTrack + 1, crcOI, count, conf, status)); + if (oi == 0) + sw.WriteLine(String.Format(" {0:00} [{1:x8}|{5:x8}] ({3" + ifmt + "}+{6" + ifmt + "}/{2" + ifmt + "}) {4}", iTrack + 1, crcOI, count, conf, status, crcOI2, conf2)); + else + sw.WriteLine(String.Format(" {0:00} [{1:x8}] ({3" + ifmt + "}/{2" + ifmt + "}) {4}", iTrack + 1, crcOI, count, conf, status)); } } @@ -1190,9 +1204,8 @@ namespace CUETools.AccurateRip { if (verbose) { - sw.WriteLine("Track [ CRC ] Status"); - GenerateLog(sw, 0, false); - GenerateLog(sw, 0, true); + sw.WriteLine("Track [ CRC | V2 ] Status"); + GenerateLog(sw, 0); uint offsets_match = 0; for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++) { @@ -1217,7 +1230,7 @@ namespace CUETools.AccurateRip break; } sw.WriteLine("Offsetted by {0}:", oi); - GenerateLog(sw, oi, false); + GenerateLog(sw, oi); } } offsets_match = 0; @@ -1252,7 +1265,7 @@ namespace CUETools.AccurateRip break; } sw.WriteLine("Offsetted by {0}:", oi); - GenerateLog(sw, oi, false); + GenerateLog(sw, oi); } } } diff --git a/CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs b/CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs index 8886a74..bc2f4ff 100644 --- a/CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs +++ b/CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs @@ -28,6 +28,8 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMetadata)); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.listView1 = new System.Windows.Forms.ListView(); @@ -35,15 +37,17 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.panel1.SuspendLayout(); this.SuspendLayout(); // // progressBar1 // this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; - this.progressBar1.Location = new System.Drawing.Point(5, 5); + this.progressBar1.Location = new System.Drawing.Point(7, 6); + this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(587, 25); + this.progressBar1.Size = new System.Drawing.Size(783, 31); this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee; this.progressBar1.TabIndex = 0; // @@ -60,10 +64,13 @@ this.listView1.FullRowSelect = true; this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(10, 10); + this.listView1.Location = new System.Drawing.Point(13, 12); + this.listView1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.listView1.MultiSelect = false; this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(597, 213); + this.listView1.ShowItemToolTips = true; + this.listView1.Size = new System.Drawing.Size(797, 263); + this.listView1.SmallImageList = this.imageList1; this.listView1.TabIndex = 1; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -77,9 +84,10 @@ // this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(442, 5); + this.button1.Location = new System.Drawing.Point(590, 6); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 25); + this.button1.Size = new System.Drawing.Size(100, 31); this.button1.TabIndex = 2; this.button1.Text = "Cancel"; this.button1.UseVisualStyleBackColor = true; @@ -89,9 +97,10 @@ // this.button2.DialogResult = System.Windows.Forms.DialogResult.OK; this.button2.Dock = System.Windows.Forms.DockStyle.Right; - this.button2.Location = new System.Drawing.Point(517, 5); + this.button2.Location = new System.Drawing.Point(690, 6); + this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 25); + this.button2.Size = new System.Drawing.Size(100, 31); this.button2.TabIndex = 3; this.button2.Text = "OK"; this.button2.UseVisualStyleBackColor = true; @@ -103,25 +112,35 @@ this.panel1.Controls.Add(this.button2); this.panel1.Controls.Add(this.progressBar1); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(10, 223); + this.panel1.Location = new System.Drawing.Point(13, 275); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(597, 35); + this.panel1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel1.Size = new System.Drawing.Size(797, 43); this.panel1.TabIndex = 4; // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "freedb"); + this.imageList1.Images.SetKeyName(1, "musicbrainz"); + this.imageList1.Images.SetKeyName(2, "discogs"); + // // FormMetadata // this.AcceptButton = this.button2; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.button1; - this.ClientSize = new System.Drawing.Size(617, 268); + this.ClientSize = new System.Drawing.Size(823, 330); this.Controls.Add(this.listView1); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; - this.MinimumSize = new System.Drawing.Size(500, 300); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MinimumSize = new System.Drawing.Size(661, 360); this.Name = "FormMetadata"; - this.Padding = new System.Windows.Forms.Padding(10); + this.Padding = new System.Windows.Forms.Padding(13, 12, 13, 12); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "CTDB Metadata Lookup"; this.Load += new System.EventHandler(this.FormMetadata_Load); @@ -139,5 +158,6 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.ImageList imageList1; } } \ No newline at end of file diff --git a/CUETools.CTDB.EACPlugin/FormMetadata.cs b/CUETools.CTDB.EACPlugin/FormMetadata.cs index 4e2b121..06a55d9 100644 --- a/CUETools.CTDB.EACPlugin/FormMetadata.cs +++ b/CUETools.CTDB.EACPlugin/FormMetadata.cs @@ -41,9 +41,7 @@ namespace CUETools.CTDB.EACPlugin { this.ctdb.ContactDB(null, this.agent, null, false, false, - AudioDataPlugIn.Options.priorityMusicbrainz, - AudioDataPlugIn.Options.priorityFreedb, - AudioDataPlugIn.Options.priorityFreedbFuzzy); + AudioDataPlugIn.Options.MetadataSearch); } private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) @@ -70,7 +68,11 @@ namespace CUETools.CTDB.EACPlugin metadata.album == "" ? "Unknown Title" : metadata.album, discnumberandtotal != "" ? " (disc " + discnumberandtotal + (metadata.discname != null ? ": " + metadata.discname : "") + ")" : "", label == "" ? "" : " (" + label + ")"); - listView1.Items.Add(new ListViewItem(text) { Tag = metadata }); + var tip = new StringBuilder(); + var i = 0; + foreach(var tr in metadata.track) + tip.AppendFormat("{0}. {2}{1}\n", ++i, tr.name, ((tr.artist ?? metadata.artist) == metadata.artist) ? "" : tr.artist + " / "); + listView1.Items.Add(new ListViewItem(text) { Tag = metadata, ImageKey = metadata.source, ToolTipText = tip.ToString() }); } this.listView1.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent); if (listView1.Items.Count == 0) diff --git a/CUETools.CTDB.EACPlugin/FormMetadata.resx b/CUETools.CTDB.EACPlugin/FormMetadata.resx index 7aafc39..e47f95e 100644 --- a/CUETools.CTDB.EACPlugin/FormMetadata.resx +++ b/CUETools.CTDB.EACPlugin/FormMetadata.resx @@ -120,4 +120,59 @@ 17, 17 + + 210, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ + CgAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAe0PCgEAAXoCUQt6 + BwAE6xYAAbUEBAPzAQQD8wIEAV8BCgFRAQABEQETAQABDwp6BAAB6wIUARUCDgEAAQ4UAAG1AwQB9AIE + AfQBBAH0AgQB9AIEAQoBAAG8A/8BEwEPCXoDAAEUAQcB6wEUARECDgIAAQ4TAAG1AaICBAH/AgQB/wEE + Af8CBAH/AgQBCgEAAbwE/wEACXoCAAERARQB6wEHAesBEQIOAwABDhIAAbUBogMEA/8BBAP/AwQBCgFR + AQ8B6wIHAbwBAAERBAABEQN6AQABEQEVAhQC6wEVAREBDgQAARERAAG1AaIFBAH/AQQB/wUEAQoBegFR + AQ8CAAH/AQABDwH3Av8BkgIRAnoBAAEOAhECFQEOAkoCDhUAAbUBogUEAf8BBAH/BQQBCgR6AQAB/wEA + AREE/wG8AQACegHrAQAEDgQ3AQ4EAAHrEAABtQGiDQQBCgSuAQAB/wIAARMBvAP/AQACrgHrBAABSgQ3 + AUoEAAHrEAAN/wH0AfMB+ASuAQAB/wEAARIBDwMAAf8BAAKuAesEAAFKBDcBSgQOAesQAAH/AaIC/wEE + A/8CBAP/AgQB+ASuAQAB/wEPAQABEQISAQAB/wEAAq4B6wQAAQ4ENwEOAhECDgHrEAAB/wGiAv8BBAL/ + AQQE/wEEAfQB8wH4BK4BAAL/AZIBEQEAAQ8BAAH/AQACrgEAAQ4EAAEOAkoBDgIUAxERAAH/AaIC/wEE + Av8EBAH/AwQBCgSuAQABBwP/AbwB6gEAAf8BAAKuAQABFAMAAg4BEQEUAesBcwIUAREBFBEAAf8BogEE + Af8BBAL/AQQC/wEEAf8BBAH0AfMBCgSuAREBEwEHBv8BAAKuAgABEQIAAg4BEQEVAesBBwHrARUBFBIA + Af8BhgL/AgQC/wIEA/8CBAHsBa4BEQEAAREBkgT/AQACrgMAARQBAAIOAREBFQEUA+sTAAH/AYYL/wH0 + AfMB7AeuAREBAAEPAesBvAH/AQACrgQAAhUDDgERAhQUAAL/AbUL/wH0AQcBAAmuAQ8BAAETAREBrgcA + BOsWAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AwABgAEBAfwBPwYAAfABDwYA + AeABBwYAAcABAwYAAYABAQYAAYABASYAAYABAQYAAYABAQYAAcABAwYAAeABBwYAAfABDwQAAYABAQH8 + AT8CAAs= + + \ No newline at end of file diff --git a/CUETools.CTDB.EACPlugin/FormSubmitParity.cs b/CUETools.CTDB.EACPlugin/FormSubmitParity.cs index e06f72f..2473143 100644 --- a/CUETools.CTDB.EACPlugin/FormSubmitParity.cs +++ b/CUETools.CTDB.EACPlugin/FormSubmitParity.cs @@ -49,7 +49,7 @@ namespace CUETools.CTDB.EACPlugin this.ctdb.UploadHelper.onProgress += UploadProgress; if (this.agent != null) { - this.ctdb.ContactDB(null, this.agent, this.drivename, true, false, CTDBPriority.None, CTDBPriority.None, CTDBPriority.None); + this.ctdb.ContactDB(null, this.agent, this.drivename, true, false, CTDBMetadataSearch.None); } else { diff --git a/CUETools.CTDB.EACPlugin/Metadata.cs b/CUETools.CTDB.EACPlugin/Metadata.cs index afb376d..3b74a81 100644 --- a/CUETools.CTDB.EACPlugin/Metadata.cs +++ b/CUETools.CTDB.EACPlugin/Metadata.cs @@ -42,7 +42,7 @@ namespace MetadataPlugIn TOC[1][0].Start = 0U; var ctdb = new CUEToolsDB(TOC, null); - var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.2"); + var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.3"); form.ShowDialog(); var meta = form.Meta; if (meta == null) @@ -154,7 +154,7 @@ namespace MetadataPlugIn public string GetPluginName() { - return "CUETools DB Metadata Plugin V2.1.2b"; + return "CUETools DB Metadata Plugin V2.1.3"; } public void ShowOptions() diff --git a/CUETools.CTDB.EACPlugin/Options.Designer.cs b/CUETools.CTDB.EACPlugin/Options.Designer.cs index a4d56ef..20315ea 100644 --- a/CUETools.CTDB.EACPlugin/Options.Designer.cs +++ b/CUETools.CTDB.EACPlugin/Options.Designer.cs @@ -33,53 +33,42 @@ namespace AudioDataPlugIn this.label2 = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.radioButtonMBHigh = new System.Windows.Forms.RadioButton(); - this.radioButtonMBLow = new System.Windows.Forms.RadioButton(); - this.radioButtonMBMedium = new System.Windows.Forms.RadioButton(); - this.radioButtonMBNone = new System.Windows.Forms.RadioButton(); + this.radioButtonMBExtensive = new System.Windows.Forms.RadioButton(); + this.radioButtonMBFast = new System.Windows.Forms.RadioButton(); + this.radioButtonMBDefault = new System.Windows.Forms.RadioButton(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.radioButtonFDMedium = new System.Windows.Forms.RadioButton(); - this.radioButtonFDHigh = new System.Windows.Forms.RadioButton(); - this.radioButtonFDLow = new System.Windows.Forms.RadioButton(); - this.radioButtonFDNone = new System.Windows.Forms.RadioButton(); this.buttonOk = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.radioButtonFZMedium = new System.Windows.Forms.RadioButton(); - this.radioButtonFZHigh = new System.Windows.Forms.RadioButton(); - this.radioButtonFZLow = new System.Windows.Forms.RadioButton(); - this.radioButtonFZNone = new System.Windows.Forms.RadioButton(); this.buttonCancel = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(95, 13); + this.label1.Location = new System.Drawing.Point(127, 16); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(139, 13); + this.label1.Size = new System.Drawing.Size(182, 17); this.label1.TabIndex = 0; - this.label1.Text = "CUETools DB Plugin V2.1.2"; + this.label1.Text = "CUETools DB Plugin V2.1.3"; // // label2 // - this.label2.Location = new System.Drawing.Point(95, 67); + this.label2.Location = new System.Drawing.Point(127, 82); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(230, 34); + this.label2.Size = new System.Drawing.Size(307, 42); this.label2.TabIndex = 1; this.label2.Text = "Copyright (c) 2011 Gregory S. Chudov"; // // linkLabel1 // this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(95, 36); + this.linkLabel1.Location = new System.Drawing.Point(127, 44); + this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(164, 13); + this.linkLabel1.Size = new System.Drawing.Size(209, 17); this.linkLabel1.TabIndex = 3; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "http://db.cuetools.net/about.php"; @@ -88,209 +77,82 @@ namespace AudioDataPlugIn // pictureBox1 // this.pictureBox1.Image = global::CUETools.CTDB.EACPlugin.Properties.Resources.ctdb64; - this.pictureBox1.Location = new System.Drawing.Point(13, 13); + this.pictureBox1.Location = new System.Drawing.Point(17, 16); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(64, 64); + this.pictureBox1.Size = new System.Drawing.Size(85, 79); this.pictureBox1.TabIndex = 4; this.pictureBox1.TabStop = false; // - // radioButtonMBHigh + // radioButtonMBExtensive // - this.radioButtonMBHigh.AutoSize = true; - this.radioButtonMBHigh.Location = new System.Drawing.Point(6, 16); - this.radioButtonMBHigh.Name = "radioButtonMBHigh"; - this.radioButtonMBHigh.Size = new System.Drawing.Size(47, 17); - this.radioButtonMBHigh.TabIndex = 6; - this.radioButtonMBHigh.TabStop = true; - this.radioButtonMBHigh.Text = "High"; - this.radioButtonMBHigh.UseVisualStyleBackColor = true; + this.radioButtonMBExtensive.AutoSize = true; + this.radioButtonMBExtensive.Location = new System.Drawing.Point(8, 20); + this.radioButtonMBExtensive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.radioButtonMBExtensive.Name = "radioButtonMBExtensive"; + this.radioButtonMBExtensive.Size = new System.Drawing.Size(89, 21); + this.radioButtonMBExtensive.TabIndex = 6; + this.radioButtonMBExtensive.TabStop = true; + this.radioButtonMBExtensive.Text = "Extensive"; + this.radioButtonMBExtensive.UseVisualStyleBackColor = true; // - // radioButtonMBLow + // radioButtonMBFast // - this.radioButtonMBLow.AutoSize = true; - this.radioButtonMBLow.Location = new System.Drawing.Point(6, 50); - this.radioButtonMBLow.Name = "radioButtonMBLow"; - this.radioButtonMBLow.Size = new System.Drawing.Size(45, 17); - this.radioButtonMBLow.TabIndex = 7; - this.radioButtonMBLow.TabStop = true; - this.radioButtonMBLow.Text = "Low"; - this.radioButtonMBLow.UseVisualStyleBackColor = true; + this.radioButtonMBFast.AutoSize = true; + this.radioButtonMBFast.Location = new System.Drawing.Point(8, 62); + this.radioButtonMBFast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.radioButtonMBFast.Name = "radioButtonMBFast"; + this.radioButtonMBFast.Size = new System.Drawing.Size(56, 21); + this.radioButtonMBFast.TabIndex = 7; + this.radioButtonMBFast.TabStop = true; + this.radioButtonMBFast.Text = "Fast"; + this.radioButtonMBFast.UseVisualStyleBackColor = true; // - // radioButtonMBMedium + // radioButtonMBDefault // - this.radioButtonMBMedium.AutoSize = true; - this.radioButtonMBMedium.Location = new System.Drawing.Point(6, 33); - this.radioButtonMBMedium.Name = "radioButtonMBMedium"; - this.radioButtonMBMedium.Size = new System.Drawing.Size(62, 17); - this.radioButtonMBMedium.TabIndex = 8; - this.radioButtonMBMedium.TabStop = true; - this.radioButtonMBMedium.Text = "Medium"; - this.radioButtonMBMedium.UseVisualStyleBackColor = true; - // - // radioButtonMBNone - // - this.radioButtonMBNone.AutoSize = true; - this.radioButtonMBNone.Location = new System.Drawing.Point(6, 67); - this.radioButtonMBNone.Name = "radioButtonMBNone"; - this.radioButtonMBNone.Size = new System.Drawing.Size(51, 17); - this.radioButtonMBNone.TabIndex = 9; - this.radioButtonMBNone.TabStop = true; - this.radioButtonMBNone.Text = "None"; - this.radioButtonMBNone.UseVisualStyleBackColor = true; + this.radioButtonMBDefault.AutoSize = true; + this.radioButtonMBDefault.Location = new System.Drawing.Point(8, 41); + this.radioButtonMBDefault.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.radioButtonMBDefault.Name = "radioButtonMBDefault"; + this.radioButtonMBDefault.Size = new System.Drawing.Size(74, 21); + this.radioButtonMBDefault.TabIndex = 8; + this.radioButtonMBDefault.TabStop = true; + this.radioButtonMBDefault.Text = "Default"; + this.radioButtonMBDefault.UseVisualStyleBackColor = true; // // groupBox1 // - this.groupBox1.Controls.Add(this.radioButtonMBMedium); - this.groupBox1.Controls.Add(this.radioButtonMBHigh); - this.groupBox1.Controls.Add(this.radioButtonMBLow); - this.groupBox1.Controls.Add(this.radioButtonMBNone); - this.groupBox1.Location = new System.Drawing.Point(12, 119); + this.groupBox1.Controls.Add(this.radioButtonMBDefault); + this.groupBox1.Controls.Add(this.radioButtonMBExtensive); + this.groupBox1.Controls.Add(this.radioButtonMBFast); + this.groupBox1.Location = new System.Drawing.Point(16, 156); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(83, 95); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(191, 107); this.groupBox1.TabIndex = 15; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Musicbrainz"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.radioButtonFDMedium); - this.groupBox2.Controls.Add(this.radioButtonFDHigh); - this.groupBox2.Controls.Add(this.radioButtonFDLow); - this.groupBox2.Controls.Add(this.radioButtonFDNone); - this.groupBox2.Location = new System.Drawing.Point(101, 119); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(83, 95); - this.groupBox2.TabIndex = 16; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Freedb"; - // - // radioButtonFDMedium - // - this.radioButtonFDMedium.AutoSize = true; - this.radioButtonFDMedium.Location = new System.Drawing.Point(6, 33); - this.radioButtonFDMedium.Name = "radioButtonFDMedium"; - this.radioButtonFDMedium.Size = new System.Drawing.Size(62, 17); - this.radioButtonFDMedium.TabIndex = 8; - this.radioButtonFDMedium.TabStop = true; - this.radioButtonFDMedium.Text = "Medium"; - this.radioButtonFDMedium.UseVisualStyleBackColor = true; - // - // radioButtonFDHigh - // - this.radioButtonFDHigh.AutoSize = true; - this.radioButtonFDHigh.Location = new System.Drawing.Point(6, 16); - this.radioButtonFDHigh.Name = "radioButtonFDHigh"; - this.radioButtonFDHigh.Size = new System.Drawing.Size(47, 17); - this.radioButtonFDHigh.TabIndex = 6; - this.radioButtonFDHigh.TabStop = true; - this.radioButtonFDHigh.Text = "High"; - this.radioButtonFDHigh.UseVisualStyleBackColor = true; - // - // radioButtonFDLow - // - this.radioButtonFDLow.AutoSize = true; - this.radioButtonFDLow.Location = new System.Drawing.Point(6, 50); - this.radioButtonFDLow.Name = "radioButtonFDLow"; - this.radioButtonFDLow.Size = new System.Drawing.Size(45, 17); - this.radioButtonFDLow.TabIndex = 7; - this.radioButtonFDLow.TabStop = true; - this.radioButtonFDLow.Text = "Low"; - this.radioButtonFDLow.UseVisualStyleBackColor = true; - // - // radioButtonFDNone - // - this.radioButtonFDNone.AutoSize = true; - this.radioButtonFDNone.Location = new System.Drawing.Point(6, 67); - this.radioButtonFDNone.Name = "radioButtonFDNone"; - this.radioButtonFDNone.Size = new System.Drawing.Size(51, 17); - this.radioButtonFDNone.TabIndex = 9; - this.radioButtonFDNone.TabStop = true; - this.radioButtonFDNone.Text = "None"; - this.radioButtonFDNone.UseVisualStyleBackColor = true; + this.groupBox1.Text = "Metadata search mode:"; // // buttonOk // this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(303, 189); + this.buttonOk.Location = new System.Drawing.Point(404, 233); + this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonOk.Name = "buttonOk"; - this.buttonOk.Size = new System.Drawing.Size(75, 25); + this.buttonOk.Size = new System.Drawing.Size(100, 31); this.buttonOk.TabIndex = 17; this.buttonOk.Text = "OK"; this.buttonOk.UseVisualStyleBackColor = true; this.buttonOk.Click += new System.EventHandler(this.button2_Click); // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 101); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(134, 13); - this.label3.TabIndex = 18; - this.label3.Text = "Metadata providers priority:"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.radioButtonFZMedium); - this.groupBox3.Controls.Add(this.radioButtonFZHigh); - this.groupBox3.Controls.Add(this.radioButtonFZLow); - this.groupBox3.Controls.Add(this.radioButtonFZNone); - this.groupBox3.Location = new System.Drawing.Point(190, 119); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(83, 95); - this.groupBox3.TabIndex = 17; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Freedb fuzzy"; - // - // radioButtonFZMedium - // - this.radioButtonFZMedium.AutoSize = true; - this.radioButtonFZMedium.Location = new System.Drawing.Point(6, 33); - this.radioButtonFZMedium.Name = "radioButtonFZMedium"; - this.radioButtonFZMedium.Size = new System.Drawing.Size(62, 17); - this.radioButtonFZMedium.TabIndex = 8; - this.radioButtonFZMedium.TabStop = true; - this.radioButtonFZMedium.Text = "Medium"; - this.radioButtonFZMedium.UseVisualStyleBackColor = true; - // - // radioButtonFZHigh - // - this.radioButtonFZHigh.AutoSize = true; - this.radioButtonFZHigh.Location = new System.Drawing.Point(6, 16); - this.radioButtonFZHigh.Name = "radioButtonFZHigh"; - this.radioButtonFZHigh.Size = new System.Drawing.Size(47, 17); - this.radioButtonFZHigh.TabIndex = 6; - this.radioButtonFZHigh.TabStop = true; - this.radioButtonFZHigh.Text = "High"; - this.radioButtonFZHigh.UseVisualStyleBackColor = true; - // - // radioButtonFZLow - // - this.radioButtonFZLow.AutoSize = true; - this.radioButtonFZLow.Location = new System.Drawing.Point(6, 50); - this.radioButtonFZLow.Name = "radioButtonFZLow"; - this.radioButtonFZLow.Size = new System.Drawing.Size(45, 17); - this.radioButtonFZLow.TabIndex = 7; - this.radioButtonFZLow.TabStop = true; - this.radioButtonFZLow.Text = "Low"; - this.radioButtonFZLow.UseVisualStyleBackColor = true; - // - // radioButtonFZNone - // - this.radioButtonFZNone.AutoSize = true; - this.radioButtonFZNone.Location = new System.Drawing.Point(6, 67); - this.radioButtonFZNone.Name = "radioButtonFZNone"; - this.radioButtonFZNone.Size = new System.Drawing.Size(51, 17); - this.radioButtonFZNone.TabIndex = 9; - this.radioButtonFZNone.TabStop = true; - this.radioButtonFZNone.Text = "None"; - this.radioButtonFZNone.UseVisualStyleBackColor = true; - // // buttonCancel // this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(303, 158); + this.buttonCancel.Location = new System.Drawing.Point(404, 194); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 25); + this.buttonCancel.Size = new System.Drawing.Size(100, 31); this.buttonCancel.TabIndex = 19; this.buttonCancel.Text = "Cancel"; this.buttonCancel.UseVisualStyleBackColor = true; @@ -298,21 +160,19 @@ namespace AudioDataPlugIn // Options // this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(390, 227); + this.ClientSize = new System.Drawing.Size(520, 279); this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.label3); this.Controls.Add(this.buttonOk); - this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.linkLabel1); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Options"; @@ -322,10 +182,6 @@ namespace AudioDataPlugIn ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -337,23 +193,11 @@ namespace AudioDataPlugIn private System.Windows.Forms.Label label2; private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.RadioButton radioButtonMBHigh; - private System.Windows.Forms.RadioButton radioButtonMBLow; - private System.Windows.Forms.RadioButton radioButtonMBMedium; - private System.Windows.Forms.RadioButton radioButtonMBNone; + private System.Windows.Forms.RadioButton radioButtonMBExtensive; + private System.Windows.Forms.RadioButton radioButtonMBFast; + private System.Windows.Forms.RadioButton radioButtonMBDefault; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.RadioButton radioButtonFDMedium; - private System.Windows.Forms.RadioButton radioButtonFDHigh; - private System.Windows.Forms.RadioButton radioButtonFDLow; - private System.Windows.Forms.RadioButton radioButtonFDNone; private System.Windows.Forms.Button buttonOk; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.RadioButton radioButtonFZMedium; - private System.Windows.Forms.RadioButton radioButtonFZHigh; - private System.Windows.Forms.RadioButton radioButtonFZLow; - private System.Windows.Forms.RadioButton radioButtonFZNone; private System.Windows.Forms.Button buttonCancel; } } \ No newline at end of file diff --git a/CUETools.CTDB.EACPlugin/Options.cs b/CUETools.CTDB.EACPlugin/Options.cs index 2221eef..a99bbb1 100644 --- a/CUETools.CTDB.EACPlugin/Options.cs +++ b/CUETools.CTDB.EACPlugin/Options.cs @@ -7,18 +7,52 @@ using System.Text; using System.Windows.Forms; using CUETools.CTDB.EACPlugin.Properties; using CUETools.CTDB; +using Microsoft.Win32; namespace AudioDataPlugIn { public partial class Options : Form { - public static CTDBPriority priorityMusicbrainz = CTDBPriority.High; - public static CTDBPriority priorityFreedb = CTDBPriority.Medium; - public static CTDBPriority priorityFreedbFuzzy = CTDBPriority.Low; + private static CTDBMetadataSearch? metadataSearch = null; + private static string optionsKey = @"SOFTWARE\CUETools\EACPugin"; + public static CTDBMetadataSearch MetadataSearch + { + get + { + if (!metadataSearch.HasValue) + { + try + { + using (var key = Registry.CurrentUser.OpenSubKey(optionsKey, false)) + { + var val = key.GetValue("MetadataSearch") as string; + if (val == "Default") metadataSearch = CTDBMetadataSearch.Default; + if (val == "Fast") metadataSearch = CTDBMetadataSearch.Fast; + if (val == "Extensive") metadataSearch = CTDBMetadataSearch.Extensive; + } + } + catch (Exception ex) + { + } + } + + return metadataSearch ?? CTDBMetadataSearch.Default; + } + + set + { + using (var key = Registry.CurrentUser.CreateSubKey(optionsKey)) + { + key.SetValue("MetadataSearch", value.ToString()); + } + + metadataSearch = value; + } + } public Options() { - InitializeComponent(); + this.InitializeComponent(); } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -29,34 +63,17 @@ namespace AudioDataPlugIn private void Options_Load(object sender, EventArgs e) { this.Icon = Resources.ctdb; - this.radioButtonMBHigh.Checked = priorityMusicbrainz == CTDBPriority.High; - this.radioButtonMBMedium.Checked = priorityMusicbrainz == CTDBPriority.Medium; - this.radioButtonMBLow.Checked = priorityMusicbrainz == CTDBPriority.Low; - this.radioButtonMBNone.Checked = priorityMusicbrainz == CTDBPriority.None; - this.radioButtonFDHigh.Checked = priorityFreedb == CTDBPriority.High; - this.radioButtonFDMedium.Checked = priorityFreedb == CTDBPriority.Medium; - this.radioButtonFDLow.Checked = priorityFreedb == CTDBPriority.Low; - this.radioButtonFDNone.Checked = priorityFreedb == CTDBPriority.None; - this.radioButtonFZHigh.Checked = priorityFreedbFuzzy == CTDBPriority.High; - this.radioButtonFZMedium.Checked = priorityFreedbFuzzy == CTDBPriority.Medium; - this.radioButtonFZLow.Checked = priorityFreedbFuzzy == CTDBPriority.Low; - this.radioButtonFZNone.Checked = priorityFreedbFuzzy == CTDBPriority.None; + this.radioButtonMBExtensive.Checked = MetadataSearch == CTDBMetadataSearch.Extensive; + this.radioButtonMBDefault.Checked = MetadataSearch == CTDBMetadataSearch.Default; + this.radioButtonMBFast.Checked = MetadataSearch == CTDBMetadataSearch.Fast; } private void button2_Click(object sender, EventArgs e) { - priorityMusicbrainz = this.radioButtonMBHigh.Checked ? CTDBPriority.High - : this.radioButtonMBMedium.Checked ? CTDBPriority.Medium - : this.radioButtonMBLow.Checked ? CTDBPriority.Low - : CTDBPriority.None; - priorityFreedb = this.radioButtonFDHigh.Checked ? CTDBPriority.High - : this.radioButtonFDMedium.Checked ? CTDBPriority.Medium - : this.radioButtonFDLow.Checked ? CTDBPriority.Low - : CTDBPriority.None; - priorityFreedbFuzzy = this.radioButtonFZHigh.Checked ? CTDBPriority.High - : this.radioButtonFZMedium.Checked ? CTDBPriority.Medium - : this.radioButtonFZLow.Checked ? CTDBPriority.Low - : CTDBPriority.None; + Options.MetadataSearch = this.radioButtonMBExtensive.Checked ? CTDBMetadataSearch.Extensive + : this.radioButtonMBDefault.Checked ? CTDBMetadataSearch.Default + : this.radioButtonMBFast.Checked ? CTDBMetadataSearch.Fast + : CTDBMetadataSearch.None; } } } diff --git a/CUETools.CTDB.EACPlugin/Plugin.cs b/CUETools.CTDB.EACPlugin/Plugin.cs index 60c3cae..e70a56d 100644 --- a/CUETools.CTDB.EACPlugin/Plugin.cs +++ b/CUETools.CTDB.EACPlugin/Plugin.cs @@ -56,7 +56,7 @@ namespace AudioDataPlugIn // the plugin and for display in the log file public string GetAudioTransferPluginName() { - return "CUETools DB Plugin V2.1.2b"; + return "CUETools DB Plugin V2.1.3"; } // Each plugin should have its own options page. @@ -122,7 +122,7 @@ namespace AudioDataPlugIn ArId = AccurateRipVerify.CalculateAccurateRipId(TOC); ar.ContactAccurateRip(ArId); #endif - var form = new FormSubmitParity(ctdb, "EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename); + var form = new FormSubmitParity(ctdb, "EAC" + m_data.HostVersion + " CTDB 2.1.3", m_drivename); //ctdb.ContactDB("EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename, false, false); form.ShowDialog(); ctdb.Init(ar); diff --git a/CUETools.CTDB/CUEToolsDB.cs b/CUETools.CTDB/CUEToolsDB.cs index db43720..61c85c9 100644 --- a/CUETools.CTDB/CUEToolsDB.cs +++ b/CUETools.CTDB/CUEToolsDB.cs @@ -57,7 +57,7 @@ namespace CUETools.CTDB } } - public void ContactDB(string server, string userAgent, string driveName, bool ctdb, bool fuzzy, CTDBPriority musicbrainz, CTDBPriority freedb, CTDBPriority freedbFuzzy) + public void ContactDB(string server, string userAgent, string driveName, bool ctdb, bool fuzzy, CTDBMetadataSearch metadataSearch) { this.driveName = driveName; this.userAgent = userAgent + " (" + Environment.OSVersion.VersionString + ")" + (driveName != null ? " (" + driveName + ")" : ""); @@ -67,9 +67,8 @@ namespace CUETools.CTDB HttpWebRequest req = (HttpWebRequest)WebRequest.Create(urlbase + "/lookup2.php" + "?ctdb=" + (ctdb ? "1" : "0") - + "&musicbrainz=" + ((int)musicbrainz).ToString() - + "&freedb=" + ((int)freedb + 8 * (int)freedbFuzzy).ToString() - + "&fuzzy=" + (fuzzy ? 1 : 0) + + "&fuzzy=" + (fuzzy ? 1 : 0) + + "&metadata=" + (metadataSearch == CTDBMetadataSearch.None ? "none" : metadataSearch == CTDBMetadataSearch.Fast ? "fast" : metadataSearch == CTDBMetadataSearch.Default ? "default" : "extensive") + "&toc=" + toc.ToString()); req.Method = "GET"; req.Proxy = proxy; @@ -817,11 +816,11 @@ namespace CUETools.CTDB public CTDBResponseMeta[] musicbrainz; } - public enum CTDBPriority + public enum CTDBMetadataSearch { None = 0, - High = 1, - Medium = 2, - Low = 3 + Fast = 1, + Default = 2, + Extensive = 3 } } diff --git a/CUETools.Codecs.LAME/Encoder.cs b/CUETools.Codecs.LAME/Encoder.cs index 6b07892..e85ce6b 100644 --- a/CUETools.Codecs.LAME/Encoder.cs +++ b/CUETools.Codecs.LAME/Encoder.cs @@ -83,12 +83,19 @@ namespace CUETools.Codecs.LAME DeInit(true); if (needTag) { + bool utf8Required = Encoding.Default.GetString(Encoding.Default.GetBytes(_path)) != _path; + var tempDir = System.IO.Path.Combine(System.IO.Path.GetPathRoot(_path), "Temp"); + var tempName = utf8Required ? System.IO.Path.Combine(tempDir, Guid.NewGuid().ToString()) : _path; try { - Lame_encDll.beWriteInfoTag(m_hLameStream, _path); + if (utf8Required && !Directory.Exists(tempDir)) Directory.CreateDirectory(tempDir); + if (utf8Required) File.Move(_path, tempName); + Lame_encDll.beWriteInfoTag(m_hLameStream, tempName); + if (utf8Required) File.Move(tempName, _path); } catch { + if (utf8Required) File.Move(tempName, _path); } } } diff --git a/CUETools.Processor/Processor.cs b/CUETools.Processor/Processor.cs index 9a34e42..3732d6e 100644 --- a/CUETools.Processor/Processor.cs +++ b/CUETools.Processor/Processor.cs @@ -2211,7 +2211,7 @@ return processor.Go(); _localDB.Save(); } - public List LookupAlbumInfo(bool useCache, bool useCUE, bool useCTDB, CTDBPriority priorityMusicbrainz, CTDBPriority priorityFreedb, CTDBPriority priorityFreedbFuzzy) + public List LookupAlbumInfo(bool useCache, bool useCUE, bool useCTDB, CTDBMetadataSearch metadataSearch) { List Releases = new List(); @@ -2268,7 +2268,7 @@ return processor.Go(); { ShowProgress("Looking up album via CTDB...", 0.0, null, null); var ctdb = new CUEToolsDB(TOC, proxy); - ctdb.ContactDB(_config.advanced.CTDBServer, "CUETools " + CUEToolsVersion, null, false, false, priorityMusicbrainz, priorityFreedb, priorityFreedbFuzzy); + ctdb.ContactDB(_config.advanced.CTDBServer, "CUETools " + CUEToolsVersion, null, false, false, metadataSearch); foreach (var meta in ctdb.Metadata) { CUEMetadata metadata = new CUEMetadata(TOC.TOCID, (int)TOC.AudioTracks); @@ -2279,7 +2279,7 @@ return processor.Go(); } } - if (!ctdbFound && priorityFreedb != CTDBPriority.None) + if (!ctdbFound && metadataSearch == CTDBMetadataSearch.Extensive) { ShowProgress("Looking up album via Freedb...", 0.0, null, null); @@ -3196,13 +3196,13 @@ return processor.Go(); // TODO: It should also be set when assigning a DataTrack!!! } - public void UseCUEToolsDB(string userAgent, string driveName, bool fuzzy, CTDBPriority musicbrainz, CTDBPriority freedb, CTDBPriority freedbFuzzy) + public void UseCUEToolsDB(string userAgent, string driveName, bool fuzzy, CTDBMetadataSearch metadataSearch) { ShowProgress((string)"Contacting CUETools database...", 0, null, null); _CUEToolsDB = new CUEToolsDB(_toc, proxy); _CUEToolsDB.UploadHelper.onProgress += new EventHandler(UploadProgress); - _CUEToolsDB.ContactDB(_config.advanced.CTDBServer, userAgent, driveName, true, fuzzy, musicbrainz, freedb, freedbFuzzy); + _CUEToolsDB.ContactDB(_config.advanced.CTDBServer, userAgent, driveName, true, fuzzy, metadataSearch); if (!_toc[_toc.TrackCount].IsAudio && DataTrackLength == 0) foreach (DBEntry e in _CUEToolsDB.Entries) @@ -6216,7 +6216,7 @@ return processor.Go(); return ArVerify.ExceptionStatus != WebExceptionStatus.Success ? WriteReport() : Go(); case "repair": { - UseCUEToolsDB("CUETools " + CUEToolsVersion, null, true, CTDBPriority.None, CTDBPriority.None, CTDBPriority.None); + UseCUEToolsDB("CUETools " + CUEToolsVersion, null, true, CTDBMetadataSearch.None); Action = CUEAction.Verify; if (CTDB.DBStatus != null) return CTDB.DBStatus; diff --git a/CUETools.Ripper.Console/Program.cs b/CUETools.Ripper.Console/Program.cs index 6d0c02b..3cedaec 100644 --- a/CUETools.Ripper.Console/Program.cs +++ b/CUETools.Ripper.Console/Program.cs @@ -180,7 +180,7 @@ namespace CUETools.ConsoleRipper string ArId = AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC); var ctdb = new CUEToolsDB(audioSource.TOC, null); ctdb.Init(arVerify); - ctdb.ContactDB(null, "CUETools.ConsoleRipper 2.1.2", audioSource.ARName, true, false, CTDBPriority.High, CTDBPriority.Medium, CTDBPriority.Low); + ctdb.ContactDB(null, "CUETools.ConsoleRipper 2.1.2", audioSource.ARName, true, false, CTDBMetadataSearch.Fast); arVerify.ContactAccurateRip(ArId); CTDBResponseMeta meta = null; foreach (var imeta in ctdb.Metadata) diff --git a/CUETools.Ripper.SCSI/Resource1.Designer.cs b/CUETools.Ripper.SCSI/Resource1.Designer.cs index c60238b..361e8e8 100644 --- a/CUETools.Ripper.SCSI/Resource1.Designer.cs +++ b/CUETools.Ripper.SCSI/Resource1.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 +// Runtime Version:2.0.50727.5446 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/CUETools.Ripper.SCSI/SCSIDrive.cs b/CUETools.Ripper.SCSI/SCSIDrive.cs index 92fc8bc..dac9109 100644 --- a/CUETools.Ripper.SCSI/SCSIDrive.cs +++ b/CUETools.Ripper.SCSI/SCSIDrive.cs @@ -1220,7 +1220,7 @@ namespace CUETools.Ripper.SCSI public sealed class SCSIException : Exception { public SCSIException(string args, Device device, Device.CommandStatus st) - : base(args + ": " + (st == Device.CommandStatus.DeviceFailed ? Device.LookupSenseError(device.GetSenseAsc(), device.GetSenseAscq()) : st.ToString())) + : base(args + ": " + (st == Device.CommandStatus.DeviceFailed ? device.GetErrorString() : st.ToString())) { } } diff --git a/CUETools/Resources/discogs.png b/CUETools/Resources/discogs.png new file mode 100644 index 0000000000000000000000000000000000000000..c5cb26ff61dc65970956393600fbf5d092717019 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL*h+%@f*C-7QF5UHxXR12uFj`ugs|fYF@JEh@d#`k)=WuPxN$`=o z;HktIvHRv*-$@?X#p^N|14BdaRX^MF-KpbvbxirbX{-M}EMPovOXk4G7pE?{Zho1v zuVO8~+M>7ZtDoLw_PoiMkjt9z>5mAz-@Ic=6Rw5%6mOZGS;+Rkt$3a0<6E49oQ|uv z<}aJR+F0ri`yy>KFBJxf - 503, 21 + 685, 31 MiddleLeft - 32, 21 + 39, 31 ETA @@ -145,7 +145,7 @@ Segoe UI, 9pt - 39, 21 + 45, 31 77 @@ -160,7 +160,7 @@ White - 44, 21 + 50, 31 55 @@ -169,7 +169,7 @@ Album found in AccurateRip database. - 120, 20 + 160, 30 Disk progress @@ -178,7 +178,7 @@ 0, 0 - 684, 26 + 912, 36 1 @@ -220,7 +220,7 @@ Courier New, 8.25pt - 0, 330 + 0, 432 0, 0, 0, 0 @@ -232,7 +232,7 @@ Both - 684, 121 + 912, 161 2 @@ -252,21 +252,6 @@ 0 - - Top, Bottom, Left, Right - - - 19 - - - 3, 17 - - - 192, 304 - - - 1 - fileSystemTreeView1 @@ -283,13 +268,16 @@ Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 0, 0, 0, 0 - 198, 324 + 264, 424 0 @@ -312,126 +300,9 @@ 3 - - 3 - - - True - - - Fill - - - NoControl - - - 99, 3 - - - 42, 29 - - - 2 - - - 153, 8 - - - Skip recently verified - - - checkBoxSkipRecent - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelVerifyMode - - - 0 - - - True - - - Fill - - - NoControl - - - 51, 3 - - - 42, 29 - - - 1 - - - Use local database - - - checkBoxVerifyUseLocal - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelVerifyMode - - - 1 - - - True - - - Fill - - - NoControl - - - 3, 3 - - - 42, 29 - - - 0 - - - Use CTDB (CUETools database) - - - checkBoxVerifyUseCDRepair - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelVerifyMode - - - 2 - - - Fill - - + 3, 17 - - - 2 - - - 144, 110 - - - 2 - + tableLayoutPanelVerifyMode @@ -445,253 +316,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxSkipRecent" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxVerifyUseLocal" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="checkBoxVerifyUseCDRepair" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333,Absolute,20" /><Rows Styles="Percent,32,72727,Percent,67,27273" /></TableLayoutSettings> - - - 3 - - - True - - - Fill - - - NoControl - - - 95, 84 - - - 0, 0, 0, 0 - - - 49, 26 - - - 5 - - - Use AccurateRip - - - checkBoxUseAccurateRip - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 0 - - - True - - - Fill - - - NoControl - - - 47, 84 - - - 0, 0, 0, 0 - - - 48, 26 - - - 4 - - - Use FreeDb - - - checkBoxUseFreeDb - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 1 - - - True - - - Fill - - - NoControl - - - 3, 40 - - - 3, 0, 3, 0 - - - 138, 20 - - - 2 - - - &Tracks - - - File per track. Gap handling can be selected in advanced settings. - - - rbTracks - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 2 - - - True - - - Fill - - - NoControl - - - 3, 0 - - - 3, 0, 3, 0 - - - 138, 20 - - - 0 - - - &Embedded - - - Create single file with embedded CUE sheet. - - - rbEmbedCUE - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 3 - - - True - - - Fill - - - NoControl - - - 3, 20 - - - 3, 0, 3, 0 - - - 138, 20 - - - 1 - - - Image + CUE - - - Create single file + CUE sheet - - - rbSingleFile - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 4 - - - True - - - Fill - - - NoControl - - - 0, 84 - - - 0, 0, 0, 0 - - - 47, 26 - - - 3 - - - Use MusicBrainz - - - checkBoxUseMusicBrainz - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelCUEStyle - - - 5 - - - Fill - - - 3, 17 - - - 0, 0, 0, 0 - - - 5 - - - 144, 110 - - - 11 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxSkipRecent" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxVerifyUseLocal" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="checkBoxVerifyUseCDRepair" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333,Absolute,27" /><Rows Styles="Percent,32.72727,Percent,67.27273" /></TableLayoutSettings> tableLayoutPanelCUEStyle @@ -706,73 +331,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxUseAccurateRip" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxUseFreeDb" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="rbTracks" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbEmbedCUE" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbSingleFile" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="checkBoxUseMusicBrainz" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,33332,Percent,33,33334,Percent,33,33334" /><Rows Styles="Percent,18,18229,Percent,18,18229,Percent,18,18229,Percent,22,72658,Percent,22,72658" /></TableLayoutSettings> - - - 3, 17 - - - False - - - Fill - - - Magenta - - - 78, 20 - - - Overwrite - - - 168, 22 - - - Locate files - - - Try to locate missing files automatically - - - 168, 22 - - - Change extension - - - Replace extension for audio files with this: - - - Magenta - - - 79, 19 - - - Locate files - - - Magenta - - - 39, 19 - - - flac - - - 3, 17 - - - 3, 0, 1, 0 - - - 144, 110 - - - 20 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxUseAccurateRip" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxUseFreeDb" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="rbTracks" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbEmbedCUE" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbSingleFile" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="checkBoxUseMusicBrainz" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33.33332,Percent,33.33334,Percent,33.33334" /><Rows Styles="Percent,18.18229,Percent,18.18229,Percent,18.18229,Percent,22.72658,Percent,22.72658" /></TableLayoutSettings> toolStripCorrectorFormat @@ -790,10 +349,16 @@ Fill - 173, 101 + 230, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 150, 130 + 201, 171 12 @@ -813,33 +378,6 @@ 0 - - False - - - Tahoma, 8.25pt - - - NoControl - - - 100, 174 - - - 0, 0, 0, 0 - - - 39, 13 - - - 19 - - - 320 - - - TopRight - labelEncoderMaxMode @@ -852,33 +390,6 @@ 0 - - True - - - False - - - Tahoma, 8.25pt - - - NoControl - - - 6, 174 - - - 0, 0, 0, 0 - - - 25, 13 - - - 19 - - - 128 - labelEncoderMinMode @@ -891,33 +402,6 @@ 1 - - Tahoma, 8.25pt - - - NoControl - - - 3, 174 - - - 0, 0, 0, 0 - - - 139, 15 - - - 18 - - - 256 - - - TopCenter - - - For lossless formats, the level of compression. For lossy formats, target quality - labelEncoderMode @@ -930,24 +414,6 @@ 2 - - Top, Left, Right - - - NoControl - - - 3, 143 - - - 0, 0, 0, 0 - - - 142, 45 - - - 17 - trackBarEncoderMode @@ -960,21 +426,6 @@ 3 - - Top, Left, Right - - - 10, 116 - - - 129, 21 - - - 16 - - - Encoder to use - comboBoxEncoder @@ -987,27 +438,6 @@ 4 - - True - - - NoControl - - - 10, 70 - - - 50, 17 - - - 16 - - - None - - - No audio output - radioButtonAudioNone @@ -1020,27 +450,6 @@ 5 - - True - - - NoControl - - - 10, 36 - - - 52, 17 - - - 15 - - - Lossy - - - Codecs which reduce audio quality - radioButtonAudioLossy @@ -1053,27 +462,6 @@ 6 - - True - - - NoControl - - - 10, 53 - - - 56, 17 - - - 14 - - - Hybrid - - - Hybrid codecs - radioButtonAudioHybrid @@ -1086,27 +474,6 @@ 7 - - True - - - NoControl - - - 10, 19 - - - 64, 17 - - - 13 - - - Lossless - - - Codecs that preserve bit-exact audio copy - radioButtonAudioLossless @@ -1119,21 +486,6 @@ 8 - - True - - - NoControl - - - 11, 90 - - - 16, 16 - - - 11 - labelFormat @@ -1146,21 +498,6 @@ 9 - - Top, Left, Right - - - 38, 88 - - - 101, 21 - - - 9 - - - Audio file format - comboBoxAudioFormat @@ -1177,10 +514,16 @@ Fill - 329, 101 + 439, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 148, 194 + 197, 254 2 @@ -1207,10 +550,13 @@ NoControl - 3, 237 + 4, 311 + + + 4, 4, 4, 4 - 164, 90 + 218, 117 Zoom @@ -1240,13 +586,13 @@ NoControl - 0, 48 + 0, 62 0, 0, 0, 0 - 97, 24 + 130, 33 13 @@ -1273,10 +619,13 @@ Fill - 100, 51 + 134, 66 + + + 4, 4, 4, 4 - 365, 21 + 486, 25 9 @@ -1300,14 +649,20 @@ Fill - 100, 3 + 134, 4 + + + 4, 4, 4, 4 - 365, 21 + 486, 24 0 + + 153, 8 + Input file @@ -1327,10 +682,13 @@ Fill - 100, 27 + 134, 35 + + + 4, 4, 4, 4 - 365, 21 + 486, 24 0 @@ -1356,45 +714,6 @@ Fill - - 38, 21 - - - Input: - - - 177, 22 - - - Folder browser - - - 177, 22 - - - Multiselect Browser - - - 177, 22 - - - Drag'n'drop mode - - - 177, 22 - - - Hide browser - - - Magenta - - - 32, 21 - - - Open/close input browser - 0, 0 @@ -1402,7 +721,7 @@ 0, 0, 0, 0 - 97, 24 + 130, 31 14 @@ -1428,47 +747,14 @@ Fill - - 48, 24 - - - Output: - - - 143, 22 - - - Browse - - - 143, 22 - - - Manual - - - 143, 22 - - - Use template - - - Magenta - - - 32, 21 - - - toolStripSplitButtonOutputBrowser - - 0, 24 + 0, 31 0, 0, 0, 0 - 97, 24 + 130, 31 15 @@ -1492,7 +778,7 @@ Fill - 3, 17 + 4, 21 0, 0, 0, 0 @@ -1501,7 +787,7 @@ 3 - 468, 72 + 624, 95 14 @@ -1519,16 +805,22 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelOutputTemplate" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxOutputFormat" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtInputPath" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtOutputPath" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="toolStripInput" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="toolStripOutput" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,20,94017,Percent,79,05983" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelOutputTemplate" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxOutputFormat" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtInputPath" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtOutputPath" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="toolStripInput" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="toolStripOutput" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,20.94017,Percent,79.05983" /><Rows Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333" /></TableLayoutSettings> Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 474, 92 + 632, 120 1 @@ -1548,21 +840,6 @@ 3 - - Top, Left, Right - - - 6, 94 - - - 150, 21 - - - 10 - - - Run custom script - comboBoxScript @@ -1575,27 +852,6 @@ 0 - - True - - - NoControl - - - 6, 71 - - - 109, 17 - - - 6 - - - Correct filenames - - - Correct filenames in CUE sheets - rbActionCorrectFilenames @@ -1608,27 +864,6 @@ 1 - - True - - - NoControl - - - 6, 54 - - - 112, 17 - - - 5 - - - Create CUE Sheet - - - Create a CUE sheet for sets of tracks and extract embedded CUE sheets - rbActionCreateCUESheet @@ -1641,27 +876,6 @@ 2 - - True - - - NoControl - - - 6, 37 - - - 53, 17 - - - 3 - - - &Verify - - - Contact the AccurateRip databse for validation and compare the image against database - rbActionVerify @@ -1674,27 +888,6 @@ 3 - - True - - - NoControl - - - 6, 20 - - - 60, 17 - - - 2 - - - &Encode - - - Convert to another format. Don't contact the AccurateRip database for validation - rbActionEncode @@ -1711,10 +904,16 @@ Fill - 3, 101 + 4, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 164, 130 + 218, 171 4 @@ -1734,231 +933,6 @@ 4 - - 2 - - - True - - - Fill - - - NoControl - - - 3, 0 - - - 75, 23 - - - 3 - - - Pregap - - - MiddleLeft - - - labelPregap - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 0 - - - True - - - Fill - - - NoControl - - - 3, 46 - - - 75, 24 - - - 5 - - - Offset - - - MiddleLeft - - - lblWriteOffset - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 1 - - - Fill - - - 84, 49 - - - 57, 21 - - - 2 - - - Right - - - Offset in samples - - - numericWriteOffset - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 2 - - - Fill - - - 84, 3 - - - 00:00:00 - - - 0 - - - 57, 21 - - - 0 - - - Pregap is a certain amount of silence or hidden audio before track one. Normally it is known from the CUE sheet, but if converting/verifying a set of separate tracks without a CUE sheet you might want to set this. - - - txtPreGapLength - - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 3 - - - True - - - Fill - - - NoControl - - - 3, 23 - - - 75, 23 - - - 4 - - - Data track - - - MiddleLeft - - - labelDataTrack - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 4 - - - Fill - - - 84, 26 - - - 00:00:00 - - - 0 - - - 57, 21 - - - 1 - - - Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here. - - - txtDataTrackLength - - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel4 - - - 5 - - - Fill - - - 3, 17 - - - 0, 0, 0, 0 - - - 3 - - - 144, 70 - - - 6 - tableLayoutPanel4 @@ -1972,16 +946,22 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelPregap" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblWriteOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numericWriteOffset" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtPreGapLength" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelDataTrack" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="txtDataTrackLength" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,56,75676,Percent,43,24324" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelPregap" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblWriteOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numericWriteOffset" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtPreGapLength" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelDataTrack" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="txtDataTrackLength" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,56.75676,Percent,43.24324" /><Rows Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333" /></TableLayoutSettings> Fill - 173, 237 + 230, 311 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 150, 90 + 201, 117 6 @@ -2001,27 +981,6 @@ 5 - - Fill - - - NoControl - - - 0, 0 - - - 0, 0, 0, 0 - - - 130, 26 - - - 9 - - - &Go - btnConvert @@ -2034,27 +993,6 @@ 0 - - NoControl - - - 0, 0 - - - 0, 0, 0, 0 - - - 65, 25 - - - 10 - - - &Stop - - - False - btnStop @@ -2067,30 +1005,6 @@ 1 - - Top, Right - - - NoControl - - - 65, 0 - - - 0, 0, 0, 0 - - - 65, 25 - - - 11 - - - &Resume - - - False - btnResume @@ -2103,30 +1017,6 @@ 2 - - Top, Right - - - NoControl - - - 65, 0 - - - 0, 0, 0, 0 - - - 65, 25 - - - 11 - - - &Pause - - - False - btnPause @@ -2143,13 +1033,13 @@ Fill - 338, 301 + 451, 394 - 12, 3, 12, 3 + 16, 4, 16, 4 - 130, 26 + 173, 34 14 @@ -2170,7 +1060,7 @@ Fill - 204, 0 + 272, 0 0, 0, 0, 0 @@ -2179,7 +1069,7 @@ 4 - 480, 330 + 640, 432 1 @@ -2197,7 +1087,7 @@ 2 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="groupBoxMode" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="grpAudioOutput" Row="1" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="pictureBoxMotd" Row="2" RowSpan="2" Column="0" ColumnSpan="1" /><Control Name="grpOutputPathGeneration" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="grpAction" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="grpExtra" Row="2" RowSpan="2" Column="1" ColumnSpan="1" /><Control Name="panelGo" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,35,41667,Percent,32,70833,Percent,31,875" /><Rows Styles="Percent,29,69697,Percent,41,51515,Percent,19,39394,Percent,9,393939" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="groupBoxMode" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="grpAudioOutput" Row="1" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="pictureBoxMotd" Row="2" RowSpan="2" Column="0" ColumnSpan="1" /><Control Name="grpOutputPathGeneration" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="grpAction" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="grpExtra" Row="2" RowSpan="2" Column="1" ColumnSpan="1" /><Control Name="panelGo" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,35.41667,Percent,32.70833,Percent,31.875" /><Rows Styles="Percent,29.69697,Percent,41.51515,Percent,19.39394,Percent,9.393939" /></TableLayoutSettings> Fill @@ -2212,7 +1102,7 @@ 2 - 684, 451 + 912, 593 17 @@ -2230,13 +1120,13 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="textBatchReport" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="grpInput" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,Absolute,480" /><Rows Styles="Absolute,330,Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="textBatchReport" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="grpInput" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,Absolute,640" /><Rows Styles="Absolute,432,Percent,100" /></TableLayoutSettings> 0, 0, 0, 0 - 684, 451 + 912, 593 toolStripContainer1.ContentPanel @@ -2268,6 +1158,9 @@ 0, 0 + + 4, 4, 4, 4 + toolStripContainer1.RightToolStripPanel @@ -2281,7 +1174,7 @@ 2 - 684, 502 + 912, 656 17 @@ -2295,89 +1188,11 @@ None - - 100, 23 - - - Create a new profile - - - 160, 22 - - - delete - - - Delete current profile - - - 157, 6 - - - 160, 22 - - - default - - - Magenta - - - 73, 22 - - - default - - - Profile - - - 6, 25 - - - Magenta - - - 23, 22 - - - About - - - Magenta - - - 23, 22 - - - CUETools website - - - Magenta - - - 23, 22 - - - Settings - - - None - - - Magenta - - - 23, 22 - - - Batch log - 0, 0 - 684, 25 + 912, 27 0 @@ -2418,53 +1233,1808 @@ 1 + + Top, Bottom, Left, Right + + + 19 + + + 4, 22 + + + 4, 4, 4, 4 + + + 256, 398 + + + 1 + + + fileSystemTreeView1 + + + CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + + + grpInput + + + 0 + + + 3 + + + checkBoxSkipRecent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 0 + + + checkBoxVerifyUseLocal + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 1 + + + checkBoxVerifyUseCDRepair + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 2 + + + Fill + + + 4, 21 + + + 4, 4, 4, 4 + + + 2 + + + 193, 146 + + + 2 + + + tableLayoutPanelVerifyMode + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxMode + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxSkipRecent" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxVerifyUseLocal" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="checkBoxVerifyUseCDRepair" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333,Absolute,27" /><Rows Styles="Percent,32.72727,Percent,67.27273" /></TableLayoutSettings> + + + 153, 8 + + + True + + + Fill + + + NoControl + + + 132, 4 + + + 4, 4, 4, 4 + + + 57, 39 + + + 2 + + + Skip recently verified + + + checkBoxSkipRecent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 0 + + + True + + + Fill + + + NoControl + + + 68, 4 + + + 4, 4, 4, 4 + + + 56, 39 + + + 1 + + + Use local database + + + checkBoxVerifyUseLocal + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 1 + + + True + + + Fill + + + NoControl + + + 4, 4 + + + 4, 4, 4, 4 + + + 56, 39 + + + 0 + + + Use CTDB (CUETools database) + + + checkBoxVerifyUseCDRepair + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelVerifyMode + + + 2 + + + 3 + + + checkBoxUseAccurateRip + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 0 + + + checkBoxUseFreeDb + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 1 + + + rbTracks + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 2 + + + rbEmbedCUE + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 3 + + + rbSingleFile + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 4 + + + checkBoxUseMusicBrainz + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 5 + + + Fill + + + 4, 21 + + + 0, 0, 0, 0 + + + 5 + + + 193, 146 + + + 11 + + + tableLayoutPanelCUEStyle + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxMode + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxUseAccurateRip" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="checkBoxUseFreeDb" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="rbTracks" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbEmbedCUE" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="rbSingleFile" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="checkBoxUseMusicBrainz" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,33.33332,Percent,33.33334,Percent,33.33334" /><Rows Styles="Percent,18.18229,Percent,18.18229,Percent,18.18229,Percent,22.72658,Percent,22.72658" /></TableLayoutSettings> + + + True + + + Fill + + + NoControl + + + 128, 111 + + + 0, 0, 0, 0 + + + 65, 35 + + + 5 + + + Use AccurateRip + + + checkBoxUseAccurateRip + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 0 + + + True + + + Fill + + + NoControl + + + 64, 111 + + + 0, 0, 0, 0 + + + 64, 35 + + + 4 + + + Use FreeDb + + + checkBoxUseFreeDb + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 1 + + + True + + + Fill + + + NoControl + + + 4, 52 + + + 4, 0, 4, 0 + + + 185, 26 + + + 2 + + + &Tracks + + + File per track. Gap handling can be selected in advanced settings. + + + rbTracks + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 2 + + + True + + + Fill + + + NoControl + + + 4, 0 + + + 4, 0, 4, 0 + + + 185, 26 + + + 0 + + + &Embedded + + + Create single file with embedded CUE sheet. + + + rbEmbedCUE + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 3 + + + True + + + Fill + + + NoControl + + + 4, 26 + + + 4, 0, 4, 0 + + + 185, 26 + + + 1 + + + Image + CUE + + + Create single file + CUE sheet + + + rbSingleFile + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 4 + + + True + + + Fill + + + NoControl + + + 0, 111 + + + 0, 0, 0, 0 + + + 64, 35 + + + 3 + + + Use MusicBrainz + + + checkBoxUseMusicBrainz + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelCUEStyle + + + 5 + + + 3, 17 + + + False + + + Fill + + + 4, 21 + + + 4, 0, 1, 0 + + + 193, 146 + + + 20 + + + toolStripCorrectorFormat + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxMode + + + 2 + + + Magenta + + + 93, 24 + + + Overwrite + + + Magenta + + + 97, 24 + + + Locate files + + + 195, 24 + + + Locate files + + + Try to locate missing files automatically + + + 195, 24 + + + Change extension + + + Replace extension for audio files with this: + + + Magenta + + + 46, 24 + + + flac + + + False + + + Tahoma, 8.25pt + + + NoControl + + + 133, 228 + + + 0, 0, 0, 0 + + + 52, 17 + + + 19 + + + 320 + + + TopRight + + + labelEncoderMaxMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 0 + + + True + + + False + + + Tahoma, 8.25pt + + + NoControl + + + 8, 228 + + + 0, 0, 0, 0 + + + 32, 17 + + + 19 + + + 128 + + + labelEncoderMinMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 1 + + + Tahoma, 8.25pt + + + NoControl + + + 4, 228 + + + 0, 0, 0, 0 + + + 185, 20 + + + 18 + + + 256 + + + TopCenter + + + For lossless formats, the level of compression. For lossy formats, target quality + + + labelEncoderMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 2 + + + Top, Left, Right + + + NoControl + + + 4, 187 + + + 0, 0, 0, 0 + + + 189, 56 + + + 17 + + + trackBarEncoderMode + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 3 + + + Top, Left, Right + + + 13, 152 + + + 4, 4, 4, 4 + + + 171, 25 + + + 16 + + + Encoder to use + + + comboBoxEncoder + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 4 + + + True + + + NoControl + + + 13, 92 + + + 4, 4, 4, 4 + + + 61, 21 + + + 16 + + + None + + + No audio output + + + radioButtonAudioNone + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 5 + + + True + + + NoControl + + + 13, 47 + + + 4, 4, 4, 4 + + + 64, 21 + + + 15 + + + Lossy + + + Codecs which reduce audio quality + + + radioButtonAudioLossy + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 6 + + + True + + + NoControl + + + 13, 69 + + + 4, 4, 4, 4 + + + 69, 21 + + + 14 + + + Hybrid + + + Hybrid codecs + + + radioButtonAudioHybrid + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 7 + + + True + + + NoControl + + + 13, 25 + + + 4, 4, 4, 4 + + + 77, 21 + + + 13 + + + Lossless + + + Codecs that preserve bit-exact audio copy + + + radioButtonAudioLossless + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 8 + + + True + + + NoControl + + + 15, 118 + + + 4, 0, 4, 0 + + + 21, 21 + + + 11 + + + labelFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 9 + + + Top, Left, Right + + + 51, 115 + + + 4, 4, 4, 4 + + + 133, 25 + + + 9 + + + Audio file format + + + comboBoxAudioFormat + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 10 + + + 46, 28 + + + Input: + + + Magenta + + + 32, 28 + + + Open/close input browser + + + 207, 24 + + + Folder browser + + + 207, 24 + + + Multiselect Browser + + + 207, 24 + + + Drag'n'drop mode + + + 207, 24 + + + Hide browser + + + 58, 31 + + + Output: + + + Magenta + + + 32, 28 + + + toolStripSplitButtonOutputBrowser + + + 166, 24 + + + Browse + + + 166, 24 + + + Manual + + + 166, 24 + + + Use template + + + Top, Left, Right + + + 8, 123 + + + 4, 4, 4, 4 + + + 198, 25 + + + 10 + + + Run custom script + + + comboBoxScript + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAction + + + 0 + + + True + + + NoControl + + + 8, 93 + + + 4, 4, 4, 4 + + + 134, 21 + + + 6 + + + Correct filenames + + + Correct filenames in CUE sheets + + + rbActionCorrectFilenames + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAction + + + 1 + + + True + + + NoControl + + + 8, 71 + + + 4, 4, 4, 4 + + + 138, 21 + + + 5 + + + Create CUE Sheet + + + Create a CUE sheet for sets of tracks and extract embedded CUE sheets + + + rbActionCreateCUESheet + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAction + + + 2 + + + True + + + NoControl + + + 8, 48 + + + 4, 4, 4, 4 + + + 63, 21 + + + 3 + + + &Verify + + + Contact the AccurateRip databse for validation and compare the image against database + + + rbActionVerify + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAction + + + 3 + + + True + + + NoControl + + + 8, 26 + + + 4, 4, 4, 4 + + + 75, 21 + + + 2 + + + &Encode + + + Convert to another format. Don't contact the AccurateRip database for validation + + + rbActionEncode + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAction + + + 4 + + + 2 + + + labelPregap + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + lblWriteOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + numericWriteOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + txtPreGapLength + + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 3 + + + labelDataTrack + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 4 + + + txtDataTrackLength + + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 5 + + + Fill + + + 4, 21 + + + 0, 0, 0, 0 + + + 3 + + + 193, 92 + + + 6 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpExtra + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelPregap" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblWriteOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numericWriteOffset" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="txtPreGapLength" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelDataTrack" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="txtDataTrackLength" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,56.75676,Percent,43.24324" /><Rows Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333" /></TableLayoutSettings> + + + True + + + Fill + + + NoControl + + + 4, 0 + + + 4, 0, 4, 0 + + + 101, 30 + + + 3 + + + Pregap + + + MiddleLeft + + + labelPregap + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + True + + + Fill + + + NoControl + + + 4, 60 + + + 4, 0, 4, 0 + + + 101, 32 + + + 5 + + + Offset + + + MiddleLeft + + + lblWriteOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + Fill + + + 114, 65 + + + 5, 5, 5, 5 + + + 74, 24 + + + 2 + + + Right + + + Offset in samples + + + numericWriteOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + Fill + + + 113, 4 + + + 4, 4, 4, 4 + + + 00:00:00 + + + 0 + + + 76, 24 + + + 0 + + + Pregap is a certain amount of silence or hidden audio before track one. Normally it is known from the CUE sheet, but if converting/verifying a set of separate tracks without a CUE sheet you might want to set this. + + + txtPreGapLength + + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 3 + + + True + + + Fill + + + NoControl + + + 4, 30 + + + 4, 0, 4, 0 + + + 101, 30 + + + 4 + + + Data track + + + MiddleLeft + + + labelDataTrack + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 4 + + + Fill + + + 113, 34 + + + 4, 4, 4, 4 + + + 00:00:00 + + + 0 + + + 76, 24 + + + 1 + + + Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here. + + + txtDataTrackLength + + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 5 + + + Fill + + + NoControl + + + 0, 0 + + + 0, 0, 0, 0 + + + 173, 34 + + + 9 + + + &Go + + + btnConvert + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGo + + + 0 + + + NoControl + + + 0, 0 + + + 0, 0, 0, 0 + + + 87, 33 + + + 10 + + + &Stop + + + False + + + btnStop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGo + + + 1 + + + Top, Right + + + NoControl + + + 87, 0 + + + 0, 0, 0, 0 + + + 87, 33 + + + 11 + + + &Resume + + + False + + + btnResume + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGo + + + 2 + + + Top, Right + + + NoControl + + + 87, 0 + + + 0, 0, 0, 0 + + + 87, 33 + + + 11 + + + &Pause + + + False + + + btnPause + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGo + + + 3 + + + Magenta + + + 85, 24 + + + default + + + Profile + + + 100, 27 + + + Create a new profile + + + 160, 24 + + + delete + + + Delete current profile + + + 157, 6 + + + 160, 24 + + + default + + + 6, 27 + + + Magenta + + + 23, 24 + + + About + + + Magenta + + + 23, 24 + + + CUETools website + + + Magenta + + + 23, 24 + + + Settings + + + None + + + Magenta + + + 23, 24 + + + Batch log + 424, 8 - - False - - - 224, 22 - - - Selected file - - - 221, 6 - - - 224, 22 - - - Set as My Music folder - - - 224, 22 - - - Reset to original location - - - 224, 22 - - - Edit metadata - - - 224, 22 - - - Add folder to local database - - - 224, 22 - - - Remove from local database - - 225, 142 + 270, 154 contextMenuStripFileTree @@ -2472,6 +3042,48 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + 269, 24 + + + Selected file + + + 266, 6 + + + 269, 24 + + + Set as My Music folder + + + 269, 24 + + + Reset to original location + + + 269, 24 + + + Edit metadata + + + 269, 24 + + + Add folder to local database + + + 269, 24 + + + Remove from local database + 845, 8 @@ -2482,10 +3094,10 @@ 30 - 6, 13 + 8, 17 - 684, 502 + 912, 656 Tahoma, 8.25pt @@ -2887,8 +3499,11 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACAAQAAwAMAAPAPAAA= + + 4, 4, 4, 4 + - 700, 538 + 927, 690 CUETools 2.1.2a diff --git a/CUETools/frmChoice.Designer.cs b/CUETools/frmChoice.Designer.cs index 85df558..90d0227 100644 --- a/CUETools/frmChoice.Designer.cs +++ b/CUETools/frmChoice.Designer.cs @@ -39,19 +39,21 @@ namespace JDP this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tableLayoutPanelMeta = new System.Windows.Forms.TableLayoutPanel(); - this.listMetadata = new System.Windows.Forms.ListView(); - this.columnHeaderMetadataValue = new System.Windows.Forms.ColumnHeader(); - this.columnHeaderMetadataName = new System.Windows.Forms.ColumnHeader(); - this.listTracks = new System.Windows.Forms.ListView(); - this.Title = new System.Windows.Forms.ColumnHeader(); - this.TrackNo = new System.Windows.Forms.ColumnHeader(); - this.Start = new System.Windows.Forms.ColumnHeader(); - this.Length = new System.Windows.Forms.ColumnHeader(); + this.dataGridViewMetadata = new System.Windows.Forms.DataGridView(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); + this.dataGridViewTracks = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumnTrackNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumnTrackTitle = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumnTrackStart = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumnTrackLength = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Item = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tableLayoutPanelMeta.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewMetadata)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTracks)).BeginInit(); this.SuspendLayout(); // // buttonOk @@ -92,6 +94,7 @@ namespace JDP this.imageList1.Images.SetKeyName(4, "tags"); this.imageList1.Images.SetKeyName(5, "local"); this.imageList1.Images.SetKeyName(6, "ctdb"); + this.imageList1.Images.SetKeyName(7, "discogs"); // // textBox1 // @@ -126,76 +129,110 @@ namespace JDP // tableLayoutPanelMeta // resources.ApplyResources(this.tableLayoutPanelMeta, "tableLayoutPanelMeta"); - this.tableLayoutPanelMeta.Controls.Add(this.listMetadata, 0, 0); - this.tableLayoutPanelMeta.Controls.Add(this.listTracks, 1, 0); + this.tableLayoutPanelMeta.Controls.Add(this.dataGridViewTracks, 0, 0); + this.tableLayoutPanelMeta.Controls.Add(this.dataGridViewMetadata, 0, 0); this.tableLayoutPanelMeta.Name = "tableLayoutPanelMeta"; // - // listMetadata + // dataGridViewMetadata // - this.listMetadata.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeaderMetadataValue, - this.columnHeaderMetadataName}); - resources.ApplyResources(this.listMetadata, "listMetadata"); - this.listMetadata.FullRowSelect = true; - this.listMetadata.GridLines = true; - this.listMetadata.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.listMetadata.LabelEdit = true; - this.listMetadata.Name = "listMetadata"; - this.listMetadata.UseCompatibleStateImageBehavior = false; - this.listMetadata.View = System.Windows.Forms.View.Details; - this.listMetadata.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listMetadata_AfterLabelEdit); - this.listMetadata.DoubleClick += new System.EventHandler(this.listMetadata_DoubleClick); - this.listMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listMetadata_KeyDown); - // - // columnHeaderMetadataValue - // - resources.ApplyResources(this.columnHeaderMetadataValue, "columnHeaderMetadataValue"); - // - // columnHeaderMetadataName - // - resources.ApplyResources(this.columnHeaderMetadataName, "columnHeaderMetadataName"); - // - // listTracks - // - this.listTracks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.Title, - this.TrackNo, - this.Start, - this.Length}); - resources.ApplyResources(this.listTracks, "listTracks"); - this.listTracks.FullRowSelect = true; - this.listTracks.GridLines = true; - this.listTracks.LabelEdit = true; - this.listTracks.Name = "listTracks"; - this.listTracks.UseCompatibleStateImageBehavior = false; - this.listTracks.View = System.Windows.Forms.View.Details; - this.listTracks.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listTracks_AfterLabelEdit); - this.listTracks.DoubleClick += new System.EventHandler(this.listTracks_DoubleClick); - this.listTracks.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.listTracks_PreviewKeyDown); - this.listTracks.BeforeLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listTracks_BeforeLabelEdit); - this.listTracks.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listTracks_KeyDown); - // - // Title - // - resources.ApplyResources(this.Title, "Title"); - // - // TrackNo - // - resources.ApplyResources(this.TrackNo, "TrackNo"); - // - // Start - // - resources.ApplyResources(this.Start, "Start"); - // - // Length - // - resources.ApplyResources(this.Length, "Length"); + this.dataGridViewMetadata.AllowUserToAddRows = false; + this.dataGridViewMetadata.AllowUserToDeleteRows = false; + this.dataGridViewMetadata.AllowUserToResizeColumns = false; + this.dataGridViewMetadata.AllowUserToResizeRows = false; + this.dataGridViewMetadata.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dataGridViewMetadata.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridViewMetadata.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.dataGridViewMetadata.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewMetadata.ColumnHeadersVisible = false; + this.dataGridViewMetadata.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Item, + this.Value}); + resources.ApplyResources(this.dataGridViewMetadata, "dataGridViewMetadata"); + this.dataGridViewMetadata.GridColor = System.Drawing.SystemColors.ControlLight; + this.dataGridViewMetadata.MultiSelect = false; + this.dataGridViewMetadata.Name = "dataGridViewMetadata"; + this.dataGridViewMetadata.RowHeadersVisible = false; + this.dataGridViewMetadata.RowTemplate.Height = 24; + this.dataGridViewMetadata.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridViewMetadata.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewMetadata_CellEndEdit); + this.dataGridViewMetadata.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dataGridViewMetadata_EditingControlShowing); + this.dataGridViewMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridViewMetadata_KeyDown); // // backgroundWorker1 // this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork); this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted); // + // dataGridViewTracks + // + this.dataGridViewTracks.AllowUserToAddRows = false; + this.dataGridViewTracks.AllowUserToDeleteRows = false; + this.dataGridViewTracks.AllowUserToResizeColumns = false; + this.dataGridViewTracks.AllowUserToResizeRows = false; + this.dataGridViewTracks.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dataGridViewTracks.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridViewTracks.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.dataGridViewTracks.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewTracks.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumnTrackNo, + this.dataGridViewTextBoxColumnTrackTitle, + this.dataGridViewTextBoxColumnTrackStart, + this.dataGridViewTextBoxColumnTrackLength}); + resources.ApplyResources(this.dataGridViewTracks, "dataGridViewTracks"); + this.dataGridViewTracks.GridColor = System.Drawing.SystemColors.ControlLight; + this.dataGridViewTracks.MultiSelect = false; + this.dataGridViewTracks.Name = "dataGridViewTracks"; + this.dataGridViewTracks.RowHeadersVisible = false; + this.dataGridViewTracks.RowTemplate.Height = 24; + this.dataGridViewTracks.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridViewTracks.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewTracks_CellEndEdit); + // + // dataGridViewTextBoxColumnTrackNo + // + this.dataGridViewTextBoxColumnTrackNo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.dataGridViewTextBoxColumnTrackNo.Frozen = true; + resources.ApplyResources(this.dataGridViewTextBoxColumnTrackNo, "dataGridViewTextBoxColumnTrackNo"); + this.dataGridViewTextBoxColumnTrackNo.Name = "dataGridViewTextBoxColumnTrackNo"; + this.dataGridViewTextBoxColumnTrackNo.ReadOnly = true; + this.dataGridViewTextBoxColumnTrackNo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumnTrackTitle + // + this.dataGridViewTextBoxColumnTrackTitle.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + resources.ApplyResources(this.dataGridViewTextBoxColumnTrackTitle, "dataGridViewTextBoxColumnTrackTitle"); + this.dataGridViewTextBoxColumnTrackTitle.Name = "dataGridViewTextBoxColumnTrackTitle"; + this.dataGridViewTextBoxColumnTrackTitle.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumnTrackStart + // + this.dataGridViewTextBoxColumnTrackStart.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + resources.ApplyResources(this.dataGridViewTextBoxColumnTrackStart, "dataGridViewTextBoxColumnTrackStart"); + this.dataGridViewTextBoxColumnTrackStart.Name = "dataGridViewTextBoxColumnTrackStart"; + this.dataGridViewTextBoxColumnTrackStart.ReadOnly = true; + this.dataGridViewTextBoxColumnTrackStart.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumnTrackLength + // + this.dataGridViewTextBoxColumnTrackLength.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + resources.ApplyResources(this.dataGridViewTextBoxColumnTrackLength, "dataGridViewTextBoxColumnTrackLength"); + this.dataGridViewTextBoxColumnTrackLength.Name = "dataGridViewTextBoxColumnTrackLength"; + this.dataGridViewTextBoxColumnTrackLength.ReadOnly = true; + this.dataGridViewTextBoxColumnTrackLength.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // Item + // + this.Item.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.Item.Frozen = true; + resources.ApplyResources(this.Item, "Item"); + this.Item.Name = "Item"; + this.Item.ReadOnly = true; + // + // Value + // + this.Value.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + resources.ApplyResources(this.Value, "Value"); + this.Value.Name = "Value"; + // // frmChoice // this.AcceptButton = this.buttonOk; @@ -207,11 +244,14 @@ namespace JDP this.ShowInTaskbar = false; this.Load += new System.EventHandler(this.frmChoice_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmChoice_FormClosing); + this.Resize += new System.EventHandler(this.frmChoice_Resize); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tableLayoutPanelMeta.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewMetadata)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTracks)).EndInit(); this.ResumeLayout(false); } @@ -228,13 +268,13 @@ namespace JDP private System.Windows.Forms.PictureBox pictureBox1; private System.ComponentModel.BackgroundWorker backgroundWorker1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanelMeta; - private System.Windows.Forms.ListView listMetadata; - private System.Windows.Forms.ColumnHeader columnHeaderMetadataValue; - private System.Windows.Forms.ColumnHeader columnHeaderMetadataName; - private System.Windows.Forms.ListView listTracks; - private System.Windows.Forms.ColumnHeader Title; - private System.Windows.Forms.ColumnHeader TrackNo; - private System.Windows.Forms.ColumnHeader Start; - private System.Windows.Forms.ColumnHeader Length; + private System.Windows.Forms.DataGridView dataGridViewMetadata; + private System.Windows.Forms.DataGridView dataGridViewTracks; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumnTrackNo; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumnTrackTitle; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumnTrackStart; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumnTrackLength; + private System.Windows.Forms.DataGridViewTextBoxColumn Item; + private System.Windows.Forms.DataGridViewTextBoxColumn Value; } } \ No newline at end of file diff --git a/CUETools/frmChoice.cs b/CUETools/frmChoice.cs index 7670a08..e1cd724 100644 --- a/CUETools/frmChoice.cs +++ b/CUETools/frmChoice.cs @@ -22,17 +22,15 @@ namespace JDP public CUESheet CUE; private bool ctdb; - private CTDBPriority priorityMusicbrainz, priorityFreedb, priorityFreedbFuzzy; + private CTDBMetadataSearch metadataSearch; - public void LookupAlbumInfo(bool cache, bool cue, bool ctdb, CTDBPriority priorityMusicbrainz, CTDBPriority priorityFreedb, CTDBPriority priorityFreedbFuzzy) + public void LookupAlbumInfo(bool cache, bool cue, bool ctdb, CTDBMetadataSearch metadataSearch) { this.ctdb = ctdb; - this.priorityMusicbrainz = priorityMusicbrainz; - this.priorityFreedb = priorityFreedb; - this.priorityFreedbFuzzy = priorityFreedbFuzzy; - var releases = CUE.LookupAlbumInfo(cache, cue, false, CTDBPriority.None, CTDBPriority.None, CTDBPriority.None); + this.metadataSearch = metadataSearch; + var releases = CUE.LookupAlbumInfo(cache, cue, false, CTDBMetadataSearch.None); this.Choices = releases; - if (ctdb || priorityMusicbrainz != CTDBPriority.None || priorityFreedb != CTDBPriority.None || priorityFreedbFuzzy != CTDBPriority.None) + if (ctdb || metadataSearch != CTDBMetadataSearch.None) backgroundWorker1.RunWorkerAsync(null); } @@ -159,14 +157,19 @@ namespace JDP CUE.CopyMetadata(ri.metadata); } - private void AutoResizeTracks() + private void AutoResizeList(ListView list, int mainCol) { - listTracks.Columns[1].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent); - listTracks.Columns[2].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent); - listTracks.Columns[3].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent); - int widthAvailable = listTracks.Width - listTracks.Columns[1].Width - listTracks.Columns[2].Width - listTracks.Columns[3].Width - listTracks.Padding.Horizontal - 24; - if (listTracks.Columns[0].Width < widthAvailable) - listTracks.Columns[0].Width = widthAvailable; + list.SuspendLayout(); + int widthAvailable = list.Width - SystemInformation.BorderSize.Width - SystemInformation.VerticalScrollBarWidth; + for (int i = 0; i < list.Columns.Count; i++) + if (i != mainCol) + { + list.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent); + widthAvailable -= list.Columns[i].Width + SystemInformation.BorderSize.Width; + } + if (list.Columns[mainCol].Width != widthAvailable) + list.Columns[mainCol].Width = widthAvailable; + list.ResumeLayout(false); } private void listChoices_SelectedIndexChanged(object sender, EventArgs e) @@ -190,65 +193,147 @@ namespace JDP else if (item != null && item is CUEMetadataEntry) { CUEMetadataEntry r = (item as CUEMetadataEntry); - listTracks.Items.Clear(); + dataGridViewTracks.SuspendLayout(); + dataGridViewTracks.Rows.Clear(); foreach (CUETrackMetadata track in r.metadata.Tracks) { - listTracks.Items.Add(new ListViewItem(new string[] { + int no = dataGridViewTracks.Rows.Count; + dataGridViewTracks.Rows.Add( + (no + 1).ToString(), track.Title, - (listTracks.Items.Count + 1).ToString(), - r.TOC[listTracks.Items.Count + r.TOC.FirstAudio].StartMSF, - r.TOC[listTracks.Items.Count + r.TOC.FirstAudio].LengthMSF - })); + r.TOC[no + r.TOC.FirstAudio].StartMSF, + r.TOC[no + r.TOC.FirstAudio].LengthMSF + ); } - AutoResizeTracks(); - listMetadata.Items.Clear(); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Artist, "Artist" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Title, "Album" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Year, "Date" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Genre, "Genre" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.DiscNumber, "Disc Number" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.TotalDiscs, "Total Discs" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.DiscName, "Disc Name" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Barcode, "Barcode" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.ReleaseDate, "Release Date" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Label, "Label" })); - listMetadata.Items.Add(new ListViewItem(new string[] { r.metadata.Country, "Country" })); + dataGridViewTracks.ResumeLayout(); + dataGridViewMetadata.Rows.Clear(); + dataGridViewMetadata.Rows.Add("Artist", r.metadata.Artist); + dataGridViewMetadata.Rows.Add("Album", r.metadata.Title); + dataGridViewMetadata.Rows.Add("Date", r.metadata.Year); + dataGridViewMetadata.Rows.Add("Genre", r.metadata.Genre); + dataGridViewMetadata.Rows.Add("Disc Number", r.metadata.DiscNumber); + dataGridViewMetadata.Rows.Add("Total Discs", r.metadata.TotalDiscs); + dataGridViewMetadata.Rows.Add("Disc Name", r.metadata.DiscName); + dataGridViewMetadata.Rows.Add("Barcode", r.metadata.Barcode); + dataGridViewMetadata.Rows.Add("Release Date", r.metadata.ReleaseDate); + dataGridViewMetadata.Rows.Add("Label", r.metadata.Label); + dataGridViewMetadata.Rows.Add("Country", r.metadata.Country); } else { - listMetadata.Items.Clear(); - listTracks.Items.Clear(); + dataGridViewMetadata.Rows.Clear(); + dataGridViewTracks.Rows.Clear(); textBox1.Text = ""; } } - private void listTracks_DoubleClick(object sender, EventArgs e) + private void pictureBox1_DoubleClick(object sender, EventArgs e) { - listTracks.FocusedItem.BeginEdit(); + pictureBox1.SizeMode = pictureBox1.SizeMode == PictureBoxSizeMode.Zoom ? + PictureBoxSizeMode.CenterImage : PictureBoxSizeMode.Zoom; } - private void listTracks_KeyDown(object sender, KeyEventArgs e) + private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e) { - if (e.KeyCode == Keys.F2) - listTracks.FocusedItem.BeginEdit(); + e.Result = CUE.LookupAlbumInfo(false, false, this.ctdb, this.metadataSearch); } - private void listTracks_BeforeLabelEdit(object sender, LabelEditEventArgs e) + private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { - if (ChosenRelease == null) + foreach (object i in (e.Result as List)) + AddItem(i); + } + + private void frmChoice_Resize(object sender, EventArgs e) + { + AutoResizeList(listChoices, 0); + } + + private void dataGridViewMetadata_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) + { + var te = e.Control as DataGridViewTextBoxEditingControl; + if (te != null) { - e.CancelEdit = true; - return; +// te.AutoCompleteMode = AutoCompleteMode.None; + te.AutoCompleteMode = AutoCompleteMode.Suggest; + te.AutoCompleteSource = AutoCompleteSource.CustomSource; + te.AutoCompleteCustomSource.Clear(); + foreach (ListViewItem item in listChoices.Items) + { + var r = item.Tag as CUEMetadataEntry; + switch (dataGridViewMetadata.CurrentCell.RowIndex) + { + case 0: + foreach (CUETrackMetadata track in r.metadata.Tracks) + te.AutoCompleteCustomSource.Add(track.Artist); + te.AutoCompleteCustomSource.Add(r.metadata.Artist); + break; + case 1: te.AutoCompleteCustomSource.Add(r.metadata.Title); break; + case 2: te.AutoCompleteCustomSource.Add(r.metadata.Year); break; + case 3: te.AutoCompleteCustomSource.Add(r.metadata.Genre); break; + case 4: te.AutoCompleteCustomSource.Add(r.metadata.DiscNumber); break; + case 5: te.AutoCompleteCustomSource.Add(r.metadata.TotalDiscs); break; + case 6: te.AutoCompleteCustomSource.Add(r.metadata.DiscName); break; + case 7: te.AutoCompleteCustomSource.Add(r.metadata.Barcode); break; + case 8: te.AutoCompleteCustomSource.Add(r.metadata.ReleaseDate); break; + case 9: te.AutoCompleteCustomSource.Add(r.metadata.Label); break; + case 10: te.AutoCompleteCustomSource.Add(r.metadata.Country); break; + } + } } } - private void listTracks_AfterLabelEdit(object sender, LabelEditEventArgs e) + private void dataGridViewMetadata_CellEndEdit(object sender, DataGridViewCellEventArgs e) { - CUEMetadataEntry ri = ChosenRelease; - if (ri != null && e.Label != null) - ri.metadata.Tracks[e.Item].Title = e.Label; + ListViewItem item = ChosenItem; + CUEMetadataEntry r = ChosenRelease; + var label = dataGridViewMetadata.Rows[e.RowIndex].Cells[1].Value as string; + if (label != null && item != null && r != null) + { + switch (e.RowIndex) + { + case 0: + foreach (CUETrackMetadata track in r.metadata.Tracks) + if (track.Artist == r.metadata.Artist) + track.Artist = label; + r.metadata.Artist = label; + break; + case 1: r.metadata.Title = label; break; + case 2: r.metadata.Year = label; break; + case 3: r.metadata.Genre = label; break; + case 4: r.metadata.DiscNumber = label; break; + case 5: r.metadata.TotalDiscs = label; break; + case 6: r.metadata.DiscName = label; break; + case 7: r.metadata.Barcode = label; break; + case 8: r.metadata.ReleaseDate = label; break; + case 9: r.metadata.Label = label; break; + case 10: r.metadata.Country = label; break; + } + item.Text = r.ToString(); + } } + private void dataGridViewMetadata_KeyDown(object sender, KeyEventArgs e) + { + CUEMetadataEntry r = ChosenRelease; + if (e.KeyCode == Keys.Delete && r != null) + { + var ee = new DataGridViewCellEventArgs(1, dataGridViewMetadata.CurrentCellAddress.Y); + dataGridViewMetadata.Rows[ee.RowIndex].Cells[1].Value = ""; + dataGridViewMetadata_CellEndEdit(sender, ee); + } + } + + private void dataGridViewTracks_CellEndEdit(object sender, DataGridViewCellEventArgs e) + { + CUEMetadataEntry ri = ChosenRelease; + var label = dataGridViewTracks.Rows[e.RowIndex].Cells[e.ColumnIndex].Value as string; + if (ri != null && label != null) + ri.metadata.Tracks[e.RowIndex].Title = label; + + } + + /* private void listTracks_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { if (e.KeyCode == Keys.Enter) @@ -262,91 +347,6 @@ namespace JDP } } } - - private void listMetadata_DoubleClick(object sender, EventArgs e) - { - listMetadata.FocusedItem.BeginEdit(); - } - - private void listMetadata_KeyDown(object sender, KeyEventArgs e) - { - CUEMetadataEntry r = ChosenRelease; - if (e.KeyCode == Keys.F2) - listMetadata.FocusedItem.BeginEdit(); - if (e.KeyCode == Keys.Delete && r != null) - { - foreach (int i in listMetadata.SelectedIndices) - { - switch (i) - { - case 0: - foreach (CUETrackMetadata track in r.metadata.Tracks) - if (track.Artist == r.metadata.Artist) - track.Artist = ""; - r.metadata.Artist = ""; - break; - case 1: r.metadata.Title = ""; break; - case 2: r.metadata.Year = ""; break; - case 3: r.metadata.Genre = ""; break; - case 4: r.metadata.DiscNumber = ""; break; - case 5: r.metadata.TotalDiscs = ""; break; - case 6: r.metadata.DiscName = ""; break; - case 7: r.metadata.Barcode = ""; break; - case 8: r.metadata.ReleaseDate = ""; break; - case 9: r.metadata.Label = ""; break; - case 10: r.metadata.Country = ""; break; - } - listMetadata.Items[i].Text = ""; - } - ListViewItem item = ChosenItem; - item.Text = r.ToString(); - } - } - - private void listMetadata_AfterLabelEdit(object sender, LabelEditEventArgs e) - { - ListViewItem item = ChosenItem; - CUEMetadataEntry r = ChosenRelease; - if (e.Label != null && item != null && r != null) - { - switch (e.Item) - { - case 0: - foreach (CUETrackMetadata track in r.metadata.Tracks) - if (track.Artist == r.metadata.Artist) - track.Artist = e.Label; - r.metadata.Artist = e.Label; - break; - case 1: r.metadata.Title = e.Label; break; - case 2: r.metadata.Year = e.Label; break; - case 3: r.metadata.Genre = e.Label; break; - case 4: r.metadata.DiscNumber = e.Label; break; - case 5: r.metadata.TotalDiscs = e.Label; break; - case 6: r.metadata.DiscName = e.Label; break; - case 7: r.metadata.Barcode = e.Label; break; - case 8: r.metadata.ReleaseDate = e.Label; break; - case 9: r.metadata.Label = e.Label; break; - case 10: r.metadata.Country = e.Label; break; - } - item.Text = r.ToString(); - } - } - - private void pictureBox1_DoubleClick(object sender, EventArgs e) - { - pictureBox1.SizeMode = pictureBox1.SizeMode == PictureBoxSizeMode.Zoom ? - PictureBoxSizeMode.CenterImage : PictureBoxSizeMode.Zoom; - } - - private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e) - { - e.Result = CUE.LookupAlbumInfo(false, false, this.ctdb, this.priorityMusicbrainz, this.priorityFreedb, this.priorityFreedbFuzzy); - } - - private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) - { - foreach (object i in (e.Result as List)) - AddItem(i); - } + * */ } } diff --git a/CUETools/frmChoice.resx b/CUETools/frmChoice.resx index 31103b1..34c064d 100644 --- a/CUETools/frmChoice.resx +++ b/CUETools/frmChoice.resx @@ -123,10 +123,13 @@ - 631, 3 + 841, 4 + + + 4, 4, 4, 4 - 154, 29 + 206, 35 @@ -154,10 +157,13 @@ Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 - 788, 144 + 1051, 177 17, 17 @@ -166,142 +172,159 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4 - HwAAAk1TRnQBSQFMAgEBBwEAAQwBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABIAMAAQEBAAEgBgABIB4AAx0BKgNDAXcDHQEqeAADJwE7AVIBUAFOAZQBdwFqAVwBzgGYAXoBWQHr - AZgBegFZAesBdwFqAVwBzgFSAVABTgGUAgAB4gH/AgAB4gH/VAADHQEpA0IBdAL/AfAB/wNCAXQDHQEp - bAADCgENAVIBUAFOAZYBrAF/AVMB+gHhAc0BuQH/AfEB4AHOAf8B+QHnAdYB/wH4AeYB1AH/AfAB3QHM - Af8B4QHNAbkB/wIAAeIB/wIAAeIB/wMKAQ1MAAMcASgDQAFxAv8B8AH/AukB2gP/AfEB/wNAAXEDHAEo - IAADNgFZA0IBdgNCAXYDMAFLBAADMAFLA0IBdgNCAXYDQgF2A0IBdgMwAUsEAAMwAUsDQgF2A0IBdgM2 - AVkEAAMKAQ0BZgFfAVcBuAHZAb8BpQH/Af4B8gHkAv8B5wHPAf8B/AHbAbsB/wH5AdMBsgH/AfYB0AGs - Af8B9AHRAa4B/wH2AdgBuwH/AgAB4gH/AgAB4gH/AWYBXwFXAbgDCgENRAADHAEnA0ABbwL/AfAB/wHr - Ad0BsQH/AfcBwQEzAf8B7QHfAbMD/wHyAf8DQAFvAxwBJxwAA0EBcgL5AekB/wLzAeMB/wJWAVUBtQND - AXgDXQHDAvMB4wH/AvMB4wH/AvMB4wH/AvMB4wH/A10BwwNDAXgCVgFVAbUC8wHjAf8C+QHpAf8DQQFy - BAABUgFQAU4BlgHZAb8BpQL/AfgB6wL/AesB0QL/AeEBwwH/Af4B2wG6Af8B+wHWAbIB/wIAAeIB/wIA - AeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/0AAA0ABbgL/AfAB/wLpAdoB/wHn - AasBHQH/AecBqwEdAf8B5wGrAR0B/wHqAdsBsAP/AfQB/wNAAW4DHAEnGAADQAFvAvQB5gH/AukB2gH/ - Au8B4AH/AvQB5gH/Au8B4AH/AukB2gH/AukB2gH/AukB2gH/AukB2gH/Au8B4AH/AvQB5gH/Au8B4AH/ - AukB2gH/AvQB5gH/A0ABbwMmATgBtQGHAVQB/QL+AfoC/wH5AekC/wHvAdgC/wHnAc0C/wHhAcIB/wH8 - AdwBuwH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/QAADHAEn - Az8BbQL/AfEB/wHnAdcBqwH/AdcBlgEIAf8B1wGWAQgB/wHXAZYBCAH/AegB2AGuA/8B9QH/Az8BbQMc - AScUAANAAW4C9gHoAf8C6wHeAf8C6wHeAf8C6wHeAf8C6wHeAf8C6wHeAf8C6wHeAf8C6wHeAf8C6wHe - Af8C6wHeAf8C6wHeAf8C6wHeAf8C6wHeAf8C9gHoAf8DQAFuAVIBUAFOAZYB4gHOAboB/wH3Ad4BxgL/ - AekB0QL/AfYB4gL/AfIB3QL/AfAB3QH/AfgB6gHZAf8B+AHmAdQB/wH7Ad8BxwH/AfUBzwGrAf8CAAHi - Af8CAAHiAf8B+AHdAcMB/wHiAc4BugH/AVIBUAFOAZZEAAMbASYDPwFsAv8B8gH/AeUB1AGpAf8BzQGJ - AQAB/wHNAYkBAAH/Ac0BiQEAAf8B6AHXAa8D/wH3Af8DPwFsAxsBJhAAAz8BbQL3AewB/wLuAeMB/wLu - AeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLuAeMB/wLu - AeMB/wL3AewB/wM/AW0BeAFqAVsB0AHvAeAB0AH/AecBvgGWAf8B5wG8AZQB/wHwAcwBqQH/Af4B7AHa - Af8B3QHEAawB/wGRAXcBXAHnAZEBdwFcAecB3QHDAaoB/wH4Ad0BxAH/AgAB4gH/AgAB4gH/AfUB1gG4 - Af8B8QHfAc8B/wF4AWoBWwHQSAADGwEmAz4BawL/AfQB/wHnAdYBrAH/AdEBjgEAAf8B0QGOAQAB/wHR - AY4BAAH/AewB2wGzA/8B+AH/Az4BawMbASYMAAM+AWsC+QHvAf8C8QHoAf8C8QHoAf8C8QHoAf8C8QHo - Af8C8QHoAf8DAAH/AUsBhQGTAf8BuALLAf8C8QHoAf8C8QHoAf8C8QHoAf8C8QHoAf8C+QHvAf8DPgFr - AZgBegFZAewB9QHkAdUB/wHpAb4BlwH/AegBvAGWAf8B5wG8AZQB/wHzAd4BygH/AZIBdwFZAeYDFAEb - AxQBGwGSAXcBWQHmAfYB4wHTAf8CAAHiAf8CAAHiAf8B7QHJAaQB/wH2AeQB0gH/AZgBegFZAexMAAMb - ASYDPgFrAv8B9QH/AesB3AGzAf8B3wGhARMB/wHfAaEBEwH/Ad8BoQETAf8B8QHiAbsD/wH6Af8DPgFr - AxsBJggAAz4BagL6AfMB/wL1Ae4B/wL1Ae4B/wL1Ae4B/wL1Ae4B/wL1Ae4B/wF2AbEBwAH/AdkB9AL/ - ATkBnAGrAf8BtQHTAdQB/wL1Ae4B/wL1Ae4B/wL1Ae4B/wL6AfMB/wM+AWoBmAF6AVkB7AH1AeQB1QH/ - AekBvwGZAf8B6QHAAZkB/wHpAcEBmgH/AfMB3QHJAf8BkgF3AVkB5gMUARsDFAEbAZIBdwFZAeYB+AHo - AdkB/wHyAdIBsgH/AfABzAGrAf8B8AHMAasB/wH2AeQB0wH/AZgBegFZAexQAAMbASYDPgFqAv8B9wH/ - AfIB5AG7Af8B8AG4ASoB/wHwAbgBKgH/AfABuAEqAf8C+AH0A/8B+wH/Az4BagMaASUEAAM9AWkC/AH3 - Af8C+AHzAf8C+AHzAf8C+AHzAf8C+AHzAf8C+AHzAf8B1AHmAecB/wFDAbQBwwH/AXMB5gH3Af8BOgGd - Aa0B/wG2AdUB1wH/AvgB8wH/AvgB8wH/AvwB9wH/Az0BaQF4AWoBWwHQAfAB4QHRAf8B6gHEAaEB/wHp - AcEBmwH/AekBwAGXAf8B8QHOAbIB/wHcAcMBqgH/AZEBdwFcAecBkQF3AVwB5wHdAcQBrAL/AfwB8wL/ - AfQB5QL/Ae4B2gH/AfwB5QHRAf8B8QHhAdEB/wF4AWoBWwHQVAADGgElAz0BaQL/AfgB/wH3AeoBwwH/ - Af0ByQE7Af8B+QHsAccB/wL7AfcB/wL8AfkD/wH8Af8DPQFpAxoBJQM9AWgC/QH6Af8C+wH3Af8C+wH3 - Af8C+wH3Af8C+wH3Af8C+wH3Af8C+wH3Af8BvgHlAegB/wFEAbUBxQH/AXMB5gH3Af8BOwGeAa4B/wG5 - AdgB2wH/AvsB9wH/Av0B+gH/Az0BaAFSAVABTgGWAeIBzgG6Af8B8QHSAbYB/wHrAcEBmwH/AesBvwGZ - Av8B5AHTAv8B6AHbAf8B8wHaAccB/wH4AfEB5AL/AfgB7QL/AfcB6QL/Af4B8QL/AfwB7wL/AfwB8gH/ - AeIBzgG6Af8BUgFQAU4BllgAAxoBJQM9AWgC/wH6Af8C+AH0Af8C+wH3Af8C6AHeAf8C2AHJAf8C6AHe - A/8B/gH/Az0BaAM9AWgC/gH9Af8C/QH7Af8C/QH7Af8C/QH7Af8C/QH7Af8C/QH7Af8C/QH7Af8C/QH7 - Af8BwAHmAesB/wFFAbUBxgH/AXMB5gH3Af8BOwGeAa8B/wG+AdgB3AH/Av4B/QH/Az0BaAMmATgBtQGH - AVQB/QH6Ae0B4QH/AewBxwGjAv8B7AHaBf8B9wHNAbYB/wHsAb0BlwL/AfQB3AP/AfcC/wH3AegD/wHz - A/8B+QH/Av4B+QH/AbUBhwFUAf0DJgE4XAADGgElAz0BaAL/AfsB/wL8AfkB/wLLAbsB/wQAAssBvAP/ - Af4B/wM9AWgDPQFnJP8BwQHoAe4B/wFFAbYBxwH/AXMB5gH3Af8DkwH/A9UB/wM9AWcEAAFSAVABTgGW - AdkBvwGlAv8B+gHwBv8B/QHzAf8B8AHBAaMB/wHuAcYBoAH/Af0B8AHRA/8B/gL/Af0B8AL/Af0B8QX/ - AdkBvwGlAf8BUgFQAU4BlmQAAxoBJQM9AWcC/wH8Af8C1AHKAf8CrwGfAf8C1AHLA/8B/gH/Az0BZwMx + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACQ + IwAAAk1TRnQBSQFMAgEBCAEAASQBAAEkAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABMAMAAQEBAAEgBgABMP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8ALgADHQEqA0MBdwMd + ASp4AAMnATsDTgGUAWIBXgFcAc4BgAFuAVkB6wGAAW4BWQHrAWIBXgFcAc4DTgGUAgAB4gH/AgAB4gH/ + JAABaAFwAXgB/wFoAXABeAH/AWgBcAF4Af8BaAFwAXgB/yAAAx0BKQNCAXQC/wHwAf8DQgF0Ax0BKWwA + AwoBDQNOAZYBogF7AU8B+gHhAc0BuQH/AfEB4AHOAf8B+QHnAdYB/wH4AeYB1AH/AfAB3QHMAf8B4QHN + AbkB/wIAAeIB/wIAAeIB/wMKAQ0YAAFoAXABeAH/Az8B/wM/Af8BJgI2Af8DDQH/Aw0B/wMAAf8DDQH/ + FAADHAEoA0ABcQL/AfAB/wLpAdoD/wHxAf8DQAFxAxwBKCAAAzYBWQNCAXYDQgF2AzABSwQAAzABSwNC + AXYDQgF2A0IBdgNCAXYDMAFLBAADMAFLA0IBdgNCAXYDNgFZBAADCgENA1cBuAHZAb8BpQH/Af4B8gHk + Av8B5wHPAf8B/AHbAbsB/wH5AdMBsgH/AfYB0AGsAf8B9AHRAa4B/wH2AdgBuwH/AgAB4gH/AgAB4gH/ + A1cBuAMKAQ0QAAM/Af8BvQLGAf8BaAFwAXgB/wM/Af8BHgImAf8DDQH/Aw0B/wMAAf8DAAH/Aw0B/wwA + AxwBJwNAAW8C/wHwAf8B6wHdAbEB/wH3AcEBLwH/Ae0B3wGzA/8B8gH/A0ABbwMcASccAANBAXIC+QHp + Af8C8wHjAf8DVQG1A0MBeANbAcMC8wHjAf8C8wHjAf8C8wHjAf8C8wHjAf8DWwHDA0MBeANVAbUC8wHj + Af8C+QHpAf8DQQFyBAADTgGWAdkBvwGlAv8B+AHrAv8B6wHRAv8B4QHDAf8B/gHbAboB/wH7AdYBsgH/ + AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/CAABHgImAf8DPwH/ + AWgBcAF4Af8BvQLGAf8BaAFwAXgB/wEeAiYB/wMNAf8DDQH/AwAB/wMAAf8DAAH/Aw0B/wgAA0ABbgL/ + AfAB/wLpAdoB/wHnAasBGQH/AecBqwEZAf8B5wGrARkB/wHqAdsBsAP/AfQB/wNAAW4DHAEnGAADQAFv + AvQB5gH/AukB2gH/Au8B4AH/AvQB5gH/Au8B4AH/AukB2gH/AukB2gH/AukB2gH/AukB2gH/Au8B4AH/ + AvQB5gH/Au8B4AH/AukB2gH/AvQB5gH/A0ABbwMmATgBsQGHAVAB/QL+AfoC/wH5AekC/wHvAdgC/wHn + Ac0C/wHhAcIB/wH8AdwBuwH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/ + AgAB4gH/BAABHgImAf8BJgI2Af8DPwH/Az8B/wFoAXABeAH/AWgBcAF4Af8BJgI2Af8BHgImAf8DDQH/ + AwAB/wMAAf8DAAH/AwAB/wEeAiYB/wQAAxwBJwM/AW0C/wHxAf8B5wHXAasB/wHXAZYBBAH/AdcBlgEE + Af8B1wGWAQQB/wHoAdgBrgP/AfUB/wM/AW0DHAEnFAADQAFuAvYB6AH/AusB3gH/AusB3gH/AusB3gH/ + AusB3gH/AusB3gH/AusB3gH/AusB3gH/AusB3gH/AusB3gH/AusB3gH/AusB3gH/AusB3gH/AvYB6AH/ + A0ABbgNOAZYB4gHOAboB/wH3Ad4BxgL/AekB0QL/AfYB4gL/AfIB3QL/AfAB3QH/AfgB6gHZAf8B+AHm + AdQB/wH7Ad8BxwH/AfUBzwGrAf8CAAHiAf8CAAHiAf8B+AHdAcMB/wHiAc4BugH/A04BlgQAAw0B/wEe + AiYB/wEeAiYB/wEmAjYB/wEmAjYB/wMNAf8BFQFgAWgB/wEVAWABaAH/AwUB/wMFAf8DAAH/AwAB/wMA + Af8DAAH/CAADGwEmAz8BbAL/AfIB/wHlAdQBqQH/Ac0BiQEAAf8BzQGJAQAB/wHNAYkBAAH/AegB1wGv + A/8B9wH/Az8BbAMbASYQAAM/AW0C9wHsAf8C7gHjAf8C7gHjAf8C7gHjAf8C7gHjAf8C7gHjAf8C7gHj + Af8C7gHjAf8C7gHjAf8C7gHjAf8C7gHjAf8C7gHjAf8C7gHjAf8C9wHsAf8DPwFtAWIBXgFbAdAB7wHg + AdAB/wHnAb4BlgH/AecBvAGUAf8B8AHMAakB/wH+AewB2gH/Ad0BxAGsAf8BdwFrAVwB5wF3AWsBXAHn + Ad0BwwGqAf8B+AHdAcQB/wIAAeIB/wIAAeIB/wH1AdYBuAH/AfEB3wHPAf8BYgFeAVsB0AFoAXABeAH/ + AwAB/wMNAf8DDQH/Aw0B/wMNAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wMFAf8DAAH/ + AwAB/wMAAf8DAAH/AWgBcAF4Af8IAAMbASYDPgFrAv8B9AH/AecB1gGsAf8B0QGOAQAB/wHRAY4BAAH/ + AdEBjgEAAf8B7AHbAbMD/wH4Af8DPgFrAxsBJgwAAz4BawL5Ae8B/wLxAegB/wLxAegB/wLxAegB/wLx + AegB/wLxAegB/wMAAf8BRwGFAZMB/wG4AssB/wLxAegB/wLxAegB/wLxAegB/wLxAegB/wL5Ae8B/wM+ + AWsBgAFuAVkB7AH1AeQB1QH/AekBvgGXAf8B6AG8AZYB/wHnAbwBlAH/AfMB3gHKAf8BeAFqAVkB5gMU + ARsDFAEbAXgBagFZAeYB9gHjAdMB/wIAAeIB/wIAAeIB/wHtAckBpAH/AfYB5AHSAf8BgAFuAVkB7AFo + AXABeAH/AwAB/wMAAf8DAAH/AQACBQH/ARUBYAFoAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHG + AdYB/wEVAWABaAH/AwAB/wMAAf8DAAH/AwAB/wFoAXABeAH/DAADGwEmAz4BawL/AfUB/wHrAdwBswH/ + Ad8BoQEPAf8B3wGhAQ8B/wHfAaEBDwH/AfEB4gG7A/8B+gH/Az4BawMbASYIAAM+AWoC+gHzAf8C9QHu + Af8C9QHuAf8C9QHuAf8C9QHuAf8C9QHuAf8BcgGxAcAB/wHZAfQC/wE1AZwBqwH/AbUB0wHUAf8C9QHu + Af8C9QHuAf8C9QHuAf8C+gHzAf8DPgFqAYABbgFZAewB9QHkAdUB/wHpAb8BmQH/AekBwAGZAf8B6QHB + AZoB/wHzAd0ByQH/AXgBagFZAeYDFAEbAxQBGwF4AWoBWQHmAfgB6AHZAf8B8gHSAbIB/wHwAcwBqwH/ + AfABzAGrAf8B9gHkAdMB/wGAAW4BWQHsAWgBcAF4Af8DAAH/AwAB/wMAAf8DAAH/ARUBYAFoAf8BAAHG + AdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEVAWABaAH/Aw0B/wMNAf8DDQH/Aw0B/wFoAXABeAH/ + EAADGwEmAz4BagL/AfcB/wHyAeQBuwH/AfABuAEmAf8B8AG4ASYB/wHwAbgBJgH/AvgB9AP/AfsB/wM+ + AWoDGgElBAADPQFpAvwB9wH/AvgB8wH/AvgB8wH/AvgB8wH/AvgB8wH/AvgB8wH/AdQB5gHnAf8BPwG0 + AcMB/wFvAeYB9wH/ATYBnQGtAf8BtgHVAdcB/wL4AfMB/wL4AfMB/wL8AfcB/wM9AWkBYgFeAVsB0AHw + AeEB0QH/AeoBxAGhAf8B6QHBAZsB/wHpAcABlwH/AfEBzgGyAf8B3AHDAaoB/wF3AWsBXAHnAXcBawFc + AecB3QHEAawC/wH8AfMC/wH0AeUC/wHuAdoB/wH8AeUB0QH/AfEB4QHRAf8BYgFeAVsB0AFoAXABeAH/ + AwAB/wMAAf8DAAH/AwAB/wMNAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wMNAf8BHgIm + Af8BHgImAf8DDQH/Aw0B/wFoAXABeAH/FAADGgElAz0BaQL/AfgB/wH3AeoBwwH/Af0ByQE3Af8B+QHs + AccB/wL7AfcB/wL8AfkD/wH8Af8DPQFpAxoBJQM9AWgC/QH6Af8C+wH3Af8C+wH3Af8C+wH3Af8C+wH3 + Af8C+wH3Af8C+wH3Af8BvgHlAegB/wFAAbUBxQH/AW8B5gH3Af8BNwGeAa4B/wG5AdgB2wH/AvsB9wH/ + Av0B+gH/Az0BaANOAZYB4gHOAboB/wHxAdIBtgH/AesBwQGbAf8B6wG/AZkC/wHkAdMC/wHoAdsB/wHz + AdoBxwH/AfgB8QHkAv8B+AHtAv8B9wHpAv8B/gHxAv8B/AHvAv8B/AHyAf8B4gHOAboB/wNOAZYEAAMN + Af8DAAH/AwAB/wMAAf8DAAH/Aw0B/wEVAWABaAH/ARUBYAFoAf8DDQH/Az8B/wM/Af8BHgImAf8BHgIm + Af8BHgImAf8cAAMaASUDPQFoAv8B+gH/AvgB9AH/AvsB9wH/AugB3gH/AtgByQH/AugB3gP/Af4B/wM9 + AWgDPQFoAv4B/QH/Av0B+wH/Av0B+wH/Av0B+wH/Av0B+wH/Av0B+wH/Av0B+wH/Av0B+wH/AcAB5gHr + Af8BQQG1AcYB/wFvAeYB9wH/ATcBngGvAf8BvgHYAdwB/wL+Af0B/wM9AWgDJgE4AbEBhwFQAf0B+gHt + AeEB/wHsAccBowL/AewB2gX/AfcBzQG2Af8B7AG9AZcC/wH0AdwD/wH3Av8B9wHoA/8B8wP/AfkB/wL+ + AfkB/wGxAYcBUAH9AyYBOAQAAz8B/wMAAf8DAAH/AwAB/wMNAf8DDQH/AR4CJgH/Az8B/wFoAXABeAH/ + AWgCrQH/Az8B/wM/Af8BHgImAf8DPwH/IAADGgElAz0BaAL/AfsB/wL8AfkB/wLLAbsB/wQAAssBvAP/ + Af4B/wM9AWgDPQFnJP8BwQHoAe4B/wFBAbYBxwH/AW8B5gH3Af8DkwH/A9UB/wM9AWcEAANOAZYB2QG/ + AaUC/wH6AfAG/wH9AfMB/wHwAcEBowH/Ae4BxgGgAf8B/QHwAdED/wH+Av8B/QHwAv8B/QHxBf8B2QG/ + AaUB/wNOAZYMAAEeAiYB/wMAAf8DAAH/Aw0B/wMNAf8BHgImAf8BJgI2Af8BaAFwAXgB/wG9AsYB/wFo + AXABeAH/ASYCNgH/Az8B/ygAAxoBJQM9AWcC/wH8Af8C1AHKAf8CrwGfAf8C1AHLA/8B/gH/Az0BZwMx AU0DPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFmA0oBjANSAacD9wH/AlYBWAG7 - A0QBegQAAwoBDQFmAV8BVwG4AdkBvwGlAf8B/gH9AfwC/wHxAeQB/wHyAcoBrgH/AfIB0gGtAf8B+QHt - AcgD/wH3A/8B/QH/Af4B/QH8Af8B2QG/AaUB/wFmAV8BVwG4AwoBDWgAAxoBJAM9AWcC/wH+A/8B/gP/ - Af4F/wM9AWcwAAMaASQCRAFFAXwCgAL/AlUBWwHBCAADCgENAVIBUAFOAZYBrAF/AVMB+gHhAc0BuQH/ - AfEB4gHUAf8B+QHsAd8B/wH7AfMB5QH/AfQB7QHkAf8B4gHOAbsB/wGsAX8BUwH6AVIBUAFOAZYDCgEN - cAADGgEkAzwBZgM8AWYDPAFmAzwBZgMxAU00AAMmATkCUwFWAa8DKgFAEAADJwE7AVIBUAFOAZQBdwFq - AVwBzgGYAXoBWQHrAZsBewFYAe8BgAFvAVsB2QFTAVABTwGXAycBO1wAAwIBAwMUARwDMAFMA0QBeQNQ - AZoDUAGkA1ABmgNEAXkDMAFMAxQBHAMDAQQIAAOWAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIA - Af8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIAAf8BGQIA - Af8EAAFMAcwC/wEZApkB/wEZApkB/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFM - AcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/xAAAwIBAwMUARwDMAFMA0QBeQNQAZoDUAGkA1ABmgNE - AXkDMAFMAxQBHAMDAQQQAAMEAQYDJAE2A1MBsAFjAl4B5QFqAl8B+wGzAqkB/wFqAl8B+wNgAesDWgHT - A1MBrANHAYIDKAE8AwcBCQQAAcwCmQH/AYACAAH/AYACAAH/AYACAAH/AYACAAH/A+oB/wPqAf8D6gH/ - AYACAAH/A+oB/wPqAf8D6gH/AYACAAH/AYACAAH/AUwCAAH/ARkCAAH/ARkCmQH/AwAB/wMPAf8DMwH/ - AwAB/wMCAf8BTAHMAv8BTAHMAv8BTAHMAv8BTAHMAv8BTAHMAv8BTAHMAv8BTAHMAv8BTAHMAv8BTAHM - Av8BTAHMAv8IAAMEAQYDJAE2A1MBsAFjAl4B5QFqAl8B+wGzAqkB/wFqAl8B+wNgAesDWgHTA1MBrANH - AYIDKAE8AwcBCQgAAwIBAwMxAU8DXAHqAc8CtAL/At0C/wLiAv8C6AL/Au4C/wLzAf8DzwH/A18B8wNY - AcYDTAGSAygBPAMDAQQBzAKZAf8BgAIAAf8BgAIAAf8BgAIAAf8D8QH/AYACAAH/AYACAAH/A/EB/wGA - AgAB/wPxAf8BgAIAAf8BgAIAAf8D8QH/AYACAAH/AYACAAH/ARkCAAH/AwAB/wPMDf8DMwH/AwIB/wFM - AcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wQAAwIBAwMx - AU8DXAHqAc8CtAL/At0C/wLiAv8C6AL/Au4C/wLzAf8DzwH/A18B8wNYAcYDTAGSAygBPAMDAQQEAAMm - ATgDbQH3AfUCxwL/AtIC/wLYAv8C3QL/AuIC/wLoAv8C9AX/A/UB/wN/AfsDWAHGA0cBggMUARwBzAKZ - Af8BmQEAARkB/wGAAgAB/wGAAgAF/wGAAgAB/wGAAgAF/wGAAgAF/wGAAgAB/wGAAgAF/wGAAgAB/wGA - AgAB/wEZAgAB/wMAAf8DzBH/AwAB/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFMAcwC/wFM - AcwC/wFMAcwC/wFMAcwC/wQAAyYBOANtAfcB9QLHAv8C0gL/AtgC/wLdAv8C4gL/AugC/wL0Bf8D9QH/ - A38B+wNYAcYDRwGCAxQBHAMHAQkDXgHdAfUCzQL/As8C/wLNAv8C0gL/AtgC/wLdAv8C4gL/AvoJ/wP1 - Af8DXwHzA1MBrAMwAUwBzAKZAf8BmQEAARkB/wGAAgAB/wGAAgAB/wGAAgAN/wGAAgAN/wGAAgAB/wGA - AgAB/wGAAgAB/wEZAgAB/wEZApkB/wMCAf8DXQH/A8AB/wPAAf8DzAH/AwAB/wMPAf8DAAH/AwAB/wMA - Af8DAAH/Aw8B/wFMAcwC/wFMAcwC/wFMAcwC/wMHAQkDXgHdAfUCzQL/As8C/wLNAv8C0gL/AtgC/wLd - Av8C4gL/AvoJ/wP1Af8DXwHzA1MBrAMwAUwDPgFqAcYCsQL/AtkC/wLUAv8CzwL/As0C/wHUAdsC/wHX - AeIC/wHkAeoR/wHSAswB/wNaAdMDQwF3AcwCmQH/AZkBAAEZAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIA - Af8BgAIABf8BgAIABf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BGQIAAf8BTAHMAv8BGQKZ - Af8DAgH/AwAB/wMABf8DAAH/AwIB/wGkAqAJ/wOZAf8DDwH/Aw8B/wFMAcwC/wFMAcwC/wM+AWoBxgKx - Av8C2QL/AtQC/wLPAv8CzQL/AdQB2wL/AdcB4gL/AeQB6hH/AdICzAH/A1oB0wNDAXcDVgG2Af8C4wH/ - AQABFAEVAf8BAAEUARUB/wEAARQBFQL/Ad4B5wH/AQABFAEVAv8B0QHzAf8BAAEUARUC/wH4Av8BVAJa - Af8BAAEUARUB/wFUAloB/wHMApkB/wFcAlUB6gNOAZQBzAKZAf8BmQEAARkB/wGAAgAB/wGAAgAB/wGA - AgAB/wGAAgAB/wGAAgAF/wGAAgAF/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wEZAgAB/wFM - AcwC/wFMAcwC/wFMAcwC/wFMAcwC/wMABf8DAAH/Aw8R/wPMAf8DAAH/AUwBzAL/AUwBzAL/A1YBtgH/ - AuMB/wFUAloB/wEAARQBFQH/AVQCWgL/Ad4B5wH/AVQCWgH/AQABFAEVAf8BVAJaAv8B+AL/AQABFAEV - Af8BAAEUARUB/wEAARQBFQH/AcwCmQH/AVwCVQHqA04BlANhAeIB/wLnAf8BAAEUARUC/wLeAv8C4AL/ - Ae8B/AH/AQABFAEVAv8B4gH8Af8BAAEUARUB/wH8AfAB+QH/AQABFAEVAf8BzAKZAf8BAAEUARUB/wHM - ApkB/wFtAmwB9wNRAaEBzAKZAf8BmQEAARkB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGA - AgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wEZAgAB/wGZAkwB/wGZ - AkwB/wGZAkwB/wGZAkwB/wMABf8DAAH/AwAB/wMzAf8DzA3/AwAB/wGZAkwB/wGZAkwB/wNhAeIB/wLn - Af8BAAEUARUC/wLeAf8BAAEUARUC/wHvAfwB/wEAARQBFQL/AeIB/AH/AQABFAEVAf8B/AHwAfkB/wEA - ARQBFQH/AcwCmQH/AcwCmQH/AcwCmQH/AW0CbAH3A1EBoQGeAowB/wHpAr4B/wEAARQBFQH/AQABFAEV - Af8B+QLWAv8B6QHzAf8BAAEUARUB/wEAARQBFQH/AQABFAEVAf8B+QHoAewB/wEAARQBFQH/AeYCugH/ - AeYCvQH/AeYCwAH/AaYClAH/A04BlDT/A/EB/wPqAf8DgAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/ - AwAF/wMAAf8DOwH/AwIB/wMAAf8DAAH/AwAF/wMAAf8BmQJMAf8BmQJMAf8BngKMAf8B6QK+Af8BAAEU - ARUB/wHzAsUB/wH5AtYC/wHpAfMB/wEAARQBFQL/AekB8wH/AQABFAEVAf8B+QHoAewB/wEAARQBFQH/ - AQABFAEVAf8B5gK9Af8B5gLAAf8BpgKUAf8DTgGUA10B0gHbAqgB/wEAARQBFQH/AeoCtwH/AfMCzQL/ - Ae4B/AH/AQABFAEVAv8B0gH1Af8BAAEUARUC/wH0AfwB/wEAARQBFQL/AtgB/wEAARQBFQL/AuIB/wNi - AfYDQwF3BP8BmQEAARkJ/wGAAgAN/wGAAgAB/wGAAgAN/wGAAgAB/wGAAgAB/wOAAf8BmQJMAf8BmQJM - Af8BmQJMAf8BmQJMAf8DAAX/AwIB/wMAAf8DDwH/AzsB/wM7Af8DAAX/AwAB/wGZAkwB/wGZAkwB/wNd - AdIB2wKoAf8BAAEUARUB/wHqArcB/wEAARQBFQL/Ae4B/AH/AQABFAEVAv8B0gH1Af8BAAEUARUC/wH0 - AfwB/wEAARQBFQL/AtgC/wLdAv8C4gH/A2IB9gNDAXcDVgGxAdUCogH/AQABFAEVAf8BAAEUARUB/wEA - ARQBFQL/AfYC/wFUAloB/wEAARQBFQH/AVQCWgL/AeAB5wH/AVQCWgH/AQABFAEVAf8BVAJaAv8C3QH/ - A1oB5AMwAUwE/wGZAQABGQn/AYACAAn/AYACABH/AYACAAH/A/EB/wPqAf8DgAH/AZkCTAH/AZkCTAH/ - AZkCTAH/AZkCTAH/AwAJ/wOZAf8DDwH/AwAB/wMCAf8DAAX/AwAB/wGZAkwB/wGZAkwB/wNWAbEB1QKi - Af8BVAJaAf8BAAEUARUB/wFUAloC/wH2Av8BAAEUARUC/wHSAfUB/wEAARQBFQL/AeAB5wH/AQABFAEV - Af8BAAEUARUB/wEAARQBFQL/At0B/wNaAeQDMAFMAzIBUAHDAr8S/wHsAfEC/wHbAecC/wHZAd4C/wLU - Av8CzwL/As0C/wLSAf8BxgKtAf8DUwGsAxQBGwT/AZkBAAEZCf8BgAIACf8BgAIAAf8BgAIAAf8BgAIA - Af8BgAIABf8BgAIAAf8BgAIAAf8BgAIAAf8BGQIAAf8BmQJMAf8BmQJMAf8BmQJMAf8BmQJMAf8DAAH/ - A8AN/wPMAf8DRQH/AwAF/wMAAf8BmQJMAf8BmQJMAf8DMgFQAcMCvxL/AewB8QL/AdsB5wL/AdkB3gL/ - AtQC/wLPAv8CzQL/AtIB/wHGAq0B/wNTAawDFAEbBAADWgHAA/UK/wL+Av8C5wL/AuMC/wLeAv8C2QL/ - AtQC/wLPAf8B9QLHAf8DXwHjAyMBNAMCAQME/wGZAQABGQH/AYACAAX/AYACAAn/AYACAAn/AYACAAX/ - AYACAAH/A/EB/wPqAf8BGQIAAf8BmQJMAf8BmQJMAf8BmQJMAf8BmQJMAf8DDwH/AzMB/wPAGf8DAAH/ - AZkCTAH/AZkCTAH/BAADWgHAA/UK/wL+Av8C5wL/AuMC/wLeAv8C2QL/AtQC/wLPAf8B9QLHAf8DXwHj - AyMBNAMCAQMEAAMXASADYgHvA/UG/wL4Av8C7AL/AucC/wLjAv8C3gL/AtkB/wH1As0B/wNtAfcDMAFN - AwQBBgQABP8BmQIZCf8BgAIAAf8BgAIACf8BgAIAAf8BgAIADf8BgAIAAf8BgAIAAf8DhgH/AZkCTAH/ - AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/Aw8B/wMAAf8DDwH/A5kR/wMAAf8BmQJMAf8BmQJMAf8EAAMX - ASADYgHvA/UG/wL4Av8C7AL/AucC/wLjAv8C3gL/AtkB/wH1As0B/wNtAfcDMAFNAwQBBgwAAxcBIANa - AcADxgL/AvcC/wLyAv8C7AL/AucC/wLjAf8BxgKxAf8DXgHQAyQBNgMCAQMIAAT/AZkCGS3/A/EB/wPq - Af8DhgH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/Aw8B/wMAAf8DAgH/ - A10B/wPMBf8DAAH/AZkCTAH/AZkCTAH/CAADFwEgA1oBwAPGAv8C9wL/AvIC/wLsAv8C5wL/AuMB/wHG - ArEB/wNeAdADJAE2AwIBAxgAAzIBUANRAaIDXQHSAYwCiQH/A2AB1ANUAaYDNwFaAwUBBxAACP8BzAKZ - Lf8D8QH/A8AB/wQAAZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/AZkCTAH/ - AZkCTAH/AwIB/wMAAf8DMwH/Aw8B/wGZAkwB/xQAAzIBUANRAaIDXQHSAYwCiQH/A2AB1ANUAaYDNwFa - AwUBBxAAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAHjA/8B8AEHAgABwQP/ - AcABAwIAAYAB/wEIARABgAEBAwABfwIAAYAEAAE/BwABHwYAAYABDwYAAcABBwYAAeABAwYAAfABAQYA - AfgHAAH8BwAB/gEIAgABgAEBAgAB/wMAAYABAQIAAf8BgAH/AfABwAEDAgAB/wHAAf8B+AHwAQ8CAAHg - AQMCAAGAAQEB4AEDAcABAQQAAcABAQGABQABgAEAAYAFAAGAQQABgAUAAYABAAGAAQEEAAGAAQEBwAED - BAABwAEDAfABDwIAAYABAQHwAQ8L + A0QBegQAAwoBDQNXAbgB2QG/AaUB/wH+Af0B/AL/AfEB5AH/AfIBygGuAf8B8gHSAa0B/wH5Ae0ByAP/ + AfcD/wH9Af8B/gH9AfwB/wHZAb8BpQH/A1cBuAMKAQ0QAAM/Af8DAAH/Aw0B/wMNAf8BHgImAf8BJgI2 + Af8DPwH/AWgBcAF4Af8BaAFwAXgB/wFoAXABeAH/MAADGgEkAz0BZwL/Af4D/wH+A/8B/gX/Az0BZzAA + AxoBJAJEAUUBfAKAAv8CVgFYAcEIAAMKAQ0DTgGWAaIBewFPAfoB4QHNAbkB/wHxAeIB1AH/AfkB7AHf + Af8B+wHzAeUB/wH0Ae0B5AH/AeIBzgG7Af8BogF7AU8B+gNOAZYDCgENGAABJgI2Af8BJgI2Af8DDQH/ + Aw0B/wMNAf8BHgImAf8DPwH/Az8B/zgAAxoBJAM8AWYDPAFmAzwBZgM8AWYDMQFNNAADJgE5A1QBrwMq + AUAQAAMnATsDTgGUAWIBXgFcAc4BgAFuAVkB6wGDAW4BWAHvAWUBYAFbAdkDTwGXAycBOygAAWgBcAF4 + Af8BaAFwAXgB/wFoAXABeAH/AWgBcAF4Af8kAAMCAQMDFAEcAzABTANEAXkDUAGaA1ABpANQAZoDRAF5 + AzABTAMUARwDAwEECAADlgH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ + ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/ARUCAAH/BAABSAHMAv8BFQKZ + Af8BFQKZAf8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHM + Av8BSAHMAv8BSAHMAv8QAAMCAQMDFAEcAzABTANEAXkDUAGaA1ABpANQAZoDRAF5AzABTAMUARwDAwEE + EAADBAEGAyQBNgNTAbABYwJeAeUBYAJfAfsBswKpAf8BYAJfAfsDYAHrA1oB0wNTAawDRwGCAygBPAMH + AQkEAAHMApkB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wPqAf8D6gH/A+oB/wGAAgAB/wPqAf8D6gH/ + A+oB/wGAAgAB/wGAAgAB/wFIAgAB/wEVAgAB/wEVApkB/wMAAf8DCwH/Ay8B/wMAAf8DAAH/AUgBzAL/ + AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/AUgBzAL/CAADBAEG + AyQBNgNTAbABYwJeAeUBYAJfAfsBswKpAf8BYAJfAfsDYAHrA1oB0wNTAawDRwGCAygBPAMHAQkIAAMC + AQMDMQFPA1wB6gHPArQC/wLdAv8C4gL/AugC/wLuAv8C8wH/A88B/wNfAfMDWAHGA0wBkgMoATwDAwEE + AcwCmQH/AYACAAH/AYACAAH/AYACAAH/A/EB/wGAAgAB/wGAAgAB/wPxAf8BgAIAAf8D8QH/AYACAAH/ + AYACAAH/A/EB/wGAAgAB/wGAAgAB/wEVAgAB/wMAAf8DzA3/Ay8B/wMAAf8BSAHMAv8BSAHMAv8BSAHM + Av8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8EAAMCAQMDMQFPA1wB6gHPArQC/wLd + Av8C4gL/AugC/wLuAv8C8wH/A88B/wNfAfMDWAHGA0wBkgMoATwDAwEEBAADJgE4A20B9wH1AscC/wLS + Av8C2AL/At0C/wLiAv8C6AL/AvQF/wP1Af8DcwH7A1gBxgNHAYIDFAEcAcwCmQH/AZkBAAEVAf8BgAIA + Af8BgAIABf8BgAIAAf8BgAIABf8BgAIABf8BgAIAAf8BgAIABf8BgAIAAf8BgAIAAf8BFQIAAf8DAAH/ + A8wR/wMAAf8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHMAv8BSAHM + Av8EAAMmATgDbQH3AfUCxwL/AtIC/wLYAv8C3QL/AuIC/wLoAv8C9AX/A/UB/wNzAfsDWAHGA0cBggMU + ARwDBwEJA14B3QH1As0C/wLPAv8CzQL/AtIC/wLYAv8C3QL/AuIC/wL6Cf8D9QH/A18B8wNTAawDMAFM + AcwCmQH/AZkBAAEVAf8BgAIAAf8BgAIAAf8BgAIADf8BgAIADf8BgAIAAf8BgAIAAf8BgAIAAf8BFQIA + Af8BFQKZAf8DAAH/A1kB/wPAAf8DwAH/A8wB/wMAAf8DCwH/AwAB/wMAAf8DAAH/AwAB/wMLAf8BSAHM + Av8BSAHMAv8BSAHMAv8DBwEJA14B3QH1As0C/wLPAv8CzQL/AtIC/wLYAv8C3QL/AuIC/wL6Cf8D9QH/ + A18B8wNTAawDMAFMAz4BagHGArEC/wLZAv8C1AL/As8C/wLNAv8B1AHbAv8B1wHiAv8B5AHqEf8B0gLM + Af8DWgHTA0MBdwHMApkB/wGZAQABFQH/AYACAAH/AYACAAH/AYACAAH/AYACAAH/AYACAAX/AYACAAX/ + AYACAAH/AYACAAH/AYACAAH/AYACAAH/AYACAAH/ARUCAAH/AUgBzAL/ARUCmQH/AwAB/wMAAf8DAAX/ + AwAB/wMAAf8BpAKgCf8DmQH/AwsB/wMLAf8BSAHMAv8BSAHMAv8DPgFqAcYCsQL/AtkC/wLUAv8CzwL/ + As0C/wHUAdsC/wHXAeIC/wHkAeoR/wHSAswB/wNaAdMDQwF3A1YBtgH/AuMB/wEAARABEQH/AQABEAER + Af8BAAEQAREC/wHeAecB/wEAARABEQL/AdEB8wH/AQABEAERAv8B+AL/AVACVgH/AQABEAERAf8BUAJW + Af8BzAKZAf8BXAJVAeoDTgGUAcwCmQH/AZkBAAEVAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIA + Bf8BgAIABf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BFQIAAf8BSAHMAv8BSAHMAv8BSAHM + Av8BSAHMAv8DAAX/AwAB/wMLEf8DzAH/AwAB/wFIAcwC/wFIAcwC/wNWAbYB/wLjAf8BUAJWAf8BAAEQ + AREB/wFQAlYC/wHeAecB/wFQAlYB/wEAARABEQH/AVACVgL/AfgC/wEAARABEQH/AQABEAERAf8BAAEQ + AREB/wHMApkB/wFcAlUB6gNOAZQDYQHiAf8C5wH/AQABEAERAv8C3gL/AuAC/wHvAfwB/wEAARABEQL/ + AeIB/AH/AQABEAERAf8B/AHwAfkB/wEAARABEQH/AcwCmQH/AQABEAERAf8BzAKZAf8BbQJsAfcDUQGh + AcwCmQH/AZkBAAEVAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIA + Af8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BFQIAAf8BmQJIAf8BmQJIAf8BmQJIAf8BmQJI + Af8DAAX/AwAB/wMAAf8DLwH/A8wN/wMAAf8BmQJIAf8BmQJIAf8DYQHiAf8C5wH/AQABEAERAv8C3gH/ + AQABEAERAv8B7wH8Af8BAAEQAREC/wHiAfwB/wEAARABEQH/AfwB8AH5Af8BAAEQAREB/wHMApkB/wHM + ApkB/wHMApkB/wFtAmwB9wNRAaEBngKMAf8B6QK+Af8BAAEQAREB/wEAARABEQH/AfkC1gL/AekB8wH/ + AQABEAERAf8BAAEQAREB/wEAARABEQH/AfkB6AHsAf8BAAEQAREB/wHmAroB/wHmAr0B/wHmAsAB/wGm + ApQB/wNOAZQ0/wPxAf8D6gH/A4AB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wMABf8DAAH/AzcB/wMA + Af8DAAH/AwAB/wMABf8DAAH/AZkCSAH/AZkCSAH/AZ4CjAH/AekCvgH/AQABEAERAf8B8wLFAf8B+QLW + Av8B6QHzAf8BAAEQAREC/wHpAfMB/wEAARABEQH/AfkB6AHsAf8BAAEQAREB/wEAARABEQH/AeYCvQH/ + AeYCwAH/AaYClAH/A04BlANdAdIB2wKoAf8BAAEQAREB/wHqArcB/wHzAs0C/wHuAfwB/wEAARABEQL/ + AdIB9QH/AQABEAERAv8B9AH8Af8BAAEQAREC/wLYAf8BAAEQAREC/wLiAf8DYgH2A0MBdwT/AZkBAAEV + Cf8BgAIADf8BgAIAAf8BgAIADf8BgAIAAf8BgAIAAf8DgAH/AZkCSAH/AZkCSAH/AZkCSAH/AZkCSAH/ + AwAF/wMAAf8DAAH/AwsB/wM3Af8DNwH/AwAF/wMAAf8BmQJIAf8BmQJIAf8DXQHSAdsCqAH/AQABEAER + Af8B6gK3Af8BAAEQAREC/wHuAfwB/wEAARABEQL/AdIB9QH/AQABEAERAv8B9AH8Af8BAAEQAREC/wLY + Av8C3QL/AuIB/wNiAfYDQwF3A1YBsQHVAqIB/wEAARABEQH/AQABEAERAf8BAAEQAREC/wH2Av8BUAJW + Af8BAAEQAREB/wFQAlYC/wHgAecB/wFQAlYB/wEAARABEQH/AVACVgL/At0B/wNaAeQDMAFMBP8BmQEA + ARUJ/wGAAgAJ/wGAAgAR/wGAAgAB/wPxAf8D6gH/A4AB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wMA + Cf8DmQH/AwsB/wMAAf8DAAH/AwAF/wMAAf8BmQJIAf8BmQJIAf8DVgGxAdUCogH/AVACVgH/AQABEAER + Af8BUAJWAv8B9gL/AQABEAERAv8B0gH1Af8BAAEQAREC/wHgAecB/wEAARABEQH/AQABEAERAf8BAAEQ + AREC/wLdAf8DWgHkAzABTAMyAVABwwK/Ev8B7AHxAv8B2wHnAv8B2QHeAv8C1AL/As8C/wLNAv8C0gH/ + AcYCrQH/A1MBrAMUARsE/wGZAQABFQn/AYACAAn/AYACAAH/AYACAAH/AYACAAH/AYACAAX/AYACAAH/ + AYACAAH/AYACAAH/ARUCAAH/AZkCSAH/AZkCSAH/AZkCSAH/AZkCSAH/AwAB/wPADf8DzAH/A0EB/wMA + Bf8DAAH/AZkCSAH/AZkCSAH/AzIBUAHDAr8S/wHsAfEC/wHbAecC/wHZAd4C/wLUAv8CzwL/As0C/wLS + Af8BxgKtAf8DUwGsAxQBGwQAA1oBwAP1Cv8C/gL/AucC/wLjAv8C3gL/AtkC/wLUAv8CzwH/AfUCxwH/ + A18B4wMjATQDAgEDBP8BmQEAARUB/wGAAgAF/wGAAgAJ/wGAAgAJ/wGAAgAF/wGAAgAB/wPxAf8D6gH/ + ARUCAAH/AZkCSAH/AZkCSAH/AZkCSAH/AZkCSAH/AwsB/wMvAf8DwBn/AwAB/wGZAkgB/wGZAkgB/wQA + A1oBwAP1Cv8C/gL/AucC/wLjAv8C3gL/AtkC/wLUAv8CzwH/AfUCxwH/A18B4wMjATQDAgEDBAADFwEg + A2IB7wP1Bv8C+AL/AuwC/wLnAv8C4wL/At4C/wLZAf8B9QLNAf8DbQH3AzABTQMEAQYEAAT/AZkCFQn/ + AYACAAH/AYACAAn/AYACAAH/AYACAA3/AYACAAH/AYACAAH/A4YB/wGZAkgB/wGZAkgB/wGZAkgB/wGZ + AkgB/wGZAkgB/wMLAf8DAAH/AwsB/wOZEf8DAAH/AZkCSAH/AZkCSAH/BAADFwEgA2IB7wP1Bv8C+AL/ + AuwC/wLnAv8C4wL/At4C/wLZAf8B9QLNAf8DbQH3AzABTQMEAQYMAAMXASADWgHAA8YC/wL3Av8C8gL/ + AuwC/wLnAv8C4wH/AcYCsQH/A14B0AMkATYDAgEDCAAE/wGZAhUt/wPxAf8D6gH/A4YB/wGZAkgB/wGZ + AkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wMLAf8DAAH/AwAB/wNZAf8DzAX/AwAB/wGZ + AkgB/wGZAkgB/wgAAxcBIANaAcADxgL/AvcC/wLyAv8C7AL/AucC/wLjAf8BxgKxAf8DXgHQAyQBNgMC + AQMYAAMyAVADUQGiA10B0gGMAokB/wNgAdQDVAGmAzcBWgMFAQcQAAj/AcwCmS3/A/EB/wPAAf8EAAGZ + AkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wGZAkgB/wMAAf8DAAH/ + Ay8B/wMLAf8BmQJIAf8UAAMyAVADUQGiA10B0gGMAokB/wNgAdQDVAGmAzcBWgMFAQcQAAFCAU0BPgcA + AT4DAAEoAwABQAMAATADAAEBAQABAQUAAYABARYAA/+BAAHjA/8B8AEHAfwBPwHBA/8BwAEDAfABDwGA + Af8BCAEQAYABAQHgAQcBAAF/AgABgAEAAcABAwEAAT8EAAGAAQEBAAEfBAABgAEBAYABDwYAAcABBwYA + AeABAwYAAfABAQYAAfgFAAGAAQEB/AUAAYABAQH+AQgCAAGAAQEBwAEDAf8DAAGAAQEB4AEHAf8BgAH/ + AfABwAEDAfABDwH/AcAB/wH4AfABDwH8AT8B4AEDAgABgAEBAeABAwHAAQEEAAHAAQEBgAUAAYABAAGA + BQABgEEAAYAFAAGAAQABgAEBBAABgAEBAcABAwQAAcABAwHwAQ8CAAGAAQEB8AEPCw== @@ -326,7 +349,10 @@ Courier New, 8pt - 3, 153 + 4, 189 + + + 4, 4, 4, 4 True @@ -335,7 +361,7 @@ Vertical - 788, 7 + 1051, 8 1 @@ -362,13 +388,16 @@ Fill - 3, 422 + 4, 519 + + + 4, 4, 4, 4 1 - 788, 35 + 1051, 43 30 @@ -386,16 +415,19 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="buttonOk" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,37,59399,Percent,22,93233,Percent,19,17293,Percent,20,11278" /><Rows Styles="Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="buttonOk" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,37.59399,Percent,22.93233,Percent,19.17293,Percent,20.11278" /><Rows Styles="Percent,100" /></TableLayoutSettings> Fill - 3, 166 + 4, 205 + + + 4, 4, 4, 4 - 788, 7 + 1051, 8 Zoom @@ -418,95 +450,116 @@ 2 - - Fill - - - 3, 3 - - - 388, 231 - - - 5 - - - listMetadata - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelMeta - - - 0 - - - 1 - - - Title - - - 210 - - - 0 - - + + True + + # - + 30 - + + 30 + + + True + + + Title + + + True + + Start - - Right + + 50 - + + 50 + + + True + + Length - - Right + + 50 - + + 58 + + Fill - - 397, 3 + + 528, 3 - - 388, 231 + + 520, 284 - - 4 + + 6 - - listTracks + + dataGridViewTracks - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanelMeta - + + 0 + + + True + + + True + + + Fill + + + 3, 3 + + + 519, 284 + + + 5 + + + dataGridViewMetadata + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelMeta + + 1 Fill - 3, 179 + 4, 221 + + + 4, 4, 4, 4 1 - 788, 237 + 1051, 290 32 @@ -524,7 +577,7 @@ 4 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="listMetadata" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="listTracks" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="dataGridViewTracks" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="dataGridViewMetadata" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> Fill @@ -532,11 +585,14 @@ 0, 0 + + 4, 4, 4, 4 + 5 - 794, 460 + 1059, 566 29 @@ -554,29 +610,29 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textBox1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="listChoices" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="pictureBox1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanelMeta" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Absolute,150,Percent,5,Percent,5,Percent,90,Absolute,40" /></TableLayoutSettings> - - - 1 - - - Value - - - 240 - - - 0 - - - Field - - - 120 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textBox1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="listChoices" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="pictureBox1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanelMeta" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Absolute,185,Percent,5,Percent,5,Percent,90,Absolute,49" /></TableLayoutSettings> 127, 17 + + True + + + Column1 + + + 50 + + + 50 + + + True + + + Column1 + True @@ -584,13 +640,16 @@ 51 - 6, 13 + 8, 16 - 794, 460 + 1059, 566 + + + 4, 4, 4, 4 - 591, 496 + 782, 600 CenterParent @@ -610,48 +669,48 @@ System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - columnHeaderMetadataValue - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - columnHeaderMetadataName - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Title - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TrackNo - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Start - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Length - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - backgroundWorker1 System.ComponentModel.BackgroundWorker, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + dataGridViewTextBoxColumnTrackNo + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumnTrackTitle + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumnTrackStart + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumnTrackLength + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Item + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Value + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmChoice diff --git a/CUETools/frmSettings.Designer.cs b/CUETools/frmSettings.Designer.cs index 9b7103a..724a649 100644 --- a/CUETools/frmSettings.Designer.cs +++ b/CUETools/frmSettings.Designer.cs @@ -1144,7 +1144,7 @@ namespace JDP { // resources.ApplyResources(this.labelEncoderExtension, "labelEncoderExtension"); this.labelEncoderExtension.DataBindings.Add(new System.Windows.Forms.Binding("ImageKey", this.encodersBindingSource, "DotExtension", true, System.Windows.Forms.DataSourceUpdateMode.Never)); - this.labelEncoderExtension.MinimumSize = new System.Drawing.Size(100, 16); + this.labelEncoderExtension.MinimumSize = new System.Drawing.Size(133, 21); this.labelEncoderExtension.Name = "labelEncoderExtension"; // // tabPage11 @@ -1222,7 +1222,7 @@ namespace JDP { // labelDecoderExtension // resources.ApplyResources(this.labelDecoderExtension, "labelDecoderExtension"); - this.labelDecoderExtension.MinimumSize = new System.Drawing.Size(100, 16); + this.labelDecoderExtension.MinimumSize = new System.Drawing.Size(133, 21); this.labelDecoderExtension.Name = "labelDecoderExtension"; // // tabPage4 @@ -1393,7 +1393,6 @@ namespace JDP { resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = btnCancel; - this.ControlBox = false; this.Controls.Add(this.tabControl1); this.Controls.Add(btnCancel); this.Controls.Add(this.btnOK); diff --git a/CUETools/frmSettings.resx b/CUETools/frmSettings.resx index dba69c5..79b57a2 100644 --- a/CUETools/frmSettings.resx +++ b/CUETools/frmSettings.resx @@ -126,10 +126,13 @@ - 268, 320 + 357, 418 + + + 4, 4, 4, 4 - 73, 23 + 97, 30 @@ -150,137 +153,17 @@ 1 - - checkBoxSeparateDecodingThread - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 0 - - - checkBoxCheckForUpdates - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 1 - - - chkAllowMultipleInstances - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 2 - - - chkReducePriority - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 3 - - - chkTruncateExtra4206Samples - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 4 - - - chkCreateCUEFileWhenEmbedded - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 5 - - - chkCreateM3U - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 6 - - - chkAutoCorrectFilenames - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpGeneral - - - 7 - - - 6, 6 - - - 252, 182 - - - 0 - - - General - - - grpGeneral - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 3 - - - 17, 17 - True - 12, 140 + 16, 183 + + + 4, 4, 4, 4 - 168, 17 + 209, 21 9 @@ -288,6 +171,9 @@ Separate thread for decoding + + 17, 17 + Improves speed on multicore processors @@ -310,10 +196,13 @@ NoControl - 12, 55 + 16, 72 + + + 4, 4, 4, 4 - 114, 17 + 142, 21 8 @@ -343,10 +232,13 @@ NoControl - 12, 21 + 16, 27 + + + 4, 4, 4, 4 - 138, 17 + 170, 21 0 @@ -376,10 +268,13 @@ NoControl - 12, 38 + 16, 50 + + + 4, 4, 4, 4 - 173, 17 + 216, 21 1 @@ -409,10 +304,13 @@ NoControl - 12, 72 + 16, 94 + + + 4, 4, 4, 4 - 215, 17 + 269, 21 7 @@ -442,10 +340,13 @@ NoControl - 12, 106 + 16, 139 + + + 4, 4, 4, 4 - 189, 17 + 232, 21 6 @@ -475,10 +376,13 @@ NoControl - 12, 89 + 16, 116 + + + 4, 4, 4, 4 - 127, 17 + 156, 21 5 @@ -508,10 +412,13 @@ NoControl - 12, 123 + 16, 161 + + + 4, 4, 4, 4 - 155, 17 + 191, 21 2 @@ -534,6 +441,36 @@ 7 + + 8, 8 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 336, 238 + + + 0 + + + General + + + grpGeneral + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 3 + True @@ -541,10 +478,13 @@ NoControl - 273, 225 + 364, 294 + + + 4, 0, 4, 0 - 54, 13 + 68, 17 11 @@ -565,10 +505,13 @@ 0 - 344, 222 + 459, 290 + + + 4, 4, 4, 4 - 166, 21 + 220, 25 12 @@ -592,10 +535,13 @@ NoControl - 189, 320 + 252, 418 + + + 4, 4, 4, 4 - 73, 23 + 97, 30 1 @@ -615,54 +561,6 @@ 2 - - chkWriteArLogOnConvert - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - chkWriteArTagsOnConvert - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - 8, 103 - - - 248, 61 - - - 1 - - - Encode and verify - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 4 - True @@ -670,10 +568,13 @@ NoControl - 6, 37 + 8, 48 + + + 4, 4, 4, 4 - 130, 17 + 162, 21 10 @@ -700,10 +601,13 @@ NoControl - 6, 20 + 8, 26 + + + 4, 4, 4, 4 - 137, 17 + 170, 21 9 @@ -726,11 +630,44 @@ 1 + + 11, 135 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 331, 80 + + + 1 + + + Encode and verify + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 4 + - 3, 49 + 4, 66 + + + 4, 4, 4, 4 - 104, 19 + 139, 24 6 @@ -751,10 +688,13 @@ Fill - 194, 3 + 260, 4 + + + 4, 4, 4, 4 - 45, 21 + 59, 24 1 @@ -778,10 +718,13 @@ NoControl - 3, 23 + 4, 31 + + + 4, 0, 4, 0 - 185, 23 + 248, 31 2 @@ -808,10 +751,13 @@ Fill - 194, 26 + 260, 35 + + + 4, 4, 4, 4 - 45, 21 + 59, 24 3 @@ -835,10 +781,13 @@ NoControl - 3, 23 + 4, 31 + + + 4, 0, 4, 0 - 187, 23 + 249, 31 7 @@ -865,10 +814,13 @@ Fill - 196, 26 + 261, 35 + + + 4, 4, 4, 4 - 43, 21 + 58, 24 8 @@ -889,10 +841,13 @@ Fill - 196, 3 + 261, 4 + + + 4, 4, 4, 4 - 43, 21 + 58, 24 6 @@ -909,9 +864,6 @@ 4 - - 17, 17 - True @@ -919,10 +871,13 @@ NoControl - 12, 98 + 16, 128 + + + 4, 4, 4, 4 - 128, 17 + 156, 21 5 @@ -952,10 +907,13 @@ NoControl - 6, 20 + 8, 26 + + + 4, 4, 4, 4 - 137, 17 + 170, 21 0 @@ -985,10 +943,13 @@ NoControl - 6, 43 + 8, 56 + + + 4, 4, 4, 4 - 136, 17 + 175, 21 1 @@ -1018,10 +979,13 @@ NoControl - 6, 20 + 8, 26 + + + 4, 4, 4, 4 - 168, 17 + 211, 21 0 @@ -1051,10 +1015,13 @@ NoControl - 23, 89 + 31, 116 + + + 4, 4, 4, 4 - 143, 17 + 178, 21 3 @@ -1084,10 +1051,13 @@ NoControl - 23, 66 + 31, 86 + + + 4, 4, 4, 4 - 149, 17 + 188, 21 2 @@ -1117,10 +1087,13 @@ NoControl - 6, 47 + 8, 61 + + + 4, 4, 4, 4 - 184, 17 + 234, 21 11 @@ -1150,10 +1123,13 @@ NoControl - 12, 20 + 16, 26 + + + 4, 4, 4, 4 - 135, 17 + 165, 21 0 @@ -1189,10 +1165,13 @@ %tracknumber%. %album artist% - %title% - 97, 68 + 129, 89 + + + 4, 4, 4, 4 - 149, 21 + 197, 24 4 @@ -1219,10 +1198,13 @@ %filename% - 97, 40 + 129, 52 + + + 4, 4, 4, 4 - 149, 21 + 197, 24 2 @@ -1248,11 +1230,17 @@ 575, 17 + + 251, 17 + - 96, 80 + 128, 105 + + + 4, 4, 4, 4 - 262, 21 + 348, 24 27 @@ -1272,15 +1260,6 @@ 4 - - 575, 17 - - - 251, 17 - - - 251, 17 - Top, Right @@ -1294,10 +1273,13 @@ NoControl - 293, 115 + 399, 150 + + + 4, 4, 4, 4 - 65, 17 + 78, 21 17 @@ -1321,10 +1303,13 @@ 5 - 96, 20 + 128, 26 + + + 4, 4, 4, 4 - 262, 21 + 348, 24 14 @@ -1345,10 +1330,13 @@ 2 - 96, 49 + 128, 64 + + + 4, 4, 4, 4 - 262, 21 + 348, 24 16 @@ -1375,10 +1363,13 @@ NoControl - 10, 71 + 13, 93 + + + 4, 4, 4, 4 - 92, 17 + 113, 21 15 @@ -1408,10 +1399,13 @@ NoControl - 10, 54 + 13, 71 + + + 4, 4, 4, 4 - 104, 17 + 129, 21 14 @@ -1441,10 +1435,13 @@ NoControl - 10, 37 + 13, 48 + + + 4, 4, 4, 4 - 101, 17 + 125, 21 13 @@ -1474,10 +1471,13 @@ NoControl - 10, 20 + 13, 26 + + + 4, 4, 4, 4 - 143, 17 + 178, 21 16 @@ -1501,10 +1501,13 @@ 0 - 96, 111 + 128, 145 + + + 4, 4, 4, 4 - 191, 21 + 253, 24 28 @@ -1524,95 +1527,14 @@ 1 - - txtSpecialExceptions - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpAudioFilenames - - - 2 - - - chkRemoveSpecial - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpAudioFilenames - - - 3 - - - chkReplaceSpaces - - - System.Windows.Forms.CheckBox, 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 - - - 6 - - - lblSingleFilenameFormat - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpAudioFilenames - - - 7 - - - 264, 6 - - - 252, 195 - - - 1 - - - Audio Filenames - - - grpAudioFilenames - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 4 - - 97, 132 + 129, 173 + + + 4, 4, 4, 4 - 149, 21 + 197, 24 7 @@ -1639,10 +1561,13 @@ NoControl - 34, 115 + 45, 150 + + + 4, 4, 4, 4 - 194, 17 + 243, 21 6 @@ -1669,10 +1594,13 @@ NoControl - 12, 165 + 16, 216 + + + 4, 4, 4, 4 - 185, 17 + 230, 21 8 @@ -1699,10 +1627,13 @@ NoControl - 11, 71 + 15, 93 + + + 4, 0, 4, 0 - 72, 13 + 92, 17 3 @@ -1729,10 +1660,13 @@ NoControl - 9, 43 + 12, 56 + + + 4, 0, 4, 0 - 74, 13 + 93, 17 1 @@ -1752,789 +1686,50 @@ 7 + + 352, 8 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 336, 255 + + + 1 + + + Audio Filenames + + + grpAudioFilenames + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 4 + Top, Left, Right - - groupBoxGaps - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 2 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 0 - - - CUETools - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - groupBoxAlbumArt - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 0 - - - groupBoxTagging - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 1 - - - 4, 22 - - - 535, 291 - - - 9 - - - Tagging - - - tabPage6 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - groupBoxARLog - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - groupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 1 - - - groupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 2 - - - groupBoxVerify - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 1 - - - AccurateRip - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 2 - - - groupBoxFormat - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 0 - - - listViewFormats - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 2 - - - Formats - - - tabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 3 - - - True - - - 136, 39 - - - 390, 246 - - - 31 - - - propertyGridEncoderSettings - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 0 - - - None - - - labelEncoderName - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalEncoder - - - 0 - - - labelEncoderModes - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalEncoder - - - 3 - - - labelEncoderPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalEncoder - - - 7 - - - labelEncoderParameters - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalEncoder - - - 8 - - - 136, 39 - - - 390, 149 - - - 22 - - - External encoder options - - - False - - - groupBoxExternalEncoder - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 1 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAnBJREFUOE+lk+1L - U1Ecx+tf0RdRgkRPhIRRUJjbdHrX2tzm012m1xmLWJqyO0wzKFmo4YtQS+1Rq73JtGFSahmpPQ4tr5XO - dmuj1ua9e0z5tjtomyYSdOB74Rzu53M4v/M7GwFs+K8hCBJjr6hInqfKjR+pUmZWS3Iz2iLuA6lhpkiV - 0VasSF79/wp4QVdBfKYo9keLGcGRIYTeTSA0Pgr+fg/s+hK8ySfYlxopkSiJCQR4roziF+/2YHn2PcLW - ewh3NyHcfgG/brdhacwKZ40eEyox/0KREZNEBfM6XVIEdnA3u7HM2BC+fA6eJhO85moEL5kQaqYRbDyF - 4INbWDhOYuzIAcdT+b6kaP2ETwSmXXVGLNkmozsGWmi4zxvgr9etCHeaRNByDa+z0zEsS6djgk/UMcZn - uY5wbzs8jZX4XiBbM4uVJHhzLZymKjwm0piYgCnT+kMPLQi3mOA5q4+srz2cSgncVD687a0Yyt7ljwlm - yAJ/oLcTwQY9/GdK1xW4StTwtrViULotLpguVjPuxloEmmhwJzUQdlozqmx46mpgrzHAKkqNH8FWqKAZ - uQj+3i54tHK4S3L/ErAKMdi8XPi6r2BUugMDmVviRXxbIEt6VUQ4FsqL4LvTGS2gSy2NSlhlFlh5BJZL - wXd1YKpQJsCOPtHm+DUKxZjMkxDjykP83FE1fDc68bOBhpNU4atGCXe9EfzVDkxrctCfmcJH4JWN9Kc1 - nysOEs8O72cncvfgW7UB7uaL0XypOoEnku0CzCbCsVtI7O0R2d7kYWmacYjYzTzK2ckNirZyA1mpTL84 - xdiXsWn9x7T6pf3L/DfyWaHnHqmNrQAAAABJRU5ErkJggg== - - - - NoControl - - - 37, 262 - - - 25, 23 - - - 29 - - - buttonEncoderDelete - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 2 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAoVJREFUOE+lk/tL - U2EYx+tfcb8UCEmJWSioKSVYKCubTVHx1lzOrSk629lcOnfzQqZz4qWiNnQbjXQX52V4wUw2Xeki9TiU - aKMIgtrw12/nGJ6t/SBBDzyH8/Kez+c97/M+71kAZ/4raEF86uaaWGq3iOh0Csj26fqI9E1dpOV1FSm2 - VBCCiVJW4vcJsJitmhGFX20OwBteQeC7H5vf1jETtEHubgDPyAnXvLjNjpcwAt0cDQujc/s2HP7ax8IX - J4zkCJ7v6mE7MGL16yK0yxKUjxdGuSMFjORYoJ0VJ1FwyLVnxv7PHYzt9OPphhq9vk7oAzoMBrTo3eqA - 69AGws1HseFGqGggN+m4fvSDgmVDa0p8+rFFrTiIgW0tNO/k1NSfUG5IIF3hQ7bWCMeBFXfH81DwJEvG - CDocDaQzaKV+1YRurwJd61JIFgSMoN7KRct8BcSzpRj+oEP/ajuu92aQjEA2xTvyfHZi6KOOgtsYMPFF - OFMC2RIP5sAYcnTpR4ygzVZzNB2chNZPQOFrPlVAeOpgCYwiU50aEzRbK0mDTwv9tgZtb/kQLlWhxnKH - EdEr0/nQzcWQT4kezyNcUabEtiCcLJPdt7BhD5ohWaqGyFN+vOeToGGBg4MmVynseyZc60tH6uPkWBH5 - ppKk2pfFIcJdjylygikYDTY66KRhLqZ3jXhgvkfDoRT5+dgx0sWofFbELhu9GW21V8NBSQw+FYj5Wkhn - q2HwdsFOwXwzB6mK5CgF/91IJ63JGc5ns/V54cLhbPQtEzC918Pk10PjaUVOTxoNh+Nh5hTie/tWfzYr - vy+TyO2+SmZp0iIZqouRy50XyEuKZCJFfu70y5R40/5l/BsV3J5Ng8nYFAAAAABJRU5ErkJggg== - - - - 6, 262 - - - 25, 23 - - - 28 - - - buttonEncoderAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 3 - - - 6, 7 - - - 124, 247 - - - 27 - - - listBoxEncoders - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 4 - - - 459, 12 - - - 67, 21 - - - 26 - - - False - - - comboBoxEncoderExtension - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 5 - - - True - - - MiddleRight - - - NoControl - - - 351, 15 - - - 100, 16 - - - 12 - - - Extension - - - False - - - labelEncoderExtension - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage10 - - - 6 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 6 - - - Encoders - - - tabPage10 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 4 - - - comboBoxDecoderExtension - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage11 - - - 0 - - - groupBoxExternalDecoder - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage11 - - - 1 - - - listViewDecoders - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage11 - - - 2 - - - labelDecoderExtension - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage11 - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 7 - - - Decoders - - - tabPage11 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 5 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage4 - - - 0 - - - grpHDCD - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage4 - - - 1 - - - chkHDCDDetect - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage4 - - - 2 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 3 - - - HDCD - - - tabPage4 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 6 - - - richTextBoxScript - - - System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage5 - - - 0 - - - buttonScriptCompile - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage5 - - - 1 - - - groupBoxScriptConditions - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage5 - - - 2 - - - listViewScripts - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage5 - - - 3 - - - 4, 22 - - - 535, 291 - - - 8 - - - Scripts - - - tabPage5 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 7 - - - propertyGrid1 - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 535, 291 - - - 10 - - - Advanced - - - tabPage7 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 8 - - - 0, 0 - - - 0, 0, 0, 0 - - - 543, 317 - - - 0 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - 6, 193 + 8, 252 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 250, 98 + 333, 128 16 @@ -2554,147 +1749,39 @@ 2 - - tableLayoutPanel3 + + 4, 26 - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBoxAlbumArt + + 4, 4, 4, 4 - + + 716, 385 + + 0 - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxCopyAlbumArt" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxExtractAlbumArt" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxEmbedAlbumArt" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelAlbumArtMaximumResolution" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="numericUpDownMaxResolution" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="textBoxAlArtFilenameFormat" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Percent,54,41177,Percent,22,42647,Percent,22,79412" /><Rows Styles="Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> + + CUETools - - 242, 3 + + tabPage1 - - 284, 275 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + tabControl1 - - Album Art - - - groupBoxAlbumArt - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - + 0 3 - - checkBoxCopyAlbumArt - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 0 - - - checkBoxExtractAlbumArt - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 1 - - - checkBoxEmbedAlbumArt - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 2 - - - labelAlbumArtMaximumResolution - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 3 - - - numericUpDownMaxResolution - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 4 - - - textBoxAlArtFilenameFormat - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel3 - - - 5 - - - 6, 20 - - - 4 - - - 272, 95 - - - 22 - - - tableLayoutPanel3 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxAlbumArt - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxCopyAlbumArt" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxExtractAlbumArt" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxEmbedAlbumArt" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelAlbumArtMaximumResolution" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="numericUpDownMaxResolution" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="textBoxAlArtFilenameFormat" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Percent,54,41177,Percent,22,42647,Percent,22,79412" /><Rows Styles="Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> - True @@ -2705,10 +1792,13 @@ NoControl - 3, 3 + 4, 4 + + + 4, 4, 4, 4 - 142, 17 + 190, 23 16 @@ -2738,10 +1828,13 @@ NoControl - 3, 49 + 4, 66 + + + 4, 4, 4, 4 - 142, 17 + 190, 23 21 @@ -2771,10 +1864,13 @@ NoControl - 3, 26 + 4, 35 + + + 4, 4, 4, 4 - 142, 17 + 190, 23 18 @@ -2801,10 +1897,13 @@ NoControl - 3, 69 + 4, 93 + + + 4, 0, 4, 0 - 203, 26 + 271, 31 20 @@ -2831,10 +1930,13 @@ Fill - 212, 72 + 283, 97 + + + 4, 4, 4, 4 - 57, 21 + 76, 24 19 @@ -2870,10 +1972,13 @@ Fill - 151, 49 + 202, 66 + + + 4, 4, 4, 4 - 118, 21 + 157, 24 22 @@ -2890,98 +1995,65 @@ 5 - - chkExtractLog + + 8, 26 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBoxTagging - - - 0 - - - checkBoxCopyBasicTags - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxTagging - - - 1 - - - checkBoxWriteCUETags - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxTagging - - - 2 - - - checkBoxCopyUnknownTags - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxTagging - - - 3 - - - chkOverwriteTags - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxTagging - - + 4 - - chkFillUpCUE + + 363, 124 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 22 - - groupBoxTagging + + tableLayoutPanel3 - - 5 + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8, 3 + + groupBoxAlbumArt - - 226, 275 - - + 0 - - groupBoxTagging + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxCopyAlbumArt" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxExtractAlbumArt" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkBoxEmbedAlbumArt" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelAlbumArtMaximumResolution" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="numericUpDownMaxResolution" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="textBoxAlArtFilenameFormat" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Percent,54.41177,Percent,22.42647,Percent,22.79412" /><Rows Styles="Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> - + + 323, 4 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 379, 360 + + + 1 + + + Album Art + + + groupBoxAlbumArt + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPage6 - - 1 + + 0 True @@ -2990,10 +2062,13 @@ NoControl - 6, 30 + 8, 39 + + + 4, 4, 4, 4 - 95, 17 + 116, 21 18 @@ -3020,10 +2095,13 @@ NoControl - 6, 115 + 8, 150 + + + 4, 4, 4, 4 - 102, 17 + 127, 21 17 @@ -3050,10 +2128,13 @@ NoControl - 6, 64 + 8, 84 + + + 4, 4, 4, 4 - 176, 17 + 221, 21 15 @@ -3080,10 +2161,13 @@ NoControl - 6, 132 + 8, 173 + + + 4, 4, 4, 4 - 121, 17 + 154, 21 14 @@ -3110,10 +2194,13 @@ NoControl - 18, 98 + 24, 128 + + + 4, 4, 4, 4 - 122, 17 + 150, 21 13 @@ -3140,10 +2227,13 @@ NoControl - 6, 81 + 8, 106 + + + 4, 4, 4, 4 - 187, 17 + 235, 21 12 @@ -3163,65 +2253,59 @@ 5 - - textBoxARLogExtension + + 11, 4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBoxARLog + + 4, 4, 4, 4 - + + 301, 360 + + 0 - - labelLogFileExtension + + groupBoxTagging - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxARLog - - - 1 - - - checkBoxARLogVerbose - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxARLog - - - 2 - - - 6, 170 - - - 250, 85 - - - 4 - - - Log file - - - groupBoxARLog - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage2 + + tabPage6 - - 0 + + 1 + + + 4, 26 + + + 4, 4, 4, 4 + + + 716, 385 + + + 9 + + + Tagging + + + tabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 %F.accurip @@ -3248,10 +2332,13 @@ accurip['('%unique%')'].log - 90, 20 + 120, 26 + + + 4, 4, 4, 4 - 154, 21 + 204, 24 2 @@ -3275,10 +2362,13 @@ NoControl - 6, 23 + 8, 30 + + + 4, 0, 4, 0 - 73, 13 + 93, 17 1 @@ -3305,10 +2395,13 @@ NoControl - 6, 53 + 8, 69 + + + 4, 4, 4, 4 - 65, 17 + 79, 21 0 @@ -3328,90 +2421,39 @@ 2 - - tableLayoutPanel2 + + 8, 222 - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBox5 + + 4, 4, 4, 4 - - 0 + + 333, 111 - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="chkEncodeWhenZeroOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelEncodeWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79,33884,Percent,20,66116" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> + + 4 - - 278, 6 + + Log file - - 248, 91 + + groupBoxARLog - - 3 - - - Encode if verified - - - groupBox5 - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPage2 - - 1 + + 0 2 - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 0 - - - Fill - - - 3, 17 - - - 3 - - - 242, 71 - - - 6 - - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="chkEncodeWhenZeroOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelEncodeWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79,33884,Percent,20,66116" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> - Fill @@ -3419,10 +2461,13 @@ NoControl - 3, 0 + 4, 0 + + + 4, 0, 4, 0 - 185, 23 + 248, 31 5 @@ -3445,102 +2490,72 @@ 0 - - tableLayoutPanel1 + + Fill - + + 4, 21 + + + 4, 4, 4, 4 + + + 3 + + + 323, 94 + + + 6 + + + tableLayoutPanel2 + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox4 + + groupBox5 - + 0 - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxFixToNearest" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelFixWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79,75207,Percent,20,24793" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="chkEncodeWhenZeroOffset" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelEncodeWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numEncodeWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79.33884,Percent,20.66116" /><Rows Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333" /></TableLayoutSettings> - - 278, 103 + + 371, 8 - - 248, 91 + + 4, 4, 4, 4 - - 2 + + 4, 4, 4, 4 - - Fix offset + + 331, 119 - - groupBox4 + + 3 - + + Encode if verified + + + groupBox5 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPage2 - - 2 + + 1 2 - - checkBoxFixToNearest - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 0 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 1 - - - Fill - - - 3, 17 - - - 3 - - - 242, 71 - - - 10 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxFixToNearest" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelFixWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79,75207,Percent,20,24793" /><Rows Styles="Percent,33,33333,Percent,33,33333,Percent,33,33333" /></TableLayoutSettings> - True @@ -3551,13 +2566,16 @@ NoControl - 3, 49 + 4, 66 + + + 4, 4, 4, 4 Yes - 236, 19 + 315, 24 6 @@ -3584,10 +2602,13 @@ NoControl - 3, 0 + 4, 0 + + + 4, 0, 4, 0 - 187, 23 + 249, 31 9 @@ -3610,53 +2631,68 @@ 1 - - checkBoxARVerifyUseSourceFolder + + Fill - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 21 - - groupBoxVerify + + 4, 4, 4, 4 - + + 3 + + + 323, 94 + + + 10 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + 0 - - chkWriteARLogOnVerify + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="checkBoxFixToNearest" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenConfidence" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelFixWhenConfidence" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="numFixWhenPercent" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,79.75207,Percent,20.24793" /><Rows Styles="Percent,33.33333,Percent,33.33333,Percent,33.33333" /></TableLayoutSettings> - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 371, 135 - - groupBoxVerify + + 4, 4, 4, 4 - - 1 + + 4, 4, 4, 4 - - 8, 6 + + 331, 119 - - 248, 91 + + 2 - - 0 + + Fix offset - - Verify + + groupBox4 - - groupBoxVerify - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPage2 - - 3 + + 2 True @@ -3665,10 +2701,13 @@ NoControl - 26, 54 + 35, 71 + + + 4, 4, 4, 4 - 102, 17 + 125, 21 2 @@ -3695,10 +2734,13 @@ NoControl - 6, 37 + 8, 48 + + + 4, 4, 4, 4 - 130, 17 + 162, 21 1 @@ -3718,179 +2760,74 @@ 1 - - comboFormatLossyEncoder + + 11, 8 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBoxFormat + + 4, 4, 4, 4 - + + 331, 119 + + 0 - - labelFormatLossyEncoder + + Verify - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBoxVerify - - groupBoxFormat - - - 1 - - - checkBoxFormatAllowLossy - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 2 - - - comboFormatLosslessEncoder - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 3 - - - checkBoxFormatSupportsLossyWAV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 4 - - - labelFormatLosslessEncoder - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 5 - - - checkBoxFormatEmbedCUESheet - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 6 - - - comboFormatDecoder - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 7 - - - checkBoxFormatAllowLossless - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 8 - - - labelFormatDefaultDecoder - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 9 - - - labelFormatTagger - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 10 - - - comboBoxFormatTagger - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxFormat - - - 11 - - - 136, 6 - - - 390, 269 - - - 17 - - - False - - - groupBoxFormat - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + tabPage2 - - 0 + + 3 + + + 4, 26 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 716, 385 + + + 1 + + + AccurateRip + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 - 155, 74 + 207, 97 + + + 4, 4, 4, 4 - 184, 21 + 244, 25 18 @@ -3914,10 +2851,13 @@ NoControl - 6, 77 + 8, 101 + + + 4, 0, 4, 0 - 76, 13 + 97, 17 19 @@ -3944,10 +2884,13 @@ NoControl - 6, 169 + 8, 221 + + + 4, 4, 4, 4 - 142, 17 + 180, 21 18 @@ -3968,10 +2911,13 @@ 2 - 155, 47 + 207, 61 + + + 4, 4, 4, 4 - 184, 21 + 244, 25 2 @@ -3995,10 +2941,13 @@ NoControl - 6, 194 + 8, 254 + + + 4, 4, 4, 4 - 122, 17 + 155, 21 16 @@ -4025,10 +2974,13 @@ NoControl - 6, 50 + 8, 65 + + + 4, 0, 4, 0 - 88, 13 + 110, 17 8 @@ -4055,10 +3007,13 @@ NoControl - 6, 219 + 8, 286 + + + 4, 4, 4, 4 - 181, 17 + 230, 21 15 @@ -4079,10 +3034,13 @@ 6 - 155, 20 + 207, 26 + + + 4, 4, 4, 4 - 184, 21 + 244, 25 4 @@ -4106,10 +3064,13 @@ NoControl - 6, 144 + 8, 188 + + + 4, 4, 4, 4 - 154, 17 + 193, 21 14 @@ -4136,10 +3097,13 @@ NoControl - 6, 23 + 8, 30 + + + 4, 0, 4, 0 - 47, 13 + 60, 17 11 @@ -4166,10 +3130,13 @@ NoControl - 6, 104 + 8, 136 + + + 4, 0, 4, 0 - 41, 13 + 51, 17 13 @@ -4190,10 +3157,13 @@ 10 - 155, 101 + 207, 132 + + + 4, 4, 4, 4 - 184, 21 + 244, 25 12 @@ -4210,11 +3180,47 @@ 11 + + 181, 8 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 520, 352 + + + 17 + + + False + + + groupBoxFormat + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 0 + + + 120 + - 6, 6 + 8, 8 + + + 4, 4, 4, 4 - 124, 269 + 165, 352 0 @@ -4231,17 +3237,77 @@ 1 - - 120 + + 4, 26 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 716, 385 + + + 2 + + + Formats + + + tabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + + + True + + + 181, 51 + + + 4, 4, 4, 4 + + + 520, 322 + + + 31 + + + propertyGridEncoderSettings + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 0 + + + None True - 6, 114 + 8, 149 + + + 4, 0, 4, 0 - 34, 13 + 43, 17 29 @@ -4268,10 +3334,13 @@ NoControl - 6, 83 + 8, 109 + + + 4, 0, 4, 0 - 38, 13 + 47, 17 28 @@ -4298,10 +3367,13 @@ NoControl - 6, 23 + 8, 30 + + + 4, 0, 4, 0 - 29, 13 + 36, 17 13 @@ -4328,10 +3400,13 @@ NoControl - 6, 52 + 8, 68 + + + 4, 0, 4, 0 - 62, 13 + 77, 17 15 @@ -4351,11 +3426,255 @@ 8 + + 181, 51 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 520, 195 + + + 22 + + + External encoder options + + + False + + + groupBoxExternalEncoder + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmtJREFUOE+lk+tL + U3EYx/1b9EWUINGNkDAKCnNe5s5am9u8nWV63GIRS3PsDNMMahi68EU4a9pVK99kmtgotYzUrkPLY6Wu + nZrU2jxn15Rv26BNc/iifvB984PP5+H3PM8vBUDK/2QdvKDRpM1T1YaPVCUzqyK5GVUZ94FUMlOk3GAv + l6b9XWyNwKHWEJ8piv1hbkZwxIbQuwmExkfB3+/GgrYCb4oJ9qVSSKyWxAVReK6K4pfudmNl9j3Cg/cQ + 7mpB2HIBv263Y3lsEC69FhPyXP6FNDsuiQnm1erUCOzkbnZhhbEjfPkcPC1GeJvrELxkRKiVRtB0CsEH + t+A4TmLsyAHnU8m+1CgbE0RgerHBgGX7ZKxiwEzDfV4Hf6N6TbjTJIK91/C6IAvD4iw6LvhEHWN8vdcR + 7rHAY6rB9xJx0izVkOCb6+Ey1uIxkcnEBUyVyh962Iuw2QjPWW3kPvlxyfLgporhtbTBVrDLHxfMkCX+ + QI8VwSYt/GcqNxQsVijgbW/DkHBbQjBdrmDcpnoEWmhwJ5WIVkoaeQE8DXos6HUYFGQknmAvldKMRAB/ + Tyc8KgncFaJ1AlaaC7ZIBF/XFYwKd2AgZ0uiiW9LxKmvygino7oMvjvWWAMXFcKYhJXlg5VEYIkQfGcH + pkrFUdjZJ9icGGO0GZNFecS47BA/d1QB3w0rfjbRcJFyfFXK4G40gL/agWllIfpz0vkIvHaR/qzmc+lB + 4tnh/eyEaA++1engbr0Yy5faE3iStz0Ks6vh+BRW7/aIeG/asDDTYCN2M48Kd3JDgq3cQH4G05+bbujL + 3rTxZ/qXb/0bHdLOuV/psRIAAAAASUVORK5CYII= + + + + NoControl + + + 49, 343 + + + 4, 4, 4, 4 + + + 33, 30 + + + 29 + + + buttonEncoderDelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 2 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAoBJREFUOE+lk+9L + k1EUx/1b3JsCoVFiFgpqSgkWyspmU1T81bacsyk627O5dOo2dWQ6J/6oqA3dRiPd5uZ0pGImTle6SH0c + SrRRBEFt7O2351F8pga+qAsHLlw+n3PPuecmAEj4n/gL1noaWF3ueqLdKSJbpwQR2ZuaSNPrClJiKSNE + 48Ws08lOCLQeCafTVR9+td6P1fAiAj/8WP++AlfQBoW7FnwjN1z14jbnuIQRHMLiqGfXhv3fu5j76oSR + HMbzbT1se0YsfXsLzYIUpWP5Ud5wHiM5EGhmJIkUHJreMWP31xZGt/rwdK0Lvb526ANaDAQ06N1ow/S+ + DYRbiELDjVBBf3YizR4IKFg+uKzC558bVMYB9G9qoH6voI4Ol2pNCtmiEPLlOjj2rLg7loO8JxlyRtDm + qCWdQSt1VRO6V5XoWJFBOidiBAIrD02zZZDMFGPooxZ9S6243ptGMgL5JD/m/eLE4CctBbcw4OmN2FUE + +Twf5sAosrSpMUbQYquKTQUnoPETUPoazxQQ3hpYAiNI70qOCxqt5aTBp4F+U42Wd0KI5ytQZbnDiOjM + dDx08zDoU6HH+whXVOx4CeKJEvl9Cwf2oBnS+UrUe0sPaj5aNCxycNEwXQz7jgnXdKlIfpwUb6LQVJRY + /bIwRLgFmCTHmYbRYJ2DDhrmYWrbiAfmezQcYivOx5+Rbkb5swJOycjNaLO9Eg5KYvB1gpithmymEobV + DtgpWGjmIlmZFKXgk4N0NJrcoVwOR58Tzh/KhG6BgOmDHia/HmpvM7J6Umg4fBxmXuH4bN/qy2Tl6tKJ + 7O6rZIY6JZLWeTFyuf0CeUmZRLAV587+TP/yrf8AQUbLH7FojlgAAAAASUVORK5CYII= + + + + 8, 343 + + + 4, 4, 4, 4 + + + 33, 30 + + + 28 + + + buttonEncoderAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 3 + + + 17 + + + 8, 9 + + + 4, 4, 4, 4 + + + 165, 323 + + + 27 + + + listBoxEncoders + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 4 + + + 612, 16 + + + 4, 4, 4, 4 + + + 88, 25 + + + 26 + + + False + + + comboBoxEncoderExtension + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 5 + + + True + + + MiddleRight + + + NoControl + + + 468, 20 + + + 4, 0, 4, 0 + + + 133, 21 + + + 12 + + + Extension + + + False + + + labelEncoderExtension + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage10 + + + 6 + + + 4, 26 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 716, 385 + + + 6 + + + Encoders + + + tabPage10 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 4 + - 459, 12 + 612, 16 + + + 4, 4, 4, 4 - 67, 21 + 88, 25 28 @@ -4375,86 +3694,14 @@ 0 - - textBoxDecoderPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalDecoder - - - 0 - - - labelDecoderPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalDecoder - - - 1 - - - labelDecoderParameters - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalDecoder - - - 2 - - - textBoxDecoderParameters - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxExternalDecoder - - - 3 - - - 136, 39 - - - 390, 87 - - - 27 - - - External decoder options - - - False - - - groupBoxExternalDecoder - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage11 - - - 1 - - 96, 20 + 128, 26 + + + 4, 4, 4, 4 - 262, 21 + 348, 24 21 @@ -4478,10 +3725,13 @@ NoControl - 6, 23 + 8, 30 + + + 4, 0, 4, 0 - 29, 13 + 36, 17 20 @@ -4508,10 +3758,13 @@ NoControl - 6, 50 + 8, 65 + + + 4, 0, 4, 0 - 62, 13 + 77, 17 22 @@ -4532,10 +3785,13 @@ 2 - 96, 47 + 128, 61 + + + 4, 4, 4, 4 - 262, 21 + 348, 24 23 @@ -4552,11 +3808,50 @@ 3 + + 181, 51 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 520, 114 + + + 27 + + + External decoder options + + + False + + + groupBoxExternalDecoder + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage11 + + + 1 + + + 120 + - 3, 6 + 4, 8 + + + 4, 4, 4, 4 - 124, 279 + 165, 365 26 @@ -4573,9 +3868,6 @@ 2 - - 120 - True @@ -4586,10 +3878,13 @@ NoControl - 351, 15 + 468, 20 + + + 4, 0, 4, 0 - 100, 16 + 133, 21 19 @@ -4612,53 +3907,35 @@ 3 - - label1 + + 4, 26 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 - - groupBox2 + + 4, 4, 4, 4 - - 0 + + 716, 385 - - numericLossyWAVQuality - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - 228, 42 - - - 298, 100 - - + 7 - - LossyWAV + + Decoders - - groupBox2 + + tabPage11 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage4 + + tabControl1 - - 0 + + 5 True @@ -4667,10 +3944,13 @@ NoControl - 6, 17 + 8, 22 + + + 4, 0, 4, 0 - 45, 13 + 55, 17 5 @@ -4691,10 +3971,13 @@ 0 - 98, 15 + 131, 20 + + + 4, 4, 4, 4 - 36, 21 + 48, 24 6 @@ -4714,11 +3997,47 @@ 1 + + 304, 55 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 397, 131 + + + 7 + + + LossyWAV + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage4 + + + 0 + - 19, 42 + 25, 55 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 203, 165 + 271, 216 1 @@ -4745,10 +4064,13 @@ NoControl - 19, 19 + 25, 25 + + + 4, 4, 4, 4 - 135, 17 + 173, 21 0 @@ -4768,14 +4090,47 @@ 2 + + 4, 26 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 716, 385 + + + 3 + + + HDCD + + + tabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 6 + Courier New, 8pt - 144, 110 + 192, 144 + + + 4, 4, 4, 4 - 382, 167 + 508, 217 28 @@ -4805,10 +4160,13 @@ NoControl - 422, 19 + 563, 25 + + + 4, 4, 4, 4 - 75, 23 + 100, 30 27 @@ -4831,6 +4189,21 @@ 1 + + 200 + + + 8, 26 + + + 4, 4, 4, 4 + + + 332, 101 + + + 2 + listViewScriptConditions @@ -4844,10 +4217,16 @@ 0 - 144, 7 + 192, 9 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 261, 101 + 348, 132 2 @@ -4870,35 +4249,17 @@ 2 - - 6, 20 - - - 249, 77 - - - 2 - - - listViewScriptConditions - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxScriptConditions - - - 0 - - - 200 + + 120 - 6, 6 + 8, 8 + + + 4, 4, 4, 4 - 124, 271 + 165, 354 1 @@ -4915,14 +4276,41 @@ 3 - - 120 + + 4, 26 + + + 4, 4, 4, 4 + + + 716, 385 + + + 8 + + + Scripts + + + tabPage5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 7 - 8, 6 + 11, 8 + + + 4, 4, 4, 4 - 518, 279 + 691, 365 0 @@ -4939,6 +4327,60 @@ 0 + + 4, 26 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 716, 385 + + + 10 + + + Advanced + + + tabPage7 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 8 + + + 0, 0 + + + 0, 0, 0, 0 + + + 724, 415 + + + 0 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True @@ -5017,15 +4459,21 @@ True + + 51 + - 6, 13 + 8, 17 - 542, 355 + 723, 464 Tahoma, 8.25pt + + 4, 4, 4, 4 + CenterParent