diff --git a/DiscImageChef.DiscImages/ChangeLog b/DiscImageChef.DiscImages/ChangeLog index bce5cec5a..9ea82e335 100644 --- a/DiscImageChef.DiscImages/ChangeLog +++ b/DiscImageChef.DiscImages/ChangeLog @@ -1,3 +1,7 @@ +2016-10-10 Natalia Portillo + + * CloneCD.cs: Correct subchannel reading. + 2016-10-08 Natalia Portillo * CloneCD.cs: diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs index 9262b59d9..3fb5ad1fc 100644 --- a/DiscImageChef.DiscImages/CloneCD.cs +++ b/DiscImageChef.DiscImages/CloneCD.cs @@ -95,7 +95,7 @@ namespace DiscImageChef.DiscImages public CloneCD() { Name = "CloneCD"; - PluginUUID = new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784\n"); + PluginUUID = new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); ImageInfo.readableMediaTags = new List(); @@ -1053,8 +1053,8 @@ namespace DiscImageChef.DiscImages break; case SectorTagType.CDSectorSubchannel: buffer = new byte[96 * length]; - dataStream.Seek((long)(_track.TrackSubchannelOffset + sectorAddress * 96), SeekOrigin.Begin); - dataStream.Read(buffer, 0, buffer.Length); + subStream.Seek((long)(_track.TrackSubchannelOffset + sectorAddress * 96), SeekOrigin.Begin); + subStream.Read(buffer, 0, buffer.Length); break; default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); diff --git a/DiscImageChef.DiscImages/DiscJuggler.cs b/DiscImageChef.DiscImages/DiscJuggler.cs new file mode 100644 index 000000000..ea686ba85 --- /dev/null +++ b/DiscImageChef.DiscImages/DiscJuggler.cs @@ -0,0 +1,41 @@ +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : DiscJuggler.cs +// Author(s) : Natalia Portillo +// +// Component : Component +// +// --[ Description ] ---------------------------------------------------------- +// +// Description +// +// --[ License ] -------------------------------------------------------------- +// +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 2.1 of the +// License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2016 Natalia Portillo +// ****************************************************************************/ +using System; +namespace DiscImageChef.DiscImages +{ + public class DiscJuggler + { + public DiscJuggler() + { + } + } +} diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 87d1c1e4d..160f1d079 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,8 @@ +2016-10-10 Natalia Portillo + + * DetectImageFormat.cs: + Add debug output. + 2016-10-07 Natalia Portillo * DiscImageChef.csproj: diff --git a/DiscImageChef/DetectImageFormat.cs b/DiscImageChef/DetectImageFormat.cs index 9a190ffe7..c4719191c 100644 --- a/DiscImageChef/DetectImageFormat.cs +++ b/DiscImageChef/DetectImageFormat.cs @@ -32,6 +32,7 @@ using System; using DiscImageChef.Filters; +using DiscImageChef.Console; namespace DiscImageChef.ImagePlugins { @@ -54,6 +55,7 @@ namespace DiscImageChef.ImagePlugins { try { + DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name); if(_imageplugin.IdentifyImage(imageFilter)) { _imageFormat = _imageplugin; @@ -77,6 +79,7 @@ namespace DiscImageChef.ImagePlugins { try { + DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name); if(_imageplugin.IdentifyImage(imageFilter)) { _imageFormat = _imageplugin;