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

CMakeLists.txt

@@ -2044,10 +2044,10 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib)
 target_link_libraries(mixxx-lib PRIVATE fidlib)
 
 # KeyFinder
-set(LIBKEYFINDER_VERSION 2.2.6)
-find_package(KeyFinder ${LIBKEYFINDER_VERSION})
 option(KEYFINDER "KeyFinder support" ON)
 if(KEYFINDER)
+  set(LIBKEYFINDER_VERSION 2.2.6)
+  find_package(KeyFinder ${LIBKEYFINDER_VERSION})
   if (KeyFinder_FOUND)
     target_link_libraries(mixxx-lib PRIVATE KeyFinder::KeyFinder)
   else()
@@ -2609,8 +2609,6 @@ if(COREAUDIO)
     src/sources/v1/legacyaudiosourceadapter.cpp
     lib/apple/CAStreamBasicDescription.cpp
   )
-  find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox REQUIRED)
-  target_link_libraries(mixxx-lib PRIVATE ${AUDIOTOOLBOX_LIBRARY})
   target_compile_definitions(mixxx-lib PRIVATE __COREAUDIO__)
   target_include_directories(mixxx-lib SYSTEM PUBLIC lib/apple)
 endif()

res/controllers/Numark-N4-scripts.js

@@ -286,14 +286,14 @@ NumarkN4.topContainer.prototype = new components.ComponentContainer();
 
 NumarkN4.MixerTemplate = function() {
     //channel will always be 0 it can be "hardcoded" into the components
-    this.deckChangeL = new components.Button ({
+    this.deckChangeL = new components.Button({
         midi: [0xB0, 0x50],
         input: function(_channel, _control, value, _status, _group) {
             this.output(value);
             //just "echos" the midi since the controller knows the deck its on itself but doesn't update the corresponding leds.
         },
     });
-    this.deckChangeR = new components.Button ({
+    this.deckChangeR = new components.Button({
         midi: [0xB0, 0x51],
         input: function(_channel, _control, value, _status, _group) {
             this.output(value);
@@ -641,7 +641,7 @@ NumarkN4.Deck = function(channel) {
         midi: [0xB0+channel, 0x01, 0xB0+channel, 0x37], //only specifying input MSB
         inKey: "rate",
         group: theDeck.group,
-        invert: false,
+        invert: true,
     });
     this.pitchLedHandler = engine.makeConnection(this.group, "rate", function(value) {
     // Turns on when rate slider is centered

src/library/rekordbox/rekordbox_anlz.cpp

@@ -17,10 +17,8 @@ void rekordbox_anlz_t::_read() {
     m__unnamed3 = m__io->read_bytes((len_header() - _io()->pos()));
     m_sections = new std::vector<tagged_section_t*>();
     {
-        int i = 0;
         while (!m__io->is_eof()) {
             m_sections->push_back(new tagged_section_t(m__io, this, m__root));
-            i++;
         }
     }
 }

src/preferences/dialog/dlgprefrecord.cpp

@@ -328,13 +328,11 @@ void DlgPrefRecord::updateTextQuality() {
     bool isVbr = false;
     if (m_selFormat.internalName == ENCODING_MP3) {
         EncoderSettings::OptionsGroup group = settings->getOptionGroups().first();
-        int i=0;
         for (const QAbstractButton* widget : qAsConst(m_optionWidgets)) {
             if (widget->objectName() == group.groupCode) {
                 if (widget->isChecked() != Qt::Unchecked && widget->text() == "VBR") {
                     isVbr = true;
                 }
-                i++;
             }
         }
     }

src/sources/soundsourceffmpeg.cpp

@@ -19,7 +19,9 @@ namespace {
 
 constexpr AVSampleFormat kavSampleFormat = AV_SAMPLE_FMT_FLT;
 
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100) // FFmpeg 5.1
 constexpr uint64_t kavChannelLayoutUndefined = 0;
+#endif
 
 constexpr int64_t kavStreamDefaultStartTime = 0;