From 7572e50bd80f89e0500512cf62b9973e12ce7671 Mon Sep 17 00:00:00 2001 From: chudov Date: Thu, 12 Jan 2012 03:32:00 +0000 Subject: [PATCH] version bump --- CUEControls/Properties/AssemblyInfo.cs | 4 +- CUEPlayer/Properties/AssemblyInfo.cs | 4 +- CUEPlayer/frmCUEPlayer.Designer.cs | 2 +- CUERipper/CUERipper.csproj | 2 +- CUERipper/frmCUERipper.de-DE.resx | 2 +- CUERipper/frmCUERipper.resx | 16 +- CUERipper/frmFreedbSubmit.resx | 2 +- CUETools.ARCUE/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.CDImage/Properties/AssemblyInfo.cs | 4 +- .../CUETools.CTDB.EACPlugin.Installer.vdproj | 6 +- CUETools.CTDB.EACPlugin/Metadata.cs | 4 +- CUETools.CTDB.EACPlugin/Options.Designer.cs | 4 +- CUETools.CTDB.EACPlugin/Plugin.cs | 179 +++++++++--------- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Codecs/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Processor/CUESheet.cs | 2 +- CUETools.Processor/Properties/AssemblyInfo.cs | 4 +- CUETools.Ripper.Console/Program.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- CUETools.Ripper.SCSI/SCSIDrive.cs | 2 +- CUETools.Ripper/Properties/AssemblyInfo.cs | 4 +- CUETools/Properties/AssemblyInfo.cs | 4 +- CUETools/frmAbout.resx | 2 +- CUETools/frmAbout.ru-RU.resx | 2 +- CUETools/frmCUETools.cs | 2 +- CUETools/frmCUETools.resx | 4 +- 36 files changed, 157 insertions(+), 156 deletions(-) diff --git a/CUEControls/Properties/AssemblyInfo.cs b/CUEControls/Properties/AssemblyInfo.cs index 0d97d7e..b34e46e 100644 --- a/CUEControls/Properties/AssemblyInfo.cs +++ b/CUEControls/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUEPlayer/Properties/AssemblyInfo.cs b/CUEPlayer/Properties/AssemblyInfo.cs index 62de579..07ed9d6 100644 --- a/CUEPlayer/Properties/AssemblyInfo.cs +++ b/CUEPlayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUEPlayer/frmCUEPlayer.Designer.cs b/CUEPlayer/frmCUEPlayer.Designer.cs index 7e42218..3086c8a 100644 --- a/CUEPlayer/frmCUEPlayer.Designer.cs +++ b/CUEPlayer/frmCUEPlayer.Designer.cs @@ -68,7 +68,7 @@ this.IsMdiContainer = true; this.MainMenuStrip = this.menuStrip1; this.Name = "frmCUEPlayer"; - this.Text = "CUEPlayer 2.1.2"; + this.Text = "CUEPlayer 2.1.4"; this.Load += new System.EventHandler(this.frmCUEPlayer_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmCUEPlayer_FormClosing); this.menuStrip1.ResumeLayout(false); diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj index e483f39..3bc7d96 100644 --- a/CUERipper/CUERipper.csproj +++ b/CUERipper/CUERipper.csproj @@ -44,7 +44,7 @@ true index.html 2 - 2.1.2.0 + 2.1.4.0 false true true diff --git a/CUERipper/frmCUERipper.de-DE.resx b/CUERipper/frmCUERipper.de-DE.resx index cf768c7..988fe63 100644 --- a/CUERipper/frmCUERipper.de-DE.resx +++ b/CUERipper/frmCUERipper.de-DE.resx @@ -208,6 +208,6 @@ Senden - CUERipper 2.1.2 + CUERipper 2.1.4 \ No newline at end of file diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx index 93f070a..4b9366d 100644 --- a/CUERipper/frmCUERipper.resx +++ b/CUERipper/frmCUERipper.resx @@ -468,7 +468,7 @@ bnComboBoxLosslessOrNot - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -495,7 +495,7 @@ bnComboBoxEncoder - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -549,7 +549,7 @@ bnComboBoxFormat - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -615,7 +615,7 @@ bnComboBoxImage - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null groupBoxSettings @@ -1011,7 +1011,7 @@ bnComboBoxRelease - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null $this @@ -1035,7 +1035,7 @@ bnComboBoxDrives - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null $this @@ -1059,7 +1059,7 @@ bnComboBoxOutputFormat - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null $this @@ -1735,7 +1735,7 @@ CenterScreen - CUERipper 2.1.2 + CUERipper 2.1.4 toolStripStatusLabel1 diff --git a/CUERipper/frmFreedbSubmit.resx b/CUERipper/frmFreedbSubmit.resx index f28f53f..c303ca6 100644 --- a/CUERipper/frmFreedbSubmit.resx +++ b/CUERipper/frmFreedbSubmit.resx @@ -138,7 +138,7 @@ imgComboBoxCategory - CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.ImgComboBox, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null groupBox1 diff --git a/CUETools.ARCUE/Properties/AssemblyInfo.cs b/CUETools.ARCUE/Properties/AssemblyInfo.cs index 23bce34..b6979a4 100644 --- a/CUETools.ARCUE/Properties/AssemblyInfo.cs +++ b/CUETools.ARCUE/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.AccurateRip/Properties/AssemblyInfo.cs b/CUETools.AccurateRip/Properties/AssemblyInfo.cs index fc30b31..71e21c2 100644 --- a/CUETools.AccurateRip/Properties/AssemblyInfo.cs +++ b/CUETools.AccurateRip/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.CDImage/Properties/AssemblyInfo.cs b/CUETools.CDImage/Properties/AssemblyInfo.cs index f3457e5..eb0081a 100644 --- a/CUETools.CDImage/Properties/AssemblyInfo.cs +++ b/CUETools.CDImage/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.CTDB.EACPlugin.Installer/CUETools.CTDB.EACPlugin.Installer.vdproj b/CUETools.CTDB.EACPlugin.Installer/CUETools.CTDB.EACPlugin.Installer.vdproj index 702ac8d..f20537f 100644 --- a/CUETools.CTDB.EACPlugin.Installer/CUETools.CTDB.EACPlugin.Installer.vdproj +++ b/CUETools.CTDB.EACPlugin.Installer/CUETools.CTDB.EACPlugin.Installer.vdproj @@ -229,7 +229,7 @@ { "AssemblyRegister" = "3:1" "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" { "_404CDECAD44DEDE89F5968D20B9790D4" @@ -260,7 +260,7 @@ { "AssemblyRegister" = "3:1" "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" { "_5C38BA7F54E368532D5699479E787C04" @@ -291,7 +291,7 @@ { "AssemblyRegister" = "3:1" "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" { "_88C1C00C7C570D8CCF5DFB2742F06623" diff --git a/CUETools.CTDB.EACPlugin/Metadata.cs b/CUETools.CTDB.EACPlugin/Metadata.cs index 3b74a81..c6c75da 100644 --- a/CUETools.CTDB.EACPlugin/Metadata.cs +++ b/CUETools.CTDB.EACPlugin/Metadata.cs @@ -42,7 +42,7 @@ namespace MetadataPlugIn TOC[1][0].Start = 0U; 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(); var meta = form.Meta; if (meta == null) @@ -154,7 +154,7 @@ namespace MetadataPlugIn public string GetPluginName() { - return "CUETools DB Metadata Plugin V2.1.3"; + return "CUETools DB Metadata Plugin V2.1.4"; } public void ShowOptions() diff --git a/CUETools.CTDB.EACPlugin/Options.Designer.cs b/CUETools.CTDB.EACPlugin/Options.Designer.cs index 20315ea..d22a00a 100644 --- a/CUETools.CTDB.EACPlugin/Options.Designer.cs +++ b/CUETools.CTDB.EACPlugin/Options.Designer.cs @@ -51,7 +51,7 @@ namespace AudioDataPlugIn this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(182, 17); this.label1.TabIndex = 0; - this.label1.Text = "CUETools DB Plugin V2.1.3"; + this.label1.Text = "CUETools DB Plugin V2.1.4"; // // label2 // @@ -60,7 +60,7 @@ namespace AudioDataPlugIn this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(307, 42); this.label2.TabIndex = 1; - this.label2.Text = "Copyright (c) 2011 Gregory S. Chudov"; + this.label2.Text = "Copyright (c) 2011-12 Gregory S. Chudov"; // // linkLabel1 // diff --git a/CUETools.CTDB.EACPlugin/Plugin.cs b/CUETools.CTDB.EACPlugin/Plugin.cs index 5e0111e..a5e7e40 100644 --- a/CUETools.CTDB.EACPlugin/Plugin.cs +++ b/CUETools.CTDB.EACPlugin/Plugin.cs @@ -14,7 +14,7 @@ using CUETools.CTDB.EACPlugin; namespace AudioDataPlugIn { - [Guid("C02A1BF2-5C46-4990-80C2-78E8C395CB80"), + [Guid("C02A1BF2-5C46-4990-80C2-78E8C395CB80"), ClassInterface(ClassInterfaceType.None), ComSourceInterfaces(typeof(IAudioDataTransfer)), ] @@ -29,17 +29,17 @@ namespace AudioDataPlugIn int m_start_pos = 0, m_length = 0; bool m_test_mode = false; IMetadataLookup m_data = null; - CDImageLayout TOC; + CDImageLayout TOC; #if USEAR string ArId; #endif - AccurateRipVerify ar; - AccurateRipVerify arTest; - CUEToolsDB ctdb; - bool sequence_ok = true; - bool is_secure_mode; - bool is_offset_set; - string m_drivename; + AccurateRipVerify ar; + AccurateRipVerify arTest; + CUEToolsDB ctdb; + bool sequence_ok = true; + bool is_secure_mode; + bool is_offset_set; + string m_drivename; #if DEBUG StringWriter m_trace; #endif @@ -50,7 +50,7 @@ namespace AudioDataPlugIn // guid is used 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 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. @@ -95,7 +95,7 @@ namespace AudioDataPlugIn // the offset was setted by AccurateRip (so having a comparable // 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 m_data = data; @@ -103,39 +103,39 @@ namespace AudioDataPlugIn #if DEBUG m_trace = new StringWriter(); #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(); - for (int i = 0; i < m_data.NumberOfTracks; i++) - { - uint start = m_data.GetTrackStartPosition(i); - uint next = m_data.GetTrackEndPosition(i); - TOC.AddTrack(new CDTrack( - (uint)i + 1, - start, - next - start, - !m_data.GetTrackDataTrack(i), - m_data.GetTrackPreemphasis(i))); - } - TOC[1][0].Start = 0U; - ar = new AccurateRipVerify(TOC, null); - arTest = new AccurateRipVerify(TOC, null); - ctdb = new CUEToolsDB(TOC, null); + 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(); + for (int i = 0; i < m_data.NumberOfTracks; i++) + { + uint start = m_data.GetTrackStartPosition(i); + uint next = m_data.GetTrackEndPosition(i); + TOC.AddTrack(new CDTrack( + (uint)i + 1, + start, + next - start, + !m_data.GetTrackDataTrack(i), + 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 ArId = AccurateRipVerify.CalculateAccurateRipId(TOC); ar.ContactAccurateRip(ArId); #endif - ctdb.Init(ar); - this.sequence_ok = true; - this.m_start_pos = 0; - this.m_length = 0; - this.m_test_mode = false; - this.is_offset_set = aroffset; - this.is_secure_mode = mode >= 2; + ctdb.Init(ar); + this.sequence_ok = true; + this.m_start_pos = 0; + this.m_length = 0; + this.m_test_mode = false; + this.is_offset_set = aroffset; + this.is_secure_mode = mode >= 2; } // 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) { // Copy the current parameters to the objects variables - m_start_pos = startpos - (int)TOC[TOC.FirstAudio][0].Start; - m_length = length; - m_test_mode = testmode; - if (this.sequence_ok) - { - var thisAr = m_test_mode ? arTest : ar; + m_start_pos = startpos - (int)TOC[TOC.FirstAudio][0].Start; + m_length = length; + m_test_mode = testmode; + if (this.sequence_ok) + { + var thisAr = m_test_mode ? arTest : ar; if (this.m_start_pos * 588 != thisAr.Position) { if (thisAr.Position == 0 && this.m_start_pos == (int)TOC[TOC.FirstAudio].Pregap) @@ -173,7 +173,7 @@ namespace AudioDataPlugIn this.sequence_ok = false; } } - } + } } @@ -186,13 +186,13 @@ namespace AudioDataPlugIn public void TransferAudioData(Array audiodata) { - if (this.sequence_ok) - { - byte[] ad = (byte[])audiodata; - AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4); - var thisAr = m_test_mode ? arTest : ar; - thisAr.Write(buff); - } + if (this.sequence_ok) + { + byte[] ad = (byte[])audiodata; + AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4); + var thisAr = m_test_mode ? arTest : ar; + thisAr.Write(buff); + } } @@ -204,9 +204,9 @@ namespace AudioDataPlugIn public void TransferFinished() { - if (this.sequence_ok) - { - var thisAr = m_test_mode ? arTest : ar; + if (this.sequence_ok) + { + var thisAr = m_test_mode ? arTest : ar; if ((m_start_pos + m_length) * 588 != thisAr.Position) { #if DEBUG @@ -214,8 +214,8 @@ namespace AudioDataPlugIn #endif this.sequence_ok = false; } - } - } + } + } // 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! public string EndOfSession() { - StringWriter sw = new StringWriter(); - if (this.sequence_ok) - { + StringWriter sw = new StringWriter(); + if (this.sequence_ok) + { if (TOC.AudioLength * 588 != ar.Position) { #if DEBUG @@ -242,7 +242,7 @@ namespace AudioDataPlugIn #endif this.sequence_ok = false; } - } + } if (!this.sequence_ok) { #if DEBUG @@ -254,24 +254,25 @@ namespace AudioDataPlugIn #if DEBUG sw.Write(m_trace.ToString()); #endif - if (this.sequence_ok) - { - var form = new FormSubmitParity( - ctdb, - "EAC" + m_data.HostVersion + " CTDB 2.1.3", - m_drivename, + if (this.sequence_ok) + { #if USEAR - (int)ar.WorstConfidence() + 1, + int conf = (int)ar.WorstConfidence() + 1; #else - 1, + int conf = 1; #endif - (arTest.Position == 0 && this.is_secure_mode) || (arTest.Position != 0 && arTest.CRC32(0) == ar.CRC32(0)) ? 100 : 0, - m_data.AlbumArtist, - m_data.AlbumTitle); - form.ShowDialog(); - sw.WriteLine("[CTDB TOCID: {0}] {1}", - TOC.TOCID, - ctdb.DBStatus ?? "found"); + var form = new FormSubmitParity( + ctdb, + "EAC" + m_data.HostVersion + " CTDB 2.1.4", + m_drivename, + conf, + (arTest.Position == 0 && this.is_secure_mode) || (arTest.Position != 0 && arTest.CRC32(0) == ar.CRC32(0)) ? 100 : 0, + m_data.AlbumArtist, + m_data.AlbumTitle); + form.ShowDialog(); + sw.WriteLine("[CTDB TOCID: {0}] {1}", + TOC.TOCID, + ctdb.DBStatus ?? "found"); if (ctdb.SubStatus != null) sw.WriteLine("Submit result: " + ctdb.SubStatus); #if DEBUG @@ -281,24 +282,24 @@ namespace AudioDataPlugIn #endif int fixConf = -1; int myConf = 0; - if (ctdb.QueryExceptionStatus == WebExceptionStatus.Success) - { - foreach (DBEntry entry in ctdb.Entries) + if (ctdb.QueryExceptionStatus == WebExceptionStatus.Success) + { + foreach (DBEntry entry in ctdb.Entries) if (!entry.hasErrors) myConf += entry.conf; else if (entry.canRecover) fixConf = Math.Max(fixConf, entry.conf); - } + } 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 - ar.GenerateFullLog(sw, false, ArId); + ar.GenerateFullLog(sw, false, ArId); #endif - } - else - sw.WriteLine("Some tracks have been skipped"); - return sw.ToString(); + } + else + sw.WriteLine("Some tracks have been skipped"); + return sw.ToString(); } } } diff --git a/CUETools.CTDB.EACPlugin/Properties/AssemblyInfo.cs b/CUETools.CTDB.EACPlugin/Properties/AssemblyInfo.cs index 75a6da9..2ec5fcb 100644 --- a/CUETools.CTDB.EACPlugin/Properties/AssemblyInfo.cs +++ b/CUETools.CTDB.EACPlugin/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CUETools.CTDB.EACPlugin")] -[assembly: AssemblyCopyright("Copyright © Gregory S. Chudov 2011")] +[assembly: AssemblyCopyright("Copyright © Gregory S. Chudov 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs b/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs index 3179e63..a41f142 100644 --- a/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs +++ b/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs b/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs index 88da957..cc2080b 100644 --- a/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs +++ b/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs b/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs index 1b3e5d4..5ffd7f3 100644 --- a/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs +++ b/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs b/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs index 27a3765..6649ed1 100644 --- a/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs +++ b/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Codecs/Properties/AssemblyInfo.cs b/CUETools.Codecs/Properties/AssemblyInfo.cs index 6ae813f..4752765 100644 --- a/CUETools.Codecs/Properties/AssemblyInfo.cs +++ b/CUETools.Codecs/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Compression.Rar/Properties/AssemblyInfo.cs b/CUETools.Compression.Rar/Properties/AssemblyInfo.cs index 26a06ff..361190a 100644 --- a/CUETools.Compression.Rar/Properties/AssemblyInfo.cs +++ b/CUETools.Compression.Rar/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Compression.Zip/Properties/AssemblyInfo.cs b/CUETools.Compression.Zip/Properties/AssemblyInfo.cs index bd02e37..aa7a394 100644 --- a/CUETools.Compression.Zip/Properties/AssemblyInfo.cs +++ b/CUETools.Compression.Zip/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Compression/Properties/AssemblyInfo.cs b/CUETools.Compression/Properties/AssemblyInfo.cs index 5d00c36..28775ea 100644 --- a/CUETools.Compression/Properties/AssemblyInfo.cs +++ b/CUETools.Compression/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs b/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs index 6a61c0c..0797832 100644 --- a/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs +++ b/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs b/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs index 05eccc4..52df6f3 100644 --- a/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs +++ b/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Processor/CUESheet.cs b/CUETools.Processor/CUESheet.cs index 05e5e15..d7dae64 100644 --- a/CUETools.Processor/CUESheet.cs +++ b/CUETools.Processor/CUESheet.cs @@ -23,7 +23,7 @@ namespace CUETools.Processor { #region Fields - public readonly static string CUEToolsVersion = "2.1.2a"; + public readonly static string CUEToolsVersion = "2.1.4"; private bool _stop, _pause; private List _attributes; diff --git a/CUETools.Processor/Properties/AssemblyInfo.cs b/CUETools.Processor/Properties/AssemblyInfo.cs index 26436ab..4e0a4b8 100644 --- a/CUETools.Processor/Properties/AssemblyInfo.cs +++ b/CUETools.Processor/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Ripper.Console/Program.cs b/CUETools.Ripper.Console/Program.cs index 3cedaec..3279f50 100644 --- a/CUETools.Ripper.Console/Program.cs +++ b/CUETools.Ripper.Console/Program.cs @@ -89,7 +89,7 @@ namespace CUETools.ConsoleRipper static void Main(string[] args) { 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("the extent permitted by law. for details."); @@ -180,7 +180,7 @@ namespace CUETools.ConsoleRipper string ArId = AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC); var ctdb = new CUEToolsDB(audioSource.TOC, null); 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); CTDBResponseMeta meta = null; foreach (var imeta in ctdb.Metadata) diff --git a/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs b/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs index d6bd2e9..82c0722 100644 --- a/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs +++ b/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools.Ripper.SCSI/SCSIDrive.cs b/CUETools.Ripper.SCSI/SCSIDrive.cs index 2787a25..1a7dacd 100644 --- a/CUETools.Ripper.SCSI/SCSIDrive.cs +++ b/CUETools.Ripper.SCSI/SCSIDrive.cs @@ -1211,7 +1211,7 @@ namespace CUETools.Ripper.SCSI { 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; } } diff --git a/CUETools.Ripper/Properties/AssemblyInfo.cs b/CUETools.Ripper/Properties/AssemblyInfo.cs index 9e3d01c..c8c8ba0 100644 --- a/CUETools.Ripper/Properties/AssemblyInfo.cs +++ b/CUETools.Ripper/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools/Properties/AssemblyInfo.cs b/CUETools/Properties/AssemblyInfo.cs index 9254268..3001f30 100644 --- a/CUETools/Properties/AssemblyInfo.cs +++ b/CUETools/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.2.0")] -[assembly: AssemblyFileVersion("2.1.2.0")] +[assembly: AssemblyVersion("2.1.4.0")] +[assembly: AssemblyFileVersion("2.1.4.0")] diff --git a/CUETools/frmAbout.resx b/CUETools/frmAbout.resx index 1ad61bb..06b8831 100644 --- a/CUETools/frmAbout.resx +++ b/CUETools/frmAbout.resx @@ -270,7 +270,7 @@ hdcd.dll (c) Christopher Key 6 - Copyright 2008-2011 Gregory S. Chudov, gchudov@gmail.com + Copyright 2008-2012 Gregory S. Chudov, gchudov@gmail.com MiddleCenter diff --git a/CUETools/frmAbout.ru-RU.resx b/CUETools/frmAbout.ru-RU.resx index 3f4a013..bf5fb26 100644 --- a/CUETools/frmAbout.ru-RU.resx +++ b/CUETools/frmAbout.ru-RU.resx @@ -158,7 +158,7 @@ hdcd.dll (c) Christopher Key 309, 17 - Copyright 2008-2011 Григорий Чудов, gchudov@gmail.com + Copyright 2008-2012 Григорий Чудов, gchudov@gmail.com 439, 296 diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs index 266f538..d255cb7 100644 --- a/CUETools/frmCUETools.cs +++ b/CUETools/frmCUETools.cs @@ -599,7 +599,7 @@ namespace JDP { get { - return "CUETools 2.1.2"; + return "CUETools 2.1.4"; } } diff --git a/CUETools/frmCUETools.resx b/CUETools/frmCUETools.resx index 8d9c5ba..3db18db 100644 --- a/CUETools/frmCUETools.resx +++ b/CUETools/frmCUETools.resx @@ -271,7 +271,7 @@ fileSystemTreeView1 - CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null + CUEControls.FileSystemTreeView, CUEControls, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null grpInput @@ -2891,7 +2891,7 @@ 699, 537 - CUETools 2.1.2a + CUETools 2.1.4 toolStripStatusLabel1