aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read Lead-In's CD-Text.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-14 20:50:18 +00:00
parent 29cedae01f
commit 4c936a4e9d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -616,6 +616,18 @@ namespace DiscImageChef.Core.Devices.Dumping
firstTrackLastSession = session.Value.TrackDescriptors[0].TrackNumber; firstTrackLastSession = session.Value.TrackDescriptors[0].TrackNumber;
} }
} }
dumpLog.WriteLine("Reading CD-Text from Lead-In");
UpdateStatus?.Invoke("Reading CD-Text from Lead-In");
sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _);
if(!sense &&
CDTextOnLeadIn.Decode(cmdBuf).HasValue)
{
tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
mediaTags.Add(MediaTagType.CD_TEXT, tmpBuf);
}
} }
/// <summary>Dumps a compact disc</summary> /// <summary>Dumps a compact disc</summary>
@@ -644,8 +656,8 @@ namespace DiscImageChef.Core.Devices.Dumping
double minSpeed = double.MaxValue; double minSpeed = double.MaxValue;
uint blocksToRead = 64; uint blocksToRead = 64;
Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>(); Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>();
byte[] cmdBuf; byte[] cmdBuf = null;
byte[] senseBuf; byte[] senseBuf = null;
byte[] tmpBuf; byte[] tmpBuf;
MmcSubchannel supportedSubchannel = MmcSubchannel.Raw; MmcSubchannel supportedSubchannel = MmcSubchannel.Raw;
TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type
@@ -704,18 +716,6 @@ namespace DiscImageChef.Core.Devices.Dumping
dskType = MediaType.CDV; dskType = MediaType.CDV;
} }
dumpLog.WriteLine("Reading CD-Text from Lead-In");
UpdateStatus?.Invoke("Reading CD-Text from Lead-In");
sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _);
if(!sense)
if(CDTextOnLeadIn.Decode(cmdBuf).HasValue)
{
tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
mediaTags.Add(MediaTagType.CD_TEXT, tmpBuf);
}
// TODO: Add other detectors here // TODO: Add other detectors here
dumpLog.WriteLine("Detecting disc type..."); dumpLog.WriteLine("Detecting disc type...");
UpdateStatus?.Invoke("Detecting disc type..."); UpdateStatus?.Invoke("Detecting disc type...");