Rename Track to TrackInfo, which better describes what it is.

2025-10-31 11:17:01 -07:00 · 2022-09-16 00:09:39 +02:00
parent 4a565b5ea0
commit 81cbd00cc8
24 changed files with 64 additions and 64 deletions
--- a/arch/amiga/encoder.cc
+++ b/arch/amiga/encoder.cc
@@ -110,7 +110,7 @@ public:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/apple2/encoder.cc
+++ b/arch/apple2/encoder.cc
@@ -36,7 +36,7 @@ private:
    const Apple2EncoderProto& _config;

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/brother/encoder.cc
+++ b/arch/brother/encoder.cc
@@ -108,7 +108,7 @@ public:

 public:
    std::unique_ptr<Fluxmap> encode(
-		std::shared_ptr<const Track>& layout,
+		std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/c64/encoder.cc
+++ b/arch/c64/encoder.cc
@@ -175,7 +175,7 @@ public:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/ibm/encoder.cc
+++ b/arch/ibm/encoder.cc
@@ -107,7 +107,7 @@ private:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/macintosh/encoder.cc
+++ b/arch/macintosh/encoder.cc
@@ -220,7 +220,7 @@ public:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/micropolis/encoder.cc
+++ b/arch/micropolis/encoder.cc
@@ -77,7 +77,7 @@ public:
    {
    }

-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/northstar/encoder.cc
+++ b/arch/northstar/encoder.cc
@@ -128,7 +128,7 @@ public:
    {
    }

-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/tids990/encoder.cc
+++ b/arch/tids990/encoder.cc
@@ -60,7 +60,7 @@ private:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/arch/victor9k/encoder.cc
+++ b/arch/victor9k/encoder.cc
@@ -164,7 +164,7 @@ private:
    }

 public:
-    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) override
    {
--- a/lib/decoders/decoders.cc
+++ b/lib/decoders/decoders.cc
@@ -61,7 +61,7 @@ std::unique_ptr<Decoder> Decoder::create(const DecoderProto& config)
 }

 std::shared_ptr<TrackDataFlux> Decoder::decodeToSectors(
-    std::shared_ptr<const Fluxmap> fluxmap, std::shared_ptr<const Track>& layout)
+    std::shared_ptr<const Fluxmap> fluxmap, std::shared_ptr<const TrackInfo>& layout)
 {
    _trackdata = std::make_shared<TrackDataFlux>();
    _trackdata->fluxmap = fluxmap;
@@ -222,7 +222,7 @@ uint64_t Decoder::readRaw64()
 }

 std::set<LogicalLocation> Decoder::requiredSectors(
-    std::shared_ptr<const Track>& layout) const
+    std::shared_ptr<const TrackInfo>& layout) const
 {
    const auto trackLayout =
        Layout::getLayoutOfTrackPhysical(layout->physicalTrack, layout->physicalSide);
--- a/lib/decoders/decoders.h
+++ b/lib/decoders/decoders.h
@@ -51,7 +51,7 @@ public:
 public:
    std::shared_ptr<TrackDataFlux> decodeToSectors(
        std::shared_ptr<const Fluxmap> fluxmap,
-        std::shared_ptr<const Track>& location);
+        std::shared_ptr<const TrackInfo>& location);

    void pushRecord(
        const Fluxmap::Position& start, const Fluxmap::Position& end);
@@ -90,7 +90,7 @@ public:
    }

    virtual std::set<LogicalLocation> requiredSectors(
-        std::shared_ptr<const Track>& location) const;
+        std::shared_ptr<const TrackInfo>& location) const;

 protected:
    virtual void beginTrack(){};
--- a/lib/encoders/encoders.cc
+++ b/lib/encoders/encoders.cc
@@ -57,13 +57,13 @@ nanoseconds_t Encoder::calculatePhysicalClockPeriod(
 }

 std::shared_ptr<const Sector> Encoder::getSector(
-    std::shared_ptr<const Track>& layout, const Image& image, unsigned sectorId)
+    std::shared_ptr<const TrackInfo>& layout, const Image& image, unsigned sectorId)
 {
    return image.get(layout->logicalTrack, layout->logicalSide, sectorId);
 }

 std::vector<std::shared_ptr<const Sector>> Encoder::collectSectors(
-    std::shared_ptr<const Track>& trackLayout, const Image& image)
+    std::shared_ptr<const TrackInfo>& trackLayout, const Image& image)
 {
    std::vector<std::shared_ptr<const Sector>> sectors;

--- a/lib/encoders/encoders.h
+++ b/lib/encoders/encoders.h
@@ -17,12 +17,12 @@ public:

 public:
    virtual std::shared_ptr<const Sector> getSector(
-        std::shared_ptr<const Track>&, const Image& image, unsigned sectorId);
+        std::shared_ptr<const TrackInfo>&, const Image& image, unsigned sectorId);

    virtual std::vector<std::shared_ptr<const Sector>> collectSectors(
-        std::shared_ptr<const Track>&, const Image& image);
+        std::shared_ptr<const TrackInfo>&, const Image& image);

-    virtual std::unique_ptr<Fluxmap> encode(std::shared_ptr<const Track>& layout,
+    virtual std::unique_ptr<Fluxmap> encode(std::shared_ptr<const TrackInfo>& layout,
        const std::vector<std::shared_ptr<const Sector>>& sectors,
        const Image& image) = 0;

--- a/lib/flux.h
+++ b/lib/flux.h
@@ -6,7 +6,7 @@
 class Fluxmap;
 class Sector;
 class Image;
-class Track;
+class TrackInfo;

 struct Record
 {
@@ -18,7 +18,7 @@ struct Record

 struct TrackDataFlux
 {
-	std::shared_ptr<const Track> layout;
+	std::shared_ptr<const TrackInfo> layout;
 	std::shared_ptr<const Fluxmap> fluxmap;
 	std::vector<std::shared_ptr<const Record>> records;
 	std::vector<std::shared_ptr<const Sector>> sectors;
@@ -26,7 +26,7 @@ struct TrackDataFlux

 struct TrackFlux
 {
-	std::shared_ptr<const Track> layout;
+	std::shared_ptr<const TrackInfo> layout;
 	std::vector<std::shared_ptr<TrackDataFlux>> trackDatas;
 	std::set<std::shared_ptr<const Sector>> sectors;
 };
--- a/lib/layout.cc
+++ b/lib/layout.cc
@@ -4,7 +4,7 @@
 #include "lib/environment.h"
 #include <fmt/format.h>

-static Local<std::map<std::pair<int, int>, std::shared_ptr<Track>>>
+static Local<std::map<std::pair<int, int>, std::shared_ptr<TrackInfo>>>
    layoutCache;

 static unsigned getTrackStep()
@@ -38,7 +38,7 @@ unsigned Layout::remapSideLogicalToPhysical(unsigned lside)
    return lside ^ config.layout().swap_sides();
 }

-std::vector<std::shared_ptr<const Track>> Layout::computeLocations()
+std::vector<std::shared_ptr<const TrackInfo>> Layout::computeLocations()
 {
    std::set<unsigned> tracks;
    if (config.has_tracks())
@@ -52,7 +52,7 @@ std::vector<std::shared_ptr<const Track>> Layout::computeLocations()
    else
        heads = iterate(0, config.layout().sides());

-    std::vector<std::shared_ptr<const Track>> locations;
+    std::vector<std::shared_ptr<const TrackInfo>> locations;
    for (unsigned logicalTrack : tracks)
    {
        for (unsigned logicalHead : heads)
@@ -125,13 +125,13 @@ std::vector<unsigned> Layout::expandSectorList(
    return sectors;
 }

-std::shared_ptr<const Track> Layout::getLayoutOfTrack(
+std::shared_ptr<const TrackInfo> Layout::getLayoutOfTrack(
    unsigned logicalTrack, unsigned logicalSide)
 {
    auto& layout = (*layoutCache)[std::make_pair(logicalTrack, logicalSide)];
    if (!layout)
    {
-    	layout = std::make_shared<Track>();
+    	layout = std::make_shared<TrackInfo>();

        LayoutProto::LayoutdataProto layoutdata;
        for (const auto& f : config.layout().layoutdata())
@@ -190,7 +190,7 @@ std::shared_ptr<const Track> Layout::getLayoutOfTrack(
    return layout;
 }

-std::shared_ptr<const Track> Layout::getLayoutOfTrackPhysical(
+std::shared_ptr<const TrackInfo> Layout::getLayoutOfTrackPhysical(
    unsigned physicalTrack, unsigned physicalSide)
 {
    return getLayoutOfTrack(remapTrackPhysicalToLogical(physicalTrack),
--- a/lib/layout.h
+++ b/lib/layout.h
@@ -4,7 +4,7 @@
 #include "lib/flux.h"

 class SectorListProto;
-class Track;
+class TrackInfo;

 class Layout
 {
@@ -25,7 +25,7 @@ public:
    /* Uses the layout and current track and heads settings to determine
     * which Locations are going to be read from or written to. 8/
     */
-    static std::vector<std::shared_ptr<const Track>> computeLocations();
+    static std::vector<std::shared_ptr<const TrackInfo>> computeLocations();

    /* Returns a series of <track, side> pairs representing the filesystem
     * ordering of the disk, in logical numbers. */
@@ -33,11 +33,11 @@ public:
        unsigned guessedTracks = 0, unsigned guessedSides = 0);

    /* Returns the layout of a given track. */
-    static std::shared_ptr<const Track> getLayoutOfTrack(
+    static std::shared_ptr<const TrackInfo> getLayoutOfTrack(
        unsigned logicalTrack, unsigned logicalHead);

    /* Returns the layout of a given track via physical location. */
-    static std::shared_ptr<const Track> getLayoutOfTrackPhysical(
+    static std::shared_ptr<const TrackInfo> getLayoutOfTrackPhysical(
        unsigned physicalTrack, unsigned physicalSide);

    /* Expand a SectorList into the actual sector IDs. */
@@ -45,14 +45,14 @@ public:
        const SectorListProto& sectorsProto);
 };

-class Track {
+class TrackInfo {
 public:
-	Track() {}
+	TrackInfo() {}

 private:
    /* Can't copy. */
-    Track(const Track&);
-    Track& operator=(const Track&);
+    TrackInfo(const TrackInfo&);
+    TrackInfo& operator=(const TrackInfo&);

 public:
    unsigned numTracks = 0;
--- a/lib/readerwriter.cc
+++ b/lib/readerwriter.cc
@@ -156,7 +156,7 @@ static std::set<std::shared_ptr<const Sector>> collectSectors(

 BadSectorsState combineRecordAndSectors(TrackFlux& trackFlux,
    Decoder& decoder,
-    std::shared_ptr<const Track>& layout)
+    std::shared_ptr<const TrackInfo>& layout)
 {
    std::set<std::shared_ptr<const Sector>> track_sectors;

@@ -182,7 +182,7 @@ BadSectorsState combineRecordAndSectors(TrackFlux& trackFlux,
 }

 ReadResult readGroup(FluxSourceIteratorHolder& fluxSourceIteratorHolder,
-    std::shared_ptr<const Track>& layout,
+    std::shared_ptr<const TrackInfo>& layout,
    TrackFlux& trackFlux,
    Decoder& decoder)
 {
@@ -224,9 +224,9 @@ ReadResult readGroup(FluxSourceIteratorHolder& fluxSourceIteratorHolder,

 void writeTracks(FluxSink& fluxSink,
    std::function<std::unique_ptr<const Fluxmap>(
-        std::shared_ptr<const Track>& layout)> producer,
-    std::function<bool(std::shared_ptr<const Track>& layout)> verifier,
-    std::vector<std::shared_ptr<const Track>>& layouts)
+        std::shared_ptr<const TrackInfo>& layout)> producer,
+    std::function<bool(std::shared_ptr<const TrackInfo>& layout)> verifier,
+    std::vector<std::shared_ptr<const TrackInfo>>& layouts)
 {
    Logger() << BeginOperationLogMessage{"Encoding and writing to disk"};

@@ -294,11 +294,11 @@ void writeTracks(FluxSink& fluxSink,
 void writeTracks(FluxSink& fluxSink,
    Encoder& encoder,
    const Image& image,
-    std::vector<std::shared_ptr<const Track>>& layouts)
+    std::vector<std::shared_ptr<const TrackInfo>>& layouts)
 {
    writeTracks(
        fluxSink,
-        [&](std::shared_ptr<const Track>& layout)
+        [&](std::shared_ptr<const TrackInfo>& layout)
        {
            auto sectors = encoder.collectSectors(layout, image);
            return encoder.encode(layout, sectors, image);
@@ -315,16 +315,16 @@ void writeTracksAndVerify(FluxSink& fluxSink,
    FluxSource& fluxSource,
    Decoder& decoder,
    const Image& image,
-    std::vector<std::shared_ptr<const Track>>& locations)
+    std::vector<std::shared_ptr<const TrackInfo>>& locations)
 {
    writeTracks(
        fluxSink,
-        [&](std::shared_ptr<const Track>& layout)
+        [&](std::shared_ptr<const TrackInfo>& layout)
        {
            auto sectors = encoder.collectSectors(layout, image);
            return encoder.encode(layout, sectors, image);
        },
-        [&](std::shared_ptr<const Track>& layout)
+        [&](std::shared_ptr<const TrackInfo>& layout)
        {
            auto trackFlux = std::make_shared<TrackFlux>();
            trackFlux->layout = layout;
@@ -381,7 +381,7 @@ void writeDiskCommand(const Image& image,
    FluxSink& fluxSink,
    Decoder* decoder,
    FluxSource* fluxSource,
-    std::vector<std::shared_ptr<const Track>>& locations)
+    std::vector<std::shared_ptr<const TrackInfo>>& locations)
 {
    if (fluxSource && decoder)
        writeTracksAndVerify(
@@ -405,7 +405,7 @@ void writeRawDiskCommand(FluxSource& fluxSource, FluxSink& fluxSink)
 	auto locations = Layout::computeLocations();
    writeTracks(
        fluxSink,
-        [&](std::shared_ptr<const Track>& layout)
+        [&](std::shared_ptr<const TrackInfo>& layout)
        {
            return fluxSource
                .readFlux(layout->physicalTrack, layout->physicalSide)
@@ -420,7 +420,7 @@ void writeRawDiskCommand(FluxSource& fluxSource, FluxSink& fluxSink)

 std::shared_ptr<TrackFlux> readAndDecodeTrack(FluxSource& fluxSource,
    Decoder& decoder,
-    std::shared_ptr<const Track>& layout)
+    std::shared_ptr<const TrackInfo>& layout)
 {
    auto trackFlux = std::make_shared<TrackFlux>();
    trackFlux->layout = layout;
--- a/lib/readerwriter.h
+++ b/lib/readerwriter.h
@@ -11,7 +11,7 @@ class Fluxmap;
 class Image;
 class ImageReader;
 class ImageWriter;
-class Track;
+class TrackInfo;
 class TrackFlux;

 extern void measureDiskRotation(
@@ -19,15 +19,15 @@ extern void measureDiskRotation(

 extern void writeTracks(FluxSink& fluxSink,
    const std::function<std::unique_ptr<const Fluxmap>(
-        std::shared_ptr<const Track>& layout)> producer,
-    std::vector<std::shared_ptr<const Track>>& locations);
+        std::shared_ptr<const TrackInfo>& layout)> producer,
+    std::vector<std::shared_ptr<const TrackInfo>>& locations);

 extern void writeTracksAndVerify(FluxSink& fluxSink,
    Encoder& encoder,
    FluxSource& fluxSource,
    Decoder& decoder,
    const Image& image,
-    std::vector<std::shared_ptr<const Track>>& locations);
+    std::vector<std::shared_ptr<const TrackInfo>>& locations);

 extern void fillBitmapTo(std::vector<bool>& bitmap,
    unsigned& cursor,
@@ -39,7 +39,7 @@ extern void writeDiskCommand(const Image& image,
    FluxSink& fluxSink,
    Decoder* decoder,
    FluxSource* fluxSource,
-    std::vector<std::shared_ptr<const Track>>& locations);
+    std::vector<std::shared_ptr<const TrackInfo>>& locations);

 extern void writeDiskCommand(const Image& image,
    Encoder& encoder,
@@ -51,7 +51,7 @@ extern void writeRawDiskCommand(FluxSource& fluxSource, FluxSink& fluxSink);

 extern std::shared_ptr<TrackFlux> readAndDecodeTrack(FluxSource& fluxSource,
    Decoder& decoder,
-    std::shared_ptr<const Track>& layout);
+    std::shared_ptr<const TrackInfo>& layout);

 extern std::shared_ptr<const DiskFlux> readDiskCommand(
    FluxSource& fluxsource, Decoder& decoder);
--- a/lib/sector.cc
+++ b/lib/sector.cc
@@ -10,7 +10,7 @@ Sector::Sector(const LogicalLocation& location):
 	physicalSide(Layout::remapSideLogicalToPhysical(location.logicalSide))
 {}

-Sector::Sector(std::shared_ptr<const Track>& layout, unsigned sectorId):
+Sector::Sector(std::shared_ptr<const TrackInfo>& layout, unsigned sectorId):
 	LogicalLocation({ layout->logicalTrack, layout->logicalSide, sectorId }),
    physicalTrack(layout->physicalTrack),
    physicalSide(layout->physicalSide)
--- a/lib/sector.h
+++ b/lib/sector.h
@@ -5,7 +5,7 @@
 #include "fluxmap.h"

 class Record;
-class Track;
+class TrackInfo;

 struct LogicalLocation
 {
@@ -65,7 +65,7 @@ struct Sector : public LogicalLocation

    Sector() {}

-    Sector(std::shared_ptr<const Track>& layout, unsigned sectorId=0);
+    Sector(std::shared_ptr<const TrackInfo>& layout, unsigned sectorId=0);

    Sector(const LogicalLocation& location);

--- a/lib/vfs/fluxsectorinterface.cc
+++ b/lib/vfs/fluxsectorinterface.cc
@@ -56,7 +56,7 @@ public:

    void flushChanges() override
    {
-        std::vector<std::shared_ptr<const Track>> locations;
+        std::vector<std::shared_ptr<const TrackInfo>> locations;

        for (const auto& trackid : _changedTracks)
        {
--- a/src/gui/fluxviewercontrol.cc
+++ b/src/gui/fluxviewercontrol.cc
@@ -434,7 +434,7 @@ void FluxViewerControl::ShowSectorMenu(std::shared_ptr<const Sector> sector)
    PopupMenu(&menu, _mouseX, _mouseY);
 }

-void FluxViewerControl::ShowRecordMenu(std::shared_ptr<const Track>& layout,
+void FluxViewerControl::ShowRecordMenu(std::shared_ptr<const TrackInfo>& layout,
    std::shared_ptr<const Record> record)
 {
    wxMenu menu;
@@ -502,7 +502,7 @@ void FluxViewerControl::DisplayRawData(std::shared_ptr<const Sector> sector)
    TextViewerWindow::Create(this, title, s.str())->Show();
 }

-void FluxViewerControl::DisplayRawData(std::shared_ptr<const Track>& layout,
+void FluxViewerControl::DisplayRawData(std::shared_ptr<const TrackInfo>& layout,
    std::shared_ptr<const Record> record)
 {
    std::stringstream s;
--- a/src/gui/fluxviewercontrol.h
+++ b/src/gui/fluxviewercontrol.h
@@ -8,7 +8,7 @@ class wxScrollBar;
 class wxScrollEvent;
 class Sector;
 class Record;
-class Track;
+class TrackInfo;

 class FluxViewerControl : public wxWindow
 {
@@ -27,11 +27,11 @@ public:
 private:
    void UpdateScale();
    void ShowSectorMenu(std::shared_ptr<const Sector> sector);
-    void ShowRecordMenu(std::shared_ptr<const Track>& layout,
+    void ShowRecordMenu(std::shared_ptr<const TrackInfo>& layout,
        std::shared_ptr<const Record> record);
    void DisplayDecodedData(std::shared_ptr<const Sector> sector);
    void DisplayRawData(std::shared_ptr<const Sector> sector);
-    void DisplayRawData(std::shared_ptr<const Track>& layout,
+    void DisplayRawData(std::shared_ptr<const TrackInfo>& layout,
        std::shared_ptr<const Record> record);

 private: