version bump

This commit is contained in:
chudov
2012-01-12 03:32:00 +00:00
parent d35f346c9e
commit 7572e50bd8
36 changed files with 157 additions and 156 deletions

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2"; this.Text = "CUEPlayer 2.1.4";
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);

View File

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

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.2</value> <value>CUERipper 2.1.4</value>
</data> </data>
</root> </root>

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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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.2</value> <value>CUERipper 2.1.4</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>

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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.4.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>

View File

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

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

View File

@@ -229,7 +229,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:CUETools.CDImage, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:CUETools.CDImage, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_404CDECAD44DEDE89F5968D20B9790D4" "_404CDECAD44DEDE89F5968D20B9790D4"
@@ -260,7 +260,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:CUETools.AccurateRip, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:CUETools.AccurateRip, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_5C38BA7F54E368532D5699479E787C04" "_5C38BA7F54E368532D5699479E787C04"
@@ -291,7 +291,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:CUETools.Codecs, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:CUETools.Codecs, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_88C1C00C7C570D8CCF5DFB2742F06623" "_88C1C00C7C570D8CCF5DFB2742F06623"

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.3"); var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.4");
form.ShowDialog(); form.ShowDialog();
var meta = form.Meta; var meta = form.Meta;
if (meta == null) if (meta == null)
@@ -154,7 +154,7 @@ namespace MetadataPlugIn
public string GetPluginName() public string GetPluginName()
{ {
return "CUETools DB Metadata Plugin V2.1.3"; return "CUETools DB Metadata Plugin V2.1.4";
} }
public void ShowOptions() public void ShowOptions()

View File

@@ -51,7 +51,7 @@ namespace AudioDataPlugIn
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(182, 17); this.label1.Size = new System.Drawing.Size(182, 17);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "CUETools DB Plugin V2.1.3"; this.label1.Text = "CUETools DB Plugin V2.1.4";
// //
// label2 // label2
// //
@@ -60,7 +60,7 @@ namespace AudioDataPlugIn
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(307, 42); this.label2.Size = new System.Drawing.Size(307, 42);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "Copyright (c) 2011 Gregory S. Chudov"; this.label2.Text = "Copyright (c) 2011-12 Gregory S. Chudov";
// //
// linkLabel1 // linkLabel1
// //

View File

@@ -14,7 +14,7 @@ using CUETools.CTDB.EACPlugin;
namespace AudioDataPlugIn namespace AudioDataPlugIn
{ {
[Guid("C02A1BF2-5C46-4990-80C2-78E8C395CB80"), [Guid("C02A1BF2-5C46-4990-80C2-78E8C395CB80"),
ClassInterface(ClassInterfaceType.None), ClassInterface(ClassInterfaceType.None),
ComSourceInterfaces(typeof(IAudioDataTransfer)), ComSourceInterfaces(typeof(IAudioDataTransfer)),
] ]
@@ -29,17 +29,17 @@ namespace AudioDataPlugIn
int m_start_pos = 0, m_length = 0; int m_start_pos = 0, m_length = 0;
bool m_test_mode = false; bool m_test_mode = false;
IMetadataLookup m_data = null; IMetadataLookup m_data = null;
CDImageLayout TOC; CDImageLayout TOC;
#if USEAR #if USEAR
string ArId; string ArId;
#endif #endif
AccurateRipVerify ar; AccurateRipVerify ar;
AccurateRipVerify arTest; AccurateRipVerify arTest;
CUEToolsDB ctdb; CUEToolsDB ctdb;
bool sequence_ok = true; bool sequence_ok = true;
bool is_secure_mode; bool is_secure_mode;
bool is_offset_set; bool is_offset_set;
string m_drivename; string m_drivename;
#if DEBUG #if DEBUG
StringWriter m_trace; StringWriter m_trace;
#endif #endif
@@ -50,7 +50,7 @@ namespace AudioDataPlugIn
// guid is used // guid is used
public string GetAudioTransferPluginGuid() public string GetAudioTransferPluginGuid()
{ {
return ((GuidAttribute)Attribute.GetCustomAttribute(GetType(), typeof(GuidAttribute))).Value; return ((GuidAttribute)Attribute.GetCustomAttribute(GetType(), typeof(GuidAttribute))).Value;
} }
@@ -59,7 +59,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.3"; return "CUETools DB Plugin V2.1.4";
} }
// Each plugin should have its own options page. // Each plugin should have its own options page.
@@ -95,7 +95,7 @@ namespace AudioDataPlugIn
// the offset was setted by AccurateRip (so having a comparable // the offset was setted by AccurateRip (so having a comparable
// offset value) // offset value)
public void StartNewSession(IMetadataLookup data, string drivename, int offset, bool aroffset, int mode) public void StartNewSession(IMetadataLookup data, string drivename, int offset, bool aroffset, int mode)
{ {
// Copy the CD metadata to the object // Copy the CD metadata to the object
m_data = data; m_data = data;
@@ -103,39 +103,39 @@ namespace AudioDataPlugIn
#if DEBUG #if DEBUG
m_trace = new StringWriter(); m_trace = new StringWriter();
#endif #endif
var parts = drivename.Split(' ');
m_drivename = parts[0].PadRight(8, ' ') + " -";
for (int i = 1; i < parts.Length; i++)
m_drivename += " " + parts[i];
TOC = new CDImageLayout(); var parts = drivename.Split(' ');
for (int i = 0; i < m_data.NumberOfTracks; i++) m_drivename = parts[0].PadRight(8, ' ') + " -";
{ for (int i = 1; i < parts.Length; i++)
uint start = m_data.GetTrackStartPosition(i); m_drivename += " " + parts[i];
uint next = m_data.GetTrackEndPosition(i);
TOC.AddTrack(new CDTrack( TOC = new CDImageLayout();
(uint)i + 1, for (int i = 0; i < m_data.NumberOfTracks; i++)
start, {
next - start, uint start = m_data.GetTrackStartPosition(i);
!m_data.GetTrackDataTrack(i), uint next = m_data.GetTrackEndPosition(i);
m_data.GetTrackPreemphasis(i))); TOC.AddTrack(new CDTrack(
} (uint)i + 1,
TOC[1][0].Start = 0U; start,
ar = new AccurateRipVerify(TOC, null); next - start,
arTest = new AccurateRipVerify(TOC, null); !m_data.GetTrackDataTrack(i),
ctdb = new CUEToolsDB(TOC, null); m_data.GetTrackPreemphasis(i)));
}
TOC[1][0].Start = 0U;
ar = new AccurateRipVerify(TOC, null);
arTest = new AccurateRipVerify(TOC, null);
ctdb = new CUEToolsDB(TOC, null);
#if USEAR #if USEAR
ArId = AccurateRipVerify.CalculateAccurateRipId(TOC); ArId = AccurateRipVerify.CalculateAccurateRipId(TOC);
ar.ContactAccurateRip(ArId); ar.ContactAccurateRip(ArId);
#endif #endif
ctdb.Init(ar); ctdb.Init(ar);
this.sequence_ok = true; this.sequence_ok = true;
this.m_start_pos = 0; this.m_start_pos = 0;
this.m_length = 0; this.m_length = 0;
this.m_test_mode = false; this.m_test_mode = false;
this.is_offset_set = aroffset; this.is_offset_set = aroffset;
this.is_secure_mode = mode >= 2; this.is_secure_mode = mode >= 2;
} }
// This function will be called once per session. A session // This function will be called once per session. A session
@@ -147,12 +147,12 @@ namespace AudioDataPlugIn
public void StartNewTransfer(int startpos, int length, bool testmode) public void StartNewTransfer(int startpos, int length, bool testmode)
{ {
// Copy the current parameters to the objects variables // Copy the current parameters to the objects variables
m_start_pos = startpos - (int)TOC[TOC.FirstAudio][0].Start; m_start_pos = startpos - (int)TOC[TOC.FirstAudio][0].Start;
m_length = length; m_length = length;
m_test_mode = testmode; m_test_mode = testmode;
if (this.sequence_ok) if (this.sequence_ok)
{ {
var thisAr = m_test_mode ? arTest : ar; var thisAr = m_test_mode ? arTest : ar;
if (this.m_start_pos * 588 != thisAr.Position) if (this.m_start_pos * 588 != thisAr.Position)
{ {
if (thisAr.Position == 0 && this.m_start_pos == (int)TOC[TOC.FirstAudio].Pregap) if (thisAr.Position == 0 && this.m_start_pos == (int)TOC[TOC.FirstAudio].Pregap)
@@ -173,7 +173,7 @@ namespace AudioDataPlugIn
this.sequence_ok = false; this.sequence_ok = false;
} }
} }
} }
} }
@@ -186,13 +186,13 @@ namespace AudioDataPlugIn
public void TransferAudioData(Array audiodata) public void TransferAudioData(Array audiodata)
{ {
if (this.sequence_ok) if (this.sequence_ok)
{ {
byte[] ad = (byte[])audiodata; byte[] ad = (byte[])audiodata;
AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4); AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4);
var thisAr = m_test_mode ? arTest : ar; var thisAr = m_test_mode ? arTest : ar;
thisAr.Write(buff); thisAr.Write(buff);
} }
} }
@@ -204,9 +204,9 @@ namespace AudioDataPlugIn
public void TransferFinished() public void TransferFinished()
{ {
if (this.sequence_ok) if (this.sequence_ok)
{ {
var thisAr = m_test_mode ? arTest : ar; var thisAr = m_test_mode ? arTest : ar;
if ((m_start_pos + m_length) * 588 != thisAr.Position) if ((m_start_pos + m_length) * 588 != thisAr.Position)
{ {
#if DEBUG #if DEBUG
@@ -214,8 +214,8 @@ namespace AudioDataPlugIn
#endif #endif
this.sequence_ok = false; this.sequence_ok = false;
} }
} }
} }
// The extraction has finished, the log dialog will // The extraction has finished, the log dialog will
@@ -225,9 +225,9 @@ namespace AudioDataPlugIn
// an empty string, in that case no log output will be done! // an empty string, in that case no log output will be done!
public string EndOfSession() public string EndOfSession()
{ {
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
if (this.sequence_ok) if (this.sequence_ok)
{ {
if (TOC.AudioLength * 588 != ar.Position) if (TOC.AudioLength * 588 != ar.Position)
{ {
#if DEBUG #if DEBUG
@@ -242,7 +242,7 @@ namespace AudioDataPlugIn
#endif #endif
this.sequence_ok = false; this.sequence_ok = false;
} }
} }
if (!this.sequence_ok) if (!this.sequence_ok)
{ {
#if DEBUG #if DEBUG
@@ -254,24 +254,25 @@ namespace AudioDataPlugIn
#if DEBUG #if DEBUG
sw.Write(m_trace.ToString()); sw.Write(m_trace.ToString());
#endif #endif
if (this.sequence_ok) if (this.sequence_ok)
{ {
var form = new FormSubmitParity(
ctdb,
"EAC" + m_data.HostVersion + " CTDB 2.1.3",
m_drivename,
#if USEAR #if USEAR
(int)ar.WorstConfidence() + 1, int conf = (int)ar.WorstConfidence() + 1;
#else #else
1, int conf = 1;
#endif #endif
(arTest.Position == 0 && this.is_secure_mode) || (arTest.Position != 0 && arTest.CRC32(0) == ar.CRC32(0)) ? 100 : 0, var form = new FormSubmitParity(
m_data.AlbumArtist, ctdb,
m_data.AlbumTitle); "EAC" + m_data.HostVersion + " CTDB 2.1.4",
form.ShowDialog(); m_drivename,
sw.WriteLine("[CTDB TOCID: {0}] {1}", conf,
TOC.TOCID, (arTest.Position == 0 && this.is_secure_mode) || (arTest.Position != 0 && arTest.CRC32(0) == ar.CRC32(0)) ? 100 : 0,
ctdb.DBStatus ?? "found"); m_data.AlbumArtist,
m_data.AlbumTitle);
form.ShowDialog();
sw.WriteLine("[CTDB TOCID: {0}] {1}",
TOC.TOCID,
ctdb.DBStatus ?? "found");
if (ctdb.SubStatus != null) if (ctdb.SubStatus != null)
sw.WriteLine("Submit result: " + ctdb.SubStatus); sw.WriteLine("Submit result: " + ctdb.SubStatus);
#if DEBUG #if DEBUG
@@ -281,24 +282,24 @@ namespace AudioDataPlugIn
#endif #endif
int fixConf = -1; int fixConf = -1;
int myConf = 0; int myConf = 0;
if (ctdb.QueryExceptionStatus == WebExceptionStatus.Success) if (ctdb.QueryExceptionStatus == WebExceptionStatus.Success)
{ {
foreach (DBEntry entry in ctdb.Entries) foreach (DBEntry entry in ctdb.Entries)
if (!entry.hasErrors) if (!entry.hasErrors)
myConf += entry.conf; myConf += entry.conf;
else if (entry.canRecover) else if (entry.canRecover)
fixConf = Math.Max(fixConf, entry.conf); fixConf = Math.Max(fixConf, entry.conf);
} }
if (fixConf > myConf) if (fixConf > myConf)
sw.WriteLine("If you are sure that your rip contains errors, you can use CUETools to repair it."); sw.WriteLine("If you are sure that your rip contains errors, you can use CUETools to repair it.");
#if USEAR #if USEAR
ar.GenerateFullLog(sw, false, ArId); ar.GenerateFullLog(sw, false, ArId);
#endif #endif
} }
else else
sw.WriteLine("Some tracks have been skipped"); sw.WriteLine("Some tracks have been skipped");
return sw.ToString(); return sw.ToString();
} }
} }
} }

View File

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CUETools.CTDB.EACPlugin")] [assembly: AssemblyProduct("CUETools.CTDB.EACPlugin")]
[assembly: AssemblyCopyright("Copyright © Gregory S. Chudov 2011")] [assembly: AssemblyCopyright("Copyright © Gregory S. Chudov 2012")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

View File

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

View File

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

View File

@@ -23,7 +23,7 @@ namespace CUETools.Processor
{ {
#region Fields #region Fields
public readonly static string CUEToolsVersion = "2.1.2a"; public readonly static string CUEToolsVersion = "2.1.4";
private bool _stop, _pause; private bool _stop, _pause;
private List<CUELine> _attributes; private List<CUELine> _attributes;

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

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.2 Copyright (C) 2008-10 Gregory S. Chudov"); Console.WriteLine("CUERipper v2.1.4 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.");
@@ -180,7 +180,7 @@ namespace CUETools.ConsoleRipper
string ArId = AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC); string ArId = AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC);
var ctdb = new CUEToolsDB(audioSource.TOC, null); var ctdb = new CUEToolsDB(audioSource.TOC, null);
ctdb.Init(arVerify); ctdb.Init(arVerify);
ctdb.ContactDB(null, "CUETools.ConsoleRipper 2.1.2", audioSource.ARName, true, false, CTDBMetadataSearch.Fast); ctdb.ContactDB(null, "CUETools.ConsoleRipper 2.1.4", audioSource.ARName, true, false, CTDBMetadataSearch.Fast);
arVerify.ContactAccurateRip(ArId); arVerify.ContactAccurateRip(ArId);
CTDBResponseMeta meta = null; CTDBResponseMeta meta = null;
foreach (var imeta in ctdb.Metadata) foreach (var imeta in ctdb.Metadata)

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

View File

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

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.2.0")] [assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: AssemblyFileVersion("2.1.4.0")]

View File

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

View File

@@ -270,7 +270,7 @@ hdcd.dll (c) Christopher Key</value>
<value>6</value> <value>6</value>
</data> </data>
<data name="linkLabel3.Text" xml:space="preserve"> <data name="linkLabel3.Text" xml:space="preserve">
<value>Copyright 2008-2011 Gregory S. Chudov, gchudov@gmail.com</value> <value>Copyright 2008-2012 Gregory S. Chudov, gchudov@gmail.com</value>
</data> </data>
<data name="linkLabel3.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="linkLabel3.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value> <value>MiddleCenter</value>

View File

@@ -158,7 +158,7 @@ hdcd.dll (c) Christopher Key
<value>309, 17</value> <value>309, 17</value>
</data> </data>
<data name="linkLabel3.Text" xml:space="preserve"> <data name="linkLabel3.Text" xml:space="preserve">
<value>Copyright 2008-2011 Григорий Чудов, gchudov@gmail.com</value> <value>Copyright 2008-2012 Григорий Чудов, gchudov@gmail.com</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>439, 296</value> <value>439, 296</value>

View File

@@ -599,7 +599,7 @@ namespace JDP
{ {
get get
{ {
return "CUETools 2.1.2"; return "CUETools 2.1.4";
} }
} }

View File

@@ -271,7 +271,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.2.0, Culture=neutral, PublicKeyToken=null</value> <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.4.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>
@@ -2891,7 +2891,7 @@
<value>699, 537</value> <value>699, 537</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>CUETools 2.1.2a</value> <value>CUETools 2.1.4</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>