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

🐛Corrected subchannel output in cdrdao images.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-03 17:36:29 +00:00
parent 7f315a03f1
commit 8104bd8d71
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -460,8 +460,7 @@ namespace DiscImageChef.DiscImages
currenttrack.Packedsubchannel = true;
goto case "RW_RAW";
case "RW_RAW":
currenttrack.Bps += 96;
currenttrack.Subchannel = true;
currenttrack.Subchannel = true;
break;
default:
throw new
@@ -483,13 +482,13 @@ namespace DiscImageChef.DiscImages
{
DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1} PRE_EMPHASIS at line {0}", lineNumber,
matchEmphasis.Groups["no"].Value);
currenttrack.FlagPre |= intrack && matchCopy.Groups["no"].Value == "";
currenttrack.FlagPre |= intrack && matchEmphasis.Groups["no"].Value == "";
}
else if(matchStereo.Success)
{
DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1}_CHANNEL_AUDIO at line {0}", lineNumber,
matchStereo.Groups["num"].Value);
currenttrack.Flag_4Ch |= intrack && matchCopy.Groups["num"].Value == "FOUR";
currenttrack.Flag_4Ch |= intrack && matchStereo.Groups["num"].Value == "FOUR";
}
else if(matchIsrc.Success)
{
@@ -860,14 +859,11 @@ namespace DiscImageChef.DiscImages
imageInfo.Sectors += track.Sectors;
}
if(discimage.Disktype == MediaType.CDG || discimage.Disktype == MediaType.CDEG ||
discimage.Disktype == MediaType.CDMIDI)
imageInfo.SectorSize = 2448; // CD+G subchannels ARE user data, as CD+G are useless without them
else if(discimage.Disktype != MediaType.CDROMXA && discimage.Disktype != MediaType.CDDA &&
discimage.Disktype != MediaType.CDI && discimage.Disktype != MediaType.CDPLUS)
imageInfo.SectorSize = 2048; // Only data tracks
else
imageInfo.SectorSize = 2352; // All others
if(discimage.Disktype != MediaType.CDG && discimage.Disktype != MediaType.CDEG &&
discimage.Disktype != MediaType.CDMIDI && discimage.Disktype != MediaType.CDROMXA &&
discimage.Disktype != MediaType.CDDA && discimage.Disktype != MediaType.CDI &&
discimage.Disktype != MediaType.CDPLUS) imageInfo.SectorSize = 2048; // Only data tracks
else imageInfo.SectorSize = 2352; // All others
if(discimage.Mcn != null) imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
@@ -1157,8 +1153,11 @@ namespace DiscImageChef.DiscImages
return new[] {(byte)flags};
}
case SectorTagType.CdTrackIsrc: return Encoding.UTF8.GetBytes(dicTrack.Isrc);
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
case SectorTagType.CdTrackIsrc:
if(dicTrack.Isrc == null) return null;
return Encoding.UTF8.GetBytes(dicTrack.Isrc);
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
}
switch(dicTrack.Tracktype)