Skip to content

Commit

Permalink
Remove obsolete virtual functions
Browse files Browse the repository at this point in the history
  • Loading branch information
uklotzde committed Oct 3, 2019
1 parent f2802da commit ff61eeb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/engine/cachingreader.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ class CachingReader : public QObject {
// Construct a CachingReader with the given group.
CachingReader(QString group,
UserSettingsPointer _config);
virtual ~CachingReader();
~CachingReader() override;

virtual void process();
void process();

enum class ReadResult {
// No samples read and buffer untouched(!), try again later in case of a cache miss
Expand All @@ -101,12 +101,12 @@ class CachingReader : public QObject {
// that is not in the cache. If any hints do request a chunk not in cache,
// then wake the reader so that it can process them. Must only be called
// from the engine callback.
virtual void hintAndMaybeWake(const HintVector& hintList);
void hintAndMaybeWake(const HintVector& hintList);

// Request that the CachingReader load a new track. These requests are
// processed in the work thread, so the reader must be woken up via wake()
// for this to take effect.
virtual void newTrack(TrackPointer pTrack);
void newTrack(TrackPointer pTrack);

void setScheduler(EngineWorkerScheduler* pScheduler) {
m_worker.setScheduler(pScheduler);
Expand Down
3 changes: 0 additions & 3 deletions src/engine/cachingreaderworker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ CachingReaderWorker::CachingReaderWorker(
m_stop(0) {
}

CachingReaderWorker::~CachingReaderWorker() {
}

ReaderStatusUpdate CachingReaderWorker::processReadRequest(
const CachingReaderChunkReadRequest& request) {
CachingReaderChunk* pChunk = request.chunk;
Expand Down
6 changes: 3 additions & 3 deletions src/engine/cachingreaderworker.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ class CachingReaderWorker : public EngineWorker {
CachingReaderWorker(QString group,
FIFO<CachingReaderChunkReadRequest>* pChunkReadRequestFIFO,
FIFO<ReaderStatusUpdate>* pReaderStatusFIFO);
virtual ~CachingReaderWorker();
~CachingReaderWorker() override = default;

// Request to load a new track. wake() must be called afterwards.
virtual void newTrack(TrackPointer pTrack);
void newTrack(TrackPointer pTrack);

// Run upkeep operations like loading tracks and reading from file. Run by a
// thread pool via the EngineWorkerScheduler.
virtual void run();
void run() override;

void quitWait();

Expand Down

0 comments on commit ff61eeb

Please sign in to comment.