From 0dd7ac7ccd53753ba19ee197829092a8bcc482b6 Mon Sep 17 00:00:00 2001 From: chudov Date: Thu, 26 May 2011 18:18:26 +0000 Subject: [PATCH] CTDB EAC Plugin: show progress bar CTDB protocol: parity files can now be on another server Version bump to 2.1.2 --- CUEControls/Properties/AssemblyInfo.cs | 4 +- CUEPlayer/Properties/AssemblyInfo.cs | 4 +- CUEPlayer/frmCUEPlayer.Designer.cs | 2 +- CUERipper/CUERipper.csproj | 2 +- CUERipper/frmCUERipper.cs | 84 ++++++++++-------- CUERipper/frmCUERipper.de-DE.resx | 2 +- CUERipper/frmCUERipper.resx | 16 ++-- CUERipper/frmFreedbSubmit.resx | 2 +- CUETools.ARCUE/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.CDImage/Properties/AssemblyInfo.cs | 4 +- .../CUETools.CTDB.EACPlugin.csproj | 11 ++- CUETools.CTDB.EACPlugin/Metadata.cs | 6 +- CUETools.CTDB.EACPlugin/Options.Designer.cs | 14 +-- CUETools.CTDB.EACPlugin/Plugin.cs | 12 ++- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Resources.resx | 4 +- CUETools.CTDB.EACPlugin/Resources/ctdb64.png | Bin 0 -> 10027 bytes CUETools.CTDB/CUEToolsDB.cs | 17 ++-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Codecs/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Parity/RsDecode.cs | Bin 22618 -> 22680 bytes CUETools.Processor/Processor.cs | 2 +- CUETools.Processor/Properties/AssemblyInfo.cs | 4 +- CUETools.Ripper.Console/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Ripper.SCSI/SCSIDrive.cs | 2 +- CUETools.Ripper/Properties/AssemblyInfo.cs | 4 +- CUETools/CUETools1.vsmdi | 5 ++ CUETools/Properties/AssemblyInfo.cs | 4 +- CUETools/frmCUETools.resx | 6 +- 39 files changed, 150 insertions(+), 119 deletions(-) create mode 100644 CUETools.CTDB.EACPlugin/Resources/ctdb64.png diff --git a/CUEControls/Properties/AssemblyInfo.cs b/CUEControls/Properties/AssemblyInfo.cs index 574607d..0d97d7e 100644 --- a/CUEControls/Properties/AssemblyInfo.cs +++ b/CUEControls/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] diff --git a/CUEPlayer/Properties/AssemblyInfo.cs b/CUEPlayer/Properties/AssemblyInfo.cs index 25b1535..62de579 100644 --- a/CUEPlayer/Properties/AssemblyInfo.cs +++ b/CUEPlayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] diff --git a/CUEPlayer/frmCUEPlayer.Designer.cs b/CUEPlayer/frmCUEPlayer.Designer.cs index bfc65c8..7e42218 100644 --- a/CUEPlayer/frmCUEPlayer.Designer.cs +++ b/CUEPlayer/frmCUEPlayer.Designer.cs @@ -68,7 +68,7 @@ this.IsMdiContainer = true; this.MainMenuStrip = this.menuStrip1; this.Name = "frmCUEPlayer"; - this.Text = "CUEPlayer 2.1.1"; + this.Text = "CUEPlayer 2.1.2"; this.Load += new System.EventHandler(this.frmCUEPlayer_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmCUEPlayer_FormClosing); this.menuStrip1.ResumeLayout(false); diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj index d71ff63..fa617ee 100644 --- a/CUERipper/CUERipper.csproj +++ b/CUERipper/CUERipper.csproj @@ -40,7 +40,7 @@ true index.html 2 - 2.1.1.0 + 2.1.2.0 false true true diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs index 79a07c1..fcd19dc 100644 --- a/CUERipper/frmCUERipper.cs +++ b/CUERipper/frmCUERipper.cs @@ -19,7 +19,6 @@ using CUETools.Codecs; using CUETools.Processor; using CUETools.Ripper; using CUEControls; -using MusicBrainz; using Freedb; namespace CUERipper @@ -562,14 +561,26 @@ namespace CUERipper SetupControls(); } - private void MusicBrainz_LookupProgress(object sender, XmlRequestEventArgs e) + //private void MusicBrainz_LookupProgress(object sender, XmlRequestEventArgs e) + //{ + // CheckStop(); + // //_progress.percentDisk = (1.0 + _progress.percentDisk) / 2; + // //_progress.input = e.Uri.ToString(); + // this.BeginInvoke((MethodInvoker)delegate() + // { + // toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " " + (e == null ? "FreeDB" : "MusicBrainz") + "..."; + // toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3; + // }); + //} + + private void FreeDB_LookupProgress(object sender) { CheckStop(); //_progress.percentDisk = (1.0 + _progress.percentDisk) / 2; //_progress.input = e.Uri.ToString(); this.BeginInvoke((MethodInvoker)delegate() { - toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " " + (e == null ? "FreeDB" : "MusicBrainz") + "..."; + toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " FreeDB..."; toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3; }); } @@ -581,12 +592,12 @@ namespace CUERipper return entry; } - private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release) - { - CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz"); - entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1); - return entry; - } + //private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release) + //{ + // CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz"); + // entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1); + // return entry; + //} private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, CDEntry cdEntry) { @@ -651,33 +662,34 @@ namespace CUERipper { 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(); - p.DiscId = audioSource.TOC.MusicBrainzId; - Query results = Release.Query(p); - MusicBrainzService.Proxy = _config.GetProxy(); - MusicBrainzService.XmlRequest += new EventHandler(MusicBrainz_LookupProgress); + //ReleaseQueryParameters p = new ReleaseQueryParameters(); + //p.DiscId = audioSource.TOC.MusicBrainzId; + //Query results = Release.Query(p); + //MusicBrainzService.Proxy = _config.GetProxy(); + //MusicBrainzService.XmlRequest += new EventHandler(MusicBrainz_LookupProgress); - try - { - foreach (Release release in results) - { - release.GetEvents(); - release.GetTracks(); - data.Releases.Add(CreateCUESheet(audioSource, release)); - } - mbresults_count = results.Count; - } - catch (Exception ex) - { - System.Diagnostics.Trace.WriteLine(ex.Message); - if (!(ex is MusicBrainzNotFoundException)) - musicbrainzError = ex.Message; - } - MusicBrainzService.Proxy = null; - MusicBrainzService.XmlRequest -= new EventHandler(MusicBrainz_LookupProgress); + //try + //{ + // foreach (Release release in results) + // { + // release.GetEvents(); + // release.GetTracks(); + // data.Releases.Add(CreateCUESheet(audioSource, release)); + // } + // mbresults_count = results.Count; + //} + //catch (Exception ex) + //{ + // System.Diagnostics.Trace.WriteLine(ex.Message); + // if (!(ex is MusicBrainzNotFoundException)) + // musicbrainzError = ex.Message; + //} + //MusicBrainzService.Proxy = null; + //MusicBrainzService.XmlRequest -= new EventHandler(MusicBrainz_LookupProgress); + this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " Freedb..."; }); FreedbHelper m_freedb = new FreedbHelper(); m_freedb.Proxy = _config.GetProxy(); @@ -692,12 +704,12 @@ namespace CUERipper string code = string.Empty; try { - MusicBrainz_LookupProgress(this, null); + FreeDB_LookupProgress(this); code = m_freedb.Query(AccurateRipVerify.CalculateCDDBQuery(audioSource.TOC), out queryResult, out coll); if (code == FreedbHelper.ResponseCodes.CODE_200) { CDEntry cdEntry; - MusicBrainz_LookupProgress(this, null); + FreeDB_LookupProgress(this); code = m_freedb.Read(queryResult, out cdEntry); if (code == FreedbHelper.ResponseCodes.CODE_210) { @@ -712,7 +724,7 @@ namespace CUERipper foreach (QueryResult qr in coll) { CDEntry cdEntry; - MusicBrainz_LookupProgress(this, null); + FreeDB_LookupProgress(this); code = m_freedb.Read(qr, out cdEntry); if (code == FreedbHelper.ResponseCodes.CODE_210) { diff --git a/CUERipper/frmCUERipper.de-DE.resx b/CUERipper/frmCUERipper.de-DE.resx index 1f41acd..cf768c7 100644 --- a/CUERipper/frmCUERipper.de-DE.resx +++ b/CUERipper/frmCUERipper.de-DE.resx @@ -208,6 +208,6 @@ Senden - CUERipper 2.1.1 + CUERipper 2.1.2 \ No newline at end of file diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx index 2cea35e..93f070a 100644 --- a/CUERipper/frmCUERipper.resx +++ b/CUERipper/frmCUERipper.resx @@ -468,7 +468,7 @@ bnComboBoxLosslessOrNot - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -495,7 +495,7 @@ bnComboBoxEncoder - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -549,7 +549,7 @@ bnComboBoxFormat - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -615,7 +615,7 @@ bnComboBoxImage - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -1011,7 +1011,7 @@ bnComboBoxRelease - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null $this @@ -1035,7 +1035,7 @@ bnComboBoxDrives - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null $this @@ -1059,7 +1059,7 @@ bnComboBoxOutputFormat - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null $this @@ -1735,7 +1735,7 @@ CenterScreen - CUERipper 2.1.1 + CUERipper 2.1.2 toolStripStatusLabel1 diff --git a/CUERipper/frmFreedbSubmit.resx b/CUERipper/frmFreedbSubmit.resx index e5256f0..f28f53f 100644 --- a/CUERipper/frmFreedbSubmit.resx +++ b/CUERipper/frmFreedbSubmit.resx @@ -138,7 +138,7 @@ imgComboBoxCategory - CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null groupBox1 diff --git a/CUETools.ARCUE/Properties/AssemblyInfo.cs b/CUETools.ARCUE/Properties/AssemblyInfo.cs index 57b34d4..23bce34 100644 --- a/CUETools.ARCUE/Properties/AssemblyInfo.cs +++ b/CUETools.ARCUE/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] diff --git a/CUETools.AccurateRip/Properties/AssemblyInfo.cs b/CUETools.AccurateRip/Properties/AssemblyInfo.cs index cee8c88..fc30b31 100644 --- a/CUETools.AccurateRip/Properties/AssemblyInfo.cs +++ b/CUETools.AccurateRip/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] diff --git a/CUETools.CDImage/Properties/AssemblyInfo.cs b/CUETools.CDImage/Properties/AssemblyInfo.cs index b586691..f3457e5 100644 --- a/CUETools.CDImage/Properties/AssemblyInfo.cs +++ b/CUETools.CDImage/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] diff --git a/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj b/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj index a3978a7..abc02a1 100644 --- a/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj +++ b/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj @@ -45,6 +45,12 @@ + + Form + + + FormSubmitParity.cs + Form @@ -67,6 +73,9 @@ + + FormSubmitParity.cs + FormMetadata.cs @@ -103,7 +112,7 @@ - +