From 96f5729cfc9352f971070808d70f322a0fbd0fe5 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 30 Jan 2020 23:04:37 +0000
Subject: [PATCH] Fix passing by of media type by dumping methods.

---
 .../Devices/Dumping/CompactDisc/Dump.cs         |  5 ++---
 DiscImageChef.Core/Devices/Dumping/MMC.cs       | 17 +++++++++--------
 DiscImageChef.Core/Devices/Dumping/SBC.cs       |  2 +-
 DiscImageChef.Core/Devices/Dumping/SCSI.cs      |  7 +++----
 DiscImageChef.Core/Devices/Dumping/XGD.cs       |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
index cd8da73ea..b5760c95f 100644
--- a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -62,8 +62,7 @@ namespace DiscImageChef.Core.Devices.Dumping
     partial class Dump
     {
         /// <summary>Dumps a compact disc</summary>
-        /// <param name="dskType">Disc type as detected in MMC layer</param>
-        void CompactDisc(out MediaType dskType)
+        void CompactDisc()
         {
             ExtentsULong           audioExtents;                                 // Extents with audio sectors
             ulong                  blocks;                                       // Total number of positive sectors
@@ -115,7 +114,7 @@ namespace DiscImageChef.Core.Devices.Dumping
 
             Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>(); // Media tags
 
-            dskType = MediaType.CD;
+            MediaType dskType = MediaType.CD;
 
             if(_dumpRaw)
             {
diff --git a/DiscImageChef.Core/Devices/Dumping/MMC.cs b/DiscImageChef.Core/Devices/Dumping/MMC.cs
index c4df5117d..cb9833352 100644
--- a/DiscImageChef.Core/Devices/Dumping/MMC.cs
+++ b/DiscImageChef.Core/Devices/Dumping/MMC.cs
@@ -50,12 +50,13 @@ namespace DiscImageChef.Core.Devices.Dumping
     partial class Dump
     {
         /// <summary>Dumps an optical disc</summary>
-        void Mmc(ref MediaType dskType)
+        void Mmc()
         {
-            bool   sense;
-            byte[] tmpBuf;
-            bool   compactDisc = true;
-            bool   isXbox      = false;
+            MediaType dskType = MediaType.Unknown;
+            bool      sense;
+            byte[]    tmpBuf;
+            bool      compactDisc = true;
+            bool      isXbox      = false;
             _speedMultiplier = 1;
 
             // TODO: Log not only what is it reading, but if it was read correctly or not.
@@ -194,7 +195,7 @@ namespace DiscImageChef.Core.Devices.Dumping
 
             if(compactDisc)
             {
-                CompactDisc(out dskType);
+                CompactDisc();
 
                 return;
             }
@@ -681,12 +682,12 @@ namespace DiscImageChef.Core.Devices.Dumping
 
             if(isXbox)
             {
-                Xgd(mediaTags, ref dskType);
+                Xgd(mediaTags, dskType);
 
                 return;
             }
 
-            Sbc(mediaTags, ref dskType, true);
+            Sbc(mediaTags, dskType, true);
         }
 
         static void AddMediaTagToSidecar(string outputPath, KeyValuePair<MediaTagType, byte[]> tag,
diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs
index daa52fb4e..cf203a452 100644
--- a/DiscImageChef.Core/Devices/Dumping/SBC.cs
+++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs
@@ -60,7 +60,7 @@ namespace DiscImageChef.Core.Devices.Dumping
         /// <param name="opticalDisc">If device contains an optical disc (e.g. DVD or BD)</param>
         /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
         /// <param name="dskType">Disc type as detected in SCSI or MMC layer</param>
-        internal void Sbc(Dictionary<MediaTagType, byte[]> mediaTags, ref MediaType dskType, bool opticalDisc)
+        internal void Sbc(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType, bool opticalDisc)
         {
             bool               sense;
             byte               scsiMediumType     = 0;
diff --git a/DiscImageChef.Core/Devices/Dumping/SCSI.cs b/DiscImageChef.Core/Devices/Dumping/SCSI.cs
index 2fb4cbef7..925a1fb97 100644
--- a/DiscImageChef.Core/Devices/Dumping/SCSI.cs
+++ b/DiscImageChef.Core/Devices/Dumping/SCSI.cs
@@ -45,8 +45,7 @@ namespace DiscImageChef.Core.Devices.Dumping
         /// <summary>Dumps a SCSI Block Commands device or a Reduced Block Commands devices</summary>
         public void Scsi()
         {
-            MediaType dskType = MediaType.Unknown;
-            int       resets  = 0;
+            int resets = 0;
 
             if(_dev.IsRemovable)
             {
@@ -235,14 +234,14 @@ namespace DiscImageChef.Core.Devices.Dumping
                     return;
                 case PeripheralDeviceTypes.MultiMediaDevice:
                     if(_outputPlugin is IWritableOpticalImage)
-                        Mmc(ref dskType);
+                        Mmc();
                     else
                         StoppingErrorMessage?.
                             Invoke("The specified plugin does not support storing optical disc images.");
 
                     return;
                 default:
-                    Sbc(null, ref dskType, false);
+                    Sbc(null, MediaType.Unknown, false);
 
                     break;
             }
diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs
index b2bd82848..cd8023680 100644
--- a/DiscImageChef.Core/Devices/Dumping/XGD.cs
+++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs
@@ -59,7 +59,7 @@ namespace DiscImageChef.Core.Devices.Dumping
         /// <summary>Dumps an Xbox Game Disc using a Kreon drive</summary>
         /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
         /// <param name="dskType">Disc type as detected in MMC layer</param>
-        internal void Xgd(Dictionary<MediaTagType, byte[]> mediaTags, ref MediaType dskType)
+        internal void Xgd(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType)
         {
             bool       sense;
             const uint BLOCK_SIZE   = 2048;