salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Track to ReaderTrack because we're about to start working on WriterTracks.

Browse Source
This commit is contained in:
David Given
2018-12-31 20:27:21 +01:00
parent d7cad63feb
commit b99a18e513
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/reader.cc
View File

@@ -46,7 +46,7 @@ void setReaderDefaults(int minTrack, int maxTrack, int minSide, int maxSide)
endside = maxSide;
}
Fluxmap& Track::read()
Fluxmap& ReaderTrack::read()
{
if (!_read)
{
@@ -62,18 +62,18 @@ Fluxmap& Track::read()
return *_fluxmap.get();
}
void Track::forceReread()
void ReaderTrack::forceReread()
{
_read = false;
}
void CapturedTrack::reallyRead()
void CapturedReaderTrack::reallyRead()
{
usbSeek(track);
_fluxmap = usbRead(side, revolutions);
}
void FileTrack::reallyRead()
void FileReaderTrack::reallyRead()
{
if (!indb)
{
@@ -83,7 +83,7 @@ void FileTrack::reallyRead()
_fluxmap = sqlReadFlux(indb, track, side);
}
std::vector<std::unique_ptr<Track>> readTracks()
std::vector<std::unique_ptr<ReaderTrack>> readTracks()
{
auto f = source.value();
std::smatch match;
@@ -121,13 +121,15 @@ std::vector<std::unique_ptr<Track>> readTracks()
);
}
std::vector<std::unique_ptr<Track>> tracks;
std::vector<std::unique_ptr<ReaderTrack>> tracks;
for (int track=starttrack; track<=endtrack; track++)
{
for (int side=startside; side<=endside; side++)
{
std::unique_ptr<Track> t(
basefilename.empty() ? (Track*)new CapturedTrack() : (Track*)new FileTrack());
std::unique_ptr<ReaderTrack> t(
basefilename.empty()
? (ReaderTrack*)new CapturedReaderTrack()
: (ReaderTrack*)new FileReaderTrack());
t->track = track;
t->side = side;
tracks.push_back(std::move(t));

10
lib/reader.h
View File

@@ -3,10 +3,10 @@
class Fluxmap;
class Track
class ReaderTrack
{
public:
virtual ~Track() {}
virtual ~ReaderTrack() {}
int track;
int side;
@@ -20,19 +20,19 @@ protected:
std::unique_ptr<Fluxmap> _fluxmap;
};
class CapturedTrack : public Track
class CapturedReaderTrack : public ReaderTrack
{
public:
void reallyRead();
};
class FileTrack : public Track
class FileReaderTrack : public ReaderTrack
{
public:
void reallyRead();
};
extern void setReaderDefaults(int minTrack, int maxTrack, int minSide, int maxSide);
extern std::vector<std::unique_ptr<Track>> readTracks();
extern std::vector<std::unique_ptr<ReaderTrack>> readTracks();
#endif