diff options
| author | RJ Ryan <rryan@mixxx.org> | 2016-04-27 10:33:48 -0700 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2016-04-27 10:33:48 -0700 |
| commit | d920f19d95ba3ea89083cd65e7bbc0814f82b0c6 (patch) | |
| tree | 13f9c20f3ef37e41213a92069fdfff1fca67b7fd /src/mixer | |
| parent | 4c5995cc1fb6334ed8933d6db733376465deb17a (diff) | |
Move all Control classes to src/control.
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/basetrackplayer.cpp | 4 | ||||
| -rw-r--r-- | src/mixer/microphone.cpp | 2 | ||||
| -rw-r--r-- | src/mixer/playerinfo.cpp | 2 | ||||
| -rw-r--r-- | src/mixer/playerinfo.h | 2 | ||||
| -rw-r--r-- | src/mixer/playermanager.cpp | 4 | ||||
| -rw-r--r-- | src/mixer/sampler.cpp | 2 | ||||
| -rw-r--r-- | src/mixer/samplerbank.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index 0fb1e4fd22..6eaa707da5 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -3,8 +3,8 @@ #include "mixer/basetrackplayer.h" #include "mixer/playerinfo.h" -#include "controlobject.h" -#include "controlpotmeter.h" +#include "control/controlobject.h" +#include "control/controlpotmeter.h" #include "track/track.h" #include "sources/soundsourceproxy.h" #include "engine/enginebuffer.h" diff --git a/src/mixer/microphone.cpp b/src/mixer/microphone.cpp index 103389e5b7..422c30186c 100644 --- a/src/mixer/microphone.cpp +++ b/src/mixer/microphone.cpp @@ -1,6 +1,6 @@ #include "mixer/microphone.h" -#include "controlobjectslave.h" +#include "control/controlobjectslave.h" #include "engine/enginemaster.h" #include "engine/enginemicrophone.h" #include "soundio/soundmanager.h" diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp index 354da42c03..895684a130 100644 --- a/src/mixer/playerinfo.cpp +++ b/src/mixer/playerinfo.cpp @@ -18,7 +18,7 @@ #include <QMutexLocker> -#include "controlobject.h" +#include "control/controlobject.h" #include "engine/enginechannel.h" #include "engine/enginexfader.h" #include "mixer/playermanager.h" diff --git a/src/mixer/playerinfo.h b/src/mixer/playerinfo.h index 542c0e54b9..960477c953 100644 --- a/src/mixer/playerinfo.h +++ b/src/mixer/playerinfo.h @@ -22,7 +22,7 @@ #include <QMap> #include <QTimerEvent> -#include "controlobjectslave.h" +#include "control/controlobjectslave.h" #include "track/track.h" class PlayerInfo : public QObject { diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index beb29987ca..2db60c9f1c 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -5,8 +5,8 @@ #include <QMutexLocker> #include "analyzer/analyzerqueue.h" -#include "controlobject.h" -#include "controlobject.h" +#include "control/controlobject.h" +#include "control/controlobject.h" #include "effects/effectsmanager.h" #include "engine/enginedeck.h" #include "engine/enginemaster.h" diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp index c8a357b60f..b086c1b2ca 100644 --- a/src/mixer/sampler.cpp +++ b/src/mixer/sampler.cpp @@ -1,6 +1,6 @@ #include "mixer/sampler.h" -#include "controlobject.h" +#include "control/controlobject.h" Sampler::Sampler(QObject* pParent, UserSettingsPointer pConfig, diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp index ea915ae6b0..e4ae049426 100644 --- a/src/mixer/samplerbank.cpp +++ b/src/mixer/samplerbank.cpp @@ -3,7 +3,7 @@ #include <QFileDialog> #include <QMessageBox> -#include "controlpushbutton.h" +#include "control/controlpushbutton.h" #include "mixer/playermanager.h" #include "mixer/sampler.h" #include "track/track.h" |