aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add VideoNow media types.

Browse Source
This commit is contained in:
Natalia Portillo
2019-02-11 20:05:00 +00:00
parent e5a66af5bd
commit 1ce8669ace
14 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.CommonTypes/MediaType.cs
View File

@@ -1049,5 +1049,11 @@ namespace DiscImageChef.CommonTypes
/// <summary>Imation 320Gb RDX</summary>
RDX320 = 734,
#endregion Imation, types 730 to 739
#region VideoNow, types 740 to 749
VideoNow = 740,
VideoNowColor = 741,
VideoNowXp = 742
#endregion
}
}

11
DiscImageChef.CommonTypes/Metadata/Dimensions.cs
View File

@@ -902,6 +902,17 @@ namespace DiscImageChef.CommonTypes.Metadata
dmns.DiameterSpecified = true;
dmns.Thickness = 1.2;
return dmns;
case CommonTypes.MediaType.VideoNow:
dmns.Diameter = 85;
dmns.DiameterSpecified = true;
dmns.Thickness = 1.2;
return dmns;
case CommonTypes.MediaType.VideoNowColor:
case CommonTypes.MediaType.VideoNowXp:
dmns.Diameter = 108;
dmns.DiameterSpecified = true;
dmns.Thickness = 1.2;
return dmns;
#endregion CD/DVD/BD
#region Apple Hard Disks

12
DiscImageChef.CommonTypes/Metadata/MediaType.cs
View File

@@ -1861,6 +1861,18 @@ namespace DiscImageChef.CommonTypes.Metadata
discType = "Hard Disk Drive";
discSubType = "Microdrive";
break;
case CommonTypes.MediaType.VideoNow:
discType = "VideoNow";
discSubType = "VideoNow";
break;
case CommonTypes.MediaType.VideoNowColor:
discType = "VideoNow";
discSubType = "VideoNow Color";
break;
case CommonTypes.MediaType.VideoNowXp:
discType = "VideoNow";
discSubType = "VideoNow XP";
break;
default:
discType = "Unknown";
discSubType = "Unknown";

5
DiscImageChef.DiscImages/Alcohol120/Helpers.cs
View File

@@ -130,7 +130,10 @@ namespace DiscImageChef.DiscImages
case MediaType.Playdia:
case MediaType.Pippin:
case MediaType.FMTOWNS:
case MediaType.MilCD: return AlcoholMediumType.CD;
case MediaType.MilCD:
case MediaType.VideoNow:
case MediaType.VideoNowColor:
case MediaType.VideoNowXp: return AlcoholMediumType.CD;
case MediaType.CDR: return AlcoholMediumType.CDR;
case MediaType.CDRW:
case MediaType.CDMRW: return AlcoholMediumType.CDRW;

3
DiscImageChef.DiscImages/Alcohol120/Properties.cs
View File

@@ -133,7 +133,8 @@ namespace DiscImageChef.DiscImages
MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO,
MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD,
MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon,
MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD
MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
MediaType.VideoNowColor, MediaType.VideoNowXp
};
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
new (string name, Type type, string description, object @default)[] { };

3
DiscImageChef.DiscImages/Alcohol120/Write.cs
View File

@@ -109,6 +109,9 @@ namespace DiscImageChef.DiscImages
case MediaType.Pippin:
case MediaType.FMTOWNS:
case MediaType.MilCD:
case MediaType.VideoNow:
case MediaType.VideoNowColor:
case MediaType.VideoNowXp:
isDvd = false;
break;
default:

3
DiscImageChef.DiscImages/CDRDAO/Properties.cs
View File

@@ -115,7 +115,8 @@ namespace DiscImageChef.DiscImages
MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD,
MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX,
MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
MediaType.FMTOWNS
MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor,
MediaType.VideoNowXp
};
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
new[] {("separate", typeof(bool), "Write each track to a separate file.", (object)false)};

5
DiscImageChef.DiscImages/CDRWin/Helpers.cs
View File

@@ -211,7 +211,10 @@ namespace DiscImageChef.DiscImages
case MediaType.ThreeDO:
case MediaType.VCD:
case MediaType.VCDHD:
case MediaType.MilCD: return CDRWIN_DISK_TYPE_CD;
case MediaType.MilCD:
case MediaType.VideoNow:
case MediaType.VideoNowColor:
case MediaType.VideoNowXp: return CDRWIN_DISK_TYPE_CD;
case MediaType.CDMRW: return CDRWIN_DISK_TYPE_CDMRW;
case MediaType.CDRW: return CDRWIN_DISK_TYPE_CDRW;
case MediaType.DVDPR: return CDRWIN_DISK_TYPE_DVDPR;

3
DiscImageChef.DiscImages/CDRWin/Properties.cs
View File

@@ -120,7 +120,8 @@ namespace DiscImageChef.DiscImages
MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO,
MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD,
MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon,
MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD
MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
MediaType.VideoNowColor, MediaType.VideoNowXp
};
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
new[] {("separate", typeof(bool), "Write each track to a separate file.", (object)false)};

3
DiscImageChef.DiscImages/CloneCD/Properties.cs
View File

@@ -68,7 +68,8 @@ namespace DiscImageChef.DiscImages
MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD,
MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX,
MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
MediaType.FMTOWNS, MediaType.MilCD
MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor,
MediaType.VideoNowXp
};
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
new (string name, Type type, string description, object @default)[] { };

5
DiscImageChef.DiscImages/DiscImageChef/Helpers.cs
View File

@@ -215,7 +215,10 @@ namespace DiscImageChef.DiscImages
case MediaType.Playdia:
case MediaType.Pippin:
case MediaType.FMTOWNS:
case MediaType.MilCD: return XmlMediaType.OpticalDisc;
case MediaType.MilCD:
case MediaType.VideoNow:
case MediaType.VideoNowColor:
case MediaType.VideoNowXp: return XmlMediaType.OpticalDisc;
default: return XmlMediaType.BlockMedia;
}
}

5
DiscImageChef.DiscImages/DiscImageChef/Write.cs
View File

@@ -996,7 +996,10 @@ namespace DiscImageChef.DiscImages
) currentBlockHeader.compression = CompressionType.Flac;
// JaguarCD stores data in audio tracks. FLAC is too inefficient, use LZMA there.
if(imageInfo.MediaType == MediaType.JaguarCD && trk.TrackType == TrackType.Audio &&
// VideoNow stores video in audio tracks, and LZMA works better too.
if((imageInfo.MediaType == MediaType.JaguarCD || imageInfo.MediaType == MediaType.VideoNow ||
imageInfo.MediaType == MediaType.VideoNowColor || imageInfo.MediaType == MediaType.VideoNowXp) &&
trk.TrackType == TrackType.Audio &&
!nocompress &&
currentBlockHeader.compression == CompressionType.Flac &&
trk.TrackSession > 1) currentBlockHeader.compression = CompressionType.Lzma;

5
DiscImageChef.Gui/Forms/frmDump.xeto.cs
View File

@@ -59,7 +59,7 @@ namespace DiscImageChef.Gui.Forms
{
public class frmDump : Form
{
string devicePath;
readonly string devicePath;
string outputPrefix;
Resume resume;
CICMMetadataType sidecar;
@@ -167,6 +167,9 @@ namespace DiscImageChef.Gui.Forms
case MediaType.CD32:
case MediaType.Playdia:
case MediaType.Pippin:
case MediaType.VideoNow:
case MediaType.VideoNowColor:
case MediaType.VideoNowXp:
chkTrack1Pregap.Visible = true;
break;
default:

4
templates/dicformat.bt
View File

@@ -544,6 +544,10 @@ enum <uint> MediaType
FD32MB = 732,
RDX = 733,
RDX320 = 734,
VideoNow = 740,
VideoNowColor = 741,
VideoNowXp = 742
};
enum <ushort> CompressionType