claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

CTDB EAC Plugin: show progress bar

Browse Source 
CTDB protocol: parity files can now be on another server
Version bump to 2.1.2
This commit is contained in:
chudov
2011-05-26 18:18:26 +00:00
parent b289629143
commit 0dd7ac7ccd
39 changed files with 150 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CUEControls/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUEPlayer/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

2
CUEPlayer/frmCUEPlayer.Designer.cs generated
View File

@@ -68,7 +68,7 @@
this.IsMdiContainer = true; this.IsMdiContainer = true;
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
this.Name = "frmCUEPlayer"; this.Name = "frmCUEPlayer";
this.Text = "CUEPlayer 2.1.1"; this.Text = "CUEPlayer 2.1.2";
this.Load += new System.EventHandler(this.frmCUEPlayer_Load); this.Load += new System.EventHandler(this.frmCUEPlayer_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmCUEPlayer_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmCUEPlayer_FormClosing);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);

2
CUERipper/CUERipper.csproj
View File

@@ -40,7 +40,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.html</WebPage> <WebPage>index.html</WebPage>
<ApplicationRevision>2</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>2.1.1.0</ApplicationVersion> <ApplicationVersion>2.1.2.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>

84
CUERipper/frmCUERipper.cs
View File

@@ -19,7 +19,6 @@ using CUETools.Codecs;
using CUETools.Processor; using CUETools.Processor;
using CUETools.Ripper; using CUETools.Ripper;
using CUEControls; using CUEControls;
using MusicBrainz;
using Freedb; using Freedb;
namespace CUERipper namespace CUERipper
@@ -562,14 +561,26 @@ namespace CUERipper
SetupControls(); 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(); CheckStop();
//_progress.percentDisk = (1.0 + _progress.percentDisk) / 2; //_progress.percentDisk = (1.0 + _progress.percentDisk) / 2;
//_progress.input = e.Uri.ToString(); //_progress.input = e.Uri.ToString();
this.BeginInvoke((MethodInvoker)delegate() 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; toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3;
}); });
} }
@@ -581,12 +592,12 @@ namespace CUERipper
return entry; return entry;
} }
private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release) //private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release)
{ //{
CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz"); // CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz");
entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1); // entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1);
return entry; // return entry;
} //}
private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, CDEntry cdEntry) private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, CDEntry cdEntry)
{ {
@@ -651,33 +662,34 @@ namespace CUERipper
{ {
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..."; });
FreedbHelper m_freedb = new FreedbHelper(); FreedbHelper m_freedb = new FreedbHelper();
m_freedb.Proxy = _config.GetProxy(); m_freedb.Proxy = _config.GetProxy();
@@ -692,12 +704,12 @@ namespace CUERipper
string code = string.Empty; string code = string.Empty;
try try
{ {
MusicBrainz_LookupProgress(this, null); 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;
MusicBrainz_LookupProgress(this, null); 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)
{ {
@@ -712,7 +724,7 @@ namespace CUERipper
foreach (QueryResult qr in coll) foreach (QueryResult qr in coll)
{ {
CDEntry cdEntry; CDEntry cdEntry;
MusicBrainz_LookupProgress(this, null); 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)
{ {

2
CUERipper/frmCUERipper.de-DE.resx
View File

@@ -208,6 +208,6 @@
<value>Senden</value> <value>Senden</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>CUERipper 2.1.1</value> <value>CUERipper 2.1.2</value>
</data> </data>
</root> </root>

16
CUERipper/frmCUERipper.resx
View File

@@ -468,7 +468,7 @@
<value>bnComboBoxLosslessOrNot</value> <value>bnComboBoxLosslessOrNot</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxLosslessOrNot.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxLosslessOrNot.Parent" xml:space="preserve">
<value>groupBoxSettings</value> <value>groupBoxSettings</value>
@@ -495,7 +495,7 @@
<value>bnComboBoxEncoder</value> <value>bnComboBoxEncoder</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxEncoder.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxEncoder.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxEncoder.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxEncoder.Parent" xml:space="preserve">
<value>groupBoxSettings</value> <value>groupBoxSettings</value>
@@ -549,7 +549,7 @@
<value>bnComboBoxFormat</value> <value>bnComboBoxFormat</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxFormat.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxFormat.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxFormat.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxFormat.Parent" xml:space="preserve">
<value>groupBoxSettings</value> <value>groupBoxSettings</value>
@@ -615,7 +615,7 @@
<value>bnComboBoxImage</value> <value>bnComboBoxImage</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxImage.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxImage.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxImage.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxImage.Parent" xml:space="preserve">
<value>groupBoxSettings</value> <value>groupBoxSettings</value>
@@ -1011,7 +1011,7 @@
<value>bnComboBoxRelease</value> <value>bnComboBoxRelease</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxRelease.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxRelease.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxRelease.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxRelease.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@@ -1035,7 +1035,7 @@
<value>bnComboBoxDrives</value> <value>bnComboBoxDrives</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxDrives.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxDrives.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxDrives.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxDrives.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@@ -1059,7 +1059,7 @@
<value>bnComboBoxOutputFormat</value> <value>bnComboBoxOutputFormat</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxOutputFormat.Type" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxOutputFormat.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;bnComboBoxOutputFormat.Parent" xml:space="preserve"> <data name="&gt;&gt;bnComboBoxOutputFormat.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@@ -1735,7 +1735,7 @@
<value>CenterScreen</value> <value>CenterScreen</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>CUERipper 2.1.1</value> <value>CUERipper 2.1.2</value>
</data> </data>
<data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve"> <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
<value>toolStripStatusLabel1</value> <value>toolStripStatusLabel1</value>

2
CUERipper/frmFreedbSubmit.resx
View File

@@ -138,7 +138,7 @@
<value>imgComboBoxCategory</value> <value>imgComboBoxCategory</value>
</data> </data>
<data name="&gt;&gt;imgComboBoxCategory.Type" xml:space="preserve"> <data name="&gt;&gt;imgComboBoxCategory.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;imgComboBoxCategory.Parent" xml:space="preserve"> <data name="&gt;&gt;imgComboBoxCategory.Parent" xml:space="preserve">
<value>groupBox1</value> <value>groupBox1</value>

4
CUETools.ARCUE/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.AccurateRip/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.CDImage/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

11
CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj
View File

@@ -45,6 +45,12 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="FormSubmitParity.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormSubmitParity.Designer.cs">
<DependentUpon>FormSubmitParity.cs</DependentUpon>
</Compile>
<Compile Include="FormMetadata.cs"> <Compile Include="FormMetadata.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@@ -67,6 +73,9 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="FormSubmitParity.resx">
<DependentUpon>FormSubmitParity.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FormMetadata.resx"> <EmbeddedResource Include="FormMetadata.resx">
<DependentUpon>FormMetadata.cs</DependentUpon> <DependentUpon>FormMetadata.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@@ -103,7 +112,7 @@
<None Include="Resources\favicon.ico" /> <None Include="Resources\favicon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\ctdb.png" /> <None Include="Resources\ctdb64.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

6
CUETools.CTDB.EACPlugin/Metadata.cs
View File

@@ -42,7 +42,7 @@ namespace MetadataPlugIn
TOC[1][0].Start = 0U; TOC[1][0].Start = 0U;
var ctdb = new CUEToolsDB(TOC, null); var ctdb = new CUEToolsDB(TOC, null);
var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.1"); var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.2");
form.ShowDialog(); form.ShowDialog();
var meta = form.Meta; var meta = form.Meta;
if (meta == null) if (meta == null)
@@ -84,13 +84,13 @@ namespace MetadataPlugIn
public Array GetPluginLogo() public Array GetPluginLogo()
{ {
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
Resources.ctdb.Save(ms); Resources.ctdb64.Save(ms, ImageFormat.Png);
return ms.ToArray(); return ms.ToArray();
} }
public string GetPluginName() public string GetPluginName()
{ {
return "CUETools DB Metadata Plugin V2.1.1"; return "CUETools DB Metadata Plugin V2.1.2";
} }
public void ShowOptions() public void ShowOptions()

14
CUETools.CTDB.EACPlugin/Options.Designer.cs generated
View File

@@ -39,15 +39,15 @@ namespace AudioDataPlugIn
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(147, 13); this.label1.Location = new System.Drawing.Point(95, 13);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(139, 13); this.label1.Size = new System.Drawing.Size(139, 13);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "CUETools DB Plugin V2.1.1"; this.label1.Text = "CUETools DB Plugin V2.1.2";
// //
// label2 // label2
// //
this.label2.Location = new System.Drawing.Point(147, 67); this.label2.Location = new System.Drawing.Point(95, 67);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(230, 74); this.label2.Size = new System.Drawing.Size(230, 74);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
@@ -56,7 +56,7 @@ namespace AudioDataPlugIn
// linkLabel1 // linkLabel1
// //
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(147, 36); this.linkLabel1.Location = new System.Drawing.Point(95, 36);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(164, 13); this.linkLabel1.Size = new System.Drawing.Size(164, 13);
this.linkLabel1.TabIndex = 3; this.linkLabel1.TabIndex = 3;
@@ -66,10 +66,10 @@ namespace AudioDataPlugIn
// //
// pictureBox1 // pictureBox1
// //
this.pictureBox1.Image = global::CUETools.CTDB.EACPlugin.Properties.Resources.ctdb1; 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(13, 13);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(128, 128); this.pictureBox1.Size = new System.Drawing.Size(64, 64);
this.pictureBox1.TabIndex = 4; this.pictureBox1.TabIndex = 4;
this.pictureBox1.TabStop = false; this.pictureBox1.TabStop = false;
// //
@@ -77,7 +77,7 @@ namespace AudioDataPlugIn
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(402, 158); this.ClientSize = new System.Drawing.Size(332, 158);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.linkLabel1); this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);

12
CUETools.CTDB.EACPlugin/Plugin.cs
View File

@@ -10,6 +10,7 @@ using CUETools.CDImage;
using CUETools.AccurateRip; using CUETools.AccurateRip;
using CUETools.Codecs; using CUETools.Codecs;
using CUETools.CTDB; using CUETools.CTDB;
using CUETools.CTDB.EACPlugin;
namespace AudioDataPlugIn namespace AudioDataPlugIn
{ {
@@ -53,7 +54,7 @@ namespace AudioDataPlugIn
// the plugin and for display in the log file // the plugin and for display in the log file
public string GetAudioTransferPluginName() public string GetAudioTransferPluginName()
{ {
return "CUETools DB Plugin V2.1.1"; return "CUETools DB Plugin V2.1.2";
} }
// Each plugin should have its own options page. // Each plugin should have its own options page.
@@ -119,7 +120,9 @@ namespace AudioDataPlugIn
#if USEAR #if USEAR
ar.ContactAccurateRip(ArId); ar.ContactAccurateRip(ArId);
#endif #endif
ctdb.ContactDB("EAC" + m_data.HostVersion + " CTDB 2.1.1", m_drivename, false, false); var form = new FormSubmitParity(ctdb, "EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename);
//ctdb.ContactDB("EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename, false, false);
form.ShowDialog();
ctdb.Init(true, ar); ctdb.Init(true, ar);
this.sequence_ok = true; this.sequence_ok = true;
this.m_start_pos = 0; this.m_start_pos = 0;
@@ -205,8 +208,8 @@ namespace AudioDataPlugIn
return ""; return "";
if (this.sequence_ok) if (this.sequence_ok)
{ {
ctdb.DoVerify(); var form = new FormSubmitParity(
ctdb.Submit( ctdb,
#if USEAR #if USEAR
(int)ar.WorstConfidence() + 1, (int)ar.WorstConfidence() + 1,
#else #else
@@ -215,6 +218,7 @@ namespace AudioDataPlugIn
(arTest.Position == 0 && this.is_secure_mode) || arTest.CRC32(0) == ar.CRC32(0) ? 100 : 0, (arTest.Position == 0 && this.is_secure_mode) || arTest.CRC32(0) == ar.CRC32(0) ? 100 : 0,
m_data.AlbumArtist, m_data.AlbumArtist,
m_data.AlbumTitle); m_data.AlbumTitle);
form.ShowDialog();
sw.WriteLine("[CTDB TOCID: {0}] {1}{2}.", sw.WriteLine("[CTDB TOCID: {0}] {1}{2}.",
TOC.TOCID, TOC.TOCID,
ctdb.DBStatus ?? "found", ctdb.DBStatus ?? "found",

4
CUETools.CTDB.EACPlugin/Properties/Resources.Designer.cs generated
View File

@@ -67,9 +67,9 @@ namespace CUETools.CTDB.EACPlugin.Properties {
} }
} }
internal static System.Drawing.Bitmap ctdb1 { internal static System.Drawing.Bitmap ctdb64 {
get { get {
object obj = ResourceManager.GetObject("ctdb1", resourceCulture); object obj = ResourceManager.GetObject("ctdb64", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }

4
CUETools.CTDB.EACPlugin/Properties/Resources.resx
View File

@@ -121,7 +121,7 @@
<data name="ctdb" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ctdb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\favicon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\favicon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="ctdb1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ctdb64" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ctdb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\ctdb64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

BIN
CUETools.CTDB.EACPlugin/Resources/ctdb64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

17
CUETools.CTDB/CUEToolsDB.cs
View File

@@ -90,7 +90,7 @@ namespace CUETools.CTDB
uint.Parse(ctdbRespEntry.crc32, NumberStyles.HexNumber), uint.Parse(ctdbRespEntry.crc32, NumberStyles.HexNumber),
ctdbRespEntry.id, ctdbRespEntry.id,
entry_toc, entry_toc,
ctdbRespEntry.hasparity == 1); ctdbRespEntry.hasparity);
entries.Add(entry); entries.Add(entry);
} }
if (ctdbResp.musicbrainz != null && ctdbResp.musicbrainz.Length != 0) if (ctdbResp.musicbrainz != null && ctdbResp.musicbrainz.Length != 0)
@@ -109,8 +109,9 @@ namespace CUETools.CTDB
} }
} }
public void FetchDB(string url, DBEntry entry) public void FetchDB(DBEntry entry)
{ {
string url = entry.hasParity[0] == '/' ? urlbase + entry.hasParity : entry.hasParity;
HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
req.Method = "GET"; req.Method = "GET";
req.Proxy = proxy; req.Proxy = proxy;
@@ -346,11 +347,11 @@ namespace CUETools.CTDB
entry.canRecover = false; entry.canRecover = false;
else if (entry.hasErrors) else if (entry.hasErrors)
{ {
if (!entry.hasParity) if (entry.hasParity == null || entry.hasParity == "")
entry.canRecover = false; entry.canRecover = false;
else else
{ {
FetchDB(string.Format("{0}/repair.php?id={1}", urlbase, entry.id), entry); FetchDB(entry);
if (entry.httpStatus != HttpStatusCode.OK) if (entry.httpStatus != HttpStatusCode.OK)
entry.canRecover = false; entry.canRecover = false;
else else
@@ -511,9 +512,9 @@ namespace CUETools.CTDB
public HttpStatusCode httpStatus; public HttpStatusCode httpStatus;
public string id; public string id;
public CDImageLayout toc; public CDImageLayout toc;
public bool hasParity; public string hasParity;
public DBEntry(byte[] parity, int pos, int len, int conf, int npar, int stride, uint crc, string id, CDImageLayout toc, bool hasParity) public DBEntry(byte[] parity, int pos, int len, int conf, int npar, int stride, uint crc, string id, CDImageLayout toc, string hasParity)
{ {
this.parity = parity; this.parity = parity;
this.id = id; this.id = id;
@@ -674,8 +675,8 @@ namespace CUETools.CTDB
public int npar { get; set; } public int npar { get; set; }
[XmlAttribute] [XmlAttribute]
public int stride { get; set; } public int stride { get; set; }
[XmlAttribute, DefaultValue(1)] [XmlAttribute]
public int hasparity { get; set; } public string hasparity { get; set; }
[XmlAttribute] [XmlAttribute]
public string parity { get; set; } public string parity { get; set; }
[XmlAttribute] [XmlAttribute]

4
CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Codecs/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Compression.Rar/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Compression.Zip/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.Compression/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

4
CUETools.FlaCudaExe/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

BIN
CUETools.Parity/RsDecode.cs
View File

Binary file not shown.

2
CUETools.Processor/Processor.cs
View File

@@ -4141,7 +4141,7 @@ string status = processor.Go();
} }
} }
public readonly static string CUEToolsVersion = "2.1.1"; public readonly static string CUEToolsVersion = "2.1.2";
public void GenerateAccurateRipLog(TextWriter sw) public void GenerateAccurateRipLog(TextWriter sw)
{ {

4
CUETools.Processor/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

2
CUETools.Ripper.Console/Program.cs
View File

@@ -89,7 +89,7 @@ namespace CUETools.ConsoleRipper
static void Main(string[] args) static void Main(string[] args)
{ {
Console.SetOut(Console.Error); Console.SetOut(Console.Error);
Console.WriteLine("CUERipper v2.1.1 Copyright (C) 2008-10 Gregory S. Chudov"); Console.WriteLine("CUERipper v2.1.2 Copyright (C) 2008-10 Gregory S. Chudov");
Console.WriteLine("This is free software under the GNU GPLv3+ license; There is NO WARRANTY, to"); Console.WriteLine("This is free software under the GNU GPLv3+ license; There is NO WARRANTY, to");
Console.WriteLine("the extent permitted by law. <http://www.gnu.org/licenses/> for details."); Console.WriteLine("the extent permitted by law. <http://www.gnu.org/licenses/> for details.");

4
CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

2
CUETools.Ripper.SCSI/SCSIDrive.cs
View File

@@ -1187,7 +1187,7 @@ namespace CUETools.Ripper.SCSI
{ {
get get
{ {
return "CUERipper v2.1.1 Copyright (C) 2008-10 Gregory S. Chudov"; return "CUERipper v2.1.2 Copyright (C) 2008-10 Gregory S. Chudov";
// ripper.GetName().Name + " " + ripper.GetName().Version; // ripper.GetName().Name + " " + ripper.GetName().Version;
} }
} }

4
CUETools.Ripper/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

5
CUETools/CUETools1.vsmdi
View File

@@ -3,4 +3,9 @@
<TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6"> <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
<RunConfiguration id="cad9b348-419f-496e-92ed-2dfc5d74da06" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, PublicKeyToken=b03f5f7f11d50a3a" /> <RunConfiguration id="cad9b348-419f-496e-92ed-2dfc5d74da06" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, PublicKeyToken=b03f5f7f11d50a3a" />
</TestList> </TestList>
<TestList name="Results Not in a List" id="8c84fa94-04c1-424b-9868-57a2d4851a1d">
<TestLinks>
<TestLink id="06227a46-f5aa-99cb-8bbe-fc70e4892c9d" name="CTDBResponseTest" storage="bin\release\cuetools.testprocessor.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
</TestLinks>
</TestList>
</TestLists> </TestLists>

4
CUETools/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.1.0")] [assembly: AssemblyVersion("2.1.2.0")]
[assembly: AssemblyFileVersion("2.1.1.0")] [assembly: AssemblyFileVersion("2.1.2.0")]

6
CUETools/frmCUETools.resx
View File

@@ -256,7 +256,7 @@
<value>fileSystemTreeView1</value> <value>fileSystemTreeView1</value>
</data> </data>
<data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve"> <data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve">
<value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve"> <data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve">
<value>grpInput</value> <value>grpInput</value>
@@ -1204,7 +1204,7 @@
<value>fileSystemTreeView1</value> <value>fileSystemTreeView1</value>
</data> </data>
<data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve"> <data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve">
<value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve"> <data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve">
<value>grpInput</value> <value>grpInput</value>
@@ -3386,7 +3386,7 @@
<value>700, 538</value> <value>700, 538</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>CUETools 2.1.1</value> <value>CUETools 2.1.2</value>
</data> </data>
<data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve"> <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
<value>toolStripStatusLabel1</value> <value>toolStripStatusLabel1</value>