diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-01-10 16:37:38 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-01-10 16:37:38 +0100 |
| commit | 0d974db280f2eaf969a79d34080051f683d9c6fa (patch) | |
| tree | daa064812d027267c4491d05c7e6469400d11739 /src/effects | |
| parent | aef1e1e2a96cbf922f8364d83c33e37c0168168d (diff) | |
| parent | 39465acc94e51acbdff636f63264a4cc4023531a (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# src/preferences/dialog/dlgprefsound.cpp
# src/soundio/soundmanagerconfig.h
# src/track/cueinfo.cpp
# src/track/cueinfo.h
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/effectsmanager.cpp | 2 | ||||
| -rw-r--r-- | src/effects/effectsmanager.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp index 9e2d47f783..7b7049d8a9 100644 --- a/src/effects/effectsmanager.cpp +++ b/src/effects/effectsmanager.cpp @@ -13,6 +13,8 @@ #include "moc_effectsmanager.cpp" #include "util/assert.h" +const QString EffectsManager::kNoEffectString = QStringLiteral("---"); + namespace { constexpr QChar kEffectGroupSeparator = '_'; constexpr QChar kGroupClose = ']'; diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h index 74af13feb1..bafb59c990 100644 --- a/src/effects/effectsmanager.h +++ b/src/effects/effectsmanager.h @@ -23,6 +23,8 @@ class EffectsBackend; class EffectsManager : public QObject { Q_OBJECT public: + static const QString kNoEffectString; + typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest); EffectsManager(QObject* pParent, |