From 94f14feeb71f36f7562dc3250e07216c5ce1880f Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 1 Dec 2015 04:25:01 +0000 Subject: [PATCH] * DiscImageChef/Commands/MediaInfo.cs: DCB was incorrectly being asked to HD DVD instead of DVD+. * DiscImageChef.Decoders/DVD/CSS&CPRM.cs: Must return value. --- DiscImageChef.Decoders/ChangeLog | 5 +++++ DiscImageChef.Decoders/DVD/CSS&CPRM.cs | 2 ++ DiscImageChef/ChangeLog | 5 +++++ DiscImageChef/Commands/MediaInfo.cs | 14 +++++++------- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index 65690b58..325432ac 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,8 @@ +2015-12-01 Natalia Portillo + + * DVD/CSS&CPRM.cs: + Must return value. + 2015-12-01 Natalia Portillo * DVD/CSS&CPRM.cs: diff --git a/DiscImageChef.Decoders/DVD/CSS&CPRM.cs b/DiscImageChef.Decoders/DVD/CSS&CPRM.cs index 6d60833e..21ec8379 100644 --- a/DiscImageChef.Decoders/DVD/CSS&CPRM.cs +++ b/DiscImageChef.Decoders/DVD/CSS&CPRM.cs @@ -138,6 +138,8 @@ namespace DiscImageChef.Decoders.DVD cmi.RegionInformation = response[5]; cmi.Reserved3 = response[6]; cmi.Reserved4 = response[7]; + + return cmi; } public static string PrettifyLeadInCopyright(LeadInCopyright? cmi) diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 3e75ede4..fe246239 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,8 @@ +2015-12-01 Natalia Portillo + + * Commands/MediaInfo.cs: + DCB was incorrectly being asked to HD DVD instead of DVD+. + 2015-12-01 Natalia Portillo * Commands/MediaInfo.cs: diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs index 72dc37c6..0aa3a2e9 100644 --- a/DiscImageChef/Commands/MediaInfo.cs +++ b/DiscImageChef/Commands/MediaInfo.cs @@ -480,7 +480,13 @@ namespace DiscImageChef.Commands if(sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: ADIP\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_adip.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + doWriteFile(outputPrefix, "_readdiscstructure_dvd+_adip.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DCB, 0, dev.Timeout, out duration); + if(sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DCB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd+_dcb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion All DVD+ @@ -492,12 +498,6 @@ namespace DiscImageChef.Commands DicConsole.ErrorWriteLine("READ DISC STRUCTURE: HDDVD CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_hddvd_cmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DCB, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DCB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_dcb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion HD DVD-ROM