diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index cb1265d35..3b6b91dd3 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -1171,50 +1171,6 @@ namespace DiscImageChef.Core.Devices.Dumping return; } - } - - /// Dumps a compact disc - /// Disc type as detected in MMC layer - internal void CompactDiscOld(ref MediaType dskType) - { - bool ret; - ulong blocks = 0; - Track[] tracks = new Track[0]; - List trackList = new List(); - long lastSector = 0; - Dictionary trackFlags = new Dictionary(); - TrackType firstTrackType = TrackType.Audio; - Dictionary leadOutStarts = new Dictionary(); - uint subSize = 0; - const uint SECTOR_SIZE = 2352; - uint blockSize = SECTOR_SIZE + subSize; - DateTime start; - DateTime end; - bool readcd = false; - bool read6 = false, read10 = false, read12 = false, read16 = false; - bool sense = false; - FullTOC.CDFullTOC? toc = null; - double totalDuration = 0; - double currentSpeed = 0; - double maxSpeed = double.MinValue; - double minSpeed = double.MaxValue; - uint blocksToRead = 64; - Dictionary mediaTags = new Dictionary(); - byte[] cmdBuf = null; - byte[] senseBuf = null; - byte[] tmpBuf; - MmcSubchannel supportedSubchannel = MmcSubchannel.Raw; - TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type - bool supportsLongSectors = true; - int sessions = 1; - int firstTrackLastSession = 0; - DumpHardwareType currentTry = null; - ExtentsULong extents = null; - DateTime timeSpeedStart = DateTime.UtcNow; - ulong sectorSpeedStart = 0; - - var mhddLog = new MhddLog(outputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); - var ibgLog = new IbgLog(outputPrefix + ".ibg", 0x0008); // If a subchannel is supported, check if output plugin allows us to write it. if(supportedSubchannel != MmcSubchannel.None) @@ -1272,6 +1228,50 @@ namespace DiscImageChef.Core.Devices.Dumping } } } + } + + /// Dumps a compact disc + /// Disc type as detected in MMC layer + internal void CompactDiscOld(ref MediaType dskType) + { + bool ret; + ulong blocks = 0; + Track[] tracks = new Track[0]; + List trackList = new List(); + long lastSector = 0; + Dictionary trackFlags = new Dictionary(); + TrackType firstTrackType = TrackType.Audio; + Dictionary leadOutStarts = new Dictionary(); + uint subSize = 0; + const uint SECTOR_SIZE = 2352; + uint blockSize = SECTOR_SIZE + subSize; + DateTime start; + DateTime end; + bool readcd = false; + bool read6 = false, read10 = false, read12 = false, read16 = false; + bool sense = false; + FullTOC.CDFullTOC? toc = null; + double totalDuration = 0; + double currentSpeed = 0; + double maxSpeed = double.MinValue; + double minSpeed = double.MaxValue; + uint blocksToRead = 64; + Dictionary mediaTags = new Dictionary(); + byte[] cmdBuf = null; + byte[] senseBuf = null; + byte[] tmpBuf; + MmcSubchannel supportedSubchannel = MmcSubchannel.Raw; + TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type + bool supportsLongSectors = true; + int sessions = 1; + int firstTrackLastSession = 0; + DumpHardwareType currentTry = null; + ExtentsULong extents = null; + DateTime timeSpeedStart = DateTime.UtcNow; + ulong sectorSpeedStart = 0; + + var mhddLog = new MhddLog(outputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + var ibgLog = new IbgLog(outputPrefix + ".ibg", 0x0008); // Set track flags foreach(KeyValuePair kvp in trackFlags)