diff --git a/CUETools/Main.cs b/CUETools/Main.cs
index 8edd270..0448dc7 100644
--- a/CUETools/Main.cs
+++ b/CUETools/Main.cs
@@ -197,7 +197,7 @@ namespace JDP {
public uint fixWhenPercent;
public uint encodeWhenConfidence;
public uint encodeWhenPercent;
- public bool writeCRC;
+ public bool writeArTags;
public bool writeArLog;
public bool fixOffset;
public bool noUnverifiedOutput;
@@ -225,7 +225,7 @@ namespace JDP {
encodeWhenPercent = 100;
fixOffset = true;
noUnverifiedOutput = false;
- writeCRC = true;
+ writeArTags = true;
writeArLog = true;
autoCorrectFilenames = true;
@@ -252,7 +252,7 @@ namespace JDP {
sw.Save("ArEncodeWhenPercent", encodeWhenPercent.ToString());
sw.Save("ArNoUnverifiedOutput", noUnverifiedOutput ? "1" : "0");
sw.Save("ArFixOffset", fixOffset ? "1" : "0");
- sw.Save("ArWriteCRC", writeCRC ? "1" : "0");
+ sw.Save("ArWriteCRC", writeArTags ? "1" : "0");
sw.Save("ArWriteLog", writeArLog ? "1" : "0");
sw.Save("AutoCorrectFilenames", autoCorrectFilenames ? "1" : "0");
@@ -301,7 +301,7 @@ namespace JDP {
fixOffset = (val != null) ? (val != "0") : true;
val = sr.Load("ArWriteCRC");
- writeCRC = (val != null) ? (val != "0") : true;
+ writeArTags = (val != null) ? (val != "0") : true;
val = sr.Load("ArWriteLog");
writeArLog = (val != null) ? (val != "0") : true;
@@ -1484,11 +1484,12 @@ namespace JDP {
if (!SkipOutput)
{
bool verifyOnly = _accurateRip && !_accurateOffset;
- if (!verifyOnly && style != CUEStyle.SingleFileWithCUE)
+ if (!verifyOnly)
{
if (!Directory.Exists(dir))
Directory.CreateDirectory(dir);
- Write(_cuePath, style);
+ if (style != CUEStyle.SingleFileWithCUE)
+ Write(_cuePath, style);
}
WriteAudioFilesPass(dir, style, statusDel, destPaths, destLengths, htoaToFile, verifyOnly);
}
@@ -1496,7 +1497,7 @@ namespace JDP {
if (_accurateRip)
{
statusDel((string)"Generating AccurateRip report...", 0, 0);
- if (!_accurateOffset && _config.writeCRC && _writeOffset == 0)
+ if (!_accurateOffset && _config.writeArTags && _writeOffset == 0)
{
uint tracksMatch;
int bestOffset;
@@ -1614,9 +1615,6 @@ namespace JDP {
}
destTags.Remove ("CUESHEET");
- destTags.Remove ("LOG");
- destTags.Remove ("LOGFILE");
- destTags.Remove ("EACLOG");
CleanupTags(destTags, "ACCURATERIP");
CleanupTags(destTags, "REPLAYGAIN");
@@ -1627,10 +1625,24 @@ namespace JDP {
destTags.Add("CUESHEET", sw.ToString());
sw.Close();
}
- if (_eacLog != null)
- destTags.Add("LOG", _eacLog);
+ else
+ {
+ string[] keys = destTags.AllKeys;
+ for (int i = 0; i < keys.Length; i++)
+ if (keys[i].ToLower().StartsWith("cue_track"))
+ destTags.Remove(keys[i]);
+ }
- if (_accurateRipId != null && _config.writeCRC)
+ if (_config.embedLog)
+ {
+ destTags.Remove("LOG");
+ destTags.Remove("LOGFILE");
+ destTags.Remove("EACLOG");
+ if (_eacLog != null)
+ destTags.Add("LOG", _eacLog);
+ }
+
+ if (_accurateRipId != null && _config.writeArTags)
{
if (style == CUEStyle.SingleFileWithCUE && _accurateOffset && accResult == HttpStatusCode.OK)
GenerateAccurateRipTags(destTags, _writeOffset, _writeOffset, -1);
@@ -1729,7 +1741,7 @@ namespace JDP {
if (destTags.Get("ARTIST") == null && "" != track.Artist)
destTags.Add("ARTIST", track.Artist);
destTags.Add("TRACKNUMBER", iTrack.ToString());
- if (_accurateRipId != null && _config.writeCRC)
+ if (_accurateRipId != null && _config.writeArTags)
{
if (_accurateOffset && accResult == HttpStatusCode.OK)
GenerateAccurateRipTags(destTags, _writeOffset, _writeOffset, iTrack);
diff --git a/CUETools/frmSettings.Designer.cs b/CUETools/frmSettings.Designer.cs
index 51e6f56..1e59a8a 100644
--- a/CUETools/frmSettings.Designer.cs
+++ b/CUETools/frmSettings.Designer.cs
@@ -36,12 +36,20 @@ namespace JDP {
this.chkFLACVerify = new System.Windows.Forms.CheckBox();
this.btnOK = new System.Windows.Forms.Button();
this.grpWavPack = new System.Windows.Forms.GroupBox();
+ this.numWVExtraMode = new System.Windows.Forms.NumericUpDown();
this.chkWVExtraMode = new System.Windows.Forms.CheckBox();
this.rbWVVeryHigh = new System.Windows.Forms.RadioButton();
this.rbWVHigh = new System.Windows.Forms.RadioButton();
this.rbWVNormal = new System.Windows.Forms.RadioButton();
this.rbWVFast = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.chkArFixOffset = new System.Windows.Forms.CheckBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.numEncodeWhenPercent = new System.Windows.Forms.NumericUpDown();
+ this.label3 = new System.Windows.Forms.Label();
+ this.numEncodeWhenConfidence = new System.Windows.Forms.NumericUpDown();
+ this.chkArNoUnverifiedAudio = new System.Windows.Forms.CheckBox();
+ this.chkArSaveLog = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.numFixWhenConfidence = new System.Windows.Forms.NumericUpDown();
this.label1 = new System.Windows.Forms.Label();
@@ -57,27 +65,20 @@ namespace JDP {
this.lblTrackFilenameFormat = new System.Windows.Forms.Label();
this.lblSingleFilenameFormat = new System.Windows.Forms.Label();
this.txtSingleFilenameFormat = new System.Windows.Forms.TextBox();
- this.chkArSaveLog = new System.Windows.Forms.CheckBox();
- this.chkArNoUnverifiedAudio = new System.Windows.Forms.CheckBox();
- this.numWVExtraMode = new System.Windows.Forms.NumericUpDown();
- this.numEncodeWhenConfidence = new System.Windows.Forms.NumericUpDown();
- this.label3 = new System.Windows.Forms.Label();
- this.numEncodeWhenPercent = new System.Windows.Forms.NumericUpDown();
- this.label4 = new System.Windows.Forms.Label();
- this.chkArFixOffset = new System.Windows.Forms.CheckBox();
+ this.chkEmbedLog = new System.Windows.Forms.CheckBox();
btnCancel = new System.Windows.Forms.Button();
this.grpGeneral.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
this.grpFLAC.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).BeginInit();
this.grpWavPack.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).BeginInit();
this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenPercent)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenConfidence)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenPercent)).BeginInit();
this.grpAudioFilenames.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenPercent)).BeginInit();
this.SuspendLayout();
//
// btnCancel
@@ -92,13 +93,14 @@ namespace JDP {
//
// grpGeneral
//
+ this.grpGeneral.Controls.Add(this.chkEmbedLog);
this.grpGeneral.Controls.Add(this.numericWriteOffset);
this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames);
this.grpGeneral.Controls.Add(this.chkPreserveHTOA);
this.grpGeneral.Controls.Add(this.lblWriteOffset);
this.grpGeneral.Location = new System.Drawing.Point(8, 4);
this.grpGeneral.Name = "grpGeneral";
- this.grpGeneral.Size = new System.Drawing.Size(246, 128);
+ this.grpGeneral.Size = new System.Drawing.Size(246, 144);
this.grpGeneral.TabIndex = 0;
this.grpGeneral.TabStop = false;
this.grpGeneral.Text = "General";
@@ -123,17 +125,18 @@ namespace JDP {
//
// chkAutoCorrectFilenames
//
- this.chkAutoCorrectFilenames.Location = new System.Drawing.Point(12, 68);
+ this.chkAutoCorrectFilenames.Location = new System.Drawing.Point(12, 61);
this.chkAutoCorrectFilenames.Name = "chkAutoCorrectFilenames";
- this.chkAutoCorrectFilenames.Size = new System.Drawing.Size(232, 36);
+ this.chkAutoCorrectFilenames.Size = new System.Drawing.Size(232, 17);
this.chkAutoCorrectFilenames.TabIndex = 3;
- this.chkAutoCorrectFilenames.Text = "Preprocess with filename corrector if unable to locate audio files";
+ this.chkAutoCorrectFilenames.Text = "Locate audio files if missing";
+ this.toolTip1.SetToolTip(this.chkAutoCorrectFilenames, "Preprocess with filename corrector if unable to locate audio files");
this.chkAutoCorrectFilenames.UseVisualStyleBackColor = true;
//
// chkPreserveHTOA
//
this.chkPreserveHTOA.AutoSize = true;
- this.chkPreserveHTOA.Location = new System.Drawing.Point(12, 48);
+ this.chkPreserveHTOA.Location = new System.Drawing.Point(12, 44);
this.chkPreserveHTOA.Name = "chkPreserveHTOA";
this.chkPreserveHTOA.Size = new System.Drawing.Size(229, 17);
this.chkPreserveHTOA.TabIndex = 2;
@@ -223,6 +226,28 @@ namespace JDP {
this.grpWavPack.TabIndex = 2;
this.grpWavPack.TabStop = false;
this.grpWavPack.Text = "WavPack";
+ //
+ // numWVExtraMode
+ //
+ this.numWVExtraMode.Location = new System.Drawing.Point(212, 19);
+ this.numWVExtraMode.Maximum = new decimal(new int[] {
+ 6,
+ 0,
+ 0,
+ 0});
+ this.numWVExtraMode.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numWVExtraMode.Name = "numWVExtraMode";
+ this.numWVExtraMode.Size = new System.Drawing.Size(29, 21);
+ this.numWVExtraMode.TabIndex = 5;
+ this.numWVExtraMode.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
//
// chkWVExtraMode
//
@@ -298,6 +323,103 @@ namespace JDP {
this.groupBox1.TabStop = false;
this.groupBox1.Text = "AccurateRip";
//
+ // chkArFixOffset
+ //
+ this.chkArFixOffset.AutoSize = true;
+ this.chkArFixOffset.Checked = true;
+ this.chkArFixOffset.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkArFixOffset.Location = new System.Drawing.Point(12, 105);
+ this.chkArFixOffset.Name = "chkArFixOffset";
+ this.chkArFixOffset.Size = new System.Drawing.Size(81, 17);
+ this.chkArFixOffset.TabIndex = 12;
+ this.chkArFixOffset.Text = "Fix offset if";
+ this.chkArFixOffset.UseVisualStyleBackColor = true;
+ this.chkArFixOffset.CheckedChanged += new System.EventHandler(this.chkArFixOffset_CheckedChanged);
+ //
+ // label4
+ //
+ this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(41, 68);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(121, 13);
+ this.label4.TabIndex = 11;
+ this.label4.Text = "% of verified tracks >=";
+ //
+ // numEncodeWhenPercent
+ //
+ this.numEncodeWhenPercent.Increment = new decimal(new int[] {
+ 5,
+ 0,
+ 0,
+ 0});
+ this.numEncodeWhenPercent.Location = new System.Drawing.Point(168, 66);
+ this.numEncodeWhenPercent.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numEncodeWhenPercent.Name = "numEncodeWhenPercent";
+ this.numEncodeWhenPercent.Size = new System.Drawing.Size(38, 21);
+ this.numEncodeWhenPercent.TabIndex = 10;
+ this.numEncodeWhenPercent.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(62, 89);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(101, 13);
+ this.label3.TabIndex = 9;
+ this.label3.Text = "with confidence >=";
+ //
+ // numEncodeWhenConfidence
+ //
+ this.numEncodeWhenConfidence.Location = new System.Drawing.Point(168, 87);
+ this.numEncodeWhenConfidence.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numEncodeWhenConfidence.Name = "numEncodeWhenConfidence";
+ this.numEncodeWhenConfidence.Size = new System.Drawing.Size(38, 21);
+ this.numEncodeWhenConfidence.TabIndex = 8;
+ this.numEncodeWhenConfidence.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
+ // chkArNoUnverifiedAudio
+ //
+ this.chkArNoUnverifiedAudio.AutoSize = true;
+ this.chkArNoUnverifiedAudio.Checked = true;
+ this.chkArNoUnverifiedAudio.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkArNoUnverifiedAudio.Location = new System.Drawing.Point(12, 44);
+ this.chkArNoUnverifiedAudio.Name = "chkArNoUnverifiedAudio";
+ this.chkArNoUnverifiedAudio.Size = new System.Drawing.Size(93, 17);
+ this.chkArNoUnverifiedAudio.TabIndex = 7;
+ this.chkArNoUnverifiedAudio.Text = "Encode only if";
+ this.chkArNoUnverifiedAudio.UseVisualStyleBackColor = true;
+ this.chkArNoUnverifiedAudio.CheckedChanged += new System.EventHandler(this.chkArNoUnverifiedAudio_CheckedChanged);
+ //
+ // chkArSaveLog
+ //
+ this.chkArSaveLog.AutoSize = true;
+ this.chkArSaveLog.Checked = true;
+ this.chkArSaveLog.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkArSaveLog.Location = new System.Drawing.Point(94, 21);
+ this.chkArSaveLog.Name = "chkArSaveLog";
+ this.chkArSaveLog.Size = new System.Drawing.Size(69, 17);
+ this.chkArSaveLog.TabIndex = 6;
+ this.chkArSaveLog.Text = "Write log";
+ this.chkArSaveLog.UseVisualStyleBackColor = true;
+ //
// label2
//
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -388,9 +510,9 @@ namespace JDP {
this.grpAudioFilenames.Controls.Add(this.lblTrackFilenameFormat);
this.grpAudioFilenames.Controls.Add(this.lblSingleFilenameFormat);
this.grpAudioFilenames.Controls.Add(this.txtSingleFilenameFormat);
- this.grpAudioFilenames.Location = new System.Drawing.Point(12, 138);
+ this.grpAudioFilenames.Location = new System.Drawing.Point(12, 150);
this.grpAudioFilenames.Name = "grpAudioFilenames";
- this.grpAudioFilenames.Size = new System.Drawing.Size(246, 192);
+ this.grpAudioFilenames.Size = new System.Drawing.Size(246, 180);
this.grpAudioFilenames.TabIndex = 6;
this.grpAudioFilenames.TabStop = false;
this.grpAudioFilenames.Text = "Audio Filenames";
@@ -478,124 +600,16 @@ namespace JDP {
this.txtSingleFilenameFormat.TabIndex = 2;
this.txtSingleFilenameFormat.Text = "%F";
//
- // chkArSaveLog
+ // chkEmbedLog
//
- this.chkArSaveLog.AutoSize = true;
- this.chkArSaveLog.Checked = true;
- this.chkArSaveLog.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkArSaveLog.Location = new System.Drawing.Point(94, 21);
- this.chkArSaveLog.Name = "chkArSaveLog";
- this.chkArSaveLog.Size = new System.Drawing.Size(69, 17);
- this.chkArSaveLog.TabIndex = 6;
- this.chkArSaveLog.Text = "Write log";
- this.chkArSaveLog.UseVisualStyleBackColor = true;
- //
- // chkArNoUnverifiedAudio
- //
- this.chkArNoUnverifiedAudio.AutoSize = true;
- this.chkArNoUnverifiedAudio.Checked = true;
- this.chkArNoUnverifiedAudio.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkArNoUnverifiedAudio.Location = new System.Drawing.Point(12, 44);
- this.chkArNoUnverifiedAudio.Name = "chkArNoUnverifiedAudio";
- this.chkArNoUnverifiedAudio.Size = new System.Drawing.Size(93, 17);
- this.chkArNoUnverifiedAudio.TabIndex = 7;
- this.chkArNoUnverifiedAudio.Text = "Encode only if";
- this.chkArNoUnverifiedAudio.UseVisualStyleBackColor = true;
- this.chkArNoUnverifiedAudio.CheckedChanged += new System.EventHandler(this.chkArNoUnverifiedAudio_CheckedChanged);
- //
- // numWVExtraMode
- //
- this.numWVExtraMode.Location = new System.Drawing.Point(212, 19);
- this.numWVExtraMode.Maximum = new decimal(new int[] {
- 6,
- 0,
- 0,
- 0});
- this.numWVExtraMode.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.numWVExtraMode.Name = "numWVExtraMode";
- this.numWVExtraMode.Size = new System.Drawing.Size(29, 21);
- this.numWVExtraMode.TabIndex = 5;
- this.numWVExtraMode.Value = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- //
- // numEncodeWhenConfidence
- //
- this.numEncodeWhenConfidence.Location = new System.Drawing.Point(168, 87);
- this.numEncodeWhenConfidence.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.numEncodeWhenConfidence.Name = "numEncodeWhenConfidence";
- this.numEncodeWhenConfidence.Size = new System.Drawing.Size(38, 21);
- this.numEncodeWhenConfidence.TabIndex = 8;
- this.numEncodeWhenConfidence.Value = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- //
- // label3
- //
- this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(62, 89);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(101, 13);
- this.label3.TabIndex = 9;
- this.label3.Text = "with confidence >=";
- //
- // numEncodeWhenPercent
- //
- this.numEncodeWhenPercent.Increment = new decimal(new int[] {
- 5,
- 0,
- 0,
- 0});
- this.numEncodeWhenPercent.Location = new System.Drawing.Point(168, 66);
- this.numEncodeWhenPercent.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.numEncodeWhenPercent.Name = "numEncodeWhenPercent";
- this.numEncodeWhenPercent.Size = new System.Drawing.Size(38, 21);
- this.numEncodeWhenPercent.TabIndex = 10;
- this.numEncodeWhenPercent.Value = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- //
- // label4
- //
- this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(41, 68);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(121, 13);
- this.label4.TabIndex = 11;
- this.label4.Text = "% of verified tracks >=";
- //
- // chkArFixOffset
- //
- this.chkArFixOffset.AutoSize = true;
- this.chkArFixOffset.Checked = true;
- this.chkArFixOffset.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkArFixOffset.Location = new System.Drawing.Point(12, 105);
- this.chkArFixOffset.Name = "chkArFixOffset";
- this.chkArFixOffset.Size = new System.Drawing.Size(81, 17);
- this.chkArFixOffset.TabIndex = 12;
- this.chkArFixOffset.Text = "Fix offset if";
- this.chkArFixOffset.UseVisualStyleBackColor = true;
- this.chkArFixOffset.CheckedChanged += new System.EventHandler(this.chkArFixOffset_CheckedChanged);
+ this.chkEmbedLog.AutoSize = true;
+ this.chkEmbedLog.Location = new System.Drawing.Point(12, 78);
+ this.chkEmbedLog.Name = "chkEmbedLog";
+ this.chkEmbedLog.Size = new System.Drawing.Size(134, 17);
+ this.chkEmbedLog.TabIndex = 6;
+ this.chkEmbedLog.Text = "Embed log file as a tag";
+ this.toolTip1.SetToolTip(this.chkEmbedLog, "File should be in the same directory as source file and have a .log extension");
+ this.chkEmbedLog.UseVisualStyleBackColor = true;
//
// frmSettings
//
@@ -627,15 +641,15 @@ namespace JDP {
((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).EndInit();
this.grpWavPack.ResumeLayout(false);
this.grpWavPack.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).EndInit();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenPercent)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenConfidence)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenPercent)).EndInit();
this.grpAudioFilenames.ResumeLayout(false);
this.grpAudioFilenames.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenPercent)).EndInit();
this.ResumeLayout(false);
}
@@ -682,6 +696,7 @@ namespace JDP {
private System.Windows.Forms.NumericUpDown numEncodeWhenPercent;
private System.Windows.Forms.CheckBox chkArFixOffset;
private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.CheckBox chkEmbedLog;
}
}
\ No newline at end of file
diff --git a/CUETools/frmSettings.cs b/CUETools/frmSettings.cs
index 7ef20d4..aad3da9 100644
--- a/CUETools/frmSettings.cs
+++ b/CUETools/frmSettings.cs
@@ -24,7 +24,7 @@ namespace JDP {
numEncodeWhenConfidence.Value = _config.encodeWhenConfidence;
numEncodeWhenPercent.Value = _config.encodeWhenPercent;
chkFLACVerify.Checked = _config.flacVerify;
- chkArAddCRCs.Checked = _config.writeCRC;
+ chkArAddCRCs.Checked = _config.writeArTags;
if (_config.wvCompressionMode == 0) rbWVFast.Checked = true;
if (_config.wvCompressionMode == 1) rbWVNormal.Checked = true;
if (_config.wvCompressionMode == 2) rbWVHigh.Checked = true;
@@ -41,6 +41,7 @@ namespace JDP {
chkArSaveLog.Checked = _config.writeArLog;
chkArNoUnverifiedAudio.Checked = _config.noUnverifiedOutput;
chkArFixOffset.Checked = _config.fixOffset;
+ chkEmbedLog.Checked = _config.embedLog;
}
private void frmSettings_FormClosing(object sender, FormClosingEventArgs e) {
@@ -76,7 +77,7 @@ namespace JDP {
_config.encodeWhenPercent = (uint)numEncodeWhenPercent.Value;
_config.encodeWhenConfidence = (uint)numEncodeWhenConfidence.Value;
_config.flacVerify = chkFLACVerify.Checked;
- _config.writeCRC = chkArAddCRCs.Checked;
+ _config.writeArTags = chkArAddCRCs.Checked;
if (rbWVFast.Checked) _config.wvCompressionMode = 0;
else if (rbWVHigh.Checked) _config.wvCompressionMode = 2;
else if (rbWVVeryHigh.Checked) _config.wvCompressionMode = 3;
@@ -92,6 +93,7 @@ namespace JDP {
_config.writeArLog = chkArSaveLog.Checked;
_config.noUnverifiedOutput = chkArNoUnverifiedAudio.Checked;
_config.fixOffset = chkArFixOffset.Checked;
+ _config.embedLog = chkEmbedLog.Checked;
}
private void chkArFixOffset_CheckedChanged(object sender, EventArgs e)
diff --git a/CUETools/frmSettings.resx b/CUETools/frmSettings.resx
index c41c4d2..1182b16 100644
--- a/CUETools/frmSettings.resx
+++ b/CUETools/frmSettings.resx
@@ -126,4 +126,7 @@
17, 17
+
+ 17, 17
+
\ No newline at end of file
diff --git a/MAC_SDK/Decompress/Sample 2/Sample 2.cpp b/MAC_SDK/Decompress/Sample 2/Sample 2.cpp
index ba977b7..ff28883 100644
--- a/MAC_SDK/Decompress/Sample 2/Sample 2.cpp
+++ b/MAC_SDK/Decompress/Sample 2/Sample 2.cpp
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
///////////////////////////////////////////////////////////////////////////////
// open the APE file
///////////////////////////////////////////////////////////////////////////////
- IAPEDecompress * pAPEDecompress = CreateIAPEDecompress(L"E:\\Music\\Babylon 5\\Episodic CDs\\Babylon 5 (1997, River Of Souls, APE) - Christopher Franke\\01 - Suite 1.ape" , &nRetVal);
+ IAPEDecompress * pAPEDecompress = CreateIAPEDecompress(L"E:\\Music\\Steve Hackett\\Steve Hackett - Wild Orchids (2006)\\Steve Hackett - Wild Orchids (2006).ape" , &nRetVal);
if (pAPEDecompress == NULL)
{
printf("Error opening APE file (error code: %d)\r\n", nRetVal);
diff --git a/MAC_SDK/Decompress/Sample 2/Sample 2.vcproj b/MAC_SDK/Decompress/Sample 2/Sample 2.vcproj
index 96deb6c..c7e6ea4 100644
--- a/MAC_SDK/Decompress/Sample 2/Sample 2.vcproj
+++ b/MAC_SDK/Decompress/Sample 2/Sample 2.vcproj
@@ -4,6 +4,7 @@
Version="8,00"
Name="Sample 2"
ProjectGUID="{E7B72EF2-1C5A-45EF-BA35-6094BCF560B1}"
+ RootNamespace="Sample 2"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
capacity_by_order > 0 || (0 == object->parameters && 0 == object->raw_bits));
if(object->capacity_by_order < max_partition_order) {
- if(0 == (object->parameters = (unsigned*)realloc(object->parameters, sizeof(unsigned)*(1 << max_partition_order))))
+ if(0 == (object->parameters = (unsigned*)realloc(object->parameters, sizeof(unsigned) << max_partition_order)))
return false;
- if(0 == (object->raw_bits = (unsigned*)realloc(object->raw_bits, sizeof(unsigned)*(1 << max_partition_order))))
+ if(0 == (object->raw_bits = (unsigned*)realloc(object->raw_bits, sizeof(unsigned) << max_partition_order)))
return false;
- memset(object->raw_bits, 0, sizeof(unsigned)*(1 << max_partition_order));
+ memset(object->raw_bits, 0, sizeof(unsigned) << max_partition_order);
object->capacity_by_order = max_partition_order;
}
diff --git a/flac/src/libFLAC/ia32/bitreader_asm.obj b/flac/src/libFLAC/ia32/bitreader_asm.obj
index fcfff60..cdcef89 100644
Binary files a/flac/src/libFLAC/ia32/bitreader_asm.obj and b/flac/src/libFLAC/ia32/bitreader_asm.obj differ
diff --git a/flac/src/libFLAC/ia32/cpu_asm.obj b/flac/src/libFLAC/ia32/cpu_asm.obj
index c2a0513..c8bb15f 100644
Binary files a/flac/src/libFLAC/ia32/cpu_asm.obj and b/flac/src/libFLAC/ia32/cpu_asm.obj differ
diff --git a/flac/src/libFLAC/ia32/fixed_asm.obj b/flac/src/libFLAC/ia32/fixed_asm.obj
index 05d61a0..b8d4bab 100644
Binary files a/flac/src/libFLAC/ia32/fixed_asm.obj and b/flac/src/libFLAC/ia32/fixed_asm.obj differ
diff --git a/flac/src/libFLAC/ia32/lpc_asm.obj b/flac/src/libFLAC/ia32/lpc_asm.obj
index f91ea46..92861b0 100644
Binary files a/flac/src/libFLAC/ia32/lpc_asm.obj and b/flac/src/libFLAC/ia32/lpc_asm.obj differ
diff --git a/flac/src/libFLAC/ia32/stream_encoder_asm.obj b/flac/src/libFLAC/ia32/stream_encoder_asm.obj
index aebec11..e463c22 100644
Binary files a/flac/src/libFLAC/ia32/stream_encoder_asm.obj and b/flac/src/libFLAC/ia32/stream_encoder_asm.obj differ
diff --git a/flac/src/libFLAC/libFLAC_static.vcproj b/flac/src/libFLAC/libFLAC_static.vcproj
index 9739873..167317c 100644
--- a/flac/src/libFLAC/libFLAC_static.vcproj
+++ b/flac/src/libFLAC/libFLAC_static.vcproj
@@ -290,11 +290,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>