CUERipper: AlbumArt support

CUERipper/frmCUERipper.cs

@@ -255,7 +255,8 @@ namespace CUERipper
 			listTracks.Items.Clear();
 			data.Releases.Clear();
 			data.selectedRelease = null;
-			selectedDriveInfo = null;
+            ResetAlbumArt();
+            selectedDriveInfo = null;
 			bnComboBoxRelease.Text = "";
 
 			if (CUEProcessorPlugins.ripper == null)
@@ -320,7 +321,11 @@ namespace CUERipper
 					Monitor.Wait(_startStop);
 				}
 			}
-		}
+            if (backgroundWorkerArtwork.IsBusy && backgroundWorkerArtwork.CancellationPending)
+            {
+                throw new StopException();
+            }
+        }
 
 		private void UploadProgress(object sender, Krystalware.UploadHelper.UploadProgressEventArgs e)
 		{
@@ -441,6 +446,13 @@ namespace CUERipper
 					bnComboBoxOutputFormat.Items.RemoveAt(OutputPathUseTemplates.Length + 10);
 			}
 
+            if (currentAlbumArt < albumArt.Count)
+            {
+                data.selectedRelease.metadata.AlbumArt.Clear();
+                data.selectedRelease.metadata.AlbumArt.Add(albumArt[currentAlbumArt].meta);
+                cueSheet.AddAlbumArt(albumArt[currentAlbumArt].contents);
+            }            
+
 			data.selectedRelease.metadata.Save();
 
 			cueSheet.CopyMetadata(data.selectedRelease.metadata);
@@ -491,12 +503,12 @@ namespace CUERipper
 					bool various = data.selectedRelease.metadata.IsVarious();
 					if (various)
 					{
-						Title.Width = 235;
+						Title.Width = 300;
 						columnHeaderArtist.Width = 120;
 					}
 					else
 					{
-						Title.Width = 235 + 120;
+						Title.Width = 300 + 120;
 						columnHeaderArtist.Width = 0;
 					}
 					for (int i = 1; i <= selectedDriveInfo.drive.TOC.TrackCount; i++)
@@ -526,7 +538,7 @@ namespace CUERipper
 					PropertyDescriptorCollection props = TypeDescriptor.GetProperties(data.selectedRelease.metadata);
 					PropertyDescriptorCollection sortedprops = props.Sort(new string[] { "Artist", "Title", "Genre", "Year", "DiscNumber", "TotalDiscs" });
 					foreach (PropertyDescriptor p in sortedprops)
-						if (p.Name != "Tracks" && p.Name != "Id" && !p.Attributes.Contains(new System.Xml.Serialization.XmlIgnoreAttribute()))
+						if (p.Name != "Tracks" && p.Name != "AlbumArt" && p.Name != "Id" && !p.Attributes.Contains(new System.Xml.Serialization.XmlIgnoreAttribute()))
 							listMetadata.Items.Add(new ListViewItem(new string[] { p.GetValue(data.selectedRelease.metadata).ToString(), p.Name }));
 				}
 			}
@@ -553,6 +565,8 @@ namespace CUERipper
 			}
 			listTracks.EndUpdate();
 			listMetadata.EndUpdate();
+
+            UpdateAlbumArt(true);
 			SetupControls();
 		}
 
@@ -616,150 +630,155 @@ namespace CUERipper
 
 		private bool loadAllMetadata = false;
 
-		private void Lookup(object o)
+        private void Lookup(object o)
-		{
+        {
-			ICDRipper audioSource = o as ICDRipper;
+            ICDRipper audioSource = o as ICDRipper;
-			int mbresults_count = 0; // have to cache results.Count, because it sometimes hangs in it, and we don't want UI thread to hang.
+            int mbresults_count = 0; // have to cache results.Count, because it sometimes hangs in it, and we don't want UI thread to hang.
-			string musicbrainzError = "";
+            string musicbrainzError = "";
 
-			data.Releases.RaiseListChangedEvents = false;
+            data.Releases.RaiseListChangedEvents = false;
 
-			cueSheet = new CUESheet(_config);
+            cueSheet = new CUESheet(_config);
-			cueSheet.OpenCD(audioSource);
+            cueSheet.OpenCD(audioSource);
-			cueSheet.Action = CUEAction.Encode;
+            cueSheet.Action = CUEAction.Encode;
 
-			this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " CTDB..."; });
+            this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " CTDB..."; });
-			cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, CTDBMetadataSearch.Default);
+            cueSheet.UseCUEToolsDB("CUERipper " + CUESheet.CUEToolsVersion, selectedDriveInfo.drive.ARName, false, CTDBMetadataSearch.Default);
-			cueSheet.CTDB.UploadHelper.onProgress += new EventHandler<Krystalware.UploadHelper.UploadProgressEventArgs>(UploadProgress);
+            cueSheet.CTDB.UploadHelper.onProgress += new EventHandler<Krystalware.UploadHelper.UploadProgressEventArgs>(UploadProgress);
-			this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " AccurateRip..."; });
+            this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " AccurateRip..."; });
-			cueSheet.UseAccurateRip();
+            cueSheet.UseAccurateRip();
 
-			General.SetCUELine(cueSheet.Attributes, "REM", "DISCID", AccurateRipVerify.CalculateCDDBId(audioSource.TOC), false);
+            General.SetCUELine(cueSheet.Attributes, "REM", "DISCID", AccurateRipVerify.CalculateCDDBId(audioSource.TOC), false);
-			General.SetCUELine(cueSheet.Attributes, "REM", "COMMENT", _config.createEACLOG ? "ExactAudioCopy v0.99pb4" : audioSource.RipperVersion, true);
+            General.SetCUELine(cueSheet.Attributes, "REM", "COMMENT", _config.createEACLOG ? "ExactAudioCopy v0.99pb4" : audioSource.RipperVersion, true);
 
-			try
+            try
-			{
+            {
-				CUEMetadata cache = CUEMetadata.Load(audioSource.TOC.TOCID);
+                CUEMetadata cache = CUEMetadata.Load(audioSource.TOC.TOCID);
-				if (cache != null)
+                if (cache != null)
-					data.Releases.Add(new CUEMetadataEntry(cache, audioSource.TOC, "local"));
+                    data.Releases.Add(new CUEMetadataEntry(cache, audioSource.TOC, "local"));
-			}
+            }
-			catch (Exception ex)
+            catch (Exception ex)
-			{
+            {
-				System.Diagnostics.Trace.WriteLine(ex.Message);
+                System.Diagnostics.Trace.WriteLine(ex.Message);
-			}
+            }
 
-			foreach (var ctdbMeta in cueSheet.CTDB.Metadata)
+            foreach (var ctdbMeta in cueSheet.CTDB.Metadata)
-			{
+            {
-				data.Releases.Add(CreateCUESheet(audioSource, ctdbMeta));
+                data.Releases.Add(CreateCUESheet(audioSource, ctdbMeta));
-			}
+            }
 
-			if (data.Releases.Count == 0 || loadAllMetadata)
+            if (data.Releases.Count == 0 || loadAllMetadata)
-			{
+            {
-				loadAllMetadata = false;
+                loadAllMetadata = false;
 
-				//this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " MusicBrainz..."; });
+                //this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " MusicBrainz..."; });
 
-				//ReleaseQueryParameters p = new ReleaseQueryParameters();
+                //ReleaseQueryParameters p = new ReleaseQueryParameters();
-				//p.DiscId = audioSource.TOC.MusicBrainzId;
+                //p.DiscId = audioSource.TOC.MusicBrainzId;
-				//Query<Release> results = Release.Query(p);
+                //Query<Release> results = Release.Query(p);
-				//MusicBrainzService.Proxy = _config.GetProxy();
+                //MusicBrainzService.Proxy = _config.GetProxy();
-				//MusicBrainzService.XmlRequest += new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
+                //MusicBrainzService.XmlRequest += new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
 
-				//try
+                //try
-				//{
+                //{
-				//    foreach (Release release in results)
+                //    foreach (Release release in results)
-				//    {
+                //    {
-				//        release.GetEvents();
+                //        release.GetEvents();
-				//        release.GetTracks();
+                //        release.GetTracks();
-				//        data.Releases.Add(CreateCUESheet(audioSource, release));
+                //        data.Releases.Add(CreateCUESheet(audioSource, release));
-				//    }
+                //    }
-				//    mbresults_count = results.Count;
+                //    mbresults_count = results.Count;
-				//}
+                //}
-				//catch (Exception ex)
+                //catch (Exception ex)
-				//{
+                //{
-				//    System.Diagnostics.Trace.WriteLine(ex.Message);
+                //    System.Diagnostics.Trace.WriteLine(ex.Message);
-				//    if (!(ex is MusicBrainzNotFoundException))
+                //    if (!(ex is MusicBrainzNotFoundException))
-				//        musicbrainzError = ex.Message;
+                //        musicbrainzError = ex.Message;
-				//}
+                //}
-				//MusicBrainzService.Proxy = null;
+                //MusicBrainzService.Proxy = null;
-				//MusicBrainzService.XmlRequest -= new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
+                //MusicBrainzService.XmlRequest -= new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
 
-				this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " Freedb..."; });
+                this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " Freedb..."; });
 
-				FreedbHelper m_freedb = new FreedbHelper();
+                FreedbHelper m_freedb = new FreedbHelper();
-				m_freedb.Proxy = _config.GetProxy(); 
+                m_freedb.Proxy = _config.GetProxy();
-				m_freedb.UserName = _config.advanced.FreedbUser;
+                m_freedb.UserName = _config.advanced.FreedbUser;
-				m_freedb.Hostname = _config.advanced.FreedbDomain;
+                m_freedb.Hostname = _config.advanced.FreedbDomain;
-				m_freedb.ClientName = "CUERipper";
+                m_freedb.ClientName = "CUERipper";
-				m_freedb.Version = CUESheet.CUEToolsVersion;
+                m_freedb.Version = CUESheet.CUEToolsVersion;
-				m_freedb.SetDefaultSiteAddress(Properties.Settings.Default.MAIN_FREEDB_SITEADDRESS);
+                m_freedb.SetDefaultSiteAddress(Properties.Settings.Default.MAIN_FREEDB_SITEADDRESS);
 
-				QueryResult queryResult;
+                QueryResult queryResult;
-				QueryResultCollection coll;
+                QueryResultCollection coll;
-				string code = string.Empty;
+                string code = string.Empty;
-				try
+                try
-				{
+                {
-					FreeDB_LookupProgress(this);
+                    FreeDB_LookupProgress(this);
-					code = m_freedb.Query(AccurateRipVerify.CalculateCDDBQuery(audioSource.TOC), out queryResult, out coll);
+                    code = m_freedb.Query(AccurateRipVerify.CalculateCDDBQuery(audioSource.TOC), out queryResult, out coll);
-					if (code == FreedbHelper.ResponseCodes.CODE_200)
+                    if (code == FreedbHelper.ResponseCodes.CODE_200)
-					{
+                    {
-						CDEntry cdEntry;
+                        CDEntry cdEntry;
-						FreeDB_LookupProgress(this);
+                        FreeDB_LookupProgress(this);
-						code = m_freedb.Read(queryResult, out cdEntry);
+                        code = m_freedb.Read(queryResult, out cdEntry);
-						if (code == FreedbHelper.ResponseCodes.CODE_210)
+                        if (code == FreedbHelper.ResponseCodes.CODE_210)
-						{
+                        {
-							CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
+                            CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
-							data.Releases.Add(r);
+                            data.Releases.Add(r);
-						}
+                        }
-					}
+                    }
-					else
+                    else
-						if (code == FreedbHelper.ResponseCodes.CODE_210 ||
+                        if (code == FreedbHelper.ResponseCodes.CODE_210 ||
-							code == FreedbHelper.ResponseCodes.CODE_211)
+                            code == FreedbHelper.ResponseCodes.CODE_211)
-						{
+                        {
-							foreach (QueryResult qr in coll)
+                            foreach (QueryResult qr in coll)
-							{
+                            {
-								CDEntry cdEntry;
+                                CDEntry cdEntry;
-								FreeDB_LookupProgress(this);
+                                FreeDB_LookupProgress(this);
-								code = m_freedb.Read(qr, out cdEntry);
+                                code = m_freedb.Read(qr, out cdEntry);
-								if (code == FreedbHelper.ResponseCodes.CODE_210)
+                                if (code == FreedbHelper.ResponseCodes.CODE_210)
-								{
+                                {
-									CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
+                                    CUEMetadataEntry r = CreateCUESheet(audioSource, cdEntry);
-									data.Releases.Add(r);
+                                    data.Releases.Add(r);
-								}
+                                }
-							}
+                            }
-						}
+                        }
-				}
+                }
-				catch (Exception ex)
+                catch (Exception ex)
-				{
+                {
-					System.Diagnostics.Trace.WriteLine(ex.Message);
+                    System.Diagnostics.Trace.WriteLine(ex.Message);
-				}
+                }
-			}
+            }
 
-			if (data.Releases.Count == 0)
+            if (data.Releases.Count == 0)
-			{
+            {
-				data.Releases.Add(CreateCUESheet(audioSource));
+                data.Releases.Add(CreateCUESheet(audioSource));
-			}
+            }
-			_workThread = null;
+            _workThread = null;
-			if (musicbrainzError != "")
+            if (musicbrainzError != "")
-				musicbrainzError = musicbrainzError + ": ";
+                musicbrainzError = musicbrainzError + ": ";
-			this.BeginInvoke((MethodInvoker)delegate()
+            while (backgroundWorkerArtwork.IsBusy)
-			{
+            {
-				SetupControls();
+                Thread.Sleep(100);
-				data.Releases.RaiseListChangedEvents = true;
+            }
-				data.Releases.ResetBindings();
+            this.BeginInvoke((MethodInvoker)delegate()
-				//bnComboBoxRelease.SelectedIndex = 0;
+            {
-				toolStripStatusAr.Enabled = cueSheet.ArVerify.ARStatus == null;
+                SetupControls();
-				toolStripStatusAr.Text = cueSheet.ArVerify.ARStatus == null ? cueSheet.ArVerify.WorstTotal().ToString() : "";
+                data.Releases.RaiseListChangedEvents = true;
-				toolStripStatusAr.ToolTipText = "AccurateRip: " + (cueSheet.ArVerify.ARStatus ?? "found") + ".";
+                data.Releases.ResetBindings();
-				toolStripStatusCTDB.Enabled = cueSheet.CTDB.DBStatus == null;
+                //bnComboBoxRelease.SelectedIndex = 0;
-				toolStripStatusCTDB.Text = cueSheet.CTDB.DBStatus == null ? cueSheet.CTDB.Total.ToString() : "";
+                toolStripStatusAr.Enabled = cueSheet.ArVerify.ARStatus == null;
-				toolStripStatusCTDB.ToolTipText = "CUETools DB: " + (cueSheet.CTDB.DBStatus ?? "found") + ".";
+                toolStripStatusAr.Text = cueSheet.ArVerify.ARStatus == null ? cueSheet.ArVerify.WorstTotal().ToString() : "";
-				toolStripStatusLabelMusicBrainz.Enabled = true;
+                toolStripStatusAr.ToolTipText = "AccurateRip: " + (cueSheet.ArVerify.ARStatus ?? "found") + ".";
-				toolStripStatusLabelMusicBrainz.BorderStyle = mbresults_count > 0 ? Border3DStyle.SunkenInner : Border3DStyle.RaisedInner;
+                toolStripStatusCTDB.Enabled = cueSheet.CTDB.DBStatus == null;
-				toolStripStatusLabelMusicBrainz.Text = mbresults_count > 0 ? mbresults_count.ToString() : "";
+                toolStripStatusCTDB.Text = cueSheet.CTDB.DBStatus == null ? cueSheet.CTDB.Total.ToString() : "";
-				toolStripStatusLabelMusicBrainz.ToolTipText = "Musicbrainz: " + (mbresults_count > 0 ? mbresults_count.ToString() + " entries found." : (musicbrainzError + "click to submit."));
+                toolStripStatusCTDB.ToolTipText = "CUETools DB: " + (cueSheet.CTDB.DBStatus ?? "found") + ".";
-			});
+                toolStripStatusLabelMusicBrainz.Enabled = true;
-		}
+                toolStripStatusLabelMusicBrainz.BorderStyle = mbresults_count > 0 ? Border3DStyle.SunkenInner : Border3DStyle.RaisedInner;
+                toolStripStatusLabelMusicBrainz.Text = mbresults_count > 0 ? mbresults_count.ToString() : "";
+                toolStripStatusLabelMusicBrainz.ToolTipText = "Musicbrainz: " + (mbresults_count > 0 ? mbresults_count.ToString() + " entries found." : (musicbrainzError + "click to submit."));
+                backgroundWorkerArtwork.RunWorkerAsync(new BackgroundWorkerArtworkArgs() { cueSheet = cueSheet, meta = data.selectedRelease });
+            });
+        }
 
 		private void UpdateDrive()
 		{
@@ -784,7 +803,8 @@ namespace CUERipper
 			listTracks.Items.Clear();
 			data.Releases.Clear();
 			data.selectedRelease = null;
-			bnComboBoxRelease.Enabled = false;
+            ResetAlbumArt();
+            bnComboBoxRelease.Enabled = false;
 			bnComboBoxRelease.Text = "";
 			if (selectedDriveInfo == null)
 			{
@@ -1224,7 +1244,8 @@ namespace CUERipper
 			loadAllMetadata = true;
 			data.Releases.Clear();
 			data.selectedRelease = null;
-			UpdateRelease();
+            ResetAlbumArt();
+            UpdateRelease();
 			_workThread = new Thread(Lookup);
 			_workThread.Priority = ThreadPriority.BelowNormal;
 			_workThread.IsBackground = true;
@@ -1362,8 +1383,146 @@ namespace CUERipper
 			SetupControls();
 			_workThread.Start();
 		}
+
+        List<AlbumArt> albumArt = new List<AlbumArt>();
+        int currentAlbumArt = 0, frontAlbumArt = -1;
+
+        private void ResetAlbumArt()
+        {
+            if (this.cueSheet != null)
+            {
+                this.cueSheet.CTDB.CancelRequest();
+            }
+            lock (albumArt)
+            {
+                if (backgroundWorkerArtwork.IsBusy)
+                    backgroundWorkerArtwork.CancelAsync();
+                albumArt.Clear();
+            }
+            UpdateAlbumArt(false);
+        }
+
+        private void UpdateAlbumArt(bool selectRelease)
+        {
+            if (albumArt.Count == 0)
+            {
+                pictureBox1.Image = null;
+                return;
+            }
+
+            if (selectRelease && data.selectedRelease != null && data.selectedRelease.metadata.AlbumArt.Count > 0)
+            {
+                for (int i = 0; i < albumArt.Count; i++)
+                {
+                    foreach (var aa in data.selectedRelease.metadata.AlbumArt)
+                    {
+                        if (aa.uri == albumArt[i].meta.uri)
+                        {
+                            currentAlbumArt = i;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (currentAlbumArt >= albumArt.Count)
+                currentAlbumArt = 0;
+            pictureBox1.Image = albumArt[currentAlbumArt].image;
+        }
+
+        private void backgroundWorkerArtwork_DoWork(object sender, DoWorkEventArgs e)
+        {
+            var args = e.Argument as BackgroundWorkerArtworkArgs;
+            var cueSheet = args.cueSheet;
+            albumArt.Clear();
+            currentAlbumArt = 0;
+            frontAlbumArt = -1;
+            var knownUrls = new List<string>();
+            var firstUrls = new List<string>();
+
+            if (args.meta != null && args.meta.metadata.AlbumArt.Count > 0)
+                foreach (var aa in args.meta.metadata.AlbumArt)
+                    firstUrls.Add(aa.uri);
+
+            for (int i = 0; i < 2; i++)
+            {
+                foreach (var metadata in cueSheet.CTDB.Metadata)
+                {
+                    if (metadata.coverart == null)
+                        continue;
+                    foreach (var coverart in metadata.coverart)
+                    {
+                        bool large = false;
+                        var uri = large ?
+                            coverart.uri : coverart.uri150 ?? coverart.uri;
+                        if (knownUrls.Contains(uri) || !coverart.primary)
+                            continue;
+                        if (i == 0 && !firstUrls.Contains(coverart.uri))
+                            continue;
+                        var ms = new MemoryStream();
+                        if (!cueSheet.CTDB.FetchFile(uri, ms))
+                            continue;
+                        lock (this.albumArt)
+                        {
+                            if (backgroundWorkerArtwork.CancellationPending)
+                            {
+                                e.Cancel = true;
+                                return;
+                            }
+                            this.albumArt.Add(new AlbumArt(coverart, ms.ToArray()));
+                        }
+                        knownUrls.Add(uri);
+                        backgroundWorkerArtwork.ReportProgress(0);
+                    }
+                }
+            }
+        }
+
+        private void backgroundWorkerArtwork_ProgressChanged(object sender, ProgressChangedEventArgs e)
+        {
+            UpdateAlbumArt(true);
+        }
+
+        private void backgroundWorkerArtwork_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            toolStripStatusLabel1.Text = "";
+            toolStripProgressBar1.Value = 0;
+        }
+
+        private void pictureBox1_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                currentAlbumArt++;
+                UpdateAlbumArt(false);
+            }
+        }
 	}
 
+    internal class BackgroundWorkerArtworkArgs
+    {
+        public CUESheet cueSheet;
+        public CUEMetadataEntry meta;
+    }
+
+    internal class AlbumArt
+    {
+        public CTDBResponseMetaImage meta;
+
+        public byte[] contents;
+
+        public Image image;
+
+        public AlbumArt(CTDBResponseMetaImage meta, byte[] contents)
+        {
+            this.meta = meta;
+            this.contents = contents;
+            using (MemoryStream imageStream = new MemoryStream(contents))
+                try { this.image = Image.FromStream(imageStream); }
+                catch { }
+        }
+    }
+
 	public class StartStop
 	{
 		public bool _stop, _pause;

CUERipper/frmCUERipper.resx

@@ -118,11 +118,11 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>0, 469</value>
+    <value>222, 95</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>394, 20</value>
+    <value>473, 20</value>
   </data>
   <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
@@ -136,21 +136,20 @@
   <data name="toolStripStatusAr.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMISURBVDhPbZP9T5pnFIb5A7dlWdNlW2ZmSYsNbadjbrT1
-        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        A6QiOLWsSApS1/rRqSW2dq5TuiBWUamVIYZarUXRCSgSERD5euG99s79sJh4kjsnOXnu65zknEcmOyd8
-        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        PjD37tBoOeCWfY+OsQSu1Qr/PhUon+ZzY2IgT4MyR+33AorbUGWAmvsi6gER7VOR7okSLn/2LKBC6bTw
-        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        5g/QVqepl0umWvhaXUDRBior6IZE2p+J2F6WeTInENgunoVY9OtobuxJ5iyXqwpU14hcUYn8eAdaegTM
-        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        DrBPwshsBacvzcpmguDG9v8Q9Q/vuK7aplp5yCW5gPJSCbUCjBowPazwSJruqQdm3p6wewQHqRSZbJxC
-        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        PoPs595Zruv8yFtWqGqMoaxP0XitQJM8im8GXi9LXeeLrEUgelwmkcsQO3jPYXKZfHoZ2Xcdz7ls8CI3
-        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        +LliDKHW72NsTrP0qkx4K8bahw32UwKxY4F44Zido3WS2QC5k0XKORcyxb3HyM0TKLunUVsCGE1hbPe2
-        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        iEbT/OmeOs3JbIZIMUtE2CIlBBDKHkThhSQHshpjD3WGITSGZ+hb3dgavfTVB5l3hCme5Mikjgmthvh7
-        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        c4109C9Khy8hNU45NQJH/ciGHb/R2mLB2ulg+vEKw7VOvN2rJNxxYoEosekNkq7X5Oc8FNdeQGgEcecX
-        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        iJnJJ8aQRSIRHnZZWfUE2fCEJUAfu+5NEku75HwRQv2TZMcnwCWZl4aorFqphEwQ7oR88L9V2m420VNT
-        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        x7Zrgb2pIPFXfpLe9+z3j5Gx2SgMWxDGTVTcRkSvdF3BW2TW7549poXePpxfXaU0PkV2YZHi7DxxXQOF
-        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        zjryD1Sc/Crp+Q2yU3LSAfv5/+HNkwEmqz9nUXGBD9cusF//MXvNnxDt+Ihd86eEH33Bwmj7+ebR0VHs
-        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        djuDbTp+r1Uwd/VL3qou4m/6DJ/uIjOGb3ig+5af7nZhtfachTidTgYHBzGZTLTr29DptGi0t9E338TQ
-        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        0IC2WUNTi05SK/o7bXR1dXDfZj2F/APN0qwvsYBTqAAAAABJRU5ErkJggg==
-        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripStatusAr.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -178,7 +177,7 @@
     <value>0, 469</value>
   </data>
   <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>571, 25</value>
+    <value>650, 25</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
@@ -197,7 +196,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>14</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -210,7 +209,7 @@
     <value>Title</value>
   </data>
   <data name="Title.Width" type="System.Int32, mscorlib">
-    <value>235</value>
+    <value>300</value>
   </data>
   <data name="TrackNo.DisplayIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -240,10 +239,10 @@
     <value>70</value>
   </data>
   <data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 87</value>
+    <value>7, 87</value>
   </data>
   <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>553, 221</value>
+    <value>630, 220</value>
   </data>
   <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -273,10 +272,10 @@
     <value>NoControl</value>
   </data>
   <data name="buttonGo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 343</value>
+    <value>3, 3</value>
   </data>
   <data name="buttonGo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>177, 33</value>
+    <value>170, 33</value>
   </data>
   <data name="buttonGo.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -291,10 +290,10 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;buttonGo.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>panel1</value>
   </data>
   <data name="&gt;&gt;buttonGo.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>0</value>
   </data>
   <data name="buttonAbort.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -303,7 +302,7 @@
     <value>NoControl</value>
   </data>
   <data name="buttonAbort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>474, 343</value>
+    <value>88, 3</value>
   </data>
   <data name="buttonAbort.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 33</value>
@@ -324,10 +323,10 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;buttonAbort.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>panel1</value>
   </data>
   <data name="&gt;&gt;buttonAbort.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>2</value>
   </data>
   <data name="buttonPause.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -336,10 +335,10 @@
     <value>NoControl</value>
   </data>
   <data name="buttonPause.Location" type="System.Drawing.Point, System.Drawing">
-    <value>383, 343</value>
+    <value>3, 3</value>
   </data>
   <data name="buttonPause.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 33</value>
+    <value>79, 33</value>
   </data>
   <data name="buttonPause.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
@@ -357,13 +356,13 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;buttonPause.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>panel1</value>
   </data>
   <data name="&gt;&gt;buttonPause.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>1</value>
   </data>
   <data name="numericWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>310, 15</value>
+    <value>257, 20</value>
   </data>
   <data name="numericWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 20</value>
@@ -393,7 +392,7 @@
     <value>NoControl</value>
   </data>
   <data name="lblWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>242, 19</value>
+    <value>189, 22</value>
   </data>
   <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>62, 13</value>
@@ -423,16 +422,16 @@
     <value>NoControl</value>
   </data>
   <data name="checkBoxEACMode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>245, 44</value>
+    <value>192, 47</value>
   </data>
   <data name="checkBoxEACMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 17</value>
+    <value>88, 17</value>
   </data>
   <data name="checkBoxEACMode.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
   </data>
   <data name="checkBoxEACMode.Text" xml:space="preserve">
-    <value>EAC log</value>
+    <value>EAC log style</value>
   </data>
   <data name="&gt;&gt;checkBoxEACMode.Name" xml:space="preserve">
     <value>checkBoxEACMode</value>
@@ -447,7 +446,7 @@
     <value>11</value>
   </data>
   <metadata name="losslessOrNotBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>369, 95</value>
+    <value>17, 95</value>
   </metadata>
   <metadata name="bindingSourceCR.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>210, 56</value>
@@ -477,7 +476,7 @@
     <value>0</value>
   </data>
   <metadata name="encodersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>189, 95</value>
+    <value>1217, 56</value>
   </metadata>
   <data name="bnComboBoxEncoder.Location" type="System.Drawing.Point, System.Drawing">
     <value>92, 46</value>
@@ -507,7 +506,7 @@
     <value>NoControl</value>
   </data>
   <data name="labelSecureMode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 98</value>
+    <value>195, 103</value>
   </data>
   <data name="labelSecureMode.Size" type="System.Drawing.Size, System.Drawing">
     <value>109, 18</value>
@@ -531,7 +530,7 @@
     <value>2</value>
   </data>
   <metadata name="formatsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>1045, 56</value>
   </metadata>
   <data name="bnComboBoxFormat.Location" type="System.Drawing.Point, System.Drawing">
     <value>92, 19</value>
@@ -729,7 +728,7 @@
     <value>NoControl</value>
   </data>
   <data name="trackBarSecureMode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>237, 71</value>
+    <value>184, 76</value>
   </data>
   <data name="trackBarSecureMode.Size" type="System.Drawing.Size, System.Drawing">
     <value>127, 45</value>
@@ -753,7 +752,7 @@
     <value>6, 332</value>
   </data>
   <data name="groupBoxSettings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>370, 134</value>
+    <value>320, 134</value>
   </data>
   <data name="groupBoxSettings.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -771,17 +770,17 @@
     <value>12</value>
   </data>
   <metadata name="drivesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>998, 56</value>
+    <value>882, 56</value>
   </metadata>
   <metadata name="imageListChecked.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>207, 17</value>
   </metadata>
   <data name="imageListChecked.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        CQAAAk1TRnQBSQFMAgEBBAEAAQwBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAWQBAAFkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -837,7 +836,7 @@
     <value>624, 17</value>
   </metadata>
   <data name="progressBarErrors.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 421</value>
+    <value>3, 91</value>
   </data>
   <metadata name="plainProgressPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>454, 17</value>
@@ -846,7 +845,7 @@
     <value>789, 17</value>
   </metadata>
   <data name="progressBarErrors.Size" type="System.Drawing.Size, System.Drawing">
-    <value>177, 23</value>
+    <value>170, 23</value>
   </data>
   <data name="progressBarErrors.TabIndex" type="System.Int32, mscorlib">
     <value>30</value>
@@ -855,22 +854,22 @@
     <value>progressBarErrors</value>
   </data>
   <data name="&gt;&gt;progressBarErrors.Type" xml:space="preserve">
-    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;progressBarErrors.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>panel1</value>
   </data>
   <data name="&gt;&gt;progressBarErrors.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>4</value>
   </data>
   <data name="progressBarCD.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 392</value>
+    <value>3, 64</value>
   </data>
   <metadata name="plainProgressPainter2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>356, 56</value>
   </metadata>
   <data name="progressBarCD.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 23</value>
+    <value>170, 23</value>
   </data>
   <data name="progressBarCD.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
@@ -882,19 +881,22 @@
     <value>progressBarCD</value>
   </data>
   <data name="&gt;&gt;progressBarCD.Type" xml:space="preserve">
-    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;progressBarCD.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>panel1</value>
   </data>
   <data name="&gt;&gt;progressBarCD.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>3</value>
+  </data>
+  <data name="txtOutputPath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <data name="txtOutputPath.Location" type="System.Drawing.Point, System.Drawing">
     <value>5, 312</value>
   </data>
   <data name="txtOutputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 20</value>
+    <value>633, 20</value>
   </data>
   <data name="txtOutputPath.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -912,7 +914,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtOutputPath.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>15</value>
+  </data>
+  <data name="bnComboBoxRelease.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <metadata name="releasesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>708, 56</value>
@@ -922,10 +927,10 @@
   </metadata>
   <data name="imageListMetadataSource.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy
-        DwAAAk1TRnQBSQFMAgEBCQEAAQwBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EAAAAk1TRnQBSQFMAgEBCgEAAWQBAAFkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -954,52 +959,57 @@
         AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
         AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wUAAfQBvAG1ArQBtQG8
-        AiA1AAH/AbwBtAEJBBkBCQIgAf8zAAH/AbsBCQH0AhkDCQEZAiABuwH/MgABvAEJAfUDGQEJCCAwAAH0
+        AiAJAATrKAAB/wG8AbQBCQQZAQkCIAH/BgAB6wIUARUCDgEAAQ4lAAH/AbsBCQH0AhkDCQEZAiABuwH/
-        AbQB/wH1BBkIIDAAAbwBCQIZAfQFGQEJAiABGQEJAbwwAAG1AfIDCQEZAQkCtAEJARkCIAHdARkBtTAA
+        BAABFAEHAesBFAERAg4CAAEOJAABvAEJAf8DGQEJCCACAAERARQB6wEHAesBEQIOAwABDiIAAfQBtAL/
-        AbQBGQMJARkBtAL/AbQBGQIgAQkBGQG0MAABtAEZAwkBGQG0Av8BtAEZAwkBGQG0MAABtQEZBQkCtAEJ
+        BBkIIAEAAREBFQIUAusBFQERAQ4EAAERIQABvAEJAhkB9AUZAQkCIAEZAQkBvAEAAQ4CEQIVAQ4CSgIO
-        AfUB9AMZAbUwAAG8BAkDGQH0AfUB9AP1AQkBvDAAAfQBtAH0AQkBGQH/AgkBGQH1AfQB9QL/AbQB9DEA
+        JQABtQHyAwkBGQEJArQBCQEZAiAB3QEZAbUB6wEABA4ENwEOBAAB6yAAAbQBGQMJARkBtAL/AbQBGQIg
-        AbwBCQH1Af8B9QIJARkB/wL1Af8BCQG8MgAB/wG7AQkB/wH0AgkBGQH1Av8BCQG7Af8zAAH/AbwBtAEJ
+        AQkBGQG0AesEAAFKBDcBSgQAAesgAAG0ARkDCQEZAbQC/wG0ARkDCQEZAbQB6wQAAUoENwFKBA4B6yAA
-        AhkB9AHzAQkBtAG8Af82AAH0AbwBtQK0AbUBvAH0dQABmQZ5AfMIAAH3AW0BvC0AAZkFoAJ5AfQIAAHw
+        AbUBGQUJArQBCQH/AfQDGQG1AesEAAEOBDcBDgIRAg4B6yAAAbwECQMZAfQB/wH0A/8BCQG8AQABDgQA
-        AW0CAAGSAeoCEgEUARUBQwERAewDAAGZCHkB8wYAAZkIeQHzBQABmQWgAXkBmgFRAnkBmQQAAfMBbQHz
+        AQ4CSgEOAhQDESEAAfQBtAH0AQkBGQH/AgkBGQH/AfQD/wG0AfQBAAEUAwACDgERARQB6wFzAhQBEQEU
-        AgAB6gFtARICFAESAW0B6wERAwABmQegAnkB9AUAAZkHoAJ5AfQEAAGZBaADeQFYAaABmQQAAe8C7AIA
+        IgABvAEJA/8CCQEZBP8BCQG8AwABEQIAAg4BEQEVAesBBwHrARUBFCMAAf8BuwEJAf8B9AIJARkD/wEJ
-        AfcBbQPqAhIBFAHsAwABmQegAXkBmgF5AfQEAAGZB6ABeQGaAXkB9AMAAZkIoAFYAaABUQF5AZkTAAGZ
+        AbsB/wQAARQBAAIOAREBFQEUA+slAAH/AbwBtAEJAhkB9AHzAQkBtAG8Af8GAAIVAw4BEQIUKAAB9AG8
-        B6ADeQGZBAABmQegA3kBmQMAAZkIoAFYAaABWAGgAZkCAALrAW0OAAGZCqABmQQAAZkKoAGZAwABmQig
+        AbUCtAG1AbwB9AoABOtnAAGZBnkB8wgAAfcBbQG8LQABmQWgAnkB9AgAAfABbQIAAZIB6gISARQBFQFD
-        AVgBoAFYAaABmQIAAfQB7QH/AgAB9wVtAuoBkgMAAZkKoAGZBAABmQqgAZkDAAGZAcMHoAFYAaABWAGg
+        AREB7AMAAZkIeQHzBgABmQh5AfMFAAGZBaABeQGaAVECeQGZBAAB8wFtAfMCAAHqAW0BEgIUARIBbQHr
-        AZkDAAH0Ae0CAAJtARIBEwEUARIBbQHrAeoDAAGZCqABmQQAAZkKoAGZAwABGgHDB6ABWAGgAVgBoAGZ
+        AREDAAGZB6ACeQH0BQABmQegAnkB9AQAAZkFoAN5AVgBoAGZBAAB7wLsAgAB9wFtA+oCEgEUAewDAAGZ
-        AgAB7wHsAe8CAAHvAesGbQH3AwABmQqgAZkEAAGZCaABkQGYAwABGgPDBaABWAGgAVgBoAGZEwABmQHD
+        B6ABeQGaAXkB9AQAAZkHoAF5AZoBeQH0AwABmQigAVgBoAFRAXkBmRMAAZkHoAN5AZkEAAGZB6ADeQGZ
-        CaABmQQAAZkBwwigAosB8gIAARsBGgh5AaABWAGgAZkCAAPsDgABmQHDCaABmQQAAZkBwwSgAZEEswHa
+        AwABmQigAVgBoAFYAaABmQIAAusBbQ4AAZkKoAGZBAABmQqgAZkDAAGZCKABWAGgAVgBoAGZAgAB9AHt
-        AbQB8gMAARoDwwWgAVgBoAGZAwAB7AMAAe8B7ATrAm0B9wMAARoBwwmgARoEAAEaAcMEoAGzAdwF2wG0
+        Af8CAAH3BW0C6gGSAwABmQqgAZkEAAGZCqABmQMAAZkBwwegAVgBoAFYAaABmQMAAfQB7QIAAm0BEgET
-        AwABGwEaCHkBoAEaAwAB7AMAAewBbQISAhMBEgJtAwABGgTDBqABGgQAARoEwwGgAbsEtAHcAbQB8gUA
+        ARQBEgFtAesB6gMAAZkKoAGZBAABmQqgAZkDAAEaAcMHoAFYAaABWAGgAZkCAAHvAewB7wIAAe8B6wZt
-        ARoDwwWgARoCAAHvAewDAAHvBOwD6wHvAwABGwoaARsEAAEbCRoCtAHzBgABGwgaARstAAEJAfMDAAF6
+        AfcDAAGZCqABmQQAAZkJoAGRAZgDAAEaA8MFoAFYAaABWAGgAZkTAAGZAcMJoAGZBAABmQHDCKACiwHy
-        AlELegEAAe0PCiAAAVEBAAERARMBAAEPCnoBtQQEA/MBBAPzAgQBXwEKEAAQ/wEAAbwD/wETAQ8JegG1
+        AgABGwEaCHkBoAFYAaABmQIAA+wOAAGZAcMJoAGZBAABmQHDBKABkQSzAdoBtAHyAwABGgPDBaABWAGg
-        AwQB9AIEAfQBBAH0AgQB9AIEAQoB8QK8AfIBAAHyBLwB8gEAAfICvAHxAfACvAHwAf8B8AS8AfAB/wHw
+        AZkDAAHsAwAB7wHsBOsCbQH3AwABGgHDCaABGgQAARoBwwSgAbMB3AXbAbQDAAEbARoIeQGgARoDAAHs
-        ArwB8AEAAbwE/wEACXoBtQGiAgQB/wIEAf8BBAH/AgQB/wIEAQoBvAH/AfQDBwT0AwcB9AH/ArwB/wH0
+        AwAB7AFtAhICEwESAm0DAAEaBMMGoAEaBAABGgTDAaABuwS0AdwBtAHyBQABGgPDBaABGgIAAe8B7AMA
-        AwcE9AMHAfQB/wG8AVEBDwHrAgcBvAEAAREEAAERA3oBtQGiAwQD/wEEA/8DBAEKAfAB9ALzAfQG8wH0
+        Ae8E7APrAe8DAAEbChoBGwQAARsJGgK0AfMGAAEbCBoBGy0AAQkB8wMAAXoCUQt6AQAB7Q8KIAABUQEA
-        AvMB9ALwAfQC8wH0BvMB9ALzAfQB8AF6AVEBDwIAAf8BAAEPAfcC/wGSAhECegG1AaIFBAH/AQQB/wUE
+        AREBEwEAAQ8KegG1BAQD8wEEA/MCBAFfAQoQABD/AQABvAP/ARMBDwl6AbUDBAH0AgQB9AEEAfQCBAH0
-        AQoB8AH0DPMB9ALwAfQM8wH0AfAEegEAAf8BAAERBP8BvAEAAnoBtQGiBQQB/wEEAf8FBAEKAfAB9Azz
+        AgQBCgHxArwB8gEAAfIEvAHyAQAB8gK8AfEB8AK8AfAB/wHwBLwB8AH/AfACvAHwAQABvAT/AQAJegG1
-        AfQC8AH0DPMB9AHwBK4BAAH/AgABEwG8A/8BAAKuAbUBog0EAQoB8QH/BfQBAAFzAbwE9AH/AvEB/wX0
+        AaICBAH/AgQB/wEEAf8CBAH/AgQBCgG8Af8B9AMHBPQDBwH0Af8CvAH/AfQDBwT0AwcB9AH/AbwBUQEP
-        AQABcwG8BPQB/wHxBK4BAAH/AQABEgEPAwAB/wEAAq4N/wH0AfMB7AHyAf8F9AEcAcMBUQEIA/QB/wLy
+        AesCBwG8AQABEQQAAREDegG1AaIDBAP/AQQD/wMEAQoB8AH0AvMB9AbzAfQC8wH0AvAB9ALzAfQG8wH0
-        Af8F9AEcAcMBUQEIA/QB/wHyBK4BAAH/AQ8BAAERAhIBAAH/AQACrgH/AaIC/wEEA/8CBAP/AgQB7AHy
+        AvMB9AHwAXoBUQEPAgAB/wEAAQ8B9wL/AZICEQJ6AbUBogUEAf8BBAH/BQQBCgHwAfQM8wH0AvAB9Azz
-        Bv8BGwFYAXoBUQEIA/8C8gb/ARsBWAF6AVEBCAP/AfIErgEAAv8BkgERAQABDwEAAf8BAAKuAf8BogL/
+        AfQB8AR6AQAB/wEAAREE/wG8AQACegG1AaIFBAH/AQQB/wUEAQoB8AH0DPMB9ALwAfQM8wH0AfAErgEA
-        AQQC/wEEBP8BBAH0AfMB7AHyB/8BGgFYAXoBUQEaAv8C8gf/ARoBWAF6AVEBGgL/AfIErgEAAQcD/wG8
+        Af8CAAETAbwD/wEAAq4BtQGiDQQBCgHxAf8F9AEAAXMBvAT0Af8C8QH/BfQBAAFzAbwE9AH/AfEErgEA
-        AeoBAAH/AQACrgH/AaIC/wEEAv8EBAH/AwQBCgHyCP8BGgFYAXoBUQEaAf8C8gj/ARoBWAF6AVEBGgH/
+        Af8BAAESAQ8DAAH/AQACrg3/AfQB8wHsAfIB/wX0ARwBwwFRAQgD9AH/AvIB/wX0ARwBwwFRAQgD9AH/
-        AfIErgERARMBBwb/AQACrgH/AaIBBAH/AQQC/wEEAv8BBAH/AQQB9AHzAQoB8gn/ARsBWAF6Ae0B8ALy
+        AfIErgEAAf8BDwEAARECEgEAAf8BAAKuAf8BogL/AQQD/wIEA/8CBAHsAfIG/wEbAVgBegFRAQgD/wLy
-        Cf8BGwFYAXoB7QHwAfIFrgERAQABEQGSBP8BAAKuAf8BhgL/AgQC/wIEA/8CBAHsAfMK8gHwAe8B9AHt
+        Bv8BGwFYAXoBUQEIA/8B8gSuAQAC/wGSAREBAAEPAQAB/wEAAq4B/wGiAv8BBAL/AQQE/wEEAfQB8wHs
-        AbwB8wryAfAB7wH0Ae0BvAeuAREBAAEPAesBvAH/AQACrgH/AYYL/wH0AfMB7AwAAfQBvAEWAW8MAAH0
+        AfIH/wEaAVgBegFRARoC/wLyB/8BGgFYAXoBUQEaAv8B8gSuAQABBwP/AbwB6gEAAf8BAAKuAf8BogL/
-        AbwBFgFvAQAJrgEPAQABEwERAa4BAAL/AbUL/wH0AQcNAAH0ARYB8w0AAfQBFgHzAUIBTQE+BwABPgMA
+        AQQC/wQEAf8DBAEKAfII/wEaAVgBegFRARoB/wLyCP8BGgFYAXoBUQEaAf8B8gSuAREBEwEHBv8BAAKu
-        ASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAfABBwYAAcABAwYAAYABAQYAAYBHAAGAAQEGAAGA
+        Af8BogEEAf8BBAL/AQQC/wEEAf8BBAH0AfMBCgHyCf8BGwFYAXoB7QHwAvIJ/wEbAVgBegHtAfAB8gWu
-        AQEGAAHAAQMGAAHwAQ8GAAj/AYABfwGPBf8BgAE/AcwBAQHAAQ8BwAEPAYABBwGMAQEBwAEHAcABBwGA
+        AREBAAERAZIE/wEAAq4B/wGGAv8CBAL/AgQD/wIEAewB8wryAfAB7wH0Ae0BvAHzCvIB8AHvAfQB7QG8
-        AQcBjAEBAcABAwHAAQMBgAEBAv8BwAEDAcABAwGAAQEBjwH/AcABAwHAAQMBgAEBAYwBAQHAAQMBwAED
+        B64BEQEAAQ8B6wG8Af8BAAKuAf8Bhgv/AfQB8wHsDAAB9AG8ARYBbwwAAfQBvAEWAW8BAAmuAQ8BAAET
-        AYABAQHMAQEBwAEDAcABAwGAAQEBjAEBAcABAwHAAQMBgAEBAv8BwAEDAcABAQGAAQEBjwH/AcABAwHA
+        AREBrgEAAv8BtQv/AfQBBw0AAfQBFgHzDQAB9AEWAfMBQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEA
-        AQAB4AEBAdwBAQHAAQMBwAEAAeABAQHcAQEBwAEDAcABAAH4AQEBnAEBAcABAwHAAQEB+AEBBf8B8wGA
+        AQEFAAGAAQEWAAP/AQAB8AEHAfwBPwQAAcABAwHwAQ8EAAGAAQEB4AEHBAABgAEAAcABAwYAAYABAQYA
-        AQECAAT/BAAC/wYAAQgBEF4AAf8B8AH/AfABgAEBAgAB/wH4Af8B+As=
+        AYABASYAAYABAQYAAYABAQQAAYABAQHAAQMEAAGAAQEB4AEHBAABwAEDAfABDwQAAfABDwH8AT8EAAj/
+        AYABfwGPBf8BgAE/AcwBAQHAAQ8BwAEPAYABBwGMAQEBwAEHAcABBwGAAQcBjAEBAcABAwHAAQMBgAEB
+        Av8BwAEDAcABAwGAAQEBjwH/AcABAwHAAQMBgAEBAYwBAQHAAQMBwAEDAYABAQHMAQEBwAEDAcABAwGA
+        AQEBjAEBAcABAwHAAQMBgAEBAv8BwAEDAcABAQGAAQEBjwH/AcABAwHAAQAB4AEBAdwBAQHAAQMBwAEA
+        AeABAQHcAQEBwAEDAcABAAH4AQEBnAEBAcABAwHAAQEB+AEBBf8B8wGAAQECAAT/BAAC/wYAAQgBEF4A
+        Af8B8AH/AfABgAEBAgAB/wH4Af8B+As=
 </value>
   </data>
   <data name="bnComboBoxRelease.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 33</value>
   </data>
   <data name="bnComboBoxRelease.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 21</value>
+    <value>632, 21</value>
   </data>
   <data name="bnComboBoxRelease.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1017,13 +1027,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxRelease.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
+  </data>
+  <data name="bnComboBoxDrives.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <data name="bnComboBoxDrives.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 6</value>
   </data>
   <data name="bnComboBoxDrives.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 21</value>
+    <value>632, 21</value>
   </data>
   <data name="bnComboBoxDrives.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1041,13 +1054,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxDrives.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
+  </data>
+  <data name="bnComboBoxOutputFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <data name="bnComboBoxOutputFormat.Location" type="System.Drawing.Point, System.Drawing">
     <value>5, 312</value>
   </data>
   <data name="bnComboBoxOutputFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 21</value>
+    <value>633, 21</value>
   </data>
   <data name="bnComboBoxOutputFormat.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -1065,7 +1081,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;bnComboBoxOutputFormat.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
+  </data>
+  <data name="listMetadata.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <data name="columnHeaderValue.DisplayIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1074,7 +1093,7 @@
     <value>Value</value>
   </data>
   <data name="columnHeaderValue.Width" type="System.Int32, mscorlib">
-    <value>400</value>
+    <value>450</value>
   </data>
   <data name="columnHeaderName.DisplayIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1083,13 +1102,13 @@
     <value>Name</value>
   </data>
   <data name="columnHeaderName.Width" type="System.Int32, mscorlib">
-    <value>120</value>
+    <value>140</value>
   </data>
   <data name="listMetadata.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 87</value>
   </data>
   <data name="listMetadata.Size" type="System.Drawing.Size, System.Drawing">
-    <value>550, 220</value>
+    <value>630, 220</value>
   </data>
   <data name="listMetadata.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -1107,7 +1126,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;listMetadata.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>16</value>
   </data>
   <data name="buttonTrackMetadata.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -1119,7 +1138,7 @@
     <value>NoControl</value>
   </data>
   <data name="buttonTrackMetadata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 112</value>
+    <value>483, 63</value>
   </data>
   <data name="buttonTrackMetadata.Size" type="System.Drawing.Size, System.Drawing">
     <value>19, 17</value>
@@ -1140,7 +1159,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonTrackMetadata.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="buttonMetadata.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 60</value>
@@ -1167,7 +1186,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonMetadata.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="buttonVA.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1197,7 +1216,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonVA.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="buttonReload.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1227,7 +1246,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonReload.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="buttonEncoding.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1257,7 +1276,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonEncoding.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="buttonTracks.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1290,7 +1309,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonTracks.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="buttonFreedbSubmit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1320,8 +1339,59 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;buttonFreedbSubmit.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>462, 339</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>176, 125</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>332, 339</value>
+  </data>
+  <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>125, 125</value>
+  </data>
+  <data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="&gt;&gt;pictureBox1.Name" xml:space="preserve">
+    <value>pictureBox1</value>
+  </data>
+  <data name="&gt;&gt;pictureBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="backgroundWorkerArtwork.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1148, 17</value>
+  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1332,7 +1402,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>571, 494</value>
+    <value>650, 494</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1855,31 +1925,31 @@
     <value>plainBackgroundPainter1</value>
   </data>
   <data name="&gt;&gt;plainBackgroundPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainBackgroundPainter, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainBackgroundPainter, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;styledBorderPainter1.Name" xml:space="preserve">
     <value>styledBorderPainter1</value>
   </data>
   <data name="&gt;&gt;styledBorderPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.StyledBorderPainter, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.StyledBorderPainter, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;plainProgressPainter1.Name" xml:space="preserve">
     <value>plainProgressPainter1</value>
   </data>
   <data name="&gt;&gt;plainProgressPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;gradientGlossPainter1.Name" xml:space="preserve">
     <value>gradientGlossPainter1</value>
   </data>
   <data name="&gt;&gt;gradientGlossPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.GradientGlossPainter, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.GradientGlossPainter, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;plainProgressPainter2.Name" xml:space="preserve">
     <value>plainProgressPainter2</value>
   </data>
   <data name="&gt;&gt;plainProgressPainter2.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.3766.36643, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.4313.32741, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
     <value>toolTip1</value>
@@ -1911,6 +1981,12 @@
   <data name="&gt;&gt;columnHeaderName.Type" xml:space="preserve">
     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;backgroundWorkerArtwork.Name" xml:space="preserve">
+    <value>backgroundWorkerArtwork</value>
+  </data>
+  <data name="&gt;&gt;backgroundWorkerArtwork.Type" xml:space="preserve">
+    <value>System.ComponentModel.BackgroundWorker, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmCUERipper</value>
   </data>

CUETools.CTDB/CUEToolsDB.cs

@@ -145,6 +145,9 @@ namespace CUETools.CTDB
             req.ReadWriteTimeout = socketTimeout;
             req.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
 
+            if (uploadHelper.onProgress != null)
+                uploadHelper.onProgress(url, new UploadProgressEventArgs(req.RequestUri.AbsoluteUri, 0.0));
+
             currentReq = req;
             try
             {
@@ -325,8 +328,8 @@ namespace CUETools.CTDB
             {
                 offset = -confirm.offset;
 
+#if DEBUG
                 // Optional sanity check: should be done by server                
-                
                 if (verify.AR.CTDBCRC(offset) != confirm.crc)
                     throw new Exception("crc mismatch");
 
@@ -345,6 +348,7 @@ namespace CUETools.CTDB
                     equals &= confirm.syndrome[0, i] == syn2[0, i];
                 if (!equals)
                     throw new Exception("syndrome mismatch");
+#endif
             }
             if (upload)
             {

CUETools.Processor/CUEMetadata.cs

@@ -24,6 +24,7 @@ namespace CUETools.Processor
 			ReleaseDate = "";
 			Label = "";
 			Country = "";
+            AlbumArt = new List<CTDB.CTDBResponseMetaImage>();
 			Tracks = new List<CUETrackMetadata>();
 		}
 
@@ -79,6 +80,8 @@ namespace CUETools.Processor
 		public string Country { get; set; }
 		public List<CUETrackMetadata> Tracks { get; set; }
 
+        public List<CTDB.CTDBResponseMetaImage> AlbumArt { get; set; }
+
 		[XmlIgnore]
 		public string DiscNumber01
 		{
@@ -150,6 +153,7 @@ namespace CUETools.Processor
 			if ((overwrite || ReleaseDate == "") && metadata.ReleaseDate != "") ReleaseDate = metadata.ReleaseDate;
 			if ((overwrite || Label == "") && metadata.Label != "") Label = metadata.Label;
 			if ((overwrite || Country == "") && metadata.Country != "") Country = metadata.Country;
+            if ((overwrite || AlbumArt.Count == 0) && metadata.AlbumArt.Count != 0) AlbumArt = metadata.AlbumArt;
 			for (int i = 0; i < Tracks.Count; i++)
 			{
 				if ((overwrite || Tracks[i].Title == "") && metadata.Tracks[i].Title != "") Tracks[i].Title = metadata.Tracks[i].Title;
@@ -212,6 +216,7 @@ namespace CUETools.Processor
 			ReleaseDate = metadata.ReleaseDate;
 			Country = metadata.Country;
 			Label = metadata.Label;
+            AlbumArt = metadata.AlbumArt;
 			for (int i = 0; i < Tracks.Count; i++)
 			{
 				Tracks[i].Title = metadata.Tracks[i].Title;
@@ -250,6 +255,9 @@ namespace CUETools.Processor
 			if (cdEntry.label != null)
 				foreach (var l in cdEntry.label)
 					this.Label = (this.Label == "" ? "" : this.Label + ": ") + (l.name ?? "") + (l.name != null && l.catno != null ? " " : "") + (l.catno ?? "");
+            this.AlbumArt.Clear();
+            if (cdEntry.coverart != null)
+                this.AlbumArt.AddRange(cdEntry.coverart);
 			if (cdEntry.track != null && cdEntry.track.Length >= this.Tracks.Count)
 			{
 				for (int i = 0; i < this.Tracks.Count; i++)

CUETools.Processor/CUESheet.cs

@@ -2754,6 +2754,14 @@ namespace CUETools.Processor
             }
         }
 
+        public void AddAlbumArt(byte[] encoded)
+        {
+            var data = new TagLib.ByteVector(encoded);
+            var picture = new TagLib.Picture(data);
+            picture.Type = TagLib.PictureType.FrontCover;
+            _albumArt.Add(picture);
+        }
+
         public void ResizeAlbumArt()
         {
             if (_albumArt == null)

CUETools/frmCUETools.Designer.cs

@@ -202,8 +202,8 @@ namespace JDP {
             // toolStripStatusLabelProcessed
             // 
             this.toolStripStatusLabelProcessed.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
             this.toolStripStatusLabelProcessed.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
             this.toolStripStatusLabelProcessed.Name = "toolStripStatusLabelProcessed";
             resources.ApplyResources(this.toolStripStatusLabelProcessed, "toolStripStatusLabelProcessed");
@@ -211,8 +211,8 @@ namespace JDP {
             // toolStripStatusLabelCTDB
             // 
             this.toolStripStatusLabelCTDB.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
             this.toolStripStatusLabelCTDB.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
             resources.ApplyResources(this.toolStripStatusLabelCTDB, "toolStripStatusLabelCTDB");
             this.toolStripStatusLabelCTDB.Image = global::JDP.Properties.Resources.cdrepair1;
@@ -221,8 +221,8 @@ namespace JDP {
             // toolStripStatusLabelAR
             // 
             this.toolStripStatusLabelAR.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) 
-                        | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
+            | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
             this.toolStripStatusLabelAR.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
             resources.ApplyResources(this.toolStripStatusLabelAR, "toolStripStatusLabelAR");
             this.toolStripStatusLabelAR.Image = global::JDP.Properties.Resources.AR;

CUETools/frmCUETools.resx

@@ -132,7 +132,7 @@
     <value>MiddleLeft</value>
   </data>
   <data name="toolStripStatusLabelProcessed.Size" type="System.Drawing.Size, System.Drawing">
-    <value>32, 31</value>
+    <value>32, 24</value>
   </data>
   <data name="toolStripStatusLabelProcessed.Text" xml:space="preserve">
     <value>ETA</value>
@@ -997,7 +997,7 @@
     <value>10, 70</value>
   </data>
   <data name="radioButtonAudioNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 13</value>
+    <value>51, 17</value>
   </data>
   <data name="radioButtonAudioNone.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
@@ -1030,7 +1030,7 @@
     <value>10, 36</value>
   </data>
   <data name="radioButtonAudioLossy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>39, 13</value>
+    <value>52, 17</value>
   </data>
   <data name="radioButtonAudioLossy.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -1063,7 +1063,7 @@
     <value>10, 53</value>
   </data>
   <data name="radioButtonAudioHybrid.Size" type="System.Drawing.Size, System.Drawing">
-    <value>41, 13</value>
+    <value>55, 17</value>
   </data>
   <data name="radioButtonAudioHybrid.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -1096,7 +1096,7 @@
     <value>10, 19</value>
   </data>
   <data name="radioButtonAudioLossless.Size" type="System.Drawing.Size, System.Drawing">
-    <value>49, 13</value>
+    <value>65, 17</value>
   </data>
   <data name="radioButtonAudioLossless.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -1585,7 +1585,7 @@
     <value>6, 71</value>
   </data>
   <data name="rbActionCorrectFilenames.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 17</value>
+    <value>106, 17</value>
   </data>
   <data name="rbActionCorrectFilenames.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -1651,7 +1651,7 @@
     <value>6, 37</value>
   </data>
   <data name="rbActionVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 17</value>
+    <value>51, 17</value>
   </data>
   <data name="rbActionVerify.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1684,7 +1684,7 @@
     <value>6, 20</value>
   </data>
   <data name="rbActionEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 17</value>
+    <value>62, 17</value>
   </data>
   <data name="rbActionEncode.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>