From e346d5e85927d3bb74639f8aa5605ee05c6e98e5 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 28 Feb 2020 00:19:50 +0000 Subject: [PATCH] Rename dic in miscellaneous places. --- Aaru.Devices/Device/List.cs | 6 +- Aaru.Devices/Remote/Remote.cs | 28 +-- Aaru.Images/AaruFormat/Helpers.cs | 6 +- Aaru.Images/Alcohol120/Properties.cs | 14 +- Aaru.Images/Alcohol120/Read.cs | 14 +- Aaru.Images/BlindWrite4/Read.cs | 52 ++-- Aaru.Images/BlindWrite5/Read.cs | 56 ++--- Aaru.Images/CDRDAO/Properties.cs | 20 +- Aaru.Images/CDRDAO/Read.cs | 64 ++--- Aaru.Images/CDRWin/Properties.cs | 22 +- Aaru.Images/CDRWin/Read.cs | 74 +++--- Aaru.Images/CHD/Helpers.cs | 4 +- Aaru.Images/CHD/Read.cs | 350 +++++++++++++-------------- Aaru.Images/CloneCD/Read.cs | 46 ++-- Aaru.Images/DiscJuggler/Read.cs | 64 ++--- Aaru.Images/GDI/Read.cs | 62 ++--- Aaru.Images/Nero/Read.cs | 36 +-- Aaru.Images/RayDIM/Write.cs | 2 +- Aaru/Commands/Device/Devices.cs | 6 +- 19 files changed, 463 insertions(+), 463 deletions(-) diff --git a/Aaru.Devices/Device/List.cs b/Aaru.Devices/Device/List.cs index 9706a0609..c403493dd 100644 --- a/Aaru.Devices/Device/List.cs +++ b/Aaru.Devices/Device/List.cs @@ -70,7 +70,7 @@ namespace Aaru.Devices public static DeviceInfo[] ListDevices(out bool isRemote, out string serverApplication, out string serverVersion, out string serverOperatingSystem, out string serverOperatingSystemVersion, out string serverArchitecture, - string dicRemote = null) + string aaruRemote = null) { isRemote = false; serverApplication = null; @@ -79,7 +79,7 @@ namespace Aaru.Devices serverOperatingSystemVersion = null; serverArchitecture = null; - if(dicRemote is null) + if(aaruRemote is null) switch(DetectOS.GetRealPlatformID()) { case PlatformID.Win32NT: return Windows.ListDevices.GetList(); @@ -92,7 +92,7 @@ namespace Aaru.Devices try { - using(var remote = new Remote.Remote(dicRemote)) + using(var remote = new Remote.Remote(aaruRemote)) { isRemote = true; serverApplication = remote.ServerApplication; diff --git a/Aaru.Devices/Remote/Remote.cs b/Aaru.Devices/Remote/Remote.cs index 9f02b01d0..67b0acd78 100644 --- a/Aaru.Devices/Remote/Remote.cs +++ b/Aaru.Devices/Remote/Remote.cs @@ -52,7 +52,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); throw new ArgumentException(); } @@ -179,7 +179,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return false; } @@ -254,7 +254,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return new DeviceInfo[0]; } @@ -355,7 +355,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); lastError = -1; return false; } @@ -451,7 +451,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return -1; } @@ -543,7 +543,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return -1; } @@ -634,7 +634,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return -1; } @@ -725,7 +725,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return -1; } @@ -818,7 +818,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return -1; } @@ -890,7 +890,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return DeviceType.Unknown; } @@ -957,7 +957,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return false; } @@ -1067,7 +1067,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return false; } @@ -1147,7 +1147,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return false; } @@ -1220,7 +1220,7 @@ namespace Aaru.Devices.Remote if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId) { - AaruConsole.ErrorWriteLine("Received data is not a DIC Remote Packet..."); + AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet..."); return false; } diff --git a/Aaru.Images/AaruFormat/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs index b0964725f..2ddfdf113 100644 --- a/Aaru.Images/AaruFormat/Helpers.cs +++ b/Aaru.Images/AaruFormat/Helpers.cs @@ -137,7 +137,7 @@ namespace Aaru.DiscImages imageInfo.DriveSerialNumber = identify.SerialNumber; } - // Get the CICM XML media type from DIC media type + // Get the CICM XML media type from Aaru media type static XmlMediaType GetXmlMediaType(MediaType type) { switch(type) @@ -282,7 +282,7 @@ namespace Aaru.DiscImages imageStream.Position = oldPosition; } - // Converts between image data type and dic media tag type + // Converts between image data type and Aaru media tag type static MediaTagType GetMediaTagTypeForDataType(DataType type) { switch(type) @@ -360,7 +360,7 @@ namespace Aaru.DiscImages } } - // Converts between dic media tag type and image data type + // Converts between Aaru media tag type and image data type static DataType GetDataTypeForMediaTag(MediaTagType tag) { switch(tag) diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs index 842f6b2ff..52c8d832f 100644 --- a/Aaru.Images/Alcohol120/Properties.cs +++ b/Aaru.Images/Alcohol120/Properties.cs @@ -66,7 +66,7 @@ namespace Aaru.DiscImages if(!alcTrackExtras.TryGetValue(alcTrack.point, out AlcoholTrackExtra alcExtra)) continue; - Track dicTrack = new Track + Track aaruTrack = new Track { Indexes = new Dictionary {{1, alcTrack.startLba}}, TrackStartSector = alcTrack.startLba, @@ -86,17 +86,17 @@ namespace Aaru.DiscImages switch(alcTrack.subMode) { case AlcoholSubchannelMode.Interleaved: - dicTrack.TrackSubchannelFilter = alcImage; - dicTrack.TrackSubchannelFile = alcImage.GetFilename(); - dicTrack.TrackSubchannelOffset = alcTrack.startOffset; - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = alcImage; + aaruTrack.TrackSubchannelFile = alcImage.GetFilename(); + aaruTrack.TrackSubchannelOffset = alcTrack.startOffset; + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; break; case AlcoholSubchannelMode.None: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; } - tracks.Add(dicTrack); + tracks.Add(aaruTrack); } return tracks; diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 4a6035837..9136e06df 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -1386,7 +1386,7 @@ namespace Aaru.DiscImages session != sessionNo) continue; - var dicTrack = new Track + var aaruTrack = new Track { Indexes = new Dictionary { @@ -1408,19 +1408,19 @@ namespace Aaru.DiscImages switch(alcTrack.subMode) { case AlcoholSubchannelMode.Interleaved: - dicTrack.TrackSubchannelFilter = alcImage; - dicTrack.TrackSubchannelFile = alcImage.GetFilename(); - dicTrack.TrackSubchannelOffset = alcTrack.startOffset; - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = alcImage; + aaruTrack.TrackSubchannelFile = alcImage.GetFilename(); + aaruTrack.TrackSubchannelOffset = alcTrack.startOffset; + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; break; case AlcoholSubchannelMode.None: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; } - tracks.Add(dicTrack); + tracks.Add(aaruTrack); } return tracks; diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs index b09c43382..eb70b13b7 100644 --- a/Aaru.Images/BlindWrite4/Read.cs +++ b/Aaru.Images/BlindWrite4/Read.cs @@ -851,31 +851,31 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1) + if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({(dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({(aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; bool mode2 = false; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: { @@ -915,11 +915,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.TrackFilter.GetDataForkStream(); + imageStream = aaruTrack.TrackFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(mode2) @@ -955,30 +955,30 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1) + if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({(dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({(aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; - if(dicTrack.TrackType == TrackType.Data) + if(aaruTrack.TrackType == TrackType.Data) throw new ArgumentException("Unsupported tag requested", nameof(tag)); switch(tag) @@ -1002,7 +1002,7 @@ namespace Aaru.DiscImages default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); } - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: switch(tag) @@ -1110,11 +1110,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.TrackFilter.GetDataForkStream(); + imageStream = aaruTrack.TrackFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1150,30 +1150,30 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1) + if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({(dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({(aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.Audio: case TrackType.CdMode1: @@ -1181,7 +1181,7 @@ namespace Aaru.DiscImages case TrackType.Data: { sectorOffset = 0; - sectorSize = (uint)dicTrack.TrackRawBytesPerSector; + sectorSize = (uint)aaruTrack.TrackRawBytesPerSector; sectorSkip = 0; break; @@ -1189,11 +1189,11 @@ namespace Aaru.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - imageStream = dicTrack.TrackFilter.GetDataForkStream(); + imageStream = aaruTrack.TrackFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); byte[] buffer = br.ReadBytes((int)(sectorSize * length)); diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs index 11f26ad98..d60f3c9dc 100644 --- a/Aaru.Images/BlindWrite5/Read.cs +++ b/Aaru.Images/BlindWrite5/Read.cs @@ -1239,24 +1239,24 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { // TODO: Cross data files - var dicTrack = new Track(); + var aaruTrack = new Track(); var chars = new DataFileCharacteristics(); - dicTrack.TrackSequence = 0; + aaruTrack.TrackSequence = 0; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); foreach(DataFileCharacteristics characteristics in filePaths.Where(characteristics => (long)sectorAddress >= @@ -1278,7 +1278,7 @@ namespace Aaru.DiscImages uint sectorSkip; bool mode2 = false; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: { @@ -1341,7 +1341,7 @@ namespace Aaru.DiscImages var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(mode2) @@ -1378,24 +1378,24 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { // TODO: Cross data files - var dicTrack = new Track(); + var aaruTrack = new Track(); var chars = new DataFileCharacteristics(); - dicTrack.TrackSequence = 0; + aaruTrack.TrackSequence = 0; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); foreach(DataFileCharacteristics characteristics in filePaths.Where(characteristics => (long)sectorAddress >= @@ -1412,7 +1412,7 @@ namespace Aaru.DiscImages chars.FileFilter == null) throw new ArgumentOutOfRangeException(nameof(chars.FileFilter), "Track does not exist in disc image"); - if(dicTrack.TrackType == TrackType.Data) + if(aaruTrack.TrackType == TrackType.Data) throw new ArgumentException("Unsupported tag requested", nameof(tag)); switch(tag) @@ -1440,7 +1440,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: switch(tag) @@ -1671,11 +1671,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.TrackFilter.GetDataForkStream(); + imageStream = aaruTrack.TrackFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1711,24 +1711,24 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { // TODO: Cross data files - var dicTrack = new Track(); + var aaruTrack = new Track(); var chars = new DataFileCharacteristics(); - dicTrack.TrackSequence = 0; + aaruTrack.TrackSequence = 0; foreach(Track bwTrack in Tracks.Where(bwTrack => bwTrack.TrackSequence == track)) { - dicTrack = bwTrack; + aaruTrack = bwTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); foreach(DataFileCharacteristics characteristics in filePaths.Where(characteristics => (long)sectorAddress >= @@ -1749,7 +1749,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: case TrackType.CdMode2Formless: @@ -1793,11 +1793,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.TrackFilter.GetDataForkStream(); + imageStream = aaruTrack.TrackFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1824,6 +1824,6 @@ namespace Aaru.DiscImages } public List GetSessionTracks(ushort session) => - Tracks.Where(dicTrack => dicTrack.TrackSession == session).ToList(); + Tracks.Where(aaruTrack => aaruTrack.TrackSession == session).ToList(); } } \ No newline at end of file diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs index 1e2ae05da..b87bfb85a 100644 --- a/Aaru.Images/CDRDAO/Properties.cs +++ b/Aaru.Images/CDRDAO/Properties.cs @@ -57,7 +57,7 @@ namespace Aaru.DiscImages foreach(CdrdaoTrack cdrTrack in discimage.Tracks) { - Track dicTrack = new Track + Track aaruTrack = new Track { Indexes = cdrTrack.Indexes, TrackDescription = cdrTrack.Title, @@ -74,21 +74,21 @@ namespace Aaru.DiscImages TrackBytesPerSector = CdrdaoTrackTypeToCookedBytesPerSector(cdrTrack.Tracktype) }; - dicTrack.TrackEndSector = dicTrack.TrackStartSector + cdrTrack.Sectors - 1; - if(!cdrTrack.Indexes.TryGetValue(0, out dicTrack.TrackStartSector)) - cdrTrack.Indexes.TryGetValue(1, out dicTrack.TrackStartSector); + aaruTrack.TrackEndSector = aaruTrack.TrackStartSector + cdrTrack.Sectors - 1; + if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector)) + cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector); if(cdrTrack.Subchannel) { - dicTrack.TrackSubchannelType = cdrTrack.Packedsubchannel + aaruTrack.TrackSubchannelType = cdrTrack.Packedsubchannel ? TrackSubchannelType.PackedInterleaved : TrackSubchannelType.RawInterleaved; - dicTrack.TrackSubchannelFilter = cdrTrack.Trackfile.Datafilter; - dicTrack.TrackSubchannelFile = cdrTrack.Trackfile.Datafilter.GetFilename(); - dicTrack.TrackSubchannelOffset = cdrTrack.Trackfile.Offset; + aaruTrack.TrackSubchannelFilter = cdrTrack.Trackfile.Datafilter; + aaruTrack.TrackSubchannelFile = cdrTrack.Trackfile.Datafilter.GetFilename(); + aaruTrack.TrackSubchannelOffset = cdrTrack.Trackfile.Offset; } - else dicTrack.TrackSubchannelType = TrackSubchannelType.None; + else aaruTrack.TrackSubchannelType = TrackSubchannelType.None; - tracks.Add(dicTrack); + tracks.Add(aaruTrack); } return tracks; diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs index 05e3baaaa..c642b2c18 100644 --- a/Aaru.Images/CDRDAO/Read.cs +++ b/Aaru.Images/CDRDAO/Read.cs @@ -918,22 +918,22 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - var dicTrack = new CdrdaoTrack + var aaruTrack = new CdrdaoTrack { Sequence = 0 }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { - dicTrack = cdrdaoTrack; + aaruTrack = cdrdaoTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -942,7 +942,7 @@ namespace Aaru.DiscImages uint sectorSkip; bool mode2 = false; - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case CDRDAO_TRACK_TYPE_MODE1: case CDRDAO_TRACK_TYPE_MODE2_FORM1: @@ -999,16 +999,16 @@ namespace Aaru.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - if(dicTrack.Subchannel) + if(aaruTrack.Subchannel) sectorSkip += 96; byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(mode2) @@ -1040,7 +1040,7 @@ namespace Aaru.DiscImages } // cdrdao audio tracks are endian swapped corresponding to Aaru - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) return buffer; byte[] swapped = new byte[buffer.Length]; @@ -1056,22 +1056,22 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - var dicTrack = new CdrdaoTrack + var aaruTrack = new CdrdaoTrack { Sequence = 0 }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { - dicTrack = cdrdaoTrack; + aaruTrack = cdrdaoTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -1079,7 +1079,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip = 0; - if(!dicTrack.Subchannel && + if(!aaruTrack.Subchannel && tag == SectorTagType.CdSectorSubchannel) throw new ArgumentException("No tags in image for requested track", nameof(tag)); @@ -1097,16 +1097,16 @@ namespace Aaru.DiscImages { CdFlags flags = 0; - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) flags |= CdFlags.DataTrack; - if(dicTrack.FlagDcp) + if(aaruTrack.FlagDcp) flags |= CdFlags.CopyPermitted; - if(dicTrack.FlagPre) + if(aaruTrack.FlagPre) flags |= CdFlags.PreEmphasis; - if(dicTrack.Flag_4Ch) + if(aaruTrack.Flag_4Ch) flags |= CdFlags.FourChannel; return new[] @@ -1115,14 +1115,14 @@ namespace Aaru.DiscImages }; } case SectorTagType.CdTrackIsrc: - if(dicTrack.Isrc == null) + if(aaruTrack.Isrc == null) return null; - return Encoding.UTF8.GetBytes(dicTrack.Isrc); + return Encoding.UTF8.GetBytes(aaruTrack.Isrc); default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); } - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case CDRDAO_TRACK_TYPE_MODE1: case CDRDAO_TRACK_TYPE_MODE2_FORM1: @@ -1229,11 +1229,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1268,22 +1268,22 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - var dicTrack = new CdrdaoTrack + var aaruTrack = new CdrdaoTrack { Sequence = 0 }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { - dicTrack = cdrdaoTrack; + aaruTrack = cdrdaoTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -1291,7 +1291,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case CDRDAO_TRACK_TYPE_MODE1: case CDRDAO_TRACK_TYPE_MODE2_FORM1: @@ -1332,16 +1332,16 @@ namespace Aaru.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - if(dicTrack.Subchannel) + if(aaruTrack.Subchannel) sectorSkip += 96; byte[] buffer = new byte[sectorSize * length]; - imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream(); var br = new BinaryReader(imageStream); br.BaseStream. - Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1358,7 +1358,7 @@ namespace Aaru.DiscImages } // cdrdao audio tracks are endian swapped corresponding to Aaru - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) return buffer; byte[] swapped = new byte[buffer.Length]; diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs index 13032a411..6540e09eb 100644 --- a/Aaru.Images/CDRWin/Properties.cs +++ b/Aaru.Images/CDRWin/Properties.cs @@ -58,7 +58,7 @@ namespace Aaru.DiscImages foreach(CdrWinTrack cdrTrack in _discImage.Tracks) { - var dicTrack = new Track + var aaruTrack = new Track { Indexes = cdrTrack.Indexes, TrackDescription = cdrTrack.Title, TrackStartSector = previousStartSector, TrackPregap = cdrTrack.Pregap, @@ -71,22 +71,22 @@ namespace Aaru.DiscImages TrackBytesPerSector = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType) }; - dicTrack.TrackEndSector = (dicTrack.TrackStartSector + cdrTrack.Sectors) - 1; + aaruTrack.TrackEndSector = (aaruTrack.TrackStartSector + cdrTrack.Sectors) - 1; - /*if(!cdrTrack.Indexes.TryGetValue(0, out dicTrack.TrackStartSector)) - cdrTrack.Indexes.TryGetValue(1, out dicTrack.TrackStartSector);*/ + /*if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector)) + cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector);*/ if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG) { - dicTrack.TrackSubchannelFilter = cdrTrack.TrackFile.DataFilter; - dicTrack.TrackSubchannelFile = cdrTrack.TrackFile.DataFilter.GetFilename(); - dicTrack.TrackSubchannelOffset = cdrTrack.TrackFile.Offset; - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = cdrTrack.TrackFile.DataFilter; + aaruTrack.TrackSubchannelFile = cdrTrack.TrackFile.DataFilter.GetFilename(); + aaruTrack.TrackSubchannelOffset = cdrTrack.TrackFile.Offset; + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; } else - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; - tracks.Add(dicTrack); - previousStartSector = dicTrack.TrackEndSector + 1; + tracks.Add(aaruTrack); + previousStartSector = aaruTrack.TrackEndSector + 1; } return tracks; diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 1de6e441c..9f81f0b78 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -1309,22 +1309,22 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - var dicTrack = new CdrWinTrack + var aaruTrack = new CdrWinTrack { Sequence = 0 }; foreach(CdrWinTrack cdrwinTrack in _discImage.Tracks.Where(cdrwinTrack => cdrwinTrack.Sequence == track)) { - dicTrack = cdrwinTrack; + aaruTrack = cdrwinTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -1333,7 +1333,7 @@ namespace Aaru.DiscImages uint sectorSkip; bool mode2 = false; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case CDRWIN_TRACK_TYPE_MODE1: case CDRWIN_TRACK_TYPE_MODE2_FORM1: @@ -1401,11 +1401,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - _imageStream = dicTrack.TrackFile.DataFilter.GetDataForkStream(); + _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream(); var br = new BinaryReader(_imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(mode2) @@ -1441,22 +1441,22 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - var dicTrack = new CdrWinTrack + var aaruTrack = new CdrWinTrack { Sequence = 0 }; foreach(CdrWinTrack cdrwinTrack in _discImage.Tracks.Where(cdrwinTrack => cdrwinTrack.Sequence == track)) { - dicTrack = cdrwinTrack; + aaruTrack = cdrwinTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -1478,17 +1478,17 @@ namespace Aaru.DiscImages { CdFlags flags = 0; - if(dicTrack.TrackType != CDRWIN_TRACK_TYPE_AUDIO && - dicTrack.TrackType != CDRWIN_TRACK_TYPE_CDG) + if(aaruTrack.TrackType != CDRWIN_TRACK_TYPE_AUDIO && + aaruTrack.TrackType != CDRWIN_TRACK_TYPE_CDG) flags |= CdFlags.DataTrack; - if(dicTrack.FlagDcp) + if(aaruTrack.FlagDcp) flags |= CdFlags.CopyPermitted; - if(dicTrack.FlagPre) + if(aaruTrack.FlagPre) flags |= CdFlags.PreEmphasis; - if(dicTrack.Flag4ch) + if(aaruTrack.Flag4ch) flags |= CdFlags.FourChannel; return new[] @@ -1497,14 +1497,14 @@ namespace Aaru.DiscImages }; } case SectorTagType.CdTrackIsrc: - return dicTrack.Isrc == null ? null : Encoding.UTF8.GetBytes(dicTrack.Isrc); + return aaruTrack.Isrc == null ? null : Encoding.UTF8.GetBytes(aaruTrack.Isrc); case SectorTagType.CdTrackText: throw new FeatureSupportedButNotImplementedImageException("Feature not yet implemented"); default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); } - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case CDRWIN_TRACK_TYPE_MODE1: case CDRWIN_TRACK_TYPE_MODE2_FORM1: @@ -1624,11 +1624,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - _imageStream = dicTrack.TrackFile.DataFilter.GetDataForkStream(); + _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream(); var br = new BinaryReader(_imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1663,22 +1663,22 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - var dicTrack = new CdrWinTrack + var aaruTrack = new CdrWinTrack { Sequence = 0 }; foreach(CdrWinTrack cdrwinTrack in _discImage.Tracks.Where(cdrwinTrack => cdrwinTrack.Sequence == track)) { - dicTrack = cdrwinTrack; + aaruTrack = cdrwinTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -1686,7 +1686,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case CDRWIN_TRACK_TYPE_MODE1: case CDRWIN_TRACK_TYPE_MODE2_FORM1: @@ -1738,11 +1738,11 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - _imageStream = dicTrack.TrackFile.DataFilter.GetDataForkStream(); + _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream(); var br = new BinaryReader(_imageStream); br.BaseStream. - Seek((long)dicTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1776,7 +1776,7 @@ namespace Aaru.DiscImages foreach(CdrWinTrack cdrTrack in _discImage.Tracks) if(cdrTrack.Session == session) { - var dicTrack = new Track + var aaruTrack = new Track { Indexes = cdrTrack.Indexes, TrackDescription = cdrTrack.Title, TrackPregap = cdrTrack.Pregap, @@ -1789,22 +1789,22 @@ namespace Aaru.DiscImages TrackBytesPerSector = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType) }; - if(!cdrTrack.Indexes.TryGetValue(0, out dicTrack.TrackStartSector)) - cdrTrack.Indexes.TryGetValue(1, out dicTrack.TrackStartSector); + if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector)) + cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector); - dicTrack.TrackEndSector = (dicTrack.TrackStartSector + cdrTrack.Sectors) - 1; + aaruTrack.TrackEndSector = (aaruTrack.TrackStartSector + cdrTrack.Sectors) - 1; if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG) { - dicTrack.TrackSubchannelFilter = cdrTrack.TrackFile.DataFilter; - dicTrack.TrackSubchannelFile = cdrTrack.TrackFile.DataFilter.GetFilename(); - dicTrack.TrackSubchannelOffset = cdrTrack.TrackFile.Offset; - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = cdrTrack.TrackFile.DataFilter; + aaruTrack.TrackSubchannelFile = cdrTrack.TrackFile.DataFilter.GetFilename(); + aaruTrack.TrackSubchannelOffset = cdrTrack.TrackFile.Offset; + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; } else - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; - tracks.Add(dicTrack); + tracks.Add(aaruTrack); } return tracks; diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs index fbdea0ca3..d5221bb6a 100644 --- a/Aaru.Images/CHD/Helpers.cs +++ b/Aaru.Images/CHD/Helpers.cs @@ -55,8 +55,8 @@ namespace Aaru.DiscImages ulong GetAbsoluteSector(ulong relativeSector, uint track) { - tracks.TryGetValue(track, out Track dicTrack); - return dicTrack.TrackStartSector + relativeSector; + tracks.TryGetValue(track, out Track aaruTrack); + return aaruTrack.TrackStartSector + relativeSector; } byte[] GetHunk(ulong hunkNo) diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs index 838f64b5b..c4baf64e4 100644 --- a/Aaru.Images/CHD/Read.cs +++ b/Aaru.Images/CHD/Read.cs @@ -504,51 +504,51 @@ namespace Aaru.DiscImages extraFrames = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 20)) }; - var dicTrack = new Track(); + var aaruTrack = new Track(); switch((ChdOldTrackType)chdTrack.type) { case ChdOldTrackType.Audio: - dicTrack.TrackBytesPerSector = 2352; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.Audio; + aaruTrack.TrackBytesPerSector = 2352; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.Audio; break; case ChdOldTrackType.Mode1: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode1; break; case ChdOldTrackType.Mode1Raw: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode1; break; case ChdOldTrackType.Mode2: case ChdOldTrackType.Mode2FormMix: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2336; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2336; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; case ChdOldTrackType.Mode2Form1: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode2Form1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode2Form1; break; case ChdOldTrackType.Mode2Form2: - dicTrack.TrackBytesPerSector = 2324; - dicTrack.TrackRawBytesPerSector = 2324; - dicTrack.TrackType = TrackType.CdMode2Form2; + aaruTrack.TrackBytesPerSector = 2324; + aaruTrack.TrackRawBytesPerSector = 2324; + aaruTrack.TrackType = TrackType.CdMode2Form2; break; case ChdOldTrackType.Mode2Raw: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; default: @@ -558,19 +558,19 @@ namespace Aaru.DiscImages switch((ChdOldSubType)chdTrack.subType) { case ChdOldSubType.Cooked: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; case ChdOldSubType.None: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; case ChdOldSubType.Raw: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; default: @@ -578,17 +578,17 @@ namespace Aaru.DiscImages ImageNotSupportedException($"Unsupported subchannel type {chdTrack.type}"); } - dicTrack.Indexes = new Dictionary(); - dicTrack.TrackDescription = $"Track {i + 1}"; - dicTrack.TrackEndSector = (currentSector + chdTrack.frames) - 1; - dicTrack.TrackFile = imageFilter.GetFilename(); - dicTrack.TrackFileType = "BINARY"; - dicTrack.TrackFilter = imageFilter; - dicTrack.TrackStartSector = currentSector; - dicTrack.TrackSequence = i + 1; - dicTrack.TrackSession = 1; + aaruTrack.Indexes = new Dictionary(); + aaruTrack.TrackDescription = $"Track {i + 1}"; + aaruTrack.TrackEndSector = (currentSector + chdTrack.frames) - 1; + aaruTrack.TrackFile = imageFilter.GetFilename(); + aaruTrack.TrackFileType = "BINARY"; + aaruTrack.TrackFilter = imageFilter; + aaruTrack.TrackStartSector = currentSector; + aaruTrack.TrackSequence = i + 1; + aaruTrack.TrackSession = 1; currentSector += chdTrack.frames + chdTrack.extraFrames; - tracks.Add(dicTrack.TrackSequence, dicTrack); + tracks.Add(aaruTrack.TrackSequence, aaruTrack); } isCdrom = true; @@ -621,57 +621,57 @@ namespace Aaru.DiscImages if(trackNo != currentTrack) throw new ImageNotSupportedException("Unsorted tracks, cannot proceed."); - var dicTrack = new Track(); + var aaruTrack = new Track(); switch(tracktype) { case TRACK_TYPE_AUDIO: - dicTrack.TrackBytesPerSector = 2352; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.Audio; + aaruTrack.TrackBytesPerSector = 2352; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.Audio; break; case TRACK_TYPE_MODE1: case TRACK_TYPE_MODE1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE1_RAW: case TRACK_TYPE_MODE1_RAW_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE2: case TRACK_TYPE_MODE2_2K: case TRACK_TYPE_MODE2_FM: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2336; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2336; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; case TRACK_TYPE_MODE2_F1: case TRACK_TYPE_MODE2_F1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode2Form1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode2Form1; break; case TRACK_TYPE_MODE2_F2: case TRACK_TYPE_MODE2_F2_2K: - dicTrack.TrackBytesPerSector = 2324; - dicTrack.TrackRawBytesPerSector = 2324; - dicTrack.TrackType = TrackType.CdMode2Form2; + aaruTrack.TrackBytesPerSector = 2324; + aaruTrack.TrackRawBytesPerSector = 2324; + aaruTrack.TrackType = TrackType.CdMode2Form2; break; case TRACK_TYPE_MODE2_RAW: case TRACK_TYPE_MODE2_RAW_2K: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; default: @@ -681,37 +681,37 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; case SUB_TYPE_NONE: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; case SUB_TYPE_RAW: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; default: throw new ImageNotSupportedException($"Unsupported subchannel type {subtype}"); } - dicTrack.Indexes = new Dictionary(); - dicTrack.TrackDescription = $"Track {trackNo}"; - dicTrack.TrackEndSector = (currentSector + frames) - 1; - dicTrack.TrackFile = imageFilter.GetFilename(); - dicTrack.TrackFileType = "BINARY"; - dicTrack.TrackFilter = imageFilter; - dicTrack.TrackStartSector = currentSector; - dicTrack.TrackSequence = trackNo; - dicTrack.TrackSession = 1; + aaruTrack.Indexes = new Dictionary(); + aaruTrack.TrackDescription = $"Track {trackNo}"; + aaruTrack.TrackEndSector = (currentSector + frames) - 1; + aaruTrack.TrackFile = imageFilter.GetFilename(); + aaruTrack.TrackFileType = "BINARY"; + aaruTrack.TrackFilter = imageFilter; + aaruTrack.TrackStartSector = currentSector; + aaruTrack.TrackSequence = trackNo; + aaruTrack.TrackSession = 1; currentSector += frames; currentTrack++; - tracks.Add(dicTrack.TrackSequence, dicTrack); + tracks.Add(aaruTrack.TrackSequence, aaruTrack); } break; @@ -748,57 +748,57 @@ namespace Aaru.DiscImages if(trackNo != currentTrack) throw new ImageNotSupportedException("Unsorted tracks, cannot proceed."); - var dicTrack = new Track(); + var aaruTrack = new Track(); switch(tracktype) { case TRACK_TYPE_AUDIO: - dicTrack.TrackBytesPerSector = 2352; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.Audio; + aaruTrack.TrackBytesPerSector = 2352; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.Audio; break; case TRACK_TYPE_MODE1: case TRACK_TYPE_MODE1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE1_RAW: case TRACK_TYPE_MODE1_RAW_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE2: case TRACK_TYPE_MODE2_2K: case TRACK_TYPE_MODE2_FM: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2336; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2336; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; case TRACK_TYPE_MODE2_F1: case TRACK_TYPE_MODE2_F1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode2Form1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode2Form1; break; case TRACK_TYPE_MODE2_F2: case TRACK_TYPE_MODE2_F2_2K: - dicTrack.TrackBytesPerSector = 2324; - dicTrack.TrackRawBytesPerSector = 2324; - dicTrack.TrackType = TrackType.CdMode2Form2; + aaruTrack.TrackBytesPerSector = 2324; + aaruTrack.TrackRawBytesPerSector = 2324; + aaruTrack.TrackType = TrackType.CdMode2Form2; break; case TRACK_TYPE_MODE2_RAW: case TRACK_TYPE_MODE2_RAW_2K: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; default: @@ -808,37 +808,37 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; case SUB_TYPE_NONE: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; case SUB_TYPE_RAW: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; default: throw new ImageNotSupportedException($"Unsupported subchannel type {subtype}"); } - dicTrack.Indexes = new Dictionary(); - dicTrack.TrackDescription = $"Track {trackNo}"; - dicTrack.TrackEndSector = (currentSector + frames) - 1; - dicTrack.TrackFile = imageFilter.GetFilename(); - dicTrack.TrackFileType = "BINARY"; - dicTrack.TrackFilter = imageFilter; - dicTrack.TrackStartSector = currentSector; - dicTrack.TrackSequence = trackNo; - dicTrack.TrackSession = 1; + aaruTrack.Indexes = new Dictionary(); + aaruTrack.TrackDescription = $"Track {trackNo}"; + aaruTrack.TrackEndSector = (currentSector + frames) - 1; + aaruTrack.TrackFile = imageFilter.GetFilename(); + aaruTrack.TrackFileType = "BINARY"; + aaruTrack.TrackFilter = imageFilter; + aaruTrack.TrackStartSector = currentSector; + aaruTrack.TrackSequence = trackNo; + aaruTrack.TrackSession = 1; currentSector += frames; currentTrack++; - tracks.Add(dicTrack.TrackSequence, dicTrack); + tracks.Add(aaruTrack.TrackSequence, aaruTrack); } break; @@ -881,57 +881,57 @@ namespace Aaru.DiscImages if(trackNo != currentTrack) throw new ImageNotSupportedException("Unsorted tracks, cannot proceed."); - var dicTrack = new Track(); + var aaruTrack = new Track(); switch(tracktype) { case TRACK_TYPE_AUDIO: - dicTrack.TrackBytesPerSector = 2352; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.Audio; + aaruTrack.TrackBytesPerSector = 2352; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.Audio; break; case TRACK_TYPE_MODE1: case TRACK_TYPE_MODE1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE1_RAW: case TRACK_TYPE_MODE1_RAW_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode1; break; case TRACK_TYPE_MODE2: case TRACK_TYPE_MODE2_2K: case TRACK_TYPE_MODE2_FM: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2336; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2336; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; case TRACK_TYPE_MODE2_F1: case TRACK_TYPE_MODE2_F1_2K: - dicTrack.TrackBytesPerSector = 2048; - dicTrack.TrackRawBytesPerSector = 2048; - dicTrack.TrackType = TrackType.CdMode2Form1; + aaruTrack.TrackBytesPerSector = 2048; + aaruTrack.TrackRawBytesPerSector = 2048; + aaruTrack.TrackType = TrackType.CdMode2Form1; break; case TRACK_TYPE_MODE2_F2: case TRACK_TYPE_MODE2_F2_2K: - dicTrack.TrackBytesPerSector = 2324; - dicTrack.TrackRawBytesPerSector = 2324; - dicTrack.TrackType = TrackType.CdMode2Form2; + aaruTrack.TrackBytesPerSector = 2324; + aaruTrack.TrackRawBytesPerSector = 2324; + aaruTrack.TrackType = TrackType.CdMode2Form2; break; case TRACK_TYPE_MODE2_RAW: case TRACK_TYPE_MODE2_RAW_2K: - dicTrack.TrackBytesPerSector = 2336; - dicTrack.TrackRawBytesPerSector = 2352; - dicTrack.TrackType = TrackType.CdMode2Formless; + aaruTrack.TrackBytesPerSector = 2336; + aaruTrack.TrackRawBytesPerSector = 2352; + aaruTrack.TrackType = TrackType.CdMode2Formless; break; default: @@ -941,37 +941,37 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.PackedInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; case SUB_TYPE_NONE: - dicTrack.TrackSubchannelType = TrackSubchannelType.None; + aaruTrack.TrackSubchannelType = TrackSubchannelType.None; break; case SUB_TYPE_RAW: - dicTrack.TrackSubchannelFile = imageFilter.GetFilename(); - dicTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - dicTrack.TrackSubchannelFilter = imageFilter; + aaruTrack.TrackSubchannelFile = imageFilter.GetFilename(); + aaruTrack.TrackSubchannelType = TrackSubchannelType.RawInterleaved; + aaruTrack.TrackSubchannelFilter = imageFilter; break; default: throw new ImageNotSupportedException($"Unsupported subchannel type {subtype}"); } - dicTrack.Indexes = new Dictionary(); - dicTrack.TrackDescription = $"Track {trackNo}"; - dicTrack.TrackEndSector = (currentSector + frames) - 1; - dicTrack.TrackFile = imageFilter.GetFilename(); - dicTrack.TrackFileType = "BINARY"; - dicTrack.TrackFilter = imageFilter; - dicTrack.TrackStartSector = currentSector; - dicTrack.TrackSequence = trackNo; - dicTrack.TrackSession = (ushort)(trackNo > 2 ? 2 : 1); + aaruTrack.Indexes = new Dictionary(); + aaruTrack.TrackDescription = $"Track {trackNo}"; + aaruTrack.TrackEndSector = (currentSector + frames) - 1; + aaruTrack.TrackFile = imageFilter.GetFilename(); + aaruTrack.TrackFileType = "BINARY"; + aaruTrack.TrackFilter = imageFilter; + aaruTrack.TrackStartSector = currentSector; + aaruTrack.TrackSequence = trackNo; + aaruTrack.TrackSession = (ushort)(trackNo > 2 ? 2 : 1); currentSector += frames; currentTrack++; - tracks.Add(dicTrack.TrackSequence, dicTrack); + tracks.Add(aaruTrack.TrackSequence, aaruTrack); } break; @@ -1036,8 +1036,8 @@ namespace Aaru.DiscImages imageInfo.MediaType = MediaType.CDROM; imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; - foreach(Track dicTrack in tracks.Values) - imageInfo.Sectors += (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1; + foreach(Track aaruTrack in tracks.Values) + imageInfo.Sectors += (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1; } else if(isGdrom) { @@ -1046,8 +1046,8 @@ namespace Aaru.DiscImages imageInfo.MediaType = MediaType.GDROM; imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; - foreach(Track dicTrack in tracks.Values) - imageInfo.Sectors += (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1; + foreach(Track aaruTrack in tracks.Values) + imageInfo.Sectors += (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1; } else throw new ImageNotSupportedException("Image does not represent a known media, aborting"); @@ -1059,30 +1059,30 @@ namespace Aaru.DiscImages partitions = new List(); ulong partPos = 0; - foreach(Track dicTrack in tracks.Values) + foreach(Track aaruTrack in tracks.Values) { var partition = new Partition { - Description = dicTrack.TrackDescription, - Size = ((dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1) * - (ulong)dicTrack.TrackRawBytesPerSector, - Length = (dicTrack.TrackEndSector - dicTrack.TrackStartSector) + 1, - Sequence = dicTrack.TrackSequence, Offset = partPos, Start = dicTrack.TrackStartSector, - Type = dicTrack.TrackType.ToString() + Description = aaruTrack.TrackDescription, + Size = ((aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1) * + (ulong)aaruTrack.TrackRawBytesPerSector, + Length = (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1, + Sequence = aaruTrack.TrackSequence, Offset = partPos, Start = aaruTrack.TrackStartSector, + Type = aaruTrack.TrackType.ToString() }; partPos += partition.Length; - offsetmap.Add(dicTrack.TrackStartSector, dicTrack.TrackSequence); + offsetmap.Add(aaruTrack.TrackStartSector, aaruTrack.TrackSequence); - if(dicTrack.TrackSubchannelType != TrackSubchannelType.None) + if(aaruTrack.TrackSubchannelType != TrackSubchannelType.None) if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel); - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: case TrackType.CdMode2Form1: - if(dicTrack.TrackRawBytesPerSector == 2352) + if(aaruTrack.TrackRawBytesPerSector == 2352) { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -1108,7 +1108,7 @@ namespace Aaru.DiscImages break; case TrackType.CdMode2Form2: - if(dicTrack.TrackRawBytesPerSector == 2352) + if(aaruTrack.TrackRawBytesPerSector == 2352) { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -1125,7 +1125,7 @@ namespace Aaru.DiscImages break; case TrackType.CdMode2Formless: - if(dicTrack.TrackRawBytesPerSector == 2352) + if(aaruTrack.TrackRawBytesPerSector == 2352) { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -1137,8 +1137,8 @@ namespace Aaru.DiscImages break; } - if(dicTrack.TrackBytesPerSector > imageInfo.SectorSize) - imageInfo.SectorSize = (uint)dicTrack.TrackBytesPerSector; + if(aaruTrack.TrackBytesPerSector > imageInfo.SectorSize) + imageInfo.SectorSize = (uint)aaruTrack.TrackBytesPerSector; partitions.Add(partition); } diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index 06bb901e2..18d2c58ce 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -847,26 +847,26 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if((length + sectorAddress) - 1 > dicTrack.TrackEndSector) + if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), string. Format("Requested more sectors ({0} {2}) than present in track ({1}), won't cross tracks", - length + sectorAddress, dicTrack.TrackEndSector, + length + sectorAddress, aaruTrack.TrackEndSector, sectorAddress)); uint sectorOffset; @@ -874,7 +874,7 @@ namespace Aaru.DiscImages uint sectorSkip; bool mode2 = false; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.Audio: { @@ -908,7 +908,7 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; - dataStream.Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); + dataStream.Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); if(mode2) { @@ -944,26 +944,26 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if((length + sectorAddress) - 1 > dicTrack.TrackEndSector) + if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); - if(dicTrack.TrackType == TrackType.Data) + if(aaruTrack.TrackType == TrackType.Data) throw new ArgumentException("Unsupported tag requested", nameof(tag)); byte[] buffer; @@ -978,13 +978,13 @@ namespace Aaru.DiscImages case SectorTagType.CdSectorSubHeader: case SectorTagType.CdSectorSync: break; case SectorTagType.CdTrackFlags: - return!trackFlags.TryGetValue((byte)dicTrack.TrackSequence, out byte flags) ? new[] + return!trackFlags.TryGetValue((byte)aaruTrack.TrackSequence, out byte flags) ? new[] { flags } : new byte[1]; case SectorTagType.CdSectorSubchannel: buffer = new byte[96 * length]; - subStream.Seek((long)(dicTrack.TrackSubchannelOffset + (sectorAddress * 96)), SeekOrigin.Begin); + subStream.Seek((long)(aaruTrack.TrackSubchannelOffset + (sectorAddress * 96)), SeekOrigin.Begin); subStream.Read(buffer, 0, buffer.Length); return buffer; @@ -995,7 +995,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: switch(tag) @@ -1196,7 +1196,7 @@ namespace Aaru.DiscImages buffer = new byte[sectorSize * length]; - dataStream.Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); + dataStream.Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); if(sectorOffset == 0 && sectorSkip == 0) @@ -1232,28 +1232,28 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if((length + sectorAddress) - 1 > dicTrack.TrackEndSector) + if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); byte[] buffer = new byte[2352 * length]; - dataStream.Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); + dataStream.Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * 2352)), SeekOrigin.Begin); dataStream.Read(buffer, 0, buffer.Length); return buffer; diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs index 1b21acb9a..53097bfcb 100644 --- a/Aaru.Images/DiscJuggler/Read.cs +++ b/Aaru.Images/DiscJuggler/Read.cs @@ -729,31 +729,31 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; bool mode2 = true; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.Audio: { @@ -764,7 +764,7 @@ namespace Aaru.DiscImages break; } case TrackType.CdMode1: - if(dicTrack.TrackRawBytesPerSector == 2352) + if(aaruTrack.TrackRawBytesPerSector == 2352) { sectorOffset = 16; sectorSize = 2048; @@ -782,7 +782,7 @@ namespace Aaru.DiscImages { mode2 = true; sectorOffset = 0; - sectorSize = (uint)dicTrack.TrackRawBytesPerSector; + sectorSize = (uint)aaruTrack.TrackRawBytesPerSector; sectorSkip = 0; } @@ -790,7 +790,7 @@ namespace Aaru.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: sectorSkip += 0; @@ -810,7 +810,7 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; imageStream. - Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * (ulong)dicTrack.TrackRawBytesPerSector)), + Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * (ulong)aaruTrack.TrackRawBytesPerSector)), SeekOrigin.Begin); if(mode2) @@ -847,26 +847,26 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); - if(dicTrack.TrackType == TrackType.Data) + if(aaruTrack.TrackType == TrackType.Data) throw new ArgumentException("Unsupported tag requested", nameof(tag)); switch(tag) @@ -894,10 +894,10 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.TrackType) + switch(aaruTrack.TrackType) { case TrackType.CdMode1: - if(dicTrack.TrackRawBytesPerSector != 2352) + if(aaruTrack.TrackRawBytesPerSector != 2352) throw new ArgumentException("Unsupported tag requested for this track", nameof(tag)); switch(tag) @@ -953,7 +953,7 @@ namespace Aaru.DiscImages break; } case SectorTagType.CdSectorSubchannel: - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: throw new ArgumentException("Unsupported tag requested for this track", @@ -972,7 +972,7 @@ namespace Aaru.DiscImages break; case TrackType.CdMode2Formless: - if(dicTrack.TrackRawBytesPerSector != 2352) + if(aaruTrack.TrackRawBytesPerSector != 2352) throw new ArgumentException("Unsupported tag requested for this track", nameof(tag)); { @@ -1001,7 +1001,7 @@ namespace Aaru.DiscImages break; } case SectorTagType.CdSectorSubchannel: - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: throw new ArgumentException("Unsupported tag requested for this track", @@ -1025,7 +1025,7 @@ namespace Aaru.DiscImages switch(tag) { case SectorTagType.CdSectorSubchannel: - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: throw new ArgumentException("Unsupported tag requested for this track", @@ -1047,7 +1047,7 @@ namespace Aaru.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: sectorSkip += 0; @@ -1067,7 +1067,7 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; imageStream. - Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * (ulong)dicTrack.TrackRawBytesPerSector)), + Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * (ulong)aaruTrack.TrackRawBytesPerSector)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1103,29 +1103,29 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - var dicTrack = new Track + var aaruTrack = new Track { TrackSequence = 0 }; foreach(Track linqTrack in Tracks.Where(linqTrack => linqTrack.TrackSequence == track)) { - dicTrack = linqTrack; + aaruTrack = linqTrack; break; } - if(dicTrack.TrackSequence == 0) + if(aaruTrack.TrackSequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length + sectorAddress > dicTrack.TrackEndSector) + if(length + sectorAddress > aaruTrack.TrackEndSector) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length + sectorAddress}) than present in track ({dicTrack.TrackEndSector}), won't cross tracks"); + $"Requested more sectors ({length + sectorAddress}) than present in track ({aaruTrack.TrackEndSector}), won't cross tracks"); - uint sectorSize = (uint)dicTrack.TrackRawBytesPerSector; + uint sectorSize = (uint)aaruTrack.TrackRawBytesPerSector; uint sectorSkip = 0; - switch(dicTrack.TrackSubchannelType) + switch(aaruTrack.TrackSubchannelType) { case TrackSubchannelType.None: sectorSkip += 0; @@ -1145,7 +1145,7 @@ namespace Aaru.DiscImages byte[] buffer = new byte[sectorSize * length]; imageStream. - Seek((long)(dicTrack.TrackFileOffset + (sectorAddress * (ulong)dicTrack.TrackRawBytesPerSector)), + Seek((long)(aaruTrack.TrackFileOffset + (sectorAddress * (ulong)aaruTrack.TrackRawBytesPerSector)), SeekOrigin.Begin); if(sectorSkip == 0) diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs index c93ff2ab7..ab772af7f 100644 --- a/Aaru.Images/GDI/Read.cs +++ b/Aaru.Images/GDI/Read.cs @@ -343,18 +343,18 @@ namespace Aaru.DiscImages return new byte[length * 2352]; } - GdiTrack dicTrack = new GdiTrack {Sequence = 0}; + GdiTrack aaruTrack = new GdiTrack {Sequence = 0}; foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track)) { - dicTrack = gdiTrack; + aaruTrack = gdiTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(sectorAddress + length > dicTrack.Sectors) + if(sectorAddress + length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -362,7 +362,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case TrackType.Audio: { @@ -373,7 +373,7 @@ namespace Aaru.DiscImages } case TrackType.CdMode1: { - if(dicTrack.Bps == 2352) + if(aaruTrack.Bps == 2352) { sectorOffset = 16; sectorSize = 2048; @@ -395,9 +395,9 @@ namespace Aaru.DiscImages ulong remainingSectors = length; - if(dicTrack.Pregap > 0 && sectorAddress < dicTrack.Pregap) + if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap) { - ulong remainingPregap = dicTrack.Pregap - sectorAddress; + ulong remainingPregap = aaruTrack.Pregap - sectorAddress; byte[] zero; if(length > remainingPregap) { @@ -415,10 +415,10 @@ namespace Aaru.DiscImages if(remainingSectors == 0) return buffer; - imageStream = dicTrack.Trackfilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfilter.GetDataForkStream(); BinaryReader br = new BinaryReader(imageStream); br.BaseStream - .Seek(dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + dicTrack.Pregap * dicTrack.Bps), + .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps), SeekOrigin.Begin); if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors)); else @@ -446,18 +446,18 @@ namespace Aaru.DiscImages throw new ArgumentException("Unsupported tag requested for this track", nameof(tag)); } - GdiTrack dicTrack = new GdiTrack {Sequence = 0}; + GdiTrack aaruTrack = new GdiTrack {Sequence = 0}; foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track)) { - dicTrack = gdiTrack; + aaruTrack = gdiTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -477,19 +477,19 @@ namespace Aaru.DiscImages { byte[] flags = new byte[1]; - flags[0] += dicTrack.Flags; + flags[0] += aaruTrack.Flags; return flags; } default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); } - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case TrackType.Audio: throw new ArgumentException("There are no tags on audio tracks", nameof(tag)); case TrackType.CdMode1: { - if(dicTrack.Bps != 2352) + if(aaruTrack.Bps != 2352) throw new FeatureNotPresentImageException("Image does not include tags for mode 1 sectors"); switch(tag) @@ -551,9 +551,9 @@ namespace Aaru.DiscImages ulong remainingSectors = length; - if(dicTrack.Pregap > 0 && sectorAddress < dicTrack.Pregap) + if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap) { - ulong remainingPregap = dicTrack.Pregap - sectorAddress; + ulong remainingPregap = aaruTrack.Pregap - sectorAddress; byte[] zero; if(length > remainingPregap) { @@ -571,10 +571,10 @@ namespace Aaru.DiscImages if(remainingSectors == 0) return buffer; - imageStream = dicTrack.Trackfilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfilter.GetDataForkStream(); BinaryReader br = new BinaryReader(imageStream); br.BaseStream - .Seek(dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + dicTrack.Pregap * dicTrack.Bps), + .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps), SeekOrigin.Begin); if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors)); else @@ -617,18 +617,18 @@ namespace Aaru.DiscImages return new byte[length * 2352]; } - GdiTrack dicTrack = new GdiTrack {Sequence = 0}; + GdiTrack aaruTrack = new GdiTrack {Sequence = 0}; foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track)) { - dicTrack = gdiTrack; + aaruTrack = gdiTrack; break; } - if(dicTrack.Sequence == 0) + if(aaruTrack.Sequence == 0) throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image"); - if(sectorAddress + length > dicTrack.Sectors) + if(sectorAddress + length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than present in track, won't cross tracks"); @@ -636,7 +636,7 @@ namespace Aaru.DiscImages uint sectorSize; uint sectorSkip; - switch(dicTrack.Tracktype) + switch(aaruTrack.Tracktype) { case TrackType.Audio: { @@ -647,7 +647,7 @@ namespace Aaru.DiscImages } case TrackType.CdMode1: { - if(dicTrack.Bps == 2352) + if(aaruTrack.Bps == 2352) { sectorOffset = 0; sectorSize = 2352; @@ -669,9 +669,9 @@ namespace Aaru.DiscImages ulong remainingSectors = length; - if(dicTrack.Pregap > 0 && sectorAddress < dicTrack.Pregap) + if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap) { - ulong remainingPregap = dicTrack.Pregap - sectorAddress; + ulong remainingPregap = aaruTrack.Pregap - sectorAddress; byte[] zero; if(length > remainingPregap) { @@ -689,10 +689,10 @@ namespace Aaru.DiscImages if(remainingSectors == 0) return buffer; - imageStream = dicTrack.Trackfilter.GetDataForkStream(); + imageStream = aaruTrack.Trackfilter.GetDataForkStream(); BinaryReader br = new BinaryReader(imageStream); br.BaseStream - .Seek(dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + dicTrack.Pregap * dicTrack.Bps), + .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps), SeekOrigin.Begin); if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors)); else diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs index 4a79b8540..e5f1a5f36 100644 --- a/Aaru.Images/Nero/Read.cs +++ b/Aaru.Images/Nero/Read.cs @@ -1089,19 +1089,19 @@ namespace Aaru.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - if(!neroTracks.TryGetValue(track, out NeroTrack dicTrack)) + if(!neroTracks.TryGetValue(track, out NeroTrack aaruTrack)) throw new ArgumentOutOfRangeException(nameof(track), "Track not found"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length}) than present in track ({dicTrack.Sectors}), won't cross tracks"); + $"Requested more sectors ({length}) than present in track ({aaruTrack.Sectors}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; bool mode2 = false; - switch((DaoMode)dicTrack.Mode) + switch((DaoMode)aaruTrack.Mode) { case DaoMode.Data: case DaoMode.DataM2F1: @@ -1188,7 +1188,7 @@ namespace Aaru.DiscImages imageStream = neroFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); - br.BaseStream.Seek((long)dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(mode2) @@ -1224,12 +1224,12 @@ namespace Aaru.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - if(!neroTracks.TryGetValue(track, out NeroTrack dicTrack)) + if(!neroTracks.TryGetValue(track, out NeroTrack aaruTrack)) throw new ArgumentOutOfRangeException(nameof(track), "Track not found"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length}) than present in track ({dicTrack.Sectors}), won't cross tracks"); + $"Requested more sectors ({length}) than present in track ({aaruTrack.Sectors}), won't cross tracks"); uint sectorOffset; uint sectorSize; @@ -1250,20 +1250,20 @@ namespace Aaru.DiscImages byte[] flags = new byte[1]; flags[0] = 0x00; - if((DaoMode)dicTrack.Mode != DaoMode.Audio && - (DaoMode)dicTrack.Mode != DaoMode.AudioSub) + if((DaoMode)aaruTrack.Mode != DaoMode.Audio && + (DaoMode)aaruTrack.Mode != DaoMode.AudioSub) flags[0] += 0x4; return flags; } - case SectorTagType.CdTrackIsrc: return dicTrack.Isrc; + case SectorTagType.CdTrackIsrc: return aaruTrack.Isrc; case SectorTagType.CdTrackText: throw new FeatureSupportedButNotImplementedImageException("Feature not yet implemented"); default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); } - switch((DaoMode)dicTrack.Mode) + switch((DaoMode)aaruTrack.Mode) { case DaoMode.Data: case DaoMode.DataM2F1: throw new ArgumentException("No tags in image for requested track", nameof(tag)); @@ -1468,7 +1468,7 @@ namespace Aaru.DiscImages imageStream = neroFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); - br.BaseStream.Seek((long)dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && @@ -1503,18 +1503,18 @@ namespace Aaru.DiscImages public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - if(!neroTracks.TryGetValue(track, out NeroTrack dicTrack)) + if(!neroTracks.TryGetValue(track, out NeroTrack aaruTrack)) throw new ArgumentOutOfRangeException(nameof(track), "Track not found"); - if(length > dicTrack.Sectors) + if(length > aaruTrack.Sectors) throw new ArgumentOutOfRangeException(nameof(length), - $"Requested more sectors ({length}) than present in track ({dicTrack.Sectors}), won't cross tracks"); + $"Requested more sectors ({length}) than present in track ({aaruTrack.Sectors}), won't cross tracks"); uint sectorOffset; uint sectorSize; uint sectorSkip; - switch((DaoMode)dicTrack.Mode) + switch((DaoMode)aaruTrack.Mode) { case DaoMode.Data: case DaoMode.DataM2F1: @@ -1565,7 +1565,7 @@ namespace Aaru.DiscImages imageStream = neroFilter.GetDataForkStream(); var br = new BinaryReader(imageStream); - br.BaseStream.Seek((long)dicTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); if(sectorOffset == 0 && diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs index 84c6dd452..fa1687e16 100644 --- a/Aaru.Images/RayDIM/Write.cs +++ b/Aaru.Images/RayDIM/Write.cs @@ -191,7 +191,7 @@ namespace Aaru.DiscImages } string headerSignature = - $"Disk IMage VER 1.0 Copyright (C) {DateTime.Now.Year:D4} Ray Arachelian, All Rights Reserved. DIC "; + $"Disk IMage VER 1.0 Copyright (C) {DateTime.Now.Year:D4} Ray Arachelian, All Rights Reserved. Aaru "; RayHdr header = new RayHdr { signature = Encoding.ASCII.GetBytes(headerSignature), diff --git a/Aaru/Commands/Device/Devices.cs b/Aaru/Commands/Device/Devices.cs index 04d554de7..6012f0cee 100644 --- a/Aaru/Commands/Device/Devices.cs +++ b/Aaru/Commands/Device/Devices.cs @@ -52,7 +52,7 @@ namespace Aaru.Commands.Device Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke))); } - public static int Invoke(bool debug, bool verbose, string dicRemoteHost) + public static int Invoke(bool debug, bool verbose, string aaruRemoteHost) { MainClass.PrintCopyright(); @@ -71,7 +71,7 @@ namespace Aaru.Commands.Device out string serverVersion, out string serverOperatingSystem, out string serverOperatingSystemVersion, - out string serverArchitecture, dicRemoteHost); + out string serverArchitecture, aaruRemoteHost); if(isRemote) { @@ -88,7 +88,7 @@ namespace Aaru.Commands.Device { devices = devices.OrderBy(d => d.Path).ToArray(); - if(dicRemoteHost is null) + if(aaruRemoteHost is null) { AaruConsole.WriteLine("{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor", "Model", "Serial", "Bus", "Supported?");