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

Fix dumpers passing class fields amongst them.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-20 14:18:12 +01:00
parent 552bb57514
commit 4af686c068
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -67,7 +67,7 @@ namespace DiscImageChef.Core.Devices.Dumping
/// Dumps a compact disc /// Dumps a compact disc
/// </summary> /// </summary>
/// <param name="dskType">Disc type as detected in MMC layer</param> /// <param name="dskType">Disc type as detected in MMC layer</param>
internal void CompactDisc(ref MediaType dskType, bool dumpFirstTrackPregap) internal void CompactDisc(ref MediaType dskType)
{ {
uint subSize; uint subSize;
DateTime start; DateTime start;

2
DiscImageChef.Core/Devices/Dumping/Dump.cs
View File

@@ -18,7 +18,6 @@ namespace DiscImageChef.Core.Devices.Dumping
readonly string devicePath; readonly string devicePath;
readonly bool doResume; readonly bool doResume;
readonly bool dumpFirstTrackPregap;
readonly DumpLog dumpLog; readonly DumpLog dumpLog;
readonly bool dumpRaw; readonly bool dumpRaw;
readonly Encoding encoding; readonly Encoding encoding;
@@ -33,6 +32,7 @@ namespace DiscImageChef.Core.Devices.Dumping
readonly CICMMetadataType preSidecar; readonly CICMMetadataType preSidecar;
readonly ushort retryPasses; readonly ushort retryPasses;
readonly bool stopOnError; readonly bool stopOnError;
bool dumpFirstTrackPregap;
Resume resume; Resume resume;
uint skip; uint skip;

6
DiscImageChef.Core/Devices/Dumping/MMC.cs
View File

@@ -67,10 +67,10 @@ namespace DiscImageChef.Core.Devices.Dumping
/// <param name="dumpLog">Dump logger</param> /// <param name="dumpLog">Dump logger</param>
/// <param name="encoding">Encoding to use when analyzing dump</param> /// <param name="encoding">Encoding to use when analyzing dump</param>
/// <param name="dskType">Disc type as detected in MMC layer</param> /// <param name="dskType">Disc type as detected in MMC layer</param>
/// <param name="dumpLeadIn">Try to read and dump as much Lead-in as possible</param> /// <param name="dumpFirstTrackPregap">Try to read and dump as much Lead-in as possible</param>
/// <param name="outputPath">Path to output file</param> /// <param name="outputPath">Path to output file</param>
/// <param name="formatOptions">Formats to pass to output file plugin</param> /// <param name="formatOptions">Formats to pass to output file plugin</param>
internal void Mmc(ref MediaType dskType, bool dumpLeadIn) internal void Mmc(ref MediaType dskType)
{ {
bool sense; bool sense;
byte[] tmpBuf; byte[] tmpBuf;
@@ -182,7 +182,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(compactDisc) if(compactDisc)
{ {
CompactDisc(ref dskType, dumpLeadIn); CompactDisc(ref dskType);
return; return;
} }

4
DiscImageChef.Core/Devices/Dumping/SCSI.cs
View File

@@ -30,7 +30,6 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
using System.Threading; using System.Threading;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.CommonTypes.Interfaces;
@@ -62,7 +61,6 @@ namespace DiscImageChef.Core.Devices.Dumping
/// <param name="dumpFirstTrackPregap">Try to read and dump as much Lead-in as possible</param> /// <param name="dumpFirstTrackPregap">Try to read and dump as much Lead-in as possible</param>
/// <param name="outputPath">Path to output file</param> /// <param name="outputPath">Path to output file</param>
/// <param name="formatOptions">Formats to pass to output file plugin</param> /// <param name="formatOptions">Formats to pass to output file plugin</param>
/// <exception cref="ArgumentException">If you asked to dump long sectors from a SCSI Streaming device</exception>
public void Scsi() public void Scsi()
{ {
MediaType dskType = MediaType.Unknown; MediaType dskType = MediaType.Unknown;
@@ -219,7 +217,7 @@ namespace DiscImageChef.Core.Devices.Dumping
Ssc(); Ssc();
return; return;
case PeripheralDeviceTypes.MultiMediaDevice: case PeripheralDeviceTypes.MultiMediaDevice:
if(outputPlugin is IWritableOpticalImage opticalPlugin) Mmc(ref dskType, dumpFirstTrackPregap); if(outputPlugin is IWritableOpticalImage opticalPlugin) Mmc(ref dskType);
else else
StoppingErrorMessage StoppingErrorMessage
?.Invoke("The specified plugin does not support storing optical disc images."); ?.Invoke("The specified plugin does not support storing optical disc images.");