Merge remote-tracking branch 'upstream/2.5' into main

.github/workflows/build.yml

@@ -316,7 +316,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-[email protected].0
+        uses: azure/trusted-[email protected].20
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -371,7 +371,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-[email protected].0
+        uses: azure/trusted-[email protected].20
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}

res/skins/Deere/mixer.xml

@@ -169,6 +169,7 @@
               <WidgetGroup>
                 <ObjectName>Crossfader</ObjectName>
                 <SizePolicy>me,min</SizePolicy>
+                <MaximumSize>200,</MaximumSize>
                 <Layout>horizontal</Layout>
                 <Children>
                   <SliderComposed>

src/effects/effectsmanager.cpp

@@ -328,7 +328,8 @@ void EffectsManager::saveEffectsXml() {
                     quickEffectChainPresets,
                     standardEffectChainPresets,
                     outputChainPreset});
-    m_pVisibleEffectsList->saveEffectsXml(&doc);
+
+    m_pVisibleEffectsList->saveEffectsXml(&doc, m_pBackendManager);
 
     QDir settingsPath(m_pConfig->getSettingsPath());
     if (!settingsPath.exists()) {

src/effects/presets/effectxmlelements.h

@@ -20,6 +20,7 @@ const QString kEqualizerEffects(QStringLiteral("EqualizerEffects"));
 const QString kChainPresetName(QStringLiteral("ChainPresetName"));
 
 const QString kVisibleEffects(QStringLiteral("VisibleEffects"));
+const QString kHiddenEffects(QStringLiteral("HiddenEffects"));
 
 const QString kChainsRoot(QStringLiteral("Chains"));
 const QString kChain(QStringLiteral("EffectChain"));

src/effects/visibleeffectslist.cpp

@@ -48,9 +48,37 @@ const EffectManifestPointer VisibleEffectsList::previous(
 }
 
 void VisibleEffectsList::readEffectsXml(
-        const QDomDocument& doc, EffectsBackendManagerPointer pBackendManager) {
+        const QDomDocument& doc,
+        EffectsBackendManagerPointer pBackendManager) {
+    QList<EffectManifestPointer> visibleEffects = readEffectsList(
+            doc,
+            pBackendManager,
+            EffectXml::kVisibleEffects);
+    const QList<EffectManifestPointer> hiddenEffects = readEffectsList(
+            doc,
+            pBackendManager,
+            EffectXml::kHiddenEffects);
+
+    // New effects will remain hidden since they are neither in the VisibleEffects
+    // nor in the newly introduced HiddenEffects list.
+    // Unhide all effects that are not in either list.
+    const auto manifests = pBackendManager->getManifestsForBackend(EffectBackendType::BuiltIn);
+    for (const EffectManifestPointer& pManifest : std::as_const(manifests)) {
+        if (!visibleEffects.contains(pManifest) &&
+                !hiddenEffects.contains(pManifest)) {
+            // pre-pend so un-hidden effects are discoverable
+            visibleEffects.prepend(pManifest);
+        }
+    }
+    setList(visibleEffects);
+}
+
+QList<EffectManifestPointer> VisibleEffectsList::readEffectsList(
+        const QDomDocument& doc,
+        EffectsBackendManagerPointer pBackendManager,
+        const QString& xmlElementName) {
     QDomElement root = doc.documentElement();
-    QDomElement visibleEffectsElement = XmlParse::selectElement(root, EffectXml::kVisibleEffects);
+    QDomElement visibleEffectsElement = XmlParse::selectElement(root, xmlElementName);
     QDomNodeList effectsElementsList = visibleEffectsElement.elementsByTagName(EffectXml::kEffect);
     QList<EffectManifestPointer> list;
 
@@ -67,19 +95,26 @@ void VisibleEffectsList::readEffectsXml(
             }
         }
     }
+    return list;
+}
 
-    if (!list.isEmpty()) {
-        setList(list);
-    } else {
-        setList(pBackendManager->getManifestsForBackend(EffectBackendType::BuiltIn));
+void VisibleEffectsList::saveEffectsXml(QDomDocument* pDoc,
+        EffectsBackendManagerPointer pBackendManager) {
+    saveEffectsListXml(pDoc, m_list, EffectXml::kVisibleEffects);
+    auto hiddenEffects = pBackendManager->getManifests();
+    for (const auto& pManifest : std::as_const(m_list)) {
+        hiddenEffects.removeAll(pManifest);
     }
+    saveEffectsListXml(pDoc, hiddenEffects, EffectXml::kHiddenEffects);
 }
 
-void VisibleEffectsList::saveEffectsXml(QDomDocument* pDoc) {
+void VisibleEffectsList::saveEffectsListXml(QDomDocument* pDoc,
+        const QList<EffectManifestPointer>& list,
+        const QString& xmlElementName) {
     QDomElement root = pDoc->documentElement();
-    QDomElement visibleEffectsElement = pDoc->createElement(EffectXml::kVisibleEffects);
+    QDomElement visibleEffectsElement = pDoc->createElement(xmlElementName);
     root.appendChild(visibleEffectsElement);
-    for (const auto& pManifest : std::as_const(m_list)) {
+    for (const auto& pManifest : std::as_const(list)) {
         VERIFY_OR_DEBUG_ASSERT(pManifest) {
             continue;
         }

src/effects/visibleeffectslist.h

@@ -21,12 +21,21 @@ class VisibleEffectsList : public QObject {
     const EffectManifestPointer previous(const EffectManifestPointer pManifest) const;
 
     void setList(const QList<EffectManifestPointer>& newList);
-    void readEffectsXml(const QDomDocument& doc, EffectsBackendManagerPointer pBackendManager);
-    void saveEffectsXml(QDomDocument* pDoc);
+    void readEffectsXml(const QDomDocument& doc,
+            EffectsBackendManagerPointer pBackendManager);
+    void saveEffectsXml(QDomDocument* pDoc,
+            EffectsBackendManagerPointer pBackendManager);
 
   signals:
     void visibleEffectsListChanged();
 
   private:
+    QList<EffectManifestPointer> readEffectsList(const QDomDocument& doc,
+            EffectsBackendManagerPointer pBackendManager,
+            const QString& xmlElementName);
+    void saveEffectsListXml(QDomDocument* pDoc,
+            const QList<EffectManifestPointer>& list,
+            const QString& xmlElementName);
+
     QList<EffectManifestPointer> m_list;
 };

src/library/export/engineprimeexportjob.cpp

@@ -378,6 +378,10 @@ EnginePrimeExportJob::EnginePrimeExportJob(
     }
 }
 
+// out-of-line declaration because we can't generate dtor in
+// header with unique_ptr's of incomplete types.
+EnginePrimeExportJob::~EnginePrimeExportJob() = default;
+
 void EnginePrimeExportJob::loadIds(const QSet<CrateId>& crateIds) {
     DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(m_pTrackCollectionManager);
 

src/library/export/engineprimeexportjob.h

@@ -32,6 +32,8 @@ class EnginePrimeExportJob : public QThread {
             TrackCollectionManager* pTrackCollectionManager,
             QSharedPointer<EnginePrimeExportRequest> pRequest);
 
+    ~EnginePrimeExportJob() override;
+
     /// Run the export job.
     void run() override;
 

src/library/librarytablemodel.cpp

@@ -98,5 +98,6 @@ TrackModel::Capabilities LibraryTableModel::getCapabilities() const {
             Capability::Hide |
             Capability::ResetPlayed |
             Capability::RemoveFromDisk |
-            Capability::Analyze;
+            Capability::Analyze |
+            Capability::Properties;
 }

src/library/missing_hidden/hiddentablemodel.cpp

@@ -97,7 +97,9 @@ Qt::ItemFlags HiddenTableModel::flags(const QModelIndex& index) const {
 TrackModel::Capabilities HiddenTableModel::getCapabilities() const {
     return Capability::Purge |
             Capability::Unhide |
-            Capability::RemoveFromDisk;
+            Capability::RemoveFromDisk |
+            Capability::EditMetadata |
+            Capability::Properties;
 }
 
 QString HiddenTableModel::modelKey(bool noSearch) const {

src/library/missing_hidden/missingtablemodel.cpp

@@ -88,7 +88,7 @@ Qt::ItemFlags MissingTableModel::flags(const QModelIndex &index) const {
 }
 
 TrackModel::Capabilities MissingTableModel::getCapabilities() const {
-    return Capability::Purge;
+    return Capability::Purge | Capability::Properties;
 }
 
 QString MissingTableModel::modelKey(bool noSearch) const {

src/library/playlisttablemodel.cpp

@@ -373,7 +373,8 @@ TrackModel::Capabilities PlaylistTableModel::getCapabilities() const {
             Capability::ResetPlayed |
             Capability::RemoveFromDisk |
             Capability::Hide |
-            Capability::Analyze;
+            Capability::Analyze |
+            Capability::Properties;
 
     if (m_iPlaylistId !=
             m_pTrackCollectionManager->internalCollection()

src/library/trackmodel.h

@@ -52,6 +52,7 @@ class TrackModel {
         RemoveCrate = 1u << 15u,
         RemoveFromDisk = 1u << 16u,
         Analyze = 1u << 17u,
+        Properties = 1u << 18u,
     };
     Q_DECLARE_FLAGS(Capabilities, Capability)
 

src/library/trackset/crate/cratetablemodel.cpp

@@ -133,7 +133,8 @@ TrackModel::Capabilities CrateTableModel::getCapabilities() const {
             Capability::ResetPlayed |
             Capability::Hide |
             Capability::RemoveFromDisk |
-            Capability::Analyze;
+            Capability::Analyze |
+            Capability::Properties;
 
     if (m_selectedCrate.isValid()) {
         Crate crate;

src/preferences/dialog/dlgprefwaveform.cpp

@@ -1,13 +1,21 @@
 #include "preferences/dialog/dlgprefwaveform.h"
 
-#include "control/controlobject.h"
+#include <QMetaEnum>
+
+#include "control/controlpushbutton.h"
 #include "library/dao/analysisdao.h"
 #include "library/library.h"
 #include "moc_dlgprefwaveform.cpp"
 #include "preferences/waveformsettings.h"
 #include "util/db/dbconnectionpooled.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveformwidgetfactory.h"
+#include "widget/woverview.h"
+
+namespace {
+const ConfigKey kOverviewTypeCfgKey(QStringLiteral("[Waveform]"),
+        QStringLiteral("WaveformOverviewType"));
+} // namespace
 
 DlgPrefWaveform::DlgPrefWaveform(
         QWidget* pParent,
@@ -19,13 +27,27 @@ DlgPrefWaveform::DlgPrefWaveform(
     setupUi(this);
 
     // Waveform overview init
-    waveformOverviewComboBox->addItem(tr("Filtered")); // "0"
-    waveformOverviewComboBox->addItem(tr("HSV"));      // "1"
-    waveformOverviewComboBox->addItem(tr("RGB"));      // "2"
-    m_pTypeControl = std::make_unique<ControlObject>(
-            ConfigKey(QStringLiteral("[Waveform]"),
-                    QStringLiteral("WaveformOverviewType")));
+    waveformOverviewComboBox->addItem(
+            tr("Filtered"), QVariant::fromValue(WOverview::Type::Filtered));
+    waveformOverviewComboBox->addItem(tr("HSV"), QVariant::fromValue(WOverview::Type::HSV));
+    waveformOverviewComboBox->addItem(tr("RGB"), QVariant::fromValue(WOverview::Type::RGB));
+    m_pTypeControl = std::make_unique<ControlPushButton>(kOverviewTypeCfgKey);
+    m_pTypeControl->setStates(QMetaEnum::fromType<WOverview::Type>().keyCount());
     m_pTypeControl->setReadOnly();
+    // Update the control with the config value
+    WOverview::Type overviewType =
+            m_pConfig->getValue<WOverview::Type>(kOverviewTypeCfgKey, WOverview::Type::RGB);
+    int cfgTypeIndex = waveformOverviewComboBox->findData(QVariant::fromValue(overviewType));
+    if (cfgTypeIndex == -1) {
+        // Invalid config value, set default type RGB and write it to config
+        waveformOverviewComboBox->setCurrentIndex(
+                waveformOverviewComboBox->findData(QVariant::fromValue(WOverview::Type::RGB)));
+        m_pConfig->setValue(kOverviewTypeCfgKey, cfgTypeIndex);
+    } else {
+        waveformOverviewComboBox->setCurrentIndex(cfgTypeIndex);
+    }
+    // Set the control used by WOverview
+    m_pTypeControl->forceSet(cfgTypeIndex);
 
     // Populate waveform options.
     WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
@@ -272,13 +294,14 @@ void DlgPrefWaveform::slotUpdate() {
                     factory->getUntilMarkAlign()));
     untilMarkTextPointSizeSpinBox->setValue(factory->getUntilMarkTextPointSize());
 
-    // By default we set RGB woverview = "2"
-    int overviewType = m_pConfig->getValue(
-            ConfigKey("[Waveform]","WaveformOverviewType"), 2);
-    if (overviewType != waveformOverviewComboBox->currentIndex()) {
-        waveformOverviewComboBox->setCurrentIndex(overviewType);
+    WOverview::Type cfgOverviewType =
+            m_pConfig->getValue<WOverview::Type>(kOverviewTypeCfgKey, WOverview::Type::RGB);
+    // Assumes the combobox index is in sync with the ControlPushButton
+    if (cfgOverviewType != waveformOverviewComboBox->currentData().value<WOverview::Type>()) {
+        int cfgOverviewTypeIndex =
+                waveformOverviewComboBox->findData(QVariant::fromValue(cfgOverviewType));
+        waveformOverviewComboBox->setCurrentIndex(cfgOverviewTypeIndex);
     }
-    slotSetWaveformOverviewType(overviewType);
 
     bool drawOverviewMinuteMarkers = m_pConfig->getValue(
             ConfigKey("[Waveform]", "DrawOverviewMinuteMarkers"), true);
@@ -293,10 +316,6 @@ void DlgPrefWaveform::slotUpdate() {
 }
 
 void DlgPrefWaveform::slotApply() {
-    ConfigValue overviewtype = ConfigValue(waveformOverviewComboBox->currentIndex());
-    if (overviewtype != m_pConfig->get(ConfigKey("[Waveform]", "WaveformOverviewType"))) {
-        m_pConfig->set(ConfigKey("[Waveform]", "WaveformOverviewType"), overviewtype);
-    }
     WaveformSettings waveformSettings(m_pConfig);
     waveformSettings.setWaveformCachingEnabled(enableWaveformCaching->isChecked());
     waveformSettings.setWaveformGenerationWithAnalysisEnabled(
@@ -338,7 +357,8 @@ void DlgPrefWaveform::slotResetToDefaults() {
     synchronizeZoomCheckBox->setChecked(true);
 
     // RGB overview.
-    waveformOverviewComboBox->setCurrentIndex(2);
+    waveformOverviewComboBox->setCurrentIndex(
+            waveformOverviewComboBox->findData(QVariant::fromValue(WOverview::Type::RGB)));
 
     // Don't normalize overview.
     normalizeOverviewCheckBox->setChecked(false);
@@ -517,9 +537,13 @@ void DlgPrefWaveform::updateEnableUntilMark() {
     requiresGLSLLabel->setVisible(!enabled);
 }
 
-void DlgPrefWaveform::slotSetWaveformOverviewType(int index) {
-    m_pConfig->set(ConfigKey("[Waveform]", "WaveformOverviewType"), ConfigValue(index));
-    m_pTypeControl->forceSet(index);
+void DlgPrefWaveform::slotSetWaveformOverviewType() {
+    // Apply immediately
+    QVariant comboboxData = waveformOverviewComboBox->currentData();
+    DEBUG_ASSERT(comboboxData.canConvert<WOverview::Type>());
+    auto type = comboboxData.value<WOverview::Type>();
+    m_pConfig->setValue(kOverviewTypeCfgKey, type);
+    m_pTypeControl->forceSet(static_cast<double>(type));
 }
 
 void DlgPrefWaveform::slotSetDefaultZoom(int index) {
@@ -570,6 +594,8 @@ void DlgPrefWaveform::slotClearCachedWaveforms() {
 }
 
 void DlgPrefWaveform::slotSetBeatGridAlpha(int alpha) {
+    // TODO(xxx) For consistency set this in WaveformWidgetFactory like
+    // the other waveform controls.
     m_pConfig->setValue(ConfigKey("[Waveform]", "beatGridAlpha"), alpha);
     WaveformWidgetFactory::instance()->setDisplayBeatGridAlpha(alpha);
 }

src/preferences/dialog/dlgprefwaveform.h

@@ -10,7 +10,7 @@
 #include "waveform/renderers/allshader/waveformrenderersignalbase.h"
 #endif
 
-class ControlObject;
+class ControlPushButton;
 class Library;
 
 class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg {
@@ -44,7 +44,7 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
         slotSetWaveformOptions(allshader::WaveformRendererSignalBase::Option::HighDetail, checked);
     }
 #endif
-    void slotSetWaveformOverviewType(int index);
+    void slotSetWaveformOverviewType();
     void slotSetDefaultZoom(int index);
     void slotSetZoomSynchronization(bool checked);
     void slotSetVisualGainAll(double gain);
@@ -73,7 +73,7 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
     void updateWaveformAcceleration(
             WaveformWidgetType::Type type, WaveformWidgetBackend backend);
 
-    std::unique_ptr<ControlObject> m_pTypeControl;
+    std::unique_ptr<ControlPushButton> m_pTypeControl;
     std::unique_ptr<ControlObject> m_pOverviewMinuteMarkersControl;
 
     UserSettingsPointer m_pConfig;