* DiscImageChef.DiscImages/CloneCD.cs:

Correct subchannel reading.

	* DiscImageChef/DetectImageFormat.cs:
	  Add debug output.
This commit is contained in:
2016-10-10 02:05:49 +01:00
parent 9eb0a44b7a
commit 17db00b068
5 changed files with 56 additions and 3 deletions

View File

@@ -1,3 +1,7 @@
2016-10-10 Natalia Portillo <claunia@claunia.com>
* CloneCD.cs: Correct subchannel reading.
2016-10-08 Natalia Portillo <claunia@claunia.com> 2016-10-08 Natalia Portillo <claunia@claunia.com>
* CloneCD.cs: * CloneCD.cs:

View File

@@ -95,7 +95,7 @@ namespace DiscImageChef.DiscImages
public CloneCD() public CloneCD()
{ {
Name = "CloneCD"; Name = "CloneCD";
PluginUUID = new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784\n"); PluginUUID = new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784");
ImageInfo = new ImageInfo(); ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>(); ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>(); ImageInfo.readableMediaTags = new List<MediaTagType>();
@@ -1053,8 +1053,8 @@ namespace DiscImageChef.DiscImages
break; break;
case SectorTagType.CDSectorSubchannel: case SectorTagType.CDSectorSubchannel:
buffer = new byte[96 * length]; buffer = new byte[96 * length];
dataStream.Seek((long)(_track.TrackSubchannelOffset + sectorAddress * 96), SeekOrigin.Begin); subStream.Seek((long)(_track.TrackSubchannelOffset + sectorAddress * 96), SeekOrigin.Begin);
dataStream.Read(buffer, 0, buffer.Length); subStream.Read(buffer, 0, buffer.Length);
break; break;
default: default:
throw new ArgumentException("Unsupported tag requested", nameof(tag)); throw new ArgumentException("Unsupported tag requested", nameof(tag));

View File

@@ -0,0 +1,41 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : DiscJuggler.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// 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 <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.DiscImages
{
public class DiscJuggler
{
public DiscJuggler()
{
}
}
}

View File

@@ -1,3 +1,8 @@
2016-10-10 Natalia Portillo <claunia@claunia.com>
* DetectImageFormat.cs:
Add debug output.
2016-10-07 Natalia Portillo <claunia@claunia.com> 2016-10-07 Natalia Portillo <claunia@claunia.com>
* DiscImageChef.csproj: * DiscImageChef.csproj:

View File

@@ -32,6 +32,7 @@
using System; using System;
using DiscImageChef.Filters; using DiscImageChef.Filters;
using DiscImageChef.Console;
namespace DiscImageChef.ImagePlugins namespace DiscImageChef.ImagePlugins
{ {
@@ -54,6 +55,7 @@ namespace DiscImageChef.ImagePlugins
{ {
try try
{ {
DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter)) if(_imageplugin.IdentifyImage(imageFilter))
{ {
_imageFormat = _imageplugin; _imageFormat = _imageplugin;
@@ -77,6 +79,7 @@ namespace DiscImageChef.ImagePlugins
{ {
try try
{ {
DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter)) if(_imageplugin.IdentifyImage(imageFilter))
{ {
_imageFormat = _imageplugin; _imageFormat = _imageplugin;