summaryrefslogtreecommitdiffstats
path: root/src/mixer/playermanager.cpp
diff options
context:
space:
mode:
authorOwen Williams <owilliams@mixxx.org>2020-03-16 10:24:35 -0400
committerOwen Williams <owilliams@mixxx.org>2020-03-16 10:24:35 -0400
commit392edc844b59e2e6201c028cdb9d22b7db1de173 (patch)
tree3ecc2165dc57ac27269562ef78041264e3556675 /src/mixer/playermanager.cpp
parentf7d988c5f7d76587fc65433bccf4a43abbca2383 (diff)
master sync: clang-format changed lines
Diffstat (limited to 'src/mixer/playermanager.cpp')
-rw-r--r--src/mixer/playermanager.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index a9a6b8b12c..43cd07ac14 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -5,9 +5,8 @@
#include <QMutexLocker>
#include "control/controlobject.h"
-#include "control/controlobject.h"
-#include "effects/effectsmanager.h"
#include "effects/effectrack.h"
+#include "effects/effectsmanager.h"
#include "engine/channels/enginedeck.h"
#include "engine/enginemaster.h"
#include "library/library.h"
@@ -17,15 +16,14 @@
#include "mixer/previewdeck.h"
#include "mixer/sampler.h"
#include "mixer/samplerbank.h"
+#include "preferences/dialog/dlgprefdeck.h"
#include "soundio/soundmanager.h"
#include "track/track.h"
#include "util/assert.h"
#include "util/defs.h"
#include "util/logger.h"
-#include "util/stat.h"
#include "util/sleepableqthread.h"
-#include "preferences/dialog/dlgprefdeck.h"
-
+#include "util/stat.h"
namespace {