Merge branch '2.5'

.codespellignore

@@ -7,3 +7,7 @@ doubleClick
 sur
 jus
 caf
+ReflectIn
+bufferIn
+indexIn
+allLocations

.codespellignorelines

@@ -73,3 +73,4 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
         QStringLiteral("caf"),
 void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
     // Note(RRyan/Max Linke):
+    // https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c

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)

CHANGELOG.md.backup

@@ -515,7 +515,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)
@@ -1349,7 +1349,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
@@ -1740,7 +1740,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()
 

cmake/modules/FindTagLib.cmake

@@ -48,7 +48,7 @@ include(IsStaticLibrary)
 find_package(PkgConfig QUIET)
 if(PkgConfig_FOUND)
   if(UNIX AND NOT APPLE)
-    # priorize the taglib1 package introduced in https://www.archlinux.de/packages/extra/x86_64/taglib1
+    # prioritize the taglib1 package introduced in https://www.archlinux.de/packages/extra/x86_64/taglib1
     set(ENV{PKG_CONFIG_PATH} "/usr/lib/taglib1/pkgconfig/:$ENV{PKG_CONFIG_PATH}")
   endif()
   pkg_check_modules(PC_TagLib QUIET taglib)

packaging/CPackConfig.cmake

@@ -15,7 +15,7 @@ set(CPACK_PACKAGE_FILE_NAME "mixxx-${PACKAGE_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-source")
 
 # The upstream version must not contain hyphen
-# . for nomal versioning + for advance and ~ for decline the version
+# . for normal versioning + for advance and ~ for decline the version
 # dpkg --compare-versions 2.3~alpha~1234~g8163 lt 2.3~beta~1234~g8163 && echo true
 # dpkg --compare-versions 2.3~beta~1234~g8163 lt 2.3.0 && echo true
 # dpkg --compare-versions 2.3.0 lt 2.3.0+2345+g163  && echo true

res/controllers/Denon-MC4000-scripts.js

@@ -117,7 +117,7 @@ MC4000.Deck = function (channel) {
     // adds this jog value to an internal 25 sample buffer, and then sets the jog value to zero.
     // The engine takes the average of the 25 sample buffer, divides by 10, and adds this to the rate at
     // which the song is playing (e.g. determined by the pitch fader). Since the effect of this depends on many factors
-    // we can only really give an empirical senstivity which makes jog work "how we like it".
+    // we can only really give an empirical sensitivity which makes jog work "how we like it".
     this.jogWheel = function (channel, control, value, status, group) {
         var numTicks = (value < 0x40) ? value: (value - 0x80);
         if (engine.isScratching(this.engineChannel)) {

res/controllers/Gemini-CDMP-7000-scripts.js

@@ -8,7 +8,7 @@
 // Changelog v1.2
 // Fixed clearing/lighting leds for hotcues if song has them set or not
 // Incorporated Pitch Ranges into Button/LCD
-// Incorprated BPM in LCD (may still not happen on first load)
+// Incorporated BPM in LCD (may still not happen on first load)
 // Updates LCD with Vinyl and Hotcue messages
 
 // ---- remaining issues

res/controllers/Hercules-DJ-Console-4-Mx-scripts.js

@@ -80,7 +80,7 @@ Hercules4Mx.userSettings = {
     // Setting this setting to true, the curve will change to scratch curve when the scratch mode is on (scratch button).
     // Setting it to false will not change it, so it will use the setting configured in the DJHercules Tray-icon configuration.
     'crossfaderScratchCurve': false,
-    // _Scratching_ Playback speed of the virtual vinyl that is being scratched. 45.00 and 33.33 are the common speeeds. (Lower number equals faster scratch)
+    // _Scratching_ Playback speed of the virtual vinyl that is being scratched. 45.00 and 33.33 are the common speeds. (Lower number equals faster scratch)
     'vinylSpeed': 45,
     // _Scratching_ You should configure this setting to the same value than in the DJHercules tray icon configuration. (Normal means 1/1).
     // If crossfaderScratchCurve is true, or the setting is changed while Mixxx is active, this value will be detected automatically.

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/controllers/Pioneer-DDJ-200-scripts.js

@@ -233,7 +233,7 @@ DDJ200.rateMSB = function(channel, control, value, status, group) {
 DDJ200.rateLSB = function(channel, control, value, status, group) {
     var vDeckNo = DDJ200.vDeckNo[script.deckFromGroup(group)];
     var vgroup = "[Channel" + vDeckNo + "]";
-    // calculte rate value from its most and least significant bytes
+    // calculate rate value from its most and least significant bytes
     var rateMSB = DDJ200.vDeck[vDeckNo]["rateMSB"];
     var rate = 1 - (((rateMSB << 7) + value) / 0x1FFF);
     engine.setValue(vgroup, "rate", rate);
@@ -248,7 +248,7 @@ DDJ200.volumeMSB = function(channel, control, value, status, group) {
 DDJ200.volumeLSB = function(channel, control, value, status, group) {
     var vDeckNo = DDJ200.vDeckNo[script.deckFromGroup(group)];
     var vgroup = "[Channel" + vDeckNo + "]";
-    // calculte volume value from its most and least significant bytes
+    // calculate volume value from its most and least significant bytes
     var volMSB = DDJ200.vDeck[vDeckNo]["volMSB"];
     var vol = ((volMSB << 7) + value) / 0x3FFF;
     //var vol = ((volMSB << 7) + value); // use for linear correction

res/controllers/Pioneer-DDJ-SB3-scripts.js

@@ -1538,8 +1538,10 @@ PioneerDDJSB3.Slicer.prototype.generateBeatPositions = function() {
         if (sample < this.trackSamples) {
             var bp = {
                 sample: sample,
-                positionIn: (this.PLAY_POSITION_RANGE * sample - 1) / this.trackSamples,
-                positionOut: (this.PLAY_POSITION_RANGE * nextSample - 1) / this.trackSamples,
+                position: {
+                    in: (this.PLAY_POSITION_RANGE * sample - 1) / this.trackSamples,
+                    out: (this.PLAY_POSITION_RANGE * nextSample - 1) / this.trackSamples,
+                }
             };
 
             this.beatPositions.push(bp);
@@ -1595,7 +1597,7 @@ PioneerDDJSB3.Slicer.prototype.playPositionChange = function(value) {
         for (var i = 0; i < this.beatPositions.length; i++) {
             var beatPosition = this.beatPositions[i];
 
-            if (value >= beatPosition.positionIn && value < beatPosition.positionOut) {
+            if (value >= beatPosition.position.in && value < beatPosition.position.out) {
                 this.currentBeat = i;
                 found = true;
             }

res/controllers/Sony-SixxAxis.js

@@ -139,7 +139,7 @@ SonySixxAxis.registerCallbacks = function(id) {
         return;
     }
     if (controller==undefined) {
-        HIDDebug("Error registrering callbacks: controller is undefined");
+        HIDDebug("Error registering callbacks: controller is undefined");
         return;
     }
 

res/controllers/Traktor-Kontrol-S4-MK3.js

@@ -117,7 +117,7 @@ const BeatLoopRolls = [
 ];
 
 
-// Define the speed of the jogwheel. This will impact the speed of the LED playback indicator, the sratch, and the speed of
+// Define the speed of the jogwheel. This will impact the speed of the LED playback indicator, the scratch, and the speed of
 // the motor if enable. Recommended value are 33 + 1/3 or 45.
 // Default: 33 + 1/3
 const BaseRevolutionsPerMinute = engine.getSetting("baseRevolutionsPerMinute") || 33 + 1/3;

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="1723570900">
       <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="1723570900">
       <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="1723570900">
       <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

res/skins/Tango/decks/row_comment_fx_left.xml

@@ -1,6 +1,6 @@
 <!--
 Description:
-  An extra line below/above waveform overview that contains FX asssign buttons and
+  An extra line below/above waveform overview that contains FX assign buttons and
   track comment (optional)
 Variables:
   chanNum : the channel number

res/skins/Tango/decks/row_comment_fx_right.xml

@@ -1,6 +1,6 @@
 <!--
 Description:
-  An extra line below/above waveform overview that contains FX asssign buttons and
+  An extra line below/above waveform overview that contains FX assign buttons and
   track comment (optional)
 Variables:
   chanNum : the channel number

res/skins/Tango/skin_settings.xml

@@ -724,7 +724,7 @@ Description:
                 <MaximumSize>112,20</MaximumSize>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
-                  <!-- translucent cover when Samlers are hidden -->
+                  <!-- translucent cover when Samplers are hidden -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
                     <MinimumSize>112,13</MinimumSize>

src/controllers/hid/hidioglobaloutputreportfifo.cpp

@@ -54,7 +54,7 @@ bool HidIoGlobalOutputReportFifo::sendNextReportDataset(QMutex* pHidDeviceAndPol
     if (pFront == nullptr) {
         // No data in FIFO to be send
         // Return with false, to signal the caller, that no time consuming IO
-        // operation was ncessary
+        // operation was necessary
         return false;
     }
 

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/encoder/encoder.cpp

@@ -40,17 +40,17 @@ const EncoderFactory& EncoderFactory::getFactory()
 
 EncoderFactory::EncoderFactory() {
     // Add new supported formats here. Also modify the getNewEncoder/getEncoderSettings method.
-    m_formats.append(Encoder::Format("WAV PCM", ENCODING_WAVE, true, "wav"));
-    m_formats.append(Encoder::Format("AIFF PCM", ENCODING_AIFF, true, "aiff"));
-    m_formats.append(Encoder::Format("FLAC", ENCODING_FLAC, true, "flac"));
-    m_formats.append(Encoder::Format("MP3", ENCODING_MP3, false, "mp3"));
-    m_formats.append(Encoder::Format("OGG Vorbis", ENCODING_OGG, false, "ogg"));
+    m_formats.append(Encoder::Format{"WAV PCM", ENCODING_WAVE, true, "wav"});
+    m_formats.append(Encoder::Format{"AIFF PCM", ENCODING_AIFF, true, "aiff"});
+    m_formats.append(Encoder::Format{"FLAC", ENCODING_FLAC, true, "flac"});
+    m_formats.append(Encoder::Format{"MP3", ENCODING_MP3, false, "mp3"});
+    m_formats.append(Encoder::Format{"OGG Vorbis", ENCODING_OGG, false, "ogg"});
 #ifdef __OPUS__
-    m_formats.append(Encoder::Format("Opus", ENCODING_OPUS, false, "opus"));
+    m_formats.append(Encoder::Format{"Opus", ENCODING_OPUS, false, "opus"});
 #endif
-    m_formats.append(Encoder::Format("AAC", ENCODING_AAC, false, "aac"));
-    m_formats.append(Encoder::Format("HE-AAC", ENCODING_HEAAC, false, "aac"));
-    m_formats.append(Encoder::Format("HE-AACv2", ENCODING_HEAACV2, false, "aac"));
+    m_formats.append(Encoder::Format{"AAC", ENCODING_AAC, false, "aac"});
+    m_formats.append(Encoder::Format{"HE-AAC", ENCODING_HEAAC, false, "aac"});
+    m_formats.append(Encoder::Format{"HE-AACv2", ENCODING_HEAACV2, false, "aac"});
 }
 
 const QList<Encoder::Format> EncoderFactory::getFormats() const

src/encoder/encoder.h

@@ -17,22 +17,12 @@ class SampleRate;
 
 class Encoder {
   public:
-        class Format {
-            public:
-              Format(const QString& labelIn,
-                      const QString& nameIn,
-                      bool losslessIn,
-                      const QString& fileExtIn)
-                      : label(labelIn),
-                        internalName(nameIn),
-                        lossless(losslessIn),
-                        fileExtension(fileExtIn) {
-              }
-            QString label;
-            QString internalName;
-            bool lossless;
-            QString fileExtension;
-        };
+    struct Format {
+        QString label;
+        QString internalName;
+        bool lossless;
+        QString fileExtension;
+    };
 
     Encoder() {}
     virtual ~Encoder() = default;

src/engine/sidechain/enginenetworkstream.cpp

@@ -134,8 +134,8 @@ qint64 EngineNetworkStream::getInputStreamTimeUs() {
 qint64 EngineNetworkStream::getNetworkTimeUs() {
     // This matches the GPL2 implementation found in
     // https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c
-    // Instead of ms resolution we use a us resolution to allow low latency settings
-    // will overflow > 200,000 years
+    // Instead of ms resolution we use a us resolution to
+    // allow low latency settings will overflow > 200,000 years
 #ifdef __WINDOWS__
     FILETIME ft;
     // no GetSystemTimePreciseAsFileTime available, fall

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/preferences/colorpaletteeditormodel.cpp

@@ -173,7 +173,7 @@ ColorPalette ColorPaletteEditorModel::getColorPalette(
             }
         }
     }
-    // If we have a non consequitive list of hotcue indexes, indexes are shifted down
+    // If we have a non consecutive list of hotcue indexes, indexes are shifted down
     // due to the sorting nature of QMap. This is intended, this way we have a color for every hotcue.
     return ColorPalette(name, colors, hotcueColorIndices.values());
 }

src/preferences/dialog/dlgprefrecord.cpp

@@ -17,7 +17,7 @@ constexpr bool kDefaultCueEnabled = true;
 DlgPrefRecord::DlgPrefRecord(QWidget* parent, UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
           m_pConfig(pConfig),
-          m_selFormat(QString(), QString(), false, QString()) {
+          m_selFormat({QString(), QString(), false, QString()}) {
     setupUi(this);
 
     // Setting recordings path.