Merge remote-tracking branch 'upstream/2.5' into sync-branch-2.5-to-2.6

Author: acolombier

.pre-commit-config.yaml

@@ -81,7 +81,11 @@ repos:
           - "@eslint/js"
           - typescript-eslint
           - eslint-plugin-jsdoc@^v50.4.3
-          - eslint-plugin-diff@^2.0.3
+          # Since 2.1.1, there is a breaking change that requires to fetch the PR base ref
+          # ("use fetched origin ref for guessed branch", https://github.com/paleite/eslint-plugin-diff/commit/e1fd847240c51a39099fffd2e4f297b23bad95c1).
+          # instead of using the branching ref as pre-commit allows (HEAD^1).
+          # We stick to this version to circumvent unnecessary deep repo fetch.
+          - eslint-plugin-diff@2.1.0
         exclude: ^res/translations/.*\.ts$
   - repo: local
     hooks:

CMakeLists.txt

@@ -4148,7 +4148,7 @@ if(APPLE)
     )
     if(IOS)
       target_link_libraries(mixxx-lib PRIVATE "-weak_framework UIKit")
-    elseif()
+    else()
       target_link_libraries(
         mixxx-lib
         PRIVATE "-weak_framework AppKit" "-weak_framework AudioUnit"

src/effects/backends/builtin/glitcheffect.cpp

@@ -89,7 +89,7 @@ void GlitchEffect::processChannel(
             }
         }
         period = std::max(period, 1 / 8.0);
-        delay_seconds = static_cast<int>(period * groupFeatures.beat_length->seconds);
+        delay_seconds = period * groupFeatures.beat_length->seconds;
         min_delay = 1 / 8.0 * groupFeatures.beat_length->seconds;
     } else {
         delay_seconds = period;

src/engine/cachingreader/cachingreaderworker.cpp

@@ -74,17 +74,19 @@ ReaderStatusUpdate CachingReaderWorker::processReadRequest(
         }
     }
 
-    // This call here assumes that the caching reader will read the first sound cue at
-    // one of the first chunks. The check serves as a sanity check to ensure that the
-    // sample data has not changed since it has ben analyzed. This could happen because
-    // of a change in actual audio data or because the file was decoded using a different
-    // decoder
-    // This is part of a first prove of concept and needs to be replaces with a different
-    // solution which is still under discussion. This might be also extended
-    // to further checks whether a automatic offset adjustment is possible or a the
-    // sample position metadata shall be treated as outdated.
-    // Failures of the sanity check only result in an entry into the log at the moment.
-    verifyFirstSound(pChunk, m_pAudioSource->getSignalInfo().getChannelCount());
+    if (status == CHUNK_READ_SUCCESS) {
+        // This call here assumes that the caching reader will read the first sound cue at
+        // one of the first chunks. The check serves as a sanity check to ensure that the
+        // sample data has not changed since it has ben analyzed. This could happen because
+        // of a change in actual audio data or because the file was decoded using a different
+        // decoder
+        // This is part of a first prove of concept and needs to be replaces with a different
+        // solution which is still under discussion. This might be also extended
+        // to further checks whether a automatic offset adjustment is possible or a the
+        // sample position metadata shall be treated as outdated.
+        // Failures of the sanity check only result in an entry into the log at the moment.
+        verifyFirstSound(pChunk, m_pAudioSource->getSignalInfo().getChannelCount());
+    }
 
     ReaderStatusUpdate result;
     result.init(status, pChunk, m_pAudioSource ? m_pAudioSource->frameIndexRange() : mixxx::IndexRange());
@@ -319,10 +321,18 @@ void CachingReaderWorker::verifyFirstSound(const CachingReaderChunk* pChunk,
                             .value()));
     if (pChunk->getIndex() == firstSoundIndex) {
         mixxx::SampleBuffer sampleBuffer(kNumSoundFrameToVerify * channelCount);
-        SINT end = static_cast<SINT>(m_firstSoundFrameToVerify.toLowerFrameBoundary().value());
-        pChunk->readBufferedSampleFrames(sampleBuffer.data(),
-                channelCount,
-                mixxx::IndexRange::forward(end - 1, kNumSoundFrameToVerify));
+        // We read two frames, the last silence frame and the first non-silence frame from
+        // m_firstSoundFrameToVerify. end points to one position after them.
+        SINT end = static_cast<SINT>(m_firstSoundFrameToVerify.toLowerFrameBoundary().value()) + 1;
+        mixxx::IndexRange probeFrameIndexRange =
+                mixxx::IndexRange::between(end - kNumSoundFrameToVerify, end);
+        mixxx::IndexRange bufferedFrameIndexRange =
+                pChunk->readBufferedSampleFrames(
+                        sampleBuffer.data(), channelCount, probeFrameIndexRange);
+        VERIFY_OR_DEBUG_ASSERT(bufferedFrameIndexRange == probeFrameIndexRange) {
+            qWarning() << "skipping verifyFirstSound()";
+            return;
+        }
         if (AnalyzerSilence::verifyFirstSound(sampleBuffer.span(),
                     mixxx::audio::FramePos(1),
                     channelCount)) {

src/library/columncache.cpp

@@ -195,8 +195,9 @@ ColumnCache::ColumnCache() {
     m_pKeyNotationCP = new ControlProxy(mixxx::library::prefs::kKeyNotationConfigKey, this);
     m_pKeyNotationCP->connectValueChanged(this, &ColumnCache::slotSetKeySortOrder);
 
+    // Used in BaseTrackTableModel() along with a later setColumns() call.
     // ColumnCache is initialized before the preferences, so slotSetKeySortOrder is called
-    // for again if DlgPrefKey sets the [Library]. key_notation CO to a value other than
+    // again if DlgPrefKey sets the [Library]. key_notation CO to a value other than
     // KeyUtils::CUSTOM as Mixxx is starting.
 }
 
@@ -246,6 +247,10 @@ void ColumnCache::setColumns(QStringList columns) {
 }
 
 void ColumnCache::slotSetKeySortOrder(double notationValue) {
+    if (m_columnsByIndex.isEmpty()) {
+        // we are not caching columns yet
+        return;
+    }
     const int keyColumnIndex = m_columnIndexByEnum[COLUMN_LIBRARYTABLE_KEY];
     if (keyColumnIndex < 0) {
         return;

src/library/trackset/setlogfeature.cpp

@@ -218,6 +218,7 @@ void SetlogFeature::onRightClickChild(const QPoint& globalPos, const QModelIndex
         }
         menu.addSeparator();
         menu.addAction(m_pExportPlaylistAction);
+        menu.addAction(m_pExportTrackFilesAction);
     }
 
     menu.exec(globalPos);