move CachingReader classes to their own folder

13 files changed, 14 insertions, 14 deletions

diff --git a/build/depends.py b/build/depends.py
index 82aa4de74a..6271f760fc 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -829,9 +829,9 @@ class MixxxCore(Feature):
                    "src/engine/controls/ratecontrol.cpp",
                    "src/engine/readaheadmanager.cpp",
                    "src/engine/enginetalkoverducking.cpp",
-                   "src/engine/cachingreader.cpp",
-                   "src/engine/cachingreaderchunk.cpp",
-                   "src/engine/cachingreaderworker.cpp",
+                   "src/engine/cachingreader/cachingreader.cpp",
+                   "src/engine/cachingreader/cachingreaderchunk.cpp",
+                   "src/engine/cachingreader/cachingreaderworker.cpp",
 
                    "src/analyzer/trackanalysisscheduler.cpp",
                    "src/analyzer/analyzerthread.cpp",
diff --git a/src/engine/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index 3bfcd868d1..ed573d771f 100644
--- a/src/engine/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -1,7 +1,7 @@
 #include <QtDebug>
 #include <QFileInfo>
 
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "control/controlobject.h"
 #include "track/track.h"
 #include "util/assert.h"
diff --git a/src/engine/cachingreader.h b/src/engine/cachingreader/cachingreader.h
index 029b44246d..036f9de8d7 100644
--- a/src/engine/cachingreader.h
+++ b/src/engine/cachingreader/cachingreader.h
@@ -16,7 +16,7 @@
 #include "track/track.h"
 #include "engine/engineworker.h"
 #include "util/fifo.h"
-#include "engine/cachingreaderworker.h"
+#include "engine/cachingreader/cachingreaderworker.h"
 
 // A Hint is an indication to the CachingReader that a certain section of a
 // SoundSource will be used 'soon' and so it should be brought into memory by
diff --git a/src/engine/cachingreaderchunk.cpp b/src/engine/cachingreader/cachingreaderchunk.cpp
index 9eb2dbbf08..f750ddaf1f 100644
--- a/src/engine/cachingreaderchunk.cpp
+++ b/src/engine/cachingreader/cachingreaderchunk.cpp
@@ -1,4 +1,4 @@
-#include "engine/cachingreaderchunk.h"
+#include "engine/cachingreader/cachingreaderchunk.h"
 
 #include <QtDebug>
 
diff --git a/src/engine/cachingreaderchunk.h b/src/engine/cachingreader/cachingreaderchunk.h
index 463e736666..463e736666 100644
--- a/src/engine/cachingreaderchunk.h
+++ b/src/engine/cachingreader/cachingreaderchunk.h
diff --git a/src/engine/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp
index 34f9a9ac83..aeccbfb5e4 100644
--- a/src/engine/cachingreaderworker.cpp
+++ b/src/engine/cachingreader/cachingreaderworker.cpp
@@ -4,7 +4,7 @@
 
 #include "control/controlobject.h"
 
-#include "engine/cachingreaderworker.h"
+#include "engine/cachingreader/cachingreaderworker.h"
 #include "sources/soundsourceproxy.h"
 #include "util/compatibility.h"
 #include "util/event.h"
diff --git a/src/engine/cachingreaderworker.h b/src/engine/cachingreader/cachingreaderworker.h
index 54c5a4c77e..fc6a438dd1 100644
--- a/src/engine/cachingreaderworker.h
+++ b/src/engine/cachingreader/cachingreaderworker.h
@@ -7,7 +7,7 @@
 #include <QThread>
 #include <QString>
 
-#include "engine/cachingreaderchunk.h"
+#include "engine/cachingreader/cachingreaderchunk.h"
 #include "track/track.h"
 #include "engine/engineworker.h"
 #include "sources/audiosource.h"
diff --git a/src/engine/controls/enginecontrol.h b/src/engine/controls/enginecontrol.h
index 3d85173a1d..9d4641f661 100644
--- a/src/engine/controls/enginecontrol.h
+++ b/src/engine/controls/enginecontrol.h
@@ -13,7 +13,7 @@
 #include "track/track.h"
 #include "control/controlvalue.h"
 #include "engine/effects/groupfeaturestate.h"
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 
 class EngineMaster;
 class EngineBuffer;
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index ccb0ddc11f..20d78eaa4e 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -2,7 +2,7 @@
 
 #include <QtDebug>
 
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "preferences/usersettings.h"
 #include "control/controlindicator.h"
 #include "control/controllinpotmeter.h"
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h
index 1a477d67a2..36a6975880 100644
--- a/src/engine/enginebuffer.h
+++ b/src/engine/enginebuffer.h
@@ -22,7 +22,7 @@
 #include <QAtomicInt>
 #include <gtest/gtest_prod.h>
 
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "preferences/usersettings.h"
 #include "control/controlvalue.h"
 #include "engine/engineobject.h"
diff --git a/src/engine/readaheadmanager.cpp b/src/engine/readaheadmanager.cpp
index 369f258423..a70473bb89 100644
--- a/src/engine/readaheadmanager.cpp
+++ b/src/engine/readaheadmanager.cpp
@@ -3,7 +3,7 @@
 
 #include "engine/readaheadmanager.h"
 
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "engine/controls/loopingcontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "util/defs.h"
diff --git a/src/engine/readaheadmanager.h b/src/engine/readaheadmanager.h
index 7547f18a0d..519b270bff 100644
--- a/src/engine/readaheadmanager.h
+++ b/src/engine/readaheadmanager.h
@@ -10,7 +10,7 @@
 
 #include "util/types.h"
 #include "util/math.h"
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 
 class LoopingControl;
 class RateControl;
diff --git a/src/test/readaheadmanager_test.cpp b/src/test/readaheadmanager_test.cpp
index 5ab56772cd..4dd0651902 100644
--- a/src/test/readaheadmanager_test.cpp
+++ b/src/test/readaheadmanager_test.cpp
@@ -3,7 +3,7 @@
 #include <QtDebug>
 #include <QScopedPointer>
 
-#include "engine/cachingreader.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "control/controlobject.h"
 #include "engine/controls/loopingcontrol.h"
 #include "engine/readaheadmanager.h"