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

CUETools: CTDB verification during encoding, CTDB confidence tags

Browse Source
This commit is contained in:
Grigory Chudov
2013-06-04 00:10:33 -04:00
parent fc74fc5ad5
commit 1e502ab0b9
18 changed files with 1419 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
CUERipper/frmCUERipper.Designer.cs generated
View File

@@ -30,13 +30,13 @@ namespace CUERipper
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCUERipper));
CUEControls.RectRadius rectRadius8 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius1 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius2 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius3 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius4 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius5 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius6 = new CUEControls.RectRadius();
CUEControls.RectRadius rectRadius7 = new CUEControls.RectRadius();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelMusicBrainz = new System.Windows.Forms.ToolStripStatusLabel();
@@ -328,11 +328,11 @@ namespace CUERipper
this.bnComboBoxLosslessOrNot.ImageList = null;
resources.ApplyResources(this.bnComboBoxLosslessOrNot, "bnComboBoxLosslessOrNot");
this.bnComboBoxLosslessOrNot.Name = "bnComboBoxLosslessOrNot";
rectRadius1.BottomLeft = 2;
rectRadius1.BottomRight = 2;
rectRadius1.TopLeft = 2;
rectRadius1.TopRight = 6;
this.bnComboBoxLosslessOrNot.Radius = rectRadius1;
rectRadius8.BottomLeft = 2;
rectRadius8.BottomRight = 2;
rectRadius8.TopLeft = 2;
rectRadius8.TopRight = 6;
this.bnComboBoxLosslessOrNot.Radius = rectRadius8;
this.bnComboBoxLosslessOrNot.SelectedValueChanged += new System.EventHandler(this.bnComboBoxLosslessOrNot_SelectedValueChanged);
//
// losslessOrNotBindingSource
@@ -353,11 +353,11 @@ namespace CUERipper
this.bnComboBoxEncoder.ImageList = null;
resources.ApplyResources(this.bnComboBoxEncoder, "bnComboBoxEncoder");
this.bnComboBoxEncoder.Name = "bnComboBoxEncoder";
rectRadius2.BottomLeft = 2;
rectRadius2.BottomRight = 2;
rectRadius2.TopLeft = 2;
rectRadius2.TopRight = 6;
this.bnComboBoxEncoder.Radius = rectRadius2;
rectRadius1.BottomLeft = 2;
rectRadius1.BottomRight = 2;
rectRadius1.TopLeft = 2;
rectRadius1.TopRight = 6;
this.bnComboBoxEncoder.Radius = rectRadius1;
this.bnComboBoxEncoder.SelectedValueChanged += new System.EventHandler(this.bnComboBoxEncoder_SelectedValueChanged);
//
// encodersBindingSource
@@ -380,11 +380,11 @@ namespace CUERipper
this.bnComboBoxFormat.ImageList = null;
resources.ApplyResources(this.bnComboBoxFormat, "bnComboBoxFormat");
this.bnComboBoxFormat.Name = "bnComboBoxFormat";
rectRadius3.BottomLeft = 2;
rectRadius3.BottomRight = 2;
rectRadius3.TopLeft = 2;
rectRadius3.TopRight = 6;
this.bnComboBoxFormat.Radius = rectRadius3;
rectRadius2.BottomLeft = 2;
rectRadius2.BottomRight = 2;
rectRadius2.TopLeft = 2;
rectRadius2.TopRight = 6;
this.bnComboBoxFormat.Radius = rectRadius2;
this.bnComboBoxFormat.SelectedValueChanged += new System.EventHandler(this.bnComboBoxFormat_SelectedValueChanged);
//
// formatsBindingSource
@@ -406,11 +406,11 @@ namespace CUERipper
this.bnComboBoxImage.ImageList = null;
resources.ApplyResources(this.bnComboBoxImage, "bnComboBoxImage");
this.bnComboBoxImage.Name = "bnComboBoxImage";
rectRadius4.BottomLeft = 2;
rectRadius4.BottomRight = 2;
rectRadius4.TopLeft = 2;
rectRadius4.TopRight = 6;
this.bnComboBoxImage.Radius = rectRadius4;
rectRadius3.BottomLeft = 2;
rectRadius3.BottomRight = 2;
rectRadius3.TopLeft = 2;
rectRadius3.TopRight = 6;
this.bnComboBoxImage.Radius = rectRadius3;
this.bnComboBoxImage.SelectedValueChanged += new System.EventHandler(this.bnComboBoxImage_SelectedValueChanged);
//
// cUEStylesBindingSource
@@ -550,11 +550,11 @@ namespace CUERipper
this.bnComboBoxRelease.ImageKeyMember = "ImageKey";
this.bnComboBoxRelease.ImageList = this.imageListMetadataSource;
this.bnComboBoxRelease.Name = "bnComboBoxRelease";
rectRadius5.BottomLeft = 2;
rectRadius5.BottomRight = 2;
rectRadius5.TopLeft = 2;
rectRadius5.TopRight = 6;
this.bnComboBoxRelease.Radius = rectRadius5;
rectRadius4.BottomLeft = 2;
rectRadius4.BottomRight = 2;
rectRadius4.TopLeft = 2;
rectRadius4.TopRight = 6;
this.bnComboBoxRelease.Radius = rectRadius4;
this.bnComboBoxRelease.SelectedValueChanged += new System.EventHandler(this.bnComboBoxRelease_SelectedValueChanged);
//
// releasesBindingSource
@@ -588,11 +588,11 @@ namespace CUERipper
this.bnComboBoxDrives.ImageKeyMember = "ImageKey";
this.bnComboBoxDrives.ImageList = this.imageListMetadataSource;
this.bnComboBoxDrives.Name = "bnComboBoxDrives";
rectRadius6.BottomLeft = 2;
rectRadius6.BottomRight = 2;
rectRadius6.TopLeft = 2;
rectRadius6.TopRight = 6;
this.bnComboBoxDrives.Radius = rectRadius6;
rectRadius5.BottomLeft = 2;
rectRadius5.BottomRight = 2;
rectRadius5.TopLeft = 2;
rectRadius5.TopRight = 6;
this.bnComboBoxDrives.Radius = rectRadius5;
this.bnComboBoxDrives.SelectedIndexChanged += new System.EventHandler(this.bnComboBoxDrives_SelectedIndexChanged);
//
// bnComboBoxOutputFormat
@@ -603,11 +603,11 @@ namespace CUERipper
resources.ApplyResources(this.bnComboBoxOutputFormat, "bnComboBoxOutputFormat");
this.bnComboBoxOutputFormat.ImageList = null;
this.bnComboBoxOutputFormat.Name = "bnComboBoxOutputFormat";
rectRadius7.BottomLeft = 2;
rectRadius7.BottomRight = 2;
rectRadius7.TopLeft = 2;
rectRadius7.TopRight = 6;
this.bnComboBoxOutputFormat.Radius = rectRadius7;
rectRadius6.BottomLeft = 2;
rectRadius6.BottomRight = 2;
rectRadius6.TopLeft = 2;
rectRadius6.TopRight = 6;
this.bnComboBoxOutputFormat.Radius = rectRadius6;
this.bnComboBoxOutputFormat.TabStop = false;
this.bnComboBoxOutputFormat.DropDown += new System.EventHandler(this.bnComboBoxOutputFormat_DroppedDown);
this.bnComboBoxOutputFormat.TextChanged += new System.EventHandler(this.bnComboBoxOutputFormat_TextChanged);

4
CUERipper/frmCUERipper.cs
View File

@@ -422,8 +422,8 @@ namespace CUERipper
this.Invoke((MethodInvoker)delegate()
{
DialogResult dlgRes = audioSource.FailedSectors.PopulationCount() != 0 ?
MessageBox.Show(this, cueSheet.GenerateAccurateRipStatus() + (canFix ? "\n" + Properties.Resources.DoneRippingRepair : "") + ".", Properties.Resources.DoneRippingErrors, MessageBoxButtons.OK, MessageBoxIcon.Error) :
MessageBox.Show(this, cueSheet.GenerateAccurateRipStatus() + ".", Properties.Resources.DoneRipping, MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show(this, cueSheet.GenerateVerifyStatus() + (canFix ? "\n" + Properties.Resources.DoneRippingRepair : "") + ".", Properties.Resources.DoneRippingErrors, MessageBoxButtons.OK, MessageBoxIcon.Error) :
MessageBox.Show(this, cueSheet.GenerateVerifyStatus() + ".", Properties.Resources.DoneRipping, MessageBoxButtons.OK, MessageBoxIcon.Information);
});
}
catch (StopException)

445
CUERipper/frmCUERipper.resx
View File

@@ -121,6 +121,31 @@
<value>222, 95</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 424</value>
</data>
<data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>664, 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">
<value>12</value>
</data>
<data name="statusStrip1.Text" xml:space="preserve">
<value>statusStrip1</value>
</data>
<data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">
<value>statusStrip1</value>
</data>
<data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>487, 20</value>
</data>
@@ -173,30 +198,36 @@
<data name="toolStripStatusLabel2.Text" xml:space="preserve">
<value>toolStripStatusAr</value>
</data>
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 424</value>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>357, 17</value>
</metadata>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="listTracks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>664, 25</value>
<data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
<data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
<value>656, 158</value>
</data>
<data name="statusStrip1.Text" xml:space="preserve">
<value>statusStrip1</value>
<data name="listTracks.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">
<value>statusStrip1</value>
<data name="listTracks.ToolTip" xml:space="preserve">
<value>Double-click to edit track names</value>
</data>
<data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;listTracks.Name" xml:space="preserve">
<value>listTracks</value>
</data>
<data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;listTracks.Type" xml:space="preserve">
<value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
<value>1</value>
<data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
<value>panel4</value>
</data>
<data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="Title.DisplayIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -234,37 +265,6 @@
<data name="Length.Width" type="System.Int32, mscorlib">
<value>70</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="listTracks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
<value>656, 158</value>
</data>
<data name="listTracks.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>357, 17</value>
</metadata>
<data name="listTracks.ToolTip" xml:space="preserve">
<value>Double-click to edit track names</value>
</data>
<data name="&gt;&gt;listTracks.Name" xml:space="preserve">
<value>listTracks</value>
</data>
<data name="&gt;&gt;listTracks.Type" xml:space="preserve">
<value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
<value>panel4</value>
</data>
<data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="buttonGo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -415,6 +415,174 @@
<data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;buttonEncoderSettings.Name" xml:space="preserve">
<value>buttonEncoderSettings</value>
</data>
<data name="&gt;&gt;buttonEncoderSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonEncoderSettings.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;buttonEncoderSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;checkBoxTestAndCopy.Name" xml:space="preserve">
<value>checkBoxTestAndCopy</value>
</data>
<data name="&gt;&gt;checkBoxTestAndCopy.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkBoxTestAndCopy.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;checkBoxTestAndCopy.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.Name" xml:space="preserve">
<value>bnComboBoxLosslessOrNot</value>
</data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.5.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;bnComboBoxLosslessOrNot.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;bnComboBoxEncoder.Name" xml:space="preserve">
<value>bnComboBoxEncoder</value>
</data>
<data name="&gt;&gt;bnComboBoxEncoder.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.5.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;bnComboBoxEncoder.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;bnComboBoxEncoder.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;labelSecureMode.Name" xml:space="preserve">
<value>labelSecureMode</value>
</data>
<data name="&gt;&gt;labelSecureMode.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelSecureMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;labelSecureMode.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;bnComboBoxFormat.Name" xml:space="preserve">
<value>bnComboBoxFormat</value>
</data>
<data name="&gt;&gt;bnComboBoxFormat.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.5.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;bnComboBoxFormat.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;bnComboBoxFormat.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;labelEncoderMinMode.Name" xml:space="preserve">
<value>labelEncoderMinMode</value>
</data>
<data name="&gt;&gt;labelEncoderMinMode.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelEncoderMinMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;labelEncoderMinMode.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;bnComboBoxImage.Name" xml:space="preserve">
<value>bnComboBoxImage</value>
</data>
<data name="&gt;&gt;bnComboBoxImage.Type" xml:space="preserve">
<value>CUEControls.ImgComboBox, CUEControls, Version=2.1.5.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;bnComboBoxImage.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;bnComboBoxImage.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;labelEncoderMaxMode.Name" xml:space="preserve">
<value>labelEncoderMaxMode</value>
</data>
<data name="&gt;&gt;labelEncoderMaxMode.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelEncoderMaxMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;labelEncoderMaxMode.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;labelEncoderMode.Name" xml:space="preserve">
<value>labelEncoderMode</value>
</data>
<data name="&gt;&gt;labelEncoderMode.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelEncoderMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;labelEncoderMode.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;trackBarEncoderMode.Name" xml:space="preserve">
<value>trackBarEncoderMode</value>
</data>
<data name="&gt;&gt;trackBarEncoderMode.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;trackBarEncoderMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;trackBarEncoderMode.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;trackBarSecureMode.Name" xml:space="preserve">
<value>trackBarSecureMode</value>
</data>
<data name="&gt;&gt;trackBarSecureMode.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;trackBarSecureMode.Parent" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;trackBarSecureMode.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="groupBoxSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="groupBoxSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="groupBoxSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>339, 136</value>
</data>
<data name="groupBoxSettings.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Name" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;groupBoxSettings.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="buttonEncoderSettings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
@@ -502,6 +670,9 @@
<data name="&gt;&gt;bnComboBoxLosslessOrNot.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="bindingSourceCR.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>210, 56</value>
</metadata>
<metadata name="encodersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1217, 56</value>
</metadata>
@@ -781,30 +952,6 @@
<data name="&gt;&gt;trackBarSecureMode.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="groupBoxSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="groupBoxSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="groupBoxSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>339, 136</value>
</data>
<data name="groupBoxSettings.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Name" xml:space="preserve">
<value>groupBoxSettings</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBoxSettings.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;groupBoxSettings.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="drivesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>882, 56</value>
</metadata>
@@ -816,7 +963,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
CQAAAk1TRnQBSQFMAgEBBAEAAcwBAgHMAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBBAEAAeQBAgHkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -871,15 +1018,12 @@
<metadata name="styledBorderPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>624, 17</value>
</metadata>
<data name="progressBarErrors.Location" type="System.Drawing.Point, System.Drawing">
<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>
</metadata>
<metadata name="gradientGlossPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>789, 17</value>
</metadata>
<data name="progressBarErrors.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 91</value>
</data>
<data name="progressBarErrors.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 23</value>
</data>
@@ -898,12 +1042,27 @@
<data name="&gt;&gt;progressBarErrors.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="progressBarCD.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 64</value>
</data>
<metadata name="plainBackgroundPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>960, 17</value>
</metadata>
<metadata name="styledBorderPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>624, 17</value>
</metadata>
<metadata name="plainProgressPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>454, 17</value>
</metadata>
<metadata name="gradientGlossPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>789, 17</value>
</metadata>
<metadata name="gradientGlossPainter1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>789, 17</value>
</metadata>
<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.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 64</value>
</data>
<data name="progressBarCD.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 23</value>
</data>
@@ -925,6 +1084,9 @@
<data name="&gt;&gt;progressBarCD.ZOrder" xml:space="preserve">
<value>3</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="txtOutputPath.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -952,6 +1114,9 @@
<data name="&gt;&gt;txtOutputPath.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>357, 17</value>
</metadata>
<data name="bnComboBoxRelease.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -966,7 +1131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
EgAAAk1TRnQBSQFMAgEBCwEAAcwBAgHMAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
EgAAAk1TRnQBSQFMAgEBCwEAAeQBAgHkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1133,24 +1298,6 @@
<data name="&gt;&gt;bnComboBoxOutputFormat.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="columnHeaderValue.DisplayIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="columnHeaderValue.Text" xml:space="preserve">
<value>Value</value>
</data>
<data name="columnHeaderValue.Width" type="System.Int32, mscorlib">
<value>450</value>
</data>
<data name="columnHeaderName.DisplayIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="columnHeaderName.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="columnHeaderName.Width" type="System.Int32, mscorlib">
<value>140</value>
</data>
<data name="listMetadata.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -1178,6 +1325,24 @@
<data name="&gt;&gt;listMetadata.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="columnHeaderValue.DisplayIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="columnHeaderValue.Text" xml:space="preserve">
<value>Value</value>
</data>
<data name="columnHeaderValue.Width" type="System.Int32, mscorlib">
<value>450</value>
</data>
<data name="columnHeaderName.DisplayIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="columnHeaderName.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="columnHeaderName.Width" type="System.Int32, mscorlib">
<value>140</value>
</data>
<data name="buttonMetadata.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 57</value>
</data>
@@ -1445,21 +1610,6 @@
<data name="&gt;&gt;buttonSettings.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="panel7.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="panel7.Location" type="System.Drawing.Point, System.Drawing">
<value>339, 0</value>
</data>
<data name="panel7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="panel7.Size" type="System.Drawing.Size, System.Drawing">
<value>141, 136</value>
</data>
<data name="panel7.TabIndex" type="System.Int32, mscorlib">
<value>44</value>
</data>
<data name="&gt;&gt;panel7.Name" xml:space="preserve">
<value>panel7</value>
</data>
@@ -1496,23 +1646,32 @@
<data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="buttonEjectDisk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
<data name="panel7.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="buttonEjectDisk.Location" type="System.Drawing.Point, System.Drawing">
<value>182, 57</value>
<data name="panel7.Location" type="System.Drawing.Point, System.Drawing">
<value>339, 0</value>
</data>
<data name="buttonEjectDisk.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 24</value>
<data name="panel7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="buttonEjectDisk.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
<data name="panel7.Size" type="System.Drawing.Size, System.Drawing">
<value>141, 136</value>
</data>
<data name="buttonEjectDisk.Text" xml:space="preserve">
<value>Eject</value>
<data name="panel7.TabIndex" type="System.Int32, mscorlib">
<value>44</value>
</data>
<data name="buttonEjectDisk.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageBeforeText</value>
<data name="&gt;&gt;panel7.Name" xml:space="preserve">
<value>panel7</value>
</data>
<data name="&gt;&gt;panel7.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;panel7.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;panel7.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;buttonEjectDisk.Name" xml:space="preserve">
<value>buttonEjectDisk</value>
@@ -1553,6 +1712,36 @@
<data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="buttonEjectDisk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonEjectDisk.Location" type="System.Drawing.Point, System.Drawing">
<value>182, 57</value>
</data>
<data name="buttonEjectDisk.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 24</value>
</data>
<data name="buttonEjectDisk.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="buttonEjectDisk.Text" xml:space="preserve">
<value>Eject</value>
</data>
<data name="buttonEjectDisk.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageBeforeText</value>
</data>
<data name="&gt;&gt;buttonEjectDisk.Name" xml:space="preserve">
<value>buttonEjectDisk</value>
</data>
<data name="&gt;&gt;buttonEjectDisk.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonEjectDisk.Parent" xml:space="preserve">
<value>panel3</value>
</data>
<data name="&gt;&gt;buttonEjectDisk.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>

3
CUETools.AccurateRip/AccurateRip.cs
View File

@@ -1037,7 +1037,8 @@ namespace CUETools.AccurateRip
public void GenerateFullLog(TextWriter sw, bool verbose, string id)
{
sw.WriteLine("[AccurateRip ID: {0}] {1}.", id, ARStatus ?? "found");
if (ExceptionStatus != WebExceptionStatus.Pending)
sw.WriteLine("[AccurateRip ID: {0}] {1}.", id, ARStatus ?? "found");
if (ExceptionStatus == WebExceptionStatus.Success)
{
if (verbose)

44
CUETools.CTDB/CUEToolsDB.cs
View File

@@ -527,6 +527,50 @@ namespace CUETools.CTDB
}
}
public int GetConfidence(int iTrack)
{
if (this.QueryExceptionStatus != WebExceptionStatus.Success)
return 0;
int conf = 0;
foreach (DBEntry entry in this.Entries)
{
if (!entry.hasErrors)
{
conf += entry.conf;
continue;
}
if (entry.canRecover)
{
var tri = this.TOC[this.TOC.FirstAudio + iTrack];
var tr0 = this.TOC[this.TOC.FirstAudio];
var min = (int)(tri.Start - tr0.Start) * 588;
var max = (int)(tri.End + 1 - tr0.Start) * 588;
if (0 == entry.repair.GetAffectedSectorsCount(min, max))
conf += entry.conf;
continue;
}
if (entry.trackcrcs != null)
{
if (this.verify.TrackCRC(iTrack + 1, -entry.offset) == entry.trackcrcs[iTrack])
{
conf += entry.conf;
continue;
}
const int _arOffsetRange = 5 * 588 - 1;
for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++)
{
if (this.verify.TrackCRC(iTrack + 1, oi) == entry.trackcrcs[iTrack])
{
conf += entry.conf;
break;
}
}
}
}
return conf;
}
public void GenerateLog(TextWriter sw, bool old)
{
if (this.DBStatus != null || this.Total == 0)

5
CUETools.Codecs.FLACCL/FLACCLWriter.cs
View File

@@ -353,7 +353,6 @@ namespace CUETools.Codecs.FLACCL
{
if (inited)
{
_IO.Close();
if (task2.frameCount > 0)
{
if (cpu_tasks != null)
@@ -374,6 +373,10 @@ namespace CUETools.Codecs.FLACCL
task.Dispose();
openCLProgram.Dispose();
OCLMan.Dispose();
// For some reason, if i move _IO.Close before OCLMan.Dispose,
// interrupting conversion takes many seconds - Delete() just
// hangs somewhere in the vicinity of File.Delete().
_IO.Close();
inited = false;
}

6
CUETools.Processor/CUEConfigAdvanced.cs
View File

@@ -85,6 +85,12 @@ namespace CUETools.Processor
[DefaultValue(false), Category("CTDB"), DisplayName("Detailed log")]
public bool DetailedCTDBLog { get; set; }
[DefaultValue(true), Category("Tagging"), DisplayName("Write CTDB tags on encode")]
public bool WriteCTDBTagsOnEncode { get; set; }
[DefaultValue(false), Category("Tagging"), DisplayName("Write CTDB tags on verify")]
public bool WriteCTDBTagsOnVerify { get; set; }
[DefaultValue(false), Category("Tagging"), DisplayName("Use id3v2.4 instead of id3v2.3")]
public bool UseId3v24 { get; set; }

94
CUETools.Processor/CUESheet.cs
View File

@@ -2400,7 +2400,7 @@ namespace CUETools.Processor
_CUEToolsDB.GenerateLog(sw, _config.advanced.DetailedCTDBLog);
}
public string GenerateAccurateRipStatus()
public string GenerateVerifyStatus()
{
string prefix = "";
if (hdcdDecoder != null && string.Format("{0:s}", hdcdDecoder) != "")
@@ -2465,6 +2465,25 @@ namespace CUETools.Processor
}
}
public void GenerateCTDBTagsForTrack(NameValueCollection tags, int iTrack, string prefix)
{
tags.Add(String.Format("{0}CTDBTRACKCONFIDENCE", prefix), String.Format("{0}/{1}", _CUEToolsDB.GetConfidence(iTrack), _CUEToolsDB.Total));
}
public void GenerateCTDBTags(NameValueCollection tags, int iTrack)
{
//tags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
tags.Add(String.Format("CTDBDISCCONFIDENCE"), String.Format("{0}/{1}", _CUEToolsDB.Confidence, _CUEToolsDB.Total));
if (iTrack != -1)
GenerateCTDBTagsForTrack(tags, iTrack, "");
else
for (iTrack = 0; iTrack < TrackCount; iTrack++)
{
GenerateCTDBTagsForTrack(tags, iTrack,
String.Format("cue_track{0:00}_", iTrack + 1));
}
}
public void CleanupTags(NameValueCollection tags, string substring)
{
string[] keys = tags.AllKeys;
@@ -2590,7 +2609,7 @@ namespace CUETools.Processor
{
var now = DateTime.Now;
var entry = OpenLocalDBEntry();
entry.Status = this.GenerateAccurateRipStatus();
entry.Status = this.GenerateVerifyStatus();
entry.ARConfidence = isUsingAccurateRip ? _arVerify.WorstConfidence() : 0;
entry.CTDBConfidence = isUsingCUEToolsDB && !isUsingCUEToolsDBFix ? CTDB.Confidence : 0;
entry.Log = AccurateRipLog;
@@ -2987,18 +3006,20 @@ namespace CUETools.Processor
public string WriteReport()
{
if (isUsingAccurateRip)
if (isUsingAccurateRip || isUsingCUEToolsDB)
{
ShowProgress((string)"Generating AccurateRip report...", 0, null, null);
if (_action == CUEAction.Verify && _config.writeArTagsOnVerify && _writeOffset == 0 && !_isArchive && !_isCD)
if (_action == CUEAction.Verify && _writeOffset == 0 && !_isArchive && !_isCD)
{
uint tracksMatch;
int bestOffset;
FindBestOffset(1, true, out tracksMatch, out bestOffset);
if (_hasEmbeddedCUESheet)
if (_config.writeArTagsOnVerify &&
isUsingAccurateRip &&
_arVerify.ExceptionStatus == WebExceptionStatus.Success)
{
if (_fileInfo is TagLib.Flac.File)
uint tracksMatch;
int bestOffset;
FindBestOffset(1, true, out tracksMatch, out bestOffset);
if (_hasEmbeddedCUESheet)
{
NameValueCollection tags = Tagging.Analyze(_fileInfo);
CleanupTags(tags, "ACCURATERIP");
@@ -3006,11 +3027,9 @@ namespace CUETools.Processor
if (Tagging.UpdateTags(_fileInfo, tags, _config))
_fileInfo.Save();
}
}
else if (_hasTrackFilenames)
{
for (int iTrack = 0; iTrack < TrackCount; iTrack++)
if (_tracks[iTrack]._fileInfo is TagLib.Flac.File)
else if (_hasTrackFilenames)
{
for (int iTrack = 0; iTrack < TrackCount; iTrack++)
{
NameValueCollection tags = Tagging.Analyze(_tracks[iTrack]._fileInfo);
CleanupTags(tags, "ACCURATERIP");
@@ -3018,6 +3037,34 @@ namespace CUETools.Processor
if (Tagging.UpdateTags(_tracks[iTrack]._fileInfo, tags, _config))
_tracks[iTrack]._fileInfo.Save();
}
}
}
if (_config.advanced.WriteCTDBTagsOnVerify &&
isUsingCUEToolsDB &&
_CUEToolsDB.QueryExceptionStatus == WebExceptionStatus.Success)
{
if (_hasEmbeddedCUESheet)
{
NameValueCollection tags = Tagging.Analyze(_fileInfo);
CleanupTags(tags, "CTDBDISCCONFIDENCE");
CleanupTags(tags, "CTDBTRACKCONFIDENCE");
GenerateCTDBTags(tags, -1);
if (Tagging.UpdateTags(_fileInfo, tags, _config))
_fileInfo.Save();
}
else if (_hasTrackFilenames)
{
for (int iTrack = 0; iTrack < TrackCount; iTrack++)
{
NameValueCollection tags = Tagging.Analyze(_tracks[iTrack]._fileInfo);
CleanupTags(tags, "CTDBDISCCONFIDENCE");
CleanupTags(tags, "CTDBTRACKCONFIDENCE");
GenerateCTDBTags(tags, iTrack);
if (Tagging.UpdateTags(_tracks[iTrack]._fileInfo, tags, _config))
_tracks[iTrack]._fileInfo.Save();
}
}
}
}
@@ -3039,7 +3086,7 @@ namespace CUETools.Processor
WriteText(Path.ChangeExtension(_outputPath, ".toc"), CUESheetLogWriter.GetTOCContents(this));
}
}
return GenerateAccurateRipStatus();
return GenerateVerifyStatus();
}
private NameValueCollection GenerateTrackTags(int iTrack, int bestOffset)
@@ -3110,6 +3157,13 @@ namespace CUETools.Processor
_arVerify.ExceptionStatus == WebExceptionStatus.Success)
GenerateAccurateRipTags(destTags, bestOffset, iTrack);
if (_config.advanced.WriteCTDBTagsOnEncode &&
_action == CUEAction.Encode &&
isUsingCUEToolsDB &&
!isUsingCUEToolsDBFix &&
_CUEToolsDB.QueryExceptionStatus == WebExceptionStatus.Success)
GenerateCTDBTags(destTags, iTrack);
if (_config.advanced.WriteCDTOCTag)
destTags.Add("CDTOC", _toc.TAG);
@@ -3200,6 +3254,14 @@ namespace CUETools.Processor
_arVerify.ExceptionStatus == WebExceptionStatus.Success)
GenerateAccurateRipTags(destTags, bestOffset, -1);
if (fWithCUE &&
_config.advanced.WriteCTDBTagsOnEncode &&
_action == CUEAction.Encode &&
isUsingCUEToolsDB &&
!isUsingCUEToolsDBFix &&
_CUEToolsDB.QueryExceptionStatus == WebExceptionStatus.Success)
GenerateCTDBTags(destTags, -1);
return destTags;
}

1
CUETools.Processor/CUESheetLogWriter.cs
View File

@@ -35,6 +35,7 @@ namespace CUETools.Processor
if (!sheet.Processed)
{
if (sheet.IsUsingCUEToolsDB) sheet.GenerateCTDBLog(writer);
if (sheet.IsUsingAccurateRip)
writer.WriteLine("[AccurateRip ID: {0}] {1}.", sheet.AccurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(sheet.TOC), sheet.ArVerify.ARStatus ?? "found");
return;
}

18
CUETools.Processor/CUEToolsProfile.cs
View File

@@ -28,10 +28,10 @@ namespace CUETools.Processor
{
_config.Load(sr);
_useFreeDb = sr.LoadBoolean("FreedbLookup") ?? _useFreeDb;
_useMusicBrainz = sr.LoadBoolean("MusicBrainzLookup") ?? _useMusicBrainz;
_useAccurateRip = sr.LoadBoolean("AccurateRipLookup") ?? _useAccurateRip;
_useCUEToolsDB = sr.LoadBoolean("CUEToolsDBLookup") ?? _useCUEToolsDB;
_editTags = sr.LoadBoolean("MusicBrainzLookup") ?? _editTags;
_CTDBVerifyOnEncode = sr.LoadBoolean("CTDBVerifyOnEncode") ?? _CTDBVerifyOnEncode;
_ARVerifyOnEncode = sr.LoadBoolean("AccurateRipLookup") ?? _ARVerifyOnEncode;
_CTDBVerify = sr.LoadBoolean("CUEToolsDBLookup") ?? _CTDBVerify;
_useLocalDB = sr.LoadBoolean("LocalDBLookup") ?? _useLocalDB;
_skipRecent = sr.LoadBoolean("SkipRecent") ?? _skipRecent;
_outputAudioType = (AudioEncoderType?)sr.LoadInt32("OutputAudioType", null, null) ?? _outputAudioType;
@@ -47,12 +47,12 @@ namespace CUETools.Processor
{
_config.Save(sw);
sw.Save("FreedbLookup", _useFreeDb);
sw.Save("MusicBrainzLookup", _useMusicBrainz);
sw.Save("AccurateRipLookup", _useAccurateRip);
sw.Save("MusicBrainzLookup", _editTags);
sw.Save("CTDBVerifyOnEncode", _CTDBVerifyOnEncode);
sw.Save("AccurateRipLookup", _ARVerifyOnEncode);
sw.Save("LocalDBLookup", _useLocalDB);
sw.Save("SkipRecent", _skipRecent);
sw.Save("CUEToolsDBLookup", _useCUEToolsDB);
sw.Save("CUEToolsDBLookup", _CTDBVerify);
sw.Save("OutputAudioType", (int)_outputAudioType);
sw.Save("OutputAudioFmt", _outputAudioFormat);
sw.Save("AccurateRipMode", (int)_action);
@@ -68,7 +68,7 @@ namespace CUETools.Processor
public CUEAction _action = CUEAction.Encode;
public CUEStyle _CUEStyle = CUEStyle.SingleFileWithCUE;
public int _writeOffset = 0;
public bool _useFreeDb = true, _useMusicBrainz = true, _useAccurateRip = true, _useCUEToolsDB = true, _useLocalDB = true, _skipRecent = false;
public bool _editTags = true, _CTDBVerifyOnEncode = true, _ARVerifyOnEncode = true, _CTDBVerify = true, _useLocalDB = true, _skipRecent = false;
public string _name;
}

1
CUETools/CUETools.csproj
View File

@@ -313,6 +313,7 @@
<None Include="Resources\images-question.ico" />
<None Include="Resources\picture.ico" />
<None Include="Resources\wma.ico" />
<None Include="Resources\more\card--pencil.png" />
<Content Include="unrar.dll">
</Content>
<Content Include="Resources\accuraterip_16.bmp" />

6
CUETools/CUETools.sln
View File

@@ -1124,10 +1124,10 @@ Global
{0E404B8B-FF82-427F-ADE4-77B54A29219F} = {5D823ABE-D280-4800-824C-2633CBAB2EA9}
{816D964C-9772-46C5-AF1D-49E8C78A1E7C} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64}
{0AC7691C-562A-4879-8A11-6C7890BF659B} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64}
{8DD1E84B-0B03-4C0B-9B42-1E49F75E7CB1} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{758285C6-1ACA-458A-9906-EE6701D5AF87} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{6B143A39-C7B2-4743-9917-92262C60E9A6} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{7EA4160F-3BBD-47C9-A38C-4053B64B24A8} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{758285C6-1ACA-458A-9906-EE6701D5AF87} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{8DD1E84B-0B03-4C0B-9B42-1E49F75E7CB1} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
{5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
EndGlobalSection
EndGlobal

10
CUETools/Properties/Resources.Designer.cs generated
View File

@@ -130,6 +130,16 @@ namespace JDP.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap card__pencil {
get {
object obj = ResourceManager.GetObject("card--pencil", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary>

199
CUETools/Properties/Resources.resx
View File

@@ -118,83 +118,41 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="freedb16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="basket" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\basket.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon-wv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AR" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AR.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cdrepair" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cdrepair.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="info2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\info2.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="find" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\find.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verify" xml:space="preserve">
<value>Verify</value>
</data>
<data name="folder_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="musicbrainz1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_feed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_feed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="cdrepair1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cdrepair.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="users" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\users.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="world_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\world_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="picture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\picture.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="world_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\world_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Go" xml:space="preserve">
<value>&amp;Go</value>
<data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="find" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\find.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cue2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -202,38 +160,68 @@
<data name="link_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\link_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="basket" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\basket.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="wma" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wma.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="calendar" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\calendar.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="folder_feed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_feed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="pictures" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pictures.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wave.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="AR" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AR.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="freedb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="report" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\report.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verify" xml:space="preserve">
<value>Verify</value>
</data>
<data name="freedb16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="puzzle--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\puzzle--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="wv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="report" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\report.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -241,41 +229,56 @@
<data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="images" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alarm-clock--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alarm-clock--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alarm_clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alarm-clock.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="calendar" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\calendar.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Go" xml:space="preserve">
<value>&amp;Go</value>
</data>
<data name="puzzle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\puzzle.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="users" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\users.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="info2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\info2.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="images" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cue3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pictures" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pictures.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alarm_clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alarm-clock.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="images_question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-question.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="picture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\picture.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cdrepair1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cdrepair.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cdrepair" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cdrepair.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alarm-clock--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alarm-clock--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="wma" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wma.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="card--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\card--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

2
CUETools/frmBatch.cs
View File

@@ -125,7 +125,7 @@ namespace JDP
if (_profile._action == CUEAction.CreateDummyCUE)
throw new Exception("CreateDummyCUE action not yet supported in commandline mode.");
bool useAR = _profile._action == CUEAction.Verify || _profile._useAccurateRip;
bool useAR = _profile._action == CUEAction.Verify || _profile._ARVerifyOnEncode;
cueSheet.Action = _profile._action;
cueSheet.OutputStyle = _profile._CUEStyle;

146
CUETools/frmCUETools.Designer.cs generated
View File

@@ -38,17 +38,17 @@ namespace JDP {
this.fileSystemTreeView1 = new CUEControls.FileSystemTreeView();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBoxMode = new System.Windows.Forms.GroupBox();
this.tableLayoutPanelVerifyMode = new System.Windows.Forms.TableLayoutPanel();
this.checkBoxSkipRecent = new System.Windows.Forms.CheckBox();
this.checkBoxVerifyUseLocal = new System.Windows.Forms.CheckBox();
this.checkBoxVerifyUseCDRepair = new System.Windows.Forms.CheckBox();
this.tableLayoutPanelCUEStyle = new System.Windows.Forms.TableLayoutPanel();
this.checkBoxUseAccurateRip = new System.Windows.Forms.CheckBox();
this.checkBoxUseFreeDb = new System.Windows.Forms.CheckBox();
this.rbTracks = new System.Windows.Forms.RadioButton();
this.rbEmbedCUE = new System.Windows.Forms.RadioButton();
this.rbSingleFile = new System.Windows.Forms.RadioButton();
this.checkBoxUseMusicBrainz = new System.Windows.Forms.CheckBox();
this.checkBoxEditTags = new System.Windows.Forms.CheckBox();
this.checkBoxARVerifyOnEncode = new System.Windows.Forms.CheckBox();
this.checkBoxCTDBVerifyOnEncode = new System.Windows.Forms.CheckBox();
this.tableLayoutPanelVerifyMode = new System.Windows.Forms.TableLayoutPanel();
this.checkBoxSkipRecent = new System.Windows.Forms.CheckBox();
this.checkBoxVerifyUseLocal = new System.Windows.Forms.CheckBox();
this.checkBoxCTDBVerify = new System.Windows.Forms.CheckBox();
this.toolStripCorrectorFormat = new System.Windows.Forms.ToolStrip();
this.toolStripButtonCorrectorOverwrite = new System.Windows.Forms.ToolStripButton();
this.toolStripDropDownButtonCorrectorMode = new System.Windows.Forms.ToolStripDropDownButton();
@@ -138,8 +138,8 @@ namespace JDP {
this.grpInput.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.groupBoxMode.SuspendLayout();
this.tableLayoutPanelVerifyMode.SuspendLayout();
this.tableLayoutPanelCUEStyle.SuspendLayout();
this.tableLayoutPanelVerifyMode.SuspendLayout();
this.toolStripCorrectorFormat.SuspendLayout();
this.grpAudioOutput.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.trackBarEncoderMode)).BeginInit();
@@ -303,73 +303,24 @@ namespace JDP {
//
// groupBoxMode
//
this.groupBoxMode.Controls.Add(this.tableLayoutPanelVerifyMode);
this.groupBoxMode.Controls.Add(this.tableLayoutPanelCUEStyle);
this.groupBoxMode.Controls.Add(this.toolStripCorrectorFormat);
this.groupBoxMode.Controls.Add(this.tableLayoutPanelVerifyMode);
resources.ApplyResources(this.groupBoxMode, "groupBoxMode");
this.groupBoxMode.Name = "groupBoxMode";
this.groupBoxMode.TabStop = false;
//
// tableLayoutPanelVerifyMode
//
resources.ApplyResources(this.tableLayoutPanelVerifyMode, "tableLayoutPanelVerifyMode");
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxSkipRecent, 2, 0);
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxVerifyUseLocal, 1, 0);
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxVerifyUseCDRepair, 0, 0);
this.tableLayoutPanelVerifyMode.Name = "tableLayoutPanelVerifyMode";
//
// checkBoxSkipRecent
//
resources.ApplyResources(this.checkBoxSkipRecent, "checkBoxSkipRecent");
this.checkBoxSkipRecent.Image = global::JDP.Properties.Resources.alarm_clock__minus;
this.checkBoxSkipRecent.Name = "checkBoxSkipRecent";
this.toolTip1.SetToolTip(this.checkBoxSkipRecent, resources.GetString("checkBoxSkipRecent.ToolTip"));
this.checkBoxSkipRecent.UseVisualStyleBackColor = true;
//
// checkBoxVerifyUseLocal
//
resources.ApplyResources(this.checkBoxVerifyUseLocal, "checkBoxVerifyUseLocal");
this.checkBoxVerifyUseLocal.Image = global::JDP.Properties.Resources.puzzle__arrow;
this.checkBoxVerifyUseLocal.Name = "checkBoxVerifyUseLocal";
this.toolTip1.SetToolTip(this.checkBoxVerifyUseLocal, resources.GetString("checkBoxVerifyUseLocal.ToolTip"));
this.checkBoxVerifyUseLocal.UseVisualStyleBackColor = true;
//
// checkBoxVerifyUseCDRepair
//
resources.ApplyResources(this.checkBoxVerifyUseCDRepair, "checkBoxVerifyUseCDRepair");
this.checkBoxVerifyUseCDRepair.Image = global::JDP.Properties.Resources.cdrepair1;
this.checkBoxVerifyUseCDRepair.Name = "checkBoxVerifyUseCDRepair";
this.toolTip1.SetToolTip(this.checkBoxVerifyUseCDRepair, resources.GetString("checkBoxVerifyUseCDRepair.ToolTip"));
this.checkBoxVerifyUseCDRepair.UseVisualStyleBackColor = true;
//
// tableLayoutPanelCUEStyle
//
resources.ApplyResources(this.tableLayoutPanelCUEStyle, "tableLayoutPanelCUEStyle");
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxUseAccurateRip, 2, 4);
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxUseFreeDb, 1, 4);
this.tableLayoutPanelCUEStyle.Controls.Add(this.rbTracks, 0, 2);
this.tableLayoutPanelCUEStyle.Controls.Add(this.rbEmbedCUE, 0, 0);
this.tableLayoutPanelCUEStyle.Controls.Add(this.rbSingleFile, 0, 1);
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxUseMusicBrainz, 0, 4);
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxEditTags, 0, 4);
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxARVerifyOnEncode, 2, 4);
this.tableLayoutPanelCUEStyle.Controls.Add(this.checkBoxCTDBVerifyOnEncode, 1, 4);
this.tableLayoutPanelCUEStyle.Name = "tableLayoutPanelCUEStyle";
//
// checkBoxUseAccurateRip
//
resources.ApplyResources(this.checkBoxUseAccurateRip, "checkBoxUseAccurateRip");
this.checkBoxUseAccurateRip.Image = global::JDP.Properties.Resources.AR;
this.checkBoxUseAccurateRip.Name = "checkBoxUseAccurateRip";
this.toolTip1.SetToolTip(this.checkBoxUseAccurateRip, resources.GetString("checkBoxUseAccurateRip.ToolTip"));
this.checkBoxUseAccurateRip.UseVisualStyleBackColor = true;
this.checkBoxUseAccurateRip.CheckedChanged += new System.EventHandler(this.checkBoxUseAccurateRip_CheckedChanged);
//
// checkBoxUseFreeDb
//
resources.ApplyResources(this.checkBoxUseFreeDb, "checkBoxUseFreeDb");
this.checkBoxUseFreeDb.Image = global::JDP.Properties.Resources.freedb16;
this.checkBoxUseFreeDb.Name = "checkBoxUseFreeDb";
this.toolTip1.SetToolTip(this.checkBoxUseFreeDb, resources.GetString("checkBoxUseFreeDb.ToolTip"));
this.checkBoxUseFreeDb.UseVisualStyleBackColor = true;
//
// rbTracks
//
resources.ApplyResources(this.rbTracks, "rbTracks");
@@ -399,13 +350,62 @@ namespace JDP {
this.toolTip1.SetToolTip(this.rbSingleFile, resources.GetString("rbSingleFile.ToolTip"));
this.rbSingleFile.UseVisualStyleBackColor = true;
//
// checkBoxUseMusicBrainz
// checkBoxEditTags
//
resources.ApplyResources(this.checkBoxUseMusicBrainz, "checkBoxUseMusicBrainz");
this.checkBoxUseMusicBrainz.Image = global::JDP.Properties.Resources.musicbrainz;
this.checkBoxUseMusicBrainz.Name = "checkBoxUseMusicBrainz";
this.toolTip1.SetToolTip(this.checkBoxUseMusicBrainz, resources.GetString("checkBoxUseMusicBrainz.ToolTip"));
this.checkBoxUseMusicBrainz.UseVisualStyleBackColor = true;
resources.ApplyResources(this.checkBoxEditTags, "checkBoxEditTags");
this.checkBoxEditTags.Image = global::JDP.Properties.Resources.card__pencil;
this.checkBoxEditTags.Name = "checkBoxEditTags";
this.toolTip1.SetToolTip(this.checkBoxEditTags, resources.GetString("checkBoxEditTags.ToolTip"));
this.checkBoxEditTags.UseVisualStyleBackColor = true;
//
// checkBoxARVerifyOnEncode
//
resources.ApplyResources(this.checkBoxARVerifyOnEncode, "checkBoxARVerifyOnEncode");
this.checkBoxARVerifyOnEncode.Image = global::JDP.Properties.Resources.AR;
this.checkBoxARVerifyOnEncode.Name = "checkBoxARVerifyOnEncode";
this.toolTip1.SetToolTip(this.checkBoxARVerifyOnEncode, resources.GetString("checkBoxARVerifyOnEncode.ToolTip"));
this.checkBoxARVerifyOnEncode.UseVisualStyleBackColor = true;
this.checkBoxARVerifyOnEncode.CheckedChanged += new System.EventHandler(this.checkBoxUseAccurateRip_CheckedChanged);
//
// checkBoxCTDBVerifyOnEncode
//
resources.ApplyResources(this.checkBoxCTDBVerifyOnEncode, "checkBoxCTDBVerifyOnEncode");
this.checkBoxCTDBVerifyOnEncode.Image = global::JDP.Properties.Resources.cdrepair1;
this.checkBoxCTDBVerifyOnEncode.Name = "checkBoxCTDBVerifyOnEncode";
this.toolTip1.SetToolTip(this.checkBoxCTDBVerifyOnEncode, resources.GetString("checkBoxCTDBVerifyOnEncode.ToolTip"));
this.checkBoxCTDBVerifyOnEncode.UseVisualStyleBackColor = true;
//
// tableLayoutPanelVerifyMode
//
resources.ApplyResources(this.tableLayoutPanelVerifyMode, "tableLayoutPanelVerifyMode");
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxSkipRecent, 2, 0);
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxVerifyUseLocal, 1, 0);
this.tableLayoutPanelVerifyMode.Controls.Add(this.checkBoxCTDBVerify, 0, 0);
this.tableLayoutPanelVerifyMode.Name = "tableLayoutPanelVerifyMode";
//
// checkBoxSkipRecent
//
resources.ApplyResources(this.checkBoxSkipRecent, "checkBoxSkipRecent");
this.checkBoxSkipRecent.Image = global::JDP.Properties.Resources.alarm_clock__minus;
this.checkBoxSkipRecent.Name = "checkBoxSkipRecent";
this.toolTip1.SetToolTip(this.checkBoxSkipRecent, resources.GetString("checkBoxSkipRecent.ToolTip"));
this.checkBoxSkipRecent.UseVisualStyleBackColor = true;
//
// checkBoxVerifyUseLocal
//
resources.ApplyResources(this.checkBoxVerifyUseLocal, "checkBoxVerifyUseLocal");
this.checkBoxVerifyUseLocal.Image = global::JDP.Properties.Resources.puzzle__arrow;
this.checkBoxVerifyUseLocal.Name = "checkBoxVerifyUseLocal";
this.toolTip1.SetToolTip(this.checkBoxVerifyUseLocal, resources.GetString("checkBoxVerifyUseLocal.ToolTip"));
this.checkBoxVerifyUseLocal.UseVisualStyleBackColor = true;
//
// checkBoxCTDBVerify
//
resources.ApplyResources(this.checkBoxCTDBVerify, "checkBoxCTDBVerify");
this.checkBoxCTDBVerify.Image = global::JDP.Properties.Resources.cdrepair1;
this.checkBoxCTDBVerify.Name = "checkBoxCTDBVerify";
this.toolTip1.SetToolTip(this.checkBoxCTDBVerify, resources.GetString("checkBoxCTDBVerify.ToolTip"));
this.checkBoxCTDBVerify.UseVisualStyleBackColor = true;
//
// toolStripCorrectorFormat
//
@@ -1081,10 +1081,10 @@ namespace JDP {
this.grpInput.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.groupBoxMode.ResumeLayout(false);
this.tableLayoutPanelVerifyMode.ResumeLayout(false);
this.tableLayoutPanelVerifyMode.PerformLayout();
this.tableLayoutPanelCUEStyle.ResumeLayout(false);
this.tableLayoutPanelCUEStyle.PerformLayout();
this.tableLayoutPanelVerifyMode.ResumeLayout(false);
this.tableLayoutPanelVerifyMode.PerformLayout();
this.toolStripCorrectorFormat.ResumeLayout(false);
this.toolStripCorrectorFormat.PerformLayout();
this.grpAudioOutput.ResumeLayout(false);
@@ -1203,11 +1203,11 @@ namespace JDP {
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemCorrectorModeLocateFiles;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemCorrectorModeChangeExtension;
private System.Windows.Forms.ToolStripButton toolStripButtonCorrectorOverwrite;
private System.Windows.Forms.CheckBox checkBoxUseMusicBrainz;
private System.Windows.Forms.CheckBox checkBoxUseAccurateRip;
private System.Windows.Forms.CheckBox checkBoxUseFreeDb;
private System.Windows.Forms.CheckBox checkBoxEditTags;
private System.Windows.Forms.CheckBox checkBoxARVerifyOnEncode;
private System.Windows.Forms.CheckBox checkBoxCTDBVerifyOnEncode;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelVerifyMode;
private System.Windows.Forms.CheckBox checkBoxVerifyUseCDRepair;
private System.Windows.Forms.CheckBox checkBoxCTDBVerify;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelCTDB;
private System.Windows.Forms.CheckBox checkBoxVerifyUseLocal;
private System.Windows.Forms.CheckBox checkBoxSkipRecent;

29
CUETools/frmCUETools.cs
View File

@@ -624,8 +624,8 @@ namespace JDP
DialogResult dlgRes = DialogResult.OK;
string status = null;
bool outputAudio = action == CUEAction.Encode && audioEncoderType != AudioEncoderType.NoAudio;
bool useAR = action == CUEAction.Verify || (outputAudio && checkBoxUseAccurateRip.Checked);
bool useCUEToolsDB = action == CUEAction.Verify && checkBoxVerifyUseCDRepair.Checked;
bool useAR = action == CUEAction.Verify || (outputAudio && checkBoxARVerifyOnEncode.Checked);
bool useCUEToolsDB = (action == CUEAction.Verify && checkBoxCTDBVerify.Checked) || (outputAudio && checkBoxCTDBVerifyOnEncode.Checked);
bool useLocalDB = action != CUEAction.Verify || checkBoxVerifyUseLocal.Checked;
bool skipRecent = action == CUEAction.Verify && checkBoxSkipRecent.Checked;
@@ -937,7 +937,7 @@ namespace JDP
toolStripStatusLabelAR.Visible = useAR;
toolStripStatusLabelCTDB.Visible = useCUEToolsDB;
if (_batchPaths.Count <= 1 && _batchProcessed == 0 && action == CUEAction.Encode && (checkBoxUseFreeDb.Checked || checkBoxUseMusicBrainz.Checked))
if (_batchPaths.Count <= 1 && _batchProcessed == 0 && action == CUEAction.Encode && checkBoxEditTags.Checked)
{
frmChoice dlg = new frmChoice();
if (_choiceWidth != 0 && _choiceHeight != 0)
@@ -1100,7 +1100,7 @@ namespace JDP
//reportForm.Message = _batchReport.ToString();
//reportForm.ShowDialog(this);
}
else if (useAR && cueSheet.Processed)
else if ((useAR || useCUEToolsDB) && cueSheet.Processed)
{
_batchReport.Append(CUESheetLogWriter.GetAccurateRipLog(cueSheet));
ReportState = true;
@@ -1228,7 +1228,10 @@ namespace JDP
private void SetupControls(bool running)
{
bool converting = (SelectedAction == CUEAction.Encode);
bool verifying = (SelectedAction == CUEAction.Verify || (SelectedAction == CUEAction.Encode && SelectedOutputAudioType != AudioEncoderType.NoAudio && checkBoxUseAccurateRip.Checked));
bool verifying = SelectedAction == CUEAction.Verify ||
(SelectedAction == CUEAction.Encode &&
SelectedOutputAudioType != AudioEncoderType.NoAudio &&
(checkBoxARVerifyOnEncode.Checked || checkBoxCTDBVerifyOnEncode.Checked));
//grpInput.Enabled = !running;
toolStripMenu.Enabled = !running;
fileSystemTreeView1.Enabled = !running;
@@ -1342,10 +1345,10 @@ namespace JDP
comboBoxOutputFormat.Text = _profile._outputTemplate ?? comboBoxOutputFormat.Items[0].ToString();
toolStripDropDownButtonProfile.Text = _profile._name;
SelectedScript = _profile._script;
checkBoxUseFreeDb.Checked = _profile._useFreeDb;
checkBoxUseMusicBrainz.Checked = _profile._useMusicBrainz;
checkBoxUseAccurateRip.Checked = _profile._useAccurateRip;
checkBoxVerifyUseCDRepair.Checked = _profile._useCUEToolsDB;
checkBoxEditTags.Checked = _profile._editTags;
checkBoxCTDBVerifyOnEncode.Checked = _profile._CTDBVerifyOnEncode;
checkBoxARVerifyOnEncode.Checked = _profile._ARVerifyOnEncode;
checkBoxCTDBVerify.Checked = _profile._CTDBVerify;
checkBoxVerifyUseLocal.Checked = _profile._useLocalDB;
checkBoxSkipRecent.Checked = _profile._skipRecent;
}
@@ -1388,10 +1391,10 @@ namespace JDP
_profile._writeOffset = (int)numericWriteOffset.Value;
_profile._outputTemplate = comboBoxOutputFormat.Text;
_profile._script = SelectedScript;
_profile._useFreeDb = checkBoxUseFreeDb.Checked;
_profile._useMusicBrainz = checkBoxUseMusicBrainz.Checked;
_profile._useAccurateRip = checkBoxUseAccurateRip.Checked;
_profile._useCUEToolsDB = checkBoxVerifyUseCDRepair.Checked;
_profile._editTags = checkBoxEditTags.Checked;
_profile._CTDBVerifyOnEncode = checkBoxCTDBVerifyOnEncode.Checked;
_profile._ARVerifyOnEncode = checkBoxARVerifyOnEncode.Checked;
_profile._CTDBVerify = checkBoxCTDBVerify.Checked;
_profile._useLocalDB = checkBoxVerifyUseLocal.Checked;
_profile._skipRecent = checkBoxSkipRecent.Checked;

1412
CUETools/frmCUETools.resx
View File

File diff suppressed because it is too large Load Diff