From da441410a6c08405c75dcc45fd8b9ca49836441e Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 5 May 2020 17:58:46 +0100
Subject: [PATCH] Subchannel log always expects subchannel raw.

---
 Aaru.Core/Logging/SubchannelLog.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Aaru.Core/Logging/SubchannelLog.cs b/Aaru.Core/Logging/SubchannelLog.cs
index 0f2c44fff..9145250f3 100644
--- a/Aaru.Core/Logging/SubchannelLog.cs
+++ b/Aaru.Core/Logging/SubchannelLog.cs
@@ -6,6 +6,7 @@ namespace Aaru.Core.Logging
 {
     public class SubchannelLog
     {
+        const    int          _subSize = 96;
         readonly bool         _bcd;
         readonly StreamWriter _logSw;
 
@@ -35,9 +36,7 @@ namespace Aaru.Core.Logging
 
         public void WriteEntry(byte[] subchannel, bool raw, long startingLba, uint blocks)
         {
-            int subSize = raw ? 96 : 16;
-
-            if(subchannel.Length / subSize != blocks)
+            if(subchannel.Length / _subSize != blocks)
             {
                 _logSw.WriteLine("Data length is invalid!");
                 _logSw.Flush();
@@ -54,9 +53,6 @@ namespace Aaru.Core.Logging
             int[] v = new int[subchannel.Length / 8];
             int[] w = new int[subchannel.Length / 8];
 
-            if(!raw)
-                subchannel = Subchannel.ConvertQToRaw(subchannel);
-
             for(int i = 0; i < subchannel.Length; i += 8)
             {
                 p[i / 8] =  subchannel[i] & 0x80;