Rename track -> cylinder in lots of places.

This commit is contained in:
David Given
2025-08-16 17:39:55 +02:00
parent 53026f3d02
commit 4ebda29171
11 changed files with 59 additions and 57 deletions

View File

@@ -71,17 +71,17 @@ public:
int tracks = _header.tracks * _header.sides;
for (int i = 0; i < tracks; i++)
{
CwfTrack trackheader;
_if.read((char*)&trackheader, sizeof(trackheader));
CwfTrack trackHeader;
_if.read((char*)&trackHeader, sizeof(trackHeader));
check_for_error();
uint32_t length =
Bytes(trackheader.length, 4).reader().read_le32() -
Bytes(trackHeader.length, 4).reader().read_le32() -
sizeof(CwfTrack);
unsigned track_number = trackheader.track * _header.step;
unsigned track_number = trackHeader.track * _header.step;
off_t pos = _if.tellg();
_trackOffsets[std::make_pair(track_number, trackheader.side)] =
_trackOffsets[std::make_pair(track_number, trackHeader.side)] =
std::make_pair(pos, length);
_if.seekg(pos + length);
}

View File

@@ -71,14 +71,14 @@ public:
if (offset == 0)
return std::make_unique<Fluxmap>();
ScpTrackHeader trackheader;
ScpTrackHeader trackHeader;
_if.seekg(offset, std::ios::beg);
_if.read((char*)&trackheader, sizeof(trackheader));
_if.read((char*)&trackHeader, sizeof(trackHeader));
check_for_error();
if ((trackheader.track_id[0] != 'T') ||
(trackheader.track_id[1] != 'R') ||
(trackheader.track_id[2] != 'K'))
if ((trackHeader.track_id[0] != 'T') ||
(trackHeader.track_id[1] != 'R') ||
(trackHeader.track_id[2] != 'K'))
error("corrupt SCP file");
std::vector<ScpTrackRevolution> revs(_header.revolutions);