Merge branch 'mixxxdj:main' into hercules-inpulse300-mappings

mixxxdj · Aug 28, 2021 · 7a0be04 · 7a0be04
2 parents ac878f9 + 49f9169
commit 7a0be04
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake
@@ -54,6 +54,12 @@ find_path(PortAudio_INCLUDE_DIR
   DOC "PortAudio include directory")
 mark_as_advanced(PortAudio_INCLUDE_DIR)
 
+# Temporary hack until https://github.com/PortAudio/portaudio/pull/635 is released.
+find_path(PortAudio_ALSA_H
+  NAMES pa_linux_alsa.h
+  PATHS ${PC_PortAudio_INCLUDE_DIRS})
+mark_as_advanced(PortAudio_ALSA_H)
+
 find_library(PortAudio_LIBRARY
   NAMES portaudio
   PATHS ${PC_PortAudio_LIBRARY_DIRS}
@@ -78,5 +84,8 @@ if(PortAudio_FOUND)
         INTERFACE_COMPILE_OPTIONS "${PC_PortAudio_CFLAGS_OTHER}"
         INTERFACE_INCLUDE_DIRECTORIES "${PortAudio_INCLUDE_DIR}"
     )
+    if(PortAudio_ALSA_H)
+      target_compile_definitions(PortAudio::PortAudio INTERFACE PA_USE_ALSA)
+    endif()
   endif()
 endif()
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
@@ -461,14 +461,14 @@ MappingInfo DlgPrefController::enumerateMappingsFromEnumerator(
 }
 
 void DlgPrefController::slotUpdate() {
-    // Check if the controller is open.
-    bool deviceOpen = m_pController->isOpen();
-    // Check/uncheck the "Enabled" box
-    m_ui.chkEnabledDevice->setChecked(deviceOpen);
-
     enumerateMappings(m_pControllerManager->getConfiguredMappingFileForDevice(
             m_pController->getName()));
 
+    // enumeratePresets will check the m_ui.chkEnabledDevice checkbox if
+    // there is a valid mapping saved in the mixxx.cfg file. However, the
+    // checkbox should only be checked if the device is currently enabled.
+    m_ui.chkEnabledDevice->setChecked(m_pController->isOpen());
+
     // If the controller is not mappable, disable the input and output mapping
     // sections and the learning wizard button.
     bool isMappable = m_pController->isMappable();

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -1040,8 +1040,13 @@ bool MixxxMainWindow::loadConfiguredSkin() {
 
 bool MixxxMainWindow::eventFilter(QObject* obj, QEvent* event) {
     if (event->type() == QEvent::ToolTip) {
-        // return true for no tool tips
-        switch (m_toolTipsCfg) {
+        // always show tooltips in the preferences window
+        QWidget* activeWindow = QApplication::activeWindow();
+        if (activeWindow &&
+                QLatin1String(activeWindow->metaObject()->className()) !=
+                        "DlgPreferences") {
+            // return true for no tool tips
+            switch (m_toolTipsCfg) {
             case mixxx::TooltipsPreference::TOOLTIPS_ONLY_IN_LIBRARY:
                 if (dynamic_cast<WBaseWidget*>(obj) != nullptr) {
                     return true;
@@ -1054,6 +1059,7 @@ bool MixxxMainWindow::eventFilter(QObject* obj, QEvent* event) {
             default:
                 DEBUG_ASSERT(!"m_toolTipsCfg value unknown");
                 return true;
+            }
         }
     }
     // standard event processing

diff --git a/src/soundio/sounddeviceportaudio.cpp b/src/soundio/sounddeviceportaudio.cpp
@@ -20,7 +20,7 @@
 #include "vinylcontrol/defs_vinylcontrol.h"
 #include "waveform/visualplayposition.h"
 
-#ifdef __LINUX__
+#ifdef PA_USE_ALSA
 // for PaAlsa_EnableRealtimeScheduling
 #include <pa_linux_alsa.h>
 #endif
@@ -333,8 +333,7 @@ SoundDeviceError SoundDevicePortAudio::open(bool isClkRefDevice, int syncBuffers
         qDebug() << "Opened PortAudio stream successfully... starting";
     }
 
-
-#ifdef __LINUX__
+#ifdef PA_USE_ALSA
     if (m_deviceTypeId == paALSA) {
         qInfo() << "Enabling ALSA real-time scheduling";
         PaAlsa_EnableRealtimeScheduling(pStream, 1);

diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat
@@ -59,7 +59,8 @@ EXIT /B 0
         SET BUILDENV_URL=https://downloads.mixxx.org/dependencies/2.3/Windows/!BUILDENV_NAME!.zip
         IF NOT EXIST !BUILDENV_PATH!.zip (
             ECHO ^Download prebuilt build environment from "!BUILDENV_URL!" to "!BUILDENV_PATH!.zip"...
-            BITSADMIN /transfer buildenvjob /download /priority normal !BUILDENV_URL! !BUILDENV_PATH!.zip
+            REM TODO: The /DYNAMIC parameter is required because our server does not yet support HTTP range headers
+            BITSADMIN /transfer buildenvjob /download /priority normal /DYNAMIC !BUILDENV_URL! !BUILDENV_PATH!.zip
             REM TODO: verify download using sha256sum?
             ECHO ^Download complete.
         ) else (