move EngineBufferScaler classes to their own folder

14 files changed, 18 insertions, 18 deletions

diff --git a/build/depends.py b/build/depends.py
index 6271f760fc..c0d65ade59 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -501,7 +501,7 @@ class SoundTouch(Dependence):
 
             build.env.Append(LIBPATH=self.SOUNDTOUCH_INTERNAL_PATH)
             build.env.Append(LIBS=['soundtouch'])
-        return ['src/engine/enginebufferscalest.cpp']
+        return ['src/engine/bufferscalers/enginebufferscalest.cpp']
 
     def configure(self, build, conf, env=None):
         if env is None:
@@ -531,7 +531,7 @@ class SoundTouch(Dependence):
 
 class RubberBand(Dependence):
     def sources(self, build):
-        sources = ['src/engine/enginebufferscalerubberband.cpp', ]
+        sources = ['src/engine/bufferscalers/enginebufferscalerubberband.cpp', ]
         return sources
 
     def configure(self, build, conf, env=None):
@@ -791,8 +791,8 @@ class MixxxCore(Feature):
                    "src/engine/engineworker.cpp",
                    "src/engine/engineworkerscheduler.cpp",
                    "src/engine/enginebuffer.cpp",
-                   "src/engine/enginebufferscale.cpp",
-                   "src/engine/enginebufferscalelinear.cpp",
+                   "src/engine/bufferscalers/enginebufferscale.cpp",
+                   "src/engine/bufferscalers/enginebufferscalelinear.cpp",
                    "src/engine/channels/engineaux.cpp",
                    "src/engine/channels/enginechannel.cpp",
                    "src/engine/channels/enginedeck.cpp",
diff --git a/src/engine/enginebufferscale.cpp b/src/engine/bufferscalers/enginebufferscale.cpp
index 903ee8b286..8e3f977ad0 100644
--- a/src/engine/enginebufferscale.cpp
+++ b/src/engine/bufferscalers/enginebufferscale.cpp
@@ -1,4 +1,4 @@
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 
 #include "engine/engine.h"
 #include "util/defs.h"
diff --git a/src/engine/enginebufferscale.h b/src/engine/bufferscalers/enginebufferscale.h
index 609cf54fb5..609cf54fb5 100644
--- a/src/engine/enginebufferscale.h
+++ b/src/engine/bufferscalers/enginebufferscale.h
diff --git a/src/engine/enginebufferscalelinear.cpp b/src/engine/bufferscalers/enginebufferscalelinear.cpp
index 4a186e4d87..c632158b20 100644
--- a/src/engine/enginebufferscalelinear.cpp
+++ b/src/engine/bufferscalers/enginebufferscalelinear.cpp
@@ -1,4 +1,4 @@
-#include "engine/enginebufferscalelinear.h"
+#include "engine/bufferscalers/enginebufferscalelinear.h"
 
 #include <QtDebug>
 
diff --git a/src/engine/enginebufferscalelinear.h b/src/engine/bufferscalers/enginebufferscalelinear.h
index 2e1a43cf3f..f30a951db8 100644
--- a/src/engine/enginebufferscalelinear.h
+++ b/src/engine/bufferscalers/enginebufferscalelinear.h
@@ -1,7 +1,7 @@
 #ifndef ENGINEBUFFERSCALELINEAR_H
 #define ENGINEBUFFERSCALELINEAR_H
 
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 #include "engine/readaheadmanager.h"
 
 /** Number of samples to read ahead */
diff --git a/src/engine/enginebufferscalerubberband.cpp b/src/engine/bufferscalers/enginebufferscalerubberband.cpp
index ee3125feec..c17973804d 100644
--- a/src/engine/enginebufferscalerubberband.cpp
+++ b/src/engine/bufferscalers/enginebufferscalerubberband.cpp
@@ -1,4 +1,4 @@
-#include "engine/enginebufferscalerubberband.h"
+#include "engine/bufferscalers/enginebufferscalerubberband.h"
 
 #include <rubberband/RubberBandStretcher.h>
 
diff --git a/src/engine/enginebufferscalerubberband.h b/src/engine/bufferscalers/enginebufferscalerubberband.h
index 2525408e18..53d07370a7 100644
--- a/src/engine/enginebufferscalerubberband.h
+++ b/src/engine/bufferscalers/enginebufferscalerubberband.h
@@ -1,7 +1,7 @@
 #ifndef ENGINEBUFFERSCALERUBBERBAND_H
 #define ENGINEBUFFERSCALERUBBERBAND_H
 
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 #include "util/memory.h"
 
 namespace RubberBand {
diff --git a/src/engine/enginebufferscalest.cpp b/src/engine/bufferscalers/enginebufferscalest.cpp
index 1ac81b5f4e..59a19a8af8 100644
--- a/src/engine/enginebufferscalest.cpp
+++ b/src/engine/bufferscalers/enginebufferscalest.cpp
@@ -1,4 +1,4 @@
-#include "engine/enginebufferscalest.h"
+#include "engine/bufferscalers/enginebufferscalest.h"
 
 // Fixes redefinition warnings from SoundTouch.
 #undef TRUE
diff --git a/src/engine/enginebufferscalest.h b/src/engine/bufferscalers/enginebufferscalest.h
index 26ddc353bc..7ac8d61100 100644
--- a/src/engine/enginebufferscalest.h
+++ b/src/engine/bufferscalers/enginebufferscalest.h
@@ -1,7 +1,7 @@
 #ifndef ENGINEBUFFERSCALEST_H
 #define ENGINEBUFFERSCALEST_H
 
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 #include "util/memory.h"
 
 class ReadAheadManager;
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 20d78eaa4e..90c02d1bbb 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -17,9 +17,9 @@
 #include "engine/controls/loopingcontrol.h"
 #include "engine/controls/quantizecontrol.h"
 #include "engine/controls/ratecontrol.h"
-#include "engine/enginebufferscalelinear.h"
-#include "engine/enginebufferscalerubberband.h"
-#include "engine/enginebufferscalest.h"
+#include "engine/bufferscalers/enginebufferscalelinear.h"
+#include "engine/bufferscalers/enginebufferscalerubberband.h"
+#include "engine/bufferscalers/enginebufferscalest.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/enginemaster.h"
 #include "engine/engineworkerscheduler.h"
diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp
index a35269d0de..44e8cd4d43 100644
--- a/src/engine/positionscratchcontroller.cpp
+++ b/src/engine/positionscratchcontroller.cpp
@@ -1,7 +1,7 @@
 #include <QtDebug>
 
 #include "engine/positionscratchcontroller.h"
-#include "engine/enginebufferscale.h" // for MIN_SEEK_SPEED
+#include "engine/bufferscalers/enginebufferscale.h" // for MIN_SEEK_SPEED
 #include "util/math.h"
 
 class VelocityController {
diff --git a/src/test/enginebufferscalelineartest.cpp b/src/test/enginebufferscalelineartest.cpp
index 224c45d3e8..7ba0d6ba7c 100644
--- a/src/test/enginebufferscalelineartest.cpp
+++ b/src/test/enginebufferscalelineartest.cpp
@@ -4,7 +4,7 @@
 #include <QtDebug>
 #include <QVector>
 
-#include "engine/enginebufferscalelinear.h"
+#include "engine/bufferscalers/enginebufferscalelinear.h"
 #include "engine/readaheadmanager.h"
 #include "test/mixxxtest.h"
 #include "util/math.h"
diff --git a/src/test/mockedenginebackendtest.h b/src/test/mockedenginebackendtest.h
index 9c64ac0433..e1902d5b2b 100644
--- a/src/test/mockedenginebackendtest.h
+++ b/src/test/mockedenginebackendtest.h
@@ -11,7 +11,7 @@
 #include "mixer/deck.h"
 #include "effects/effectsmanager.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"
diff --git a/src/test/signalpathtest.h b/src/test/signalpathtest.h
index deccb79a4b..3cddde67e7 100644
--- a/src/test/signalpathtest.h
+++ b/src/test/signalpathtest.h
@@ -12,7 +12,7 @@
 #include "mixer/deck.h"
 #include "effects/effectsmanager.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginebufferscale.h"
+#include "engine/bufferscalers/enginebufferscale.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"