summaryrefslogtreecommitdiffstats
path: root/src/recording
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-12-07 23:21:07 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-12-08 00:03:41 +0100
commit3108ef258011de9f012ce233746524aad413b78e (patch)
tree214e1ea81907a483e315378c00936ad432bcd113 /src/recording
parent371ff2852ba6aec830bee97bf80e27134d515ea3 (diff)
parente0f70a2cc1d10b65f5b7cf5bd832121510e66a11 (diff)
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts: # src/controllers/colormapperjsproxy.cpp # src/controllers/engine/controllerengine.cpp # src/controllers/hid/hidcontroller.cpp # src/database/mixxxdb.cpp # src/library/crate/cratetablemodel.cpp # src/library/dao/trackdao.cpp # src/library/hiddentablemodel.cpp # src/library/library.cpp # src/library/playlisttablemodel.cpp # src/library/trackset/baseplaylistfeature.cpp # src/library/trackset/crate/cratefeaturehelper.cpp # src/mixxxapplication.cpp # src/network/jsonwebtask.cpp # src/preferences/dialog/dlgpreferences.cpp # src/recording/recordingmanager.cpp # src/track/track.cpp # src/widget/wsearchlineedit.cpp
Diffstat (limited to 'src/recording')
-rw-r--r--src/recording/recordingmanager.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index 027d8a15de..2f0a4a28a6 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -12,6 +12,7 @@
#include "engine/sidechain/enginerecord.h"
#include "engine/sidechain/enginesidechain.h"
#include "errordialoghandler.h"
+#include "moc_recordingmanager.cpp"
#include "recording/defs_recording.h"
#define MIN_DISK_FREE 1024 * 1024 * 1024ll // one gibibyte