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

Merge pull request #415 from FakeShemp/patch-5

Browse Source 
Allow for CDs to have subchannel r-w filled entirely with 0xFF
This commit is contained in:
Natalia Portillo
2020-10-16 23:51:01 +01:00
committed by GitHub
parent b3c578074d 645a6caae3
commit 425097b3b6
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Aaru.Core/Logging/SubchannelLog.cs
View File

@@ -164,12 +164,18 @@ namespace Aaru.Core.Logging
if(raw)
for(uint i = 12 * block; i < (12 * block) + 12; i++)
{
if(r[i] == 0 &&
s[i] == 0 &&
t[i] == 0 &&
u[i] == 0 &&
v[i] == 0 &&
w[i] == 0)
if((r[i] == 0 &&
s[i] == 0 &&
t[i] == 0 &&
u[i] == 0 &&
v[i] == 0 &&
w[i] == 0) ||
(r[i] == 0xFF &&
s[i] == 0xFF &&
t[i] == 0xFF &&
u[i] == 0xFF &&
v[i] == 0xFF &&
w[i] == 0xFF))
continue;
rwEmpty = false;
@@ -261,4 +267,4 @@ namespace Aaru.Core.Logging
_logSw.Flush();
}
}
}
}

14
Aaru.Core/Media/CompactDisc.cs
View File

@@ -100,15 +100,9 @@ namespace Aaru.Core.Media
pWeight++;
}
for(int rw = subPos + 24; rw < subPos + 96; rw++)
{
if(deSub[rw] == 0)
continue;
rwOk = false;
break;
}
if(!deSub.Skip(subPos + 24).Take(96 - 24).All(rw => (rw == 0)) &&
!deSub.Skip(subPos + 24).Take(96 - 24).All(rw => (rw == 0xFF)))
rwOk = false;
bool rwPacket = false;
bool cdtextPacket = false;
@@ -1501,4 +1495,4 @@ namespace Aaru.Core.Media
endProgress?.Invoke();
}
}
}
}