ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert CompileCueJob.CompiledCueIndex to a readonly struct

This commit is contained in:
YoshiRulz 2021-01-02 18:35:00 +10:00
parent d87066c634
commit 277f57eebd
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
View File

@ -17,19 +17,20 @@ namespace BizHawk.Emulation.DiscSystem.CUE
public string ISRC; public string ISRC;
} }
internal class CompiledCueIndex internal readonly struct CompiledCueIndex
{ {
public int Number; /// <remarks>this is annoying, it should just be an integer</remarks>
public readonly Timestamp FileMSF;
/// <summary> public readonly int Number;
/// this is annoying, it should just be an integer
/// </summary>
public Timestamp FileMSF;
public override string ToString() public CompiledCueIndex(int number, Timestamp fileMSF)
{ {
return $"I#{Number:D2} {FileMSF}"; Number = number;
FileMSF = fileMSF;
} }
public override readonly string ToString() => $"I#{Number:D2} {FileMSF}";
} }
/// <summary> /// <summary>
@ -108,13 +109,9 @@ namespace BizHawk.Emulation.DiscSystem.CUE
public override string ToString() public override string ToString()
{ {
var idx = Indexes.Find((i) => i.Number == 1); var idx = Indexes.Find((i) => i.Number == 1);
if (idx == null) if (idx.Number != 1) return $"T#{Number:D2} NO INDEX 1";
return $"T#{Number:D2} NO INDEX 1"; var indexlist = string.Join("|", Indexes);
else return $"T#{Number:D2} {BlobIndex}:{idx.FileMSF} ({indexlist})";
{
var indexlist = string.Join("|", Indexes);
return $"T#{Number:D2} {BlobIndex}:{idx.FileMSF} ({indexlist})";
}
} }
} }
@ -345,18 +342,14 @@ namespace BizHawk.Emulation.DiscSystem.CUE
//normalize: if an index 0 is missing, add it here //normalize: if an index 0 is missing, add it here
if (curr_track.Indexes[0].Number != 0) if (curr_track.Indexes[0].Number != 0)
{ {
var index0 = new CompiledCueIndex();
var index1 = curr_track.Indexes[0];
index0.Number = 0;
index0.FileMSF = index1.FileMSF; //same MSF as index 1 will make it effectively nonexistent
//well now, if it's the first in the file, an implicit index will take its value from 00:00:00 in the file //well now, if it's the first in the file, an implicit index will take its value from 00:00:00 in the file
//this is the kind of thing I sought to solve originally by 'interpreting' the file, but it seems easy enough to handle this way //this is the kind of thing I sought to solve originally by 'interpreting' the file, but it seems easy enough to handle this way
//my carlin.cue tests this but test cases shouldn't be hard to find //my carlin.cue tests this but test cases shouldn't be hard to find
if (curr_track.IsFirstInFile) var fileMSF = curr_track.IsFirstInFile
index0.FileMSF = new Timestamp(0); ? new Timestamp(0)
: curr_track.Indexes[0].FileMSF; // else, same MSF as index 1 will make it effectively nonexistent
curr_track.Indexes.Insert(0, index0); curr_track.Indexes.Insert(0, new CompiledCueIndex(0, fileMSF));
} }
OUT_CompiledCueTracks.Add(curr_track); OUT_CompiledCueTracks.Add(curr_track);
@ -395,11 +388,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
private void AddIndex(CUE_File.Command.INDEX indexCommand) private void AddIndex(CUE_File.Command.INDEX indexCommand)
{ {
curr_track.Indexes.Add(new CompiledCueIndex curr_track.Indexes.Add(new CompiledCueIndex(indexCommand.Number, indexCommand.Timestamp));
{
FileMSF = indexCommand.Timestamp,
Number = indexCommand.Number
});
} }
public override void Run() public override void Run()