Merge branch '2.5'

.markdownlint-cli2.yaml

@@ -9,7 +9,7 @@ config:
   # The same headline in different nested sections is okay (and necessary for
   # CHANGELOG.md).
   no-duplicate-header:
-    allow_different_nesting: true
+    siblings_only: true
 
   # We use ordered lists to make stuff easier to read in a text editor.
   ol-prefix:

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ default_language_version:
   rust: 1.64.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: fix-byte-order-marker
         exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters|UTF-8-BOM.txt)$
@@ -51,7 +51,7 @@ repos:
         # protect main and any branch that has a semver-like name
         args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$']
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.3.0
     hooks:
       - id: codespell
         args:
@@ -66,7 +66,7 @@ repos:
           ]
         exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.48.0
+    rev: v9.8.0
     hooks:
       - id: eslint
         args: [--fix, --report-unused-disable-directives]
@@ -96,35 +96,35 @@ repos:
           - clang-format==16.0.6
         files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 24.4.2
     hooks:
       - id: black
         files: ^tools/.*$
   - repo: https://github.com/pycqa/flake8
-    rev: "6.1.0"
+    rev: "7.1.0"
     hooks:
       - id: flake8
         files: ^tools/.*$
         types: [text, python]
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.5
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.9.2
+    rev: v0.13.0
     hooks:
       - id: markdownlint-cli2
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.26.3
+    rev: 0.29.1
     hooks:
       - id: check-github-workflows
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.2
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         types: [yaml]
   - repo: https://github.com/qarmin/qml_formatter.git
-    rev: 0.2.0
+    rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
     hooks:
       - id: qml_formatter
   - repo: local

CHANGELOG.md

@@ -628,7 +628,7 @@
   [#4806](https://github.com/mixxxdj/mixxx/pull/4806)
   [#11873](https://github.com/mixxxdj/mixxx/pull/11873)
   [#11872](https://github.com/mixxxdj/mixxx/issues/11872)
-* Add support for overriding analyzis settings about variable/constant BPM on a per-track basis [#10931](https://github.com/mixxxdj/mixxx/pull/10931)
+* Add support for overriding analysis settings about variable/constant BPM on a per-track basis [#10931](https://github.com/mixxxdj/mixxx/pull/10931)
 * Add menu for looking up track metadata at Discogs, SoundCloud and LastFM [#4772](https://github.com/mixxxdj/mixxx/pull/4772) [#4836](https://github.com/mixxxdj/mixxx/pull/4836)
 * Add "Delete Track Files" action, does "Move to Trash" with Qt >= 5.15
   [#4560](https://github.com/mixxxdj/mixxx/pull/4560)
@@ -1462,7 +1462,7 @@
   [#11327](https://github.com/mixxxdj/mixxx/issues/11327)
 * LateNight: brighter fx parameter buttons
   [#11397](https://github.com/mixxxdj/mixxx/pull/11397)
-* Fix drift in analyzis data after exporting metadata to MP3 files with ID3v1.1 tags
+* Fix drift in analysis data after exporting metadata to MP3 files with ID3v1.1 tags
   [#11168](https://github.com/mixxxdj/mixxx/pull/11168)
   [#11159](https://github.com/mixxxdj/mixxx/issues/11159)
 * Fix broadcasting using Opus encoding
@@ -1853,7 +1853,7 @@
 * Add controller mapping for Denon MC7000 [#2546](https://github.com/mixxxdj/mixxx/pull/2546)
 * Add controller mapping for Stanton DJC.4 [#2607](https://github.com/mixxxdj/mixxx/pull/2607)
 * Fix broadcasting via broadcast/recording input [#9959](https://github.com/mixxxdj/mixxx/issues/9959) [#2743](https://github.com/mixxxdj/mixxx/pull/2743)
-* Only apply ducking gain in manual ducking mode when talkover is enabed [#7668](https://github.com/mixxxdj/mixxx/issues/7668) [#8995](https://github.com/mixxxdj/mixxx/issues/8995) [#8795](https://github.com/mixxxdj/mixxx/issues/8795) [#2759](https://github.com/mixxxdj/mixxx/pull/2759)
+* Only apply ducking gain in manual ducking mode when talkover is enabled [#7668](https://github.com/mixxxdj/mixxx/issues/7668) [#8995](https://github.com/mixxxdj/mixxx/issues/8995) [#8795](https://github.com/mixxxdj/mixxx/issues/8795) [#2759](https://github.com/mixxxdj/mixxx/pull/2759)
 * Ignore MIDI Clock Messages (0xF8) because they are not usable in Mixxx and inhibited the screensaver [#2786](https://github.com/mixxxdj/mixxx/pull/2786)
 
 ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24)

CMakeLists.txt

@@ -3679,7 +3679,7 @@ else()
   check_include_file_cxx(gsl/gsl HAVE_GSL_GSL)
   if(NOT HAVE_GSL_GSL)
     unset(HAVE_GSL_GSL CACHE) # unset cache to re-evaluate this until it succeeds. check_include_file_cxx() has no REQUIRED flag.
-    message(FATAL_ERROR "ms-gsl deveopment headers (libmsgsl-dev) not found")
+    message(FATAL_ERROR "ms-gsl development headers (libmsgsl-dev) not found")
   endif()
 endif()
 

res/controllers/Midi_for_light-scripts.js

@@ -447,7 +447,7 @@ midi_for_light.volumeBeatOnDelay = function() { // allow deck change with volume
     midi_for_light.volumebeat = true;
 };
 
-midi_for_light.crossfaderChange = function() { // crossfader chenge, check deck change
+midi_for_light.crossfaderChange = function() { // crossfader change, check deck change
     // if fader prevent, go out
     if (midi_for_light.crossfader_block === true) return;
 

res/linux/org.mixxx.Mixxx.metainfo.xml

@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.6.0" type="development" date="2024-07-29" timestamp="1722231413">
+    <release version="2.6.0" type="development" date="2024-08-13" timestamp="1723549971">
       <description>
  <p>
   Waveforms
@@ -153,7 +153,7 @@
  </ul>
 </description>
     </release>
-    <release version="2.5.0" type="development" date="2024-07-29" timestamp="1722231413">
+    <release version="2.5.0" type="development" date="2024-08-13" timestamp="1723549971">
       <description>
  <p>
   Waveforms
@@ -1154,7 +1154,7 @@
  </ul>
 </description>
     </release>
-    <release version="2.4.2" type="development" date="2024-07-29" timestamp="1722231413">
+    <release version="2.4.2" type="development" date="2024-08-13" timestamp="1723549971">
       <description>
  <p>
   Controller Mappings
@@ -1627,7 +1627,7 @@
    #11872
   </li>
   <li>
-   Add support for overriding analyzis settings about variable/constant BPM on a per-track basis
+   Add support for overriding analysis settings about variable/constant BPM on a per-track basis
    #10931
   </li>
   <li>
@@ -3611,7 +3611,7 @@
    #11397
   </li>
   <li>
-   Fix drift in analyzis data after exporting metadata to MP3 files with ID3v1.1 tags
+   Fix drift in analysis data after exporting metadata to MP3 files with ID3v1.1 tags
    #11168
    #11159
   </li>
@@ -5018,7 +5018,7 @@
    #2743
   </li>
   <li>
-   Only apply ducking gain in manual ducking mode when talkover is enabed
+   Only apply ducking gain in manual ducking mode when talkover is enabled
    #7668
    #8995
    #8795

src/analyzer/analyzersilence.cpp

@@ -67,9 +67,6 @@ SINT AnalyzerSilence::findFirstSoundInChunk(std::span<const CSAMPLE> samples) {
 SINT AnalyzerSilence::findLastSoundInChunk(std::span<const CSAMPLE> samples) {
     // -1 is required, because the distance from the fist sample index (0) to crend() is 1,
     SINT ret = std::distance(first_sound(samples.rbegin(), samples.rend()), samples.rend()) - 1;
-    if (ret == -1) {
-        ret = samples.size();
-    }
     return ret;
 }
 
@@ -98,7 +95,7 @@ bool AnalyzerSilence::processSamples(const CSAMPLE* pIn, SINT count) {
     }
     if (m_signalStart >= 0) {
         const SINT lastSoundSample = findLastSoundInChunk(samples);
-        if (lastSoundSample < count - 1) { // not only sound or silence
+        if (lastSoundSample >= 0) { // not only sound or silence
             m_signalEnd = m_framesProcessed + lastSoundSample / m_channelCount + 1;
         }
     }

src/effects/visibleeffectslist.cpp

@@ -66,7 +66,7 @@ void VisibleEffectsList::readEffectsXml(
     for (const EffectManifestPointer& pManifest : std::as_const(manifests)) {
         if (!visibleEffects.contains(pManifest) &&
                 !hiddenEffects.contains(pManifest)) {
-            // pre-pend so un-hidden effects are discoverable
+            // prepend so un-hidden effects are discoverable
             visibleEffects.prepend(pManifest);
         }
     }

src/library/basetracktablemodel.cpp

@@ -820,7 +820,7 @@ QVariant BaseTrackTableModel::roleValue(
                 return dt;
             }
             if (field == ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED) {
-                // Timstamp column in history feature:
+                // Timestamp column in history feature:
                 // Use localized date/time format without text: "5/20/98 03:40 AM"
                 return mixxx::displayLocalDateTime(dt);
             }

src/library/export/engineprimeexportjob.cpp

@@ -563,7 +563,11 @@ void EnginePrimeExportJob::run() {
             qWarning() << "Failed to export track"
                        << m_pLastLoadedTrack->getId().toString() << ":"
                        << e.what();
-            m_lastErrorMessage = e.what();
+            //: %1 is the artist %2 is the title and %3 is the original error message
+            m_lastErrorMessage = tr("Failed to export track %1 - %2:\n%3")
+                                         .arg(m_pLastLoadedTrack->getArtist(),
+                                                 m_pLastLoadedTrack->getTitle(),
+                                                 e.what());
             emit failed(m_lastErrorMessage);
             return;
         }

src/library/export/libraryexporter.cpp

@@ -64,9 +64,7 @@ void LibraryExporter::beginEnginePrimeExport(
             &EnginePrimeExportJob::failed,
             this,
             [](const QString& message) {
-                QMessageBox::critical(nullptr,
-                        tr("Export Failed"),
-                        QString{tr("Export failed: %1")}.arg(message));
+                QMessageBox::critical(nullptr, tr("Export Failed"), message);
             });
 
     // Construct a dialog to monitor job progress and offer cancellation.

src/library/tabledelegates/checkboxdelegate.cpp

@@ -10,6 +10,8 @@ CheckboxDelegate::CheckboxDelegate(QTableView* pTableView, const QString& checkb
         : TableItemDelegate(pTableView),
           m_pCheckBox(new QCheckBox(m_pTableView)),
           m_checkboxName(checkboxName) {
+    // Note that object names set here are not picked up by /tools/qsscheck.py
+    // and need to be added there manually
     m_pCheckBox->setObjectName(checkboxName);
     // NOTE(rryan): Without ensurePolished the first render of the QTableView
     // shows the checkbox unstyled. Not sure why -- but this fixes it.

tools/qsscheck.py

@@ -18,6 +18,12 @@
 )
 RE_CLASSNAME = re.compile(r"^[A-Z]\w+$")
 RE_OBJNAME_VARTAG = re.compile(r"<.*>")
+# Some object names set via variables in
+# src/library/tabledelegates/checkboxdelegate.cpp
+CPP_OBJNAMES = [
+    "LibraryBPMButton",
+    "LibraryPlayedCheckbox",
+]
 
 # List of Qt Widgets, generated with:
 #     python -c 'import inspect, from PyQt5 import QtWidgets;
@@ -230,7 +236,7 @@ def get_skins(path):
 def get_global_names(mixxx_path):
     """Returns 2 sets with all class and object names in the Mixxx codebase."""
     classnames = set()
-    objectnames = set()
+    objectnames = set(CPP_OBJNAMES)
     for root, dirs, fnames in os.walk(os.path.join(mixxx_path, "src")):
         for fname in fnames:
             ext = os.path.splitext(fname)[1]