summaryrefslogtreecommitdiffstats
path: root/src/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'src/controllers')
-rw-r--r--src/controllers/controllerengine.cpp2
-rw-r--r--src/controllers/controllerengine.h2
-rw-r--r--src/controllers/controllermanager.cpp4
-rw-r--r--src/controllers/controllermanager.h8
-rw-r--r--src/controllers/controllerpresetinfo.h2
-rw-r--r--src/controllers/controlpickermenu.h2
-rw-r--r--src/controllers/defs_controllers.h8
-rw-r--r--src/controllers/dlgcontrollerlearning.h2
-rw-r--r--src/controllers/dlgprefcontroller.cpp4
-rw-r--r--src/controllers/dlgprefcontrollers.cpp2
-rw-r--r--src/controllers/midi/midimessage.h2
11 files changed, 19 insertions, 19 deletions
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
index 2abe7e7543..9c70056f37 100644
--- a/src/controllers/controllerengine.cpp
+++ b/src/controllers/controllerengine.cpp
@@ -205,7 +205,7 @@ void ControllerEngine::initializeScriptEngine() {
/* -------- ------------------------------------------------------
Purpose: Load all script files given in the supplied list
- Input: Global ConfigObject, QString list of file names to load
+ Input: List of script paths and file names to load
Output: Returns true if no errors occured.
-------- ------------------------------------------------------ */
bool ControllerEngine::loadScriptFiles(const QList<QString>& scriptPaths,
diff --git a/src/controllers/controllerengine.h b/src/controllers/controllerengine.h
index 6c91ab5e0a..06ec5cdeca 100644
--- a/src/controllers/controllerengine.h
+++ b/src/controllers/controllerengine.h
@@ -14,7 +14,7 @@
#include <QtScript>
#include "bytearrayclass.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
#include "controllers/controllerpreset.h"
#include "controllers/softtakeover.h"
#include "util/alphabetafilter.h"
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 1ecdad5335..c54c76e648 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -57,7 +57,7 @@ bool controllerCompare(Controller *a,Controller *b) {
return a->getName() < b->getName();
}
-ControllerManager::ControllerManager(ConfigObject<ConfigValue>* pConfig)
+ControllerManager::ControllerManager(UserSettingsPointer pConfig)
: QObject(),
m_pConfig(pConfig),
// WARNING: Do not parent m_pControllerLearningEventFilter to
@@ -398,7 +398,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
}
// static
-QList<QString> ControllerManager::getPresetPaths(ConfigObject<ConfigValue>* pConfig) {
+QList<QString> ControllerManager::getPresetPaths(UserSettingsPointer pConfig) {
QList<QString> scriptPaths;
scriptPaths.append(userPresetsPath(pConfig));
scriptPaths.append(resourcePresetsPath(pConfig));
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index e1b4d061ab..32c35c1166 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -8,7 +8,7 @@
#ifndef CONTROLLERMANAGER_H
#define CONTROLLERMANAGER_H
-#include "configobject.h"
+#include "preferences/usersettings.h"
#include "controllers/controllerenumerator.h"
#include "controllers/controllerpreset.h"
#include "controllers/controllerpresetinfo.h"
@@ -25,7 +25,7 @@ bool controllerCompare(Controller *a,Controller *b);
class ControllerManager : public QObject {
Q_OBJECT
public:
- ControllerManager(ConfigObject<ConfigValue> * pConfig);
+ ControllerManager(UserSettingsPointer pConfig);
virtual ~ControllerManager();
QList<Controller*> getControllers() const;
@@ -37,7 +37,7 @@ class ControllerManager : public QObject {
void setUpDevices() { emit(requestSetUpDevices()); };
void savePresets(bool onlyActive=false) { emit(requestSave(onlyActive)); };
- static QList<QString> getPresetPaths(ConfigObject<ConfigValue>* pConfig);
+ static QList<QString> getPresetPaths(UserSettingsPointer pConfig);
// If pathOrFilename is an absolute path, returns it. If it is a relative
// path and it is contained within any of the directories in presetPaths,
@@ -82,7 +82,7 @@ class ControllerManager : public QObject {
}
private:
- ConfigObject<ConfigValue> *m_pConfig;
+ UserSettingsPointer m_pConfig;
ControllerLearningEventFilter* m_pControllerLearningEventFilter;
QTimer m_pollTimer;
mutable QMutex m_mutex;
diff --git a/src/controllers/controllerpresetinfo.h b/src/controllers/controllerpresetinfo.h
index 5bbf2d7621..1be92b9790 100644
--- a/src/controllers/controllerpresetinfo.h
+++ b/src/controllers/controllerpresetinfo.h
@@ -18,7 +18,7 @@
#include <QHash>
#include <QDomElement>
-#include "configobject.h"
+#include "preferences/usersettings.h"
#include "controllers/controllerpreset.h"
#include "controllers/controllerpresetfilehandler.h"
diff --git a/src/controllers/controlpickermenu.h b/src/controllers/controlpickermenu.h
index 6f82d19a3a..db17b410a9 100644
--- a/src/controllers/controlpickermenu.h
+++ b/src/controllers/controlpickermenu.h
@@ -5,7 +5,7 @@
#include <QObject>
#include <QSignalMapper>
-#include "configobject.h"
+#include "preferences/usersettings.h"
class ControlPickerMenu : public QMenu {
Q_OBJECT
diff --git a/src/controllers/defs_controllers.h b/src/controllers/defs_controllers.h
index 3877d67f20..906f07ac8c 100644
--- a/src/controllers/defs_controllers.h
+++ b/src/controllers/defs_controllers.h
@@ -6,22 +6,22 @@
***************************************************************************/
#include <QDir>
-#include "configobject.h"
+#include "preferences/usersettings.h"
-inline QString resourcePresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString resourcePresetsPath(UserSettingsPointer pConfig) {
QString presetsPath = pConfig->getResourcePath();
QDir dir(presetsPath.append("/controllers/"));
return dir.absolutePath().append("/");
}
// Prior to Mixxx 1.11.0 presets were stored in ${SETTINGS_PATH}/midi.
-inline QString legacyUserPresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString legacyUserPresetsPath(UserSettingsPointer pConfig) {
QString presetsPath = pConfig->getSettingsPath();
QDir dir(presetsPath.append("/midi/"));
return dir.absolutePath().append("/");
}
-inline QString userPresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString userPresetsPath(UserSettingsPointer pConfig) {
QString presetsPath = pConfig->getSettingsPath();
QDir dir(presetsPath.append("/controllers/"));
return dir.absolutePath().append("/");
diff --git a/src/controllers/dlgcontrollerlearning.h b/src/controllers/dlgcontrollerlearning.h
index cb6b8952a1..c56575ef3d 100644
--- a/src/controllers/dlgcontrollerlearning.h
+++ b/src/controllers/dlgcontrollerlearning.h
@@ -23,7 +23,7 @@
#include "controllers/midi/midimessage.h"
#include "controllers/controller.h"
#include "controllers/controllervisitor.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
class ControllerPreset;
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 2e743b6887..eabe3f1be3 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -367,7 +367,7 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
presetDirs.append(presetFileInfo.canonicalPath());
ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
- presetPath, ControllerManager::getPresetPaths(m_pConfig.data()));
+ presetPath, ControllerManager::getPresetPaths(m_pConfig));
// Import the preset scripts to the user scripts folder.
for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
@@ -731,7 +731,7 @@ void DlgPrefController::openScript() {
foreach (QModelIndex index, selectedIndices) {
selectedRows.insert(index.row());
}
- QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig.data());
+ QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig);
foreach (int row, selectedRows) {
QString scriptName = m_ui.m_pScriptsTableWidget->item(row, 0)->text();
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index 0d3a32c0dd..4054cb2b7d 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -25,7 +25,7 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
connect(btnOpenUserPresets, SIGNAL(clicked()),
&m_buttonMapper, SLOT(map()));
- m_buttonMapper.setMapping(btnOpenUserPresets, userPresetsPath(m_pConfig.data()));
+ m_buttonMapper.setMapping(btnOpenUserPresets, userPresetsPath(m_pConfig));
// Connections
connect(m_pControllerManager, SIGNAL(devicesChanged()),
diff --git a/src/controllers/midi/midimessage.h b/src/controllers/midi/midimessage.h
index dd600d6eaf..57aa5e2748 100644
--- a/src/controllers/midi/midimessage.h
+++ b/src/controllers/midi/midimessage.h
@@ -5,7 +5,7 @@
#include <QPair>
#include <QMetaType>
-#include "configobject.h"
+#include "preferences/usersettings.h"
// The second value of each OpCode will be the channel number the message
// corresponds to. So 0xB0 is a CC on the first channel, and 0xB1 is a CC
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 20:17:33 +0000