This commit is contained in:
chudov
2012-04-17 01:22:49 +00:00
parent 3a50c03cef
commit 8e61e9b54f
19 changed files with 61 additions and 9 deletions

View File

@@ -91,7 +91,7 @@ namespace CUETools.Processor
encodeWhenZeroOffset = false;
fixOffset = false;
noUnverifiedOutput = false;
writeArTagsOnEncode = true;
writeArTagsOnEncode = false;
writeArLogOnConvert = true;
writeArTagsOnVerify = false;
writeArLogOnVerify = false;
@@ -402,7 +402,7 @@ return processor.Go();
encodeWhenZeroOffset = sr.LoadBoolean("ArEncodeWhenZeroOffset") ?? false;
noUnverifiedOutput = sr.LoadBoolean("ArNoUnverifiedOutput") ?? false;
fixOffset = sr.LoadBoolean("ArFixOffset") ?? false;
writeArTagsOnEncode = sr.LoadBoolean("ArWriteCRC") ?? true;
writeArTagsOnEncode = sr.LoadBoolean("ArWriteCRC") ?? writeArTagsOnEncode;
writeArLogOnConvert = sr.LoadBoolean("ArWriteLog") ?? true;
writeArTagsOnVerify = sr.LoadBoolean("ArWriteTagsOnVerify") ?? false;
writeArLogOnVerify = sr.LoadBoolean("ArWriteLogOnVerify") ?? false;

View File

@@ -84,5 +84,8 @@ namespace CUETools.Processor
[DefaultValue(false), Category("CTDB"), DisplayName("Detailed log")]
public bool DetailedCTDBLog { get; set; }
[DefaultValue(false), Category("Tagging"), DisplayName("Use id3v2.4 instead of id3v2.3")]
public bool UseId3v24 { get; set; }
}
}

View File

@@ -313,7 +313,7 @@ namespace CUETools.Processor
this.Tracks[i].Comment = cdEntry.track[i + firstAudio].extra ?? "";
}
}
}
}
private static string FreedbToEncoding(Encoding iso, Encoding def, ref bool changed, ref bool error, string s)
{

View File

@@ -2508,6 +2508,8 @@ namespace CUETools.Processor
if (!_isCD)
throw new Exception("Not a cd");
_ripper.DetectGaps();
_arTestVerify = new AccurateRipVerify(_toc, proxy);
var buff = new AudioBuffer(AudioPCMConfig.RedBook, 0x10000);
while (_ripper.Read(buff, -1) != 0)
@@ -3902,7 +3904,17 @@ namespace CUETools.Processor
}
if (sourceInfo.Offset != 0)
audioSource.Position = sourceInfo.Offset;
{
try
{
audioSource.Position = sourceInfo.Offset;
}
catch(Exception ex)
{
audioSource.Close();
throw ex;
}
}
//if (!(audioSource is AudioPipe) && !(audioSource is UserDefinedReader) && _config.separateDecodingThread)
if (!(audioSource is AudioPipe) && pipe)

View File

@@ -99,6 +99,10 @@ namespace CUETools.Processor
return;
}
value = value.Replace('\n', ' ').Replace('\r', ' ').Replace('"', '\'');
if (value.Length > 1024)
value = value.Substring(0, 1021) + "...";
CUELine line = General.FindCUELine(list, command, command2);
if (line == null)
{

View File

@@ -30,6 +30,7 @@ namespace CUETools.Processor
if (fileInfo is TagLib.Mpeg.AudioFile || (fileInfo is TagLib.UserDefined.File && (fileInfo as TagLib.UserDefined.File).Tagger == CUEToolsTagger.ID3v2))
{
var id3v2 = (TagLib.Id3v2.Tag)fileInfo.GetTag(TagLib.TagTypes.Id3v2, true);
id3v2.Version = (byte) (config.advanced.UseId3v24 ? 4 : 3);
foreach (string tag in tags.AllKeys)
{
var frame = TagLib.Id3v2.UserTextInformationFrame.Get(id3v2, tag, true);