mirror of
https://github.com/aaru-dps/Aaru.Server.git
synced 2025-12-16 19:24:27 +00:00
Refactor and code cleanup.
This commit is contained in:
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -82,7 +80,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
@@ -59,7 +58,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -98,7 +97,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
@@ -58,7 +57,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
#region Public enumerations
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -98,7 +96,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Byte 8 to 11
|
||||
/// L0 Data Area Capacity
|
||||
/// </summary>
|
||||
public UInt32 Capacity;
|
||||
public uint Capacity;
|
||||
}
|
||||
|
||||
public struct MiddleZoneStartAddress
|
||||
@@ -107,7 +105,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length = 10
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -147,7 +145,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Byte 8 to 11
|
||||
/// Start LBA of Shifted Middle Area on L0
|
||||
/// </summary>
|
||||
public UInt32 ShiftedMiddleAreaStartAddress;
|
||||
public uint ShiftedMiddleAreaStartAddress;
|
||||
}
|
||||
|
||||
public struct JumpIntervalSize
|
||||
@@ -156,7 +154,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length = 10
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -191,7 +189,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Byte 8 to 11
|
||||
/// Jump Interval size for the Regular Interval Layer Jump
|
||||
/// </summary>
|
||||
public UInt32 Size;
|
||||
public uint Size;
|
||||
}
|
||||
|
||||
public struct ManualLayerJumpAddress
|
||||
@@ -200,7 +198,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length = 10
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -235,7 +233,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Byte 8 to 11
|
||||
/// LBA for the manual layer jump
|
||||
/// </summary>
|
||||
public UInt32 LBA;
|
||||
public uint LBA;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -141,17 +141,17 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 8 to 11
|
||||
/// PSN where Data Area starts
|
||||
/// </summary>
|
||||
public UInt32 DataAreaStartPSN;
|
||||
public uint DataAreaStartPSN;
|
||||
/// <summary>
|
||||
/// Bytes 12 to 15
|
||||
/// PSN where Data Area ends
|
||||
/// </summary>
|
||||
public UInt32 DataAreaEndPSN;
|
||||
public uint DataAreaEndPSN;
|
||||
/// <summary>
|
||||
/// Bytes 16 to 19
|
||||
/// PSN where Data Area ends in Layer 0
|
||||
/// </summary>
|
||||
public UInt32 Layer0EndPSN;
|
||||
public uint Layer0EndPSN;
|
||||
/// <summary>
|
||||
/// Byte 20, bit 7
|
||||
/// True if BCA exists. GC/Wii discs do not have this bit set, but there is a BCA, making it unreadable in normal DVD drives
|
||||
@@ -169,7 +169,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 21 to 22
|
||||
/// UMD only, media attribute, application-defined, part of media specific in rest of discs
|
||||
/// </summary>
|
||||
public UInt16 MediaAttribute;
|
||||
public ushort MediaAttribute;
|
||||
#endregion UMD PFI
|
||||
|
||||
#region DVD-RAM PFI
|
||||
@@ -285,12 +285,12 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 36 to 39
|
||||
/// Sector number of the first sector of the current Border Out
|
||||
/// </summary>
|
||||
public UInt32 CurrentBorderOutSector;
|
||||
public uint CurrentBorderOutSector;
|
||||
/// <summary>
|
||||
/// Bytes 40 to 43
|
||||
/// Sector number of the first sector of the next Border In
|
||||
/// </summary>
|
||||
public UInt32 NextBorderInSector;
|
||||
public uint NextBorderInSector;
|
||||
#endregion DVD-R PFI, DVD-RW PFI
|
||||
|
||||
#region DVD+RW PFI
|
||||
@@ -1013,12 +1013,12 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Byte 36
|
||||
/// Start sector number of current RMD in Extra Border Zone
|
||||
/// </summary>
|
||||
public UInt32 CurrentRMDExtraBorderPSN;
|
||||
public uint CurrentRMDExtraBorderPSN;
|
||||
/// <summary>
|
||||
/// Byte 40
|
||||
/// Start sector number of Physical Format Information blocks in Extra Border Zone
|
||||
/// </summary>
|
||||
public UInt32 PFIExtraBorderPSN;
|
||||
public uint PFIExtraBorderPSN;
|
||||
/// <summary>
|
||||
/// Byte 44, bit 0
|
||||
/// If NOT set, Control Data Zone is pre-recorded
|
||||
@@ -1351,7 +1351,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
sizeString = "120mm";
|
||||
break;
|
||||
default:
|
||||
sizeString = String.Format("unknown size identifier {0}", decoded.DiscSize);
|
||||
sizeString = string.Format("unknown size identifier {0}", decoded.DiscSize);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -82,7 +80,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -112,7 +110,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 6 to 7
|
||||
/// Number of remaining RMDs in current RMZ
|
||||
/// </summary>
|
||||
public UInt16 CurrentRemainingRMDs;
|
||||
public ushort CurrentRemainingRMDs;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
@@ -58,7 +57,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -73,17 +72,17 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 4 to 7
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt32 UnusedPrimaryBlocks;
|
||||
public uint UnusedPrimaryBlocks;
|
||||
/// <summary>
|
||||
/// Bytes 8 to 11
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt32 UnusedSupplementaryBlocks;
|
||||
public uint UnusedSupplementaryBlocks;
|
||||
/// <summary>
|
||||
/// Bytes 12 to 15
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt32 AllocatedSupplementaryBlocks;
|
||||
public uint AllocatedSupplementaryBlocks;
|
||||
}
|
||||
|
||||
public static SpareAreaInformation? Decode(byte[] response)
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
// Copyright © 2011-2016 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
|
||||
namespace DiscImageChef.Decoders.DVD
|
||||
{
|
||||
/// <summary>
|
||||
@@ -58,7 +56,7 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 0 to 1
|
||||
/// Data length
|
||||
/// </summary>
|
||||
public UInt16 DataLength;
|
||||
public ushort DataLength;
|
||||
/// <summary>
|
||||
/// Byte 2
|
||||
/// Reserved
|
||||
@@ -83,37 +81,37 @@ namespace DiscImageChef.Decoders.DVD
|
||||
/// Bytes 6 to 7
|
||||
/// Random number
|
||||
/// </summary>
|
||||
public UInt16 RandomNumber;
|
||||
public ushort RandomNumber;
|
||||
/// <summary>
|
||||
/// Byte 8 to 11
|
||||
/// Year
|
||||
/// </summary>
|
||||
public UInt32 Year;
|
||||
public uint Year;
|
||||
/// <summary>
|
||||
/// Byte 12 to 13
|
||||
/// Month
|
||||
/// </summary>
|
||||
public UInt16 Month;
|
||||
public ushort Month;
|
||||
/// <summary>
|
||||
/// Byte 14 to 15
|
||||
/// Day
|
||||
/// </summary>
|
||||
public UInt16 Day;
|
||||
public ushort Day;
|
||||
/// <summary>
|
||||
/// Byte 16 to 17
|
||||
/// Hour
|
||||
/// </summary>
|
||||
public UInt16 Hour;
|
||||
public ushort Hour;
|
||||
/// <summary>
|
||||
/// Byte 18 to 19
|
||||
/// Minute
|
||||
/// </summary>
|
||||
public UInt16 Minute;
|
||||
public ushort Minute;
|
||||
/// <summary>
|
||||
/// Byte 20 to 21
|
||||
/// Second
|
||||
/// </summary>
|
||||
public UInt16 Second;
|
||||
public ushort Second;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user