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

Fix detection of CD-i discs.

Browse Source 
Do not take as decoded data that has merely returned the SCSI data length header.
This commit is contained in:
Natalia Portillo
2020-03-06 19:24:41 +00:00
parent be9ee4bd8e
commit b14ee9bfc3
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Aaru.Core/Media/Detection/MMC.cs
View File

@@ -299,26 +299,29 @@ namespace Aaru.Core.Media.Detection
}
}
if(hasDataTrack &&
hasAudioTrack &&
allFirstSessionTracksAreAudio &&
sessions == 2)
mediaType = MediaType.CDPLUS;
if(mediaType != MediaType.CDI)
{
if(hasDataTrack &&
hasAudioTrack &&
allFirstSessionTracksAreAudio &&
sessions == 2)
mediaType = MediaType.CDPLUS;
if(!hasDataTrack &&
hasAudioTrack &&
sessions == 1)
mediaType = MediaType.CDDA;
if(!hasDataTrack &&
hasAudioTrack &&
sessions == 1)
mediaType = MediaType.CDDA;
if(hasDataTrack &&
!hasAudioTrack &&
sessions == 1)
mediaType = MediaType.CDROM;
if(hasDataTrack &&
!hasAudioTrack &&
sessions == 1)
mediaType = MediaType.CDROM;
if(hasVideoTrack &&
!hasDataTrack &&
sessions == 1)
mediaType = MediaType.CDV;
if(hasVideoTrack &&
!hasDataTrack &&
sessions == 1)
mediaType = MediaType.CDV;
}
if((mediaType == MediaType.CD || mediaType == MediaType.CDROM) && hasDataTrack)
{

8
Aaru.Core/Media/Info/ScsiInfo.cs
View File

@@ -1124,7 +1124,7 @@ namespace Aaru.Core.Media.Info
AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Session info\n{0}",
Sense.PrettifySense(senseBuf));
}
else
else if(cmdBuf.Length > 4)
{
Session = cmdBuf;
DecodedSession = Decoders.CD.Session.Decode(cmdBuf);
@@ -1143,7 +1143,7 @@ namespace Aaru.Core.Media.Info
AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Raw TOC\n{0}",
Sense.PrettifySense(senseBuf));
}
else
else if(cmdBuf.Length > 4)
{
RawToc = cmdBuf;
@@ -1155,7 +1155,7 @@ namespace Aaru.Core.Media.Info
if(sense)
AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: PMA\n{0}",
Sense.PrettifySense(senseBuf));
else
else if(cmdBuf.Length > 4)
Pma = cmdBuf;
sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _);
@@ -1165,7 +1165,7 @@ namespace Aaru.Core.Media.Info
AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: CD-TEXT\n{0}",
Sense.PrettifySense(senseBuf));
}
else
else if(cmdBuf.Length > 4)
{
CdTextLeadIn = cmdBuf;
DecodedCdTextLeadIn = CDTextOnLeadIn.Decode(cmdBuf);