jack-midi support

SetupConfigure.cmake

@@ -195,10 +195,10 @@ endif()
 set(QT_SUPPORT ON)
 
 if (MUSE_MODULE_AUDIO_JACK)
-    if (OS_IS_LIN OR MINGW)
-        add_compile_definitions(JACK_AUDIO)
-    else()
+    if (OS_IS_WIN AND (NOT MINGW))
         set(MUSE_MODULE_AUDIO_JACK OFF)
+    else()
+        add_compile_definitions(JACK_AUDIO)
     endif()
 endif()
 

buildscripts/ci/macos/setup.sh

@@ -28,6 +28,11 @@ export MACOSX_DEPLOYMENT_TARGET=10.14
 echo "Install build tools"
 brew install cmake ninja --formula --quiet
 
+wget -q https://github.com/jackaudio/jack2-releases/releases/download/v1.9.22/jack2-macOS-universal-v1.9.22.tar.gz
+tar xvf jack2-macOS-universal-v1.9.22.tar.gz
+ls -ltr
+sudo installer -pkg ./jack2-osx-1.9.22.pkg -target /
+
 # Download dependencies
 echo "Download dependencies"
 

src/app/cmdoptions.h

@@ -63,6 +63,10 @@ struct CmdOptions {
         std::optional<float> pngDpiResolution;
     } exportImage;
 
+    struct {
+        std::optional<int> audioDelayCompensate;
+    } audio;
+
     struct {
         std::optional<int> mp3Bitrate;
     } exportAudio;

src/app/internal/commandlineparser.cpp

@@ -163,6 +163,8 @@ void CommandLineParser::init()
                                           "Check an audio plugin for compatibility with the application and register it", "path"));
     m_parser.addOption(QCommandLineOption("register-failed-audio-plugin", "Register an incompatible audio plugin", "path"));
 
+    m_parser.addOption(QCommandLineOption("audioDelayCompensate", "Compensate for delay in frames caused by MuseScore buffering", "1024"));
+
     // Internal
     m_parser.addOption(internalCommandLineOption("score-display-name-override",
                                                  "Display name to be shown in splash screen for the score that is being opened", "name"));
@@ -275,6 +277,10 @@ void CommandLineParser::parse(int argc, char** argv)
         m_options.audioPluginRegistration.failCode = !args1.empty() ? args1[0].toInt() : -1;
     }
 
+    if (m_parser.isSet("audioDelayCompensate")) {
+        m_options.audio.audioDelayCompensate = intValue("audioDelayCompensate");
+    }
+
     // Converter mode
     if (m_parser.isSet("r")) {
         std::optional<float> val = floatValue("r");

src/app/internal/guiapp.cpp

@@ -314,4 +314,6 @@ void GuiApp::applyCommandLineOptions(const CmdOptions& options)
     if (options.app.loggerLevel) {
         m_globalModule.setLoggerLevel(options.app.loggerLevel.value());
     }
+
+    audioConfiguration()->setAudioDelayCompensate(options.audio.audioDelayCompensate.value_or(1024)); // FIX: equal to buffer-size
 }

src/app/internal/guiapp.h

@@ -16,6 +16,7 @@
 #include "appshell/iappshellconfiguration.h"
 #include "appshell/internal/istartupscenario.h"
 #include "importexport/guitarpro/iguitarproconfiguration.h"
+#include "audio/iaudioconfiguration.h"
 
 namespace mu::app {
 class GuiApp : public muse::BaseApplication, public std::enable_shared_from_this<GuiApp>
@@ -25,6 +26,7 @@ class GuiApp : public muse::BaseApplication, public std::enable_shared_from_this
     muse::Inject<appshell::IAppShellConfiguration> appshellConfiguration;
     muse::Inject<appshell::IStartupScenario> startupScenario;
     muse::Inject<iex::guitarpro::IGuitarProConfiguration> guitarProConfiguration;
+    muse::Inject<muse::audio::IAudioConfiguration> audioConfiguration;
 
 public:
     GuiApp(const CmdOptions& options, const muse::modularity::ContextPtr& ctx);

src/appshell/appshell.qrc

@@ -103,6 +103,7 @@
         <file>qml/Preferences/internal/MeiSection.qml</file>
         <file>qml/Preferences/internal/PublishMuseScoreComSection.qml</file>
         <file>qml/Preferences/internal/MixerSection.qml</file>
+        <file>qml/Preferences/internal/JackSection.qml</file>
         <file>qml/DevTools/Extensions/ExtensionsListView.qml</file>
         <file>qml/platform/PlatformMenuBar.qml</file>
         <file>qml/Preferences/PercussionPreferencesPage.qml</file>

src/appshell/qml/Preferences/AudioMidiPreferencesPage.qml

@@ -82,6 +82,19 @@ PreferencesPage {
 
         SeparatorLine {}
 
+        JackSection {
+            jackTransportEnable: audioMidiModel.jackTransportEnable
+
+            navigation.section: root.navigationSection
+            navigation.order: root.navigationOrderStart + 3
+
+            onJackTransportEnableChangeRequested: function(enable) {
+                audioMidiModel.jackTransportEnable = enable
+            }
+        }
+
+        SeparatorLine {}
+
         MixerSection {
             muteHiddenInstruments: audioMidiModel.muteHiddenInstruments
 

src/appshell/qml/Preferences/internal/JackSection.qml

@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-Studio-CLA-applies
+ *
+ * MuseScore Studio
+ * Music Composition & Notation
+ *
+ * Copyright (C) MuseScore Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.15
+
+import Muse.Ui 1.0
+import Muse.UiComponents 1.0
+
+BaseSection {
+    id: root
+
+    title: qsTrc("appshell/preferences", "Jack")
+
+    property alias jackTransportEnable: jackTransportEnableCheckBox.checked
+
+    signal jackTransportEnableChangeRequested(bool enable)
+
+    CheckBox {
+        id: jackTransportEnableCheckBox
+
+        width: parent.width
+
+        text: qsTrc("appshell/preferences", "Enable Jack Transport")
+
+        navigation.name: "JackTransportEnableCheckbox"
+        navigation.panel: root.navigation
+
+        onClicked: {
+            root.jackTransportEnableChangeRequested(!checked)
+        }
+    }
+}

src/appshell/view/preferences/audiomidipreferencesmodel.cpp

@@ -99,6 +99,10 @@ void AudioMidiPreferencesModel::init()
     playbackConfiguration()->muteHiddenInstrumentsChanged().onReceive(this, [this](bool mute) {
         emit muteHiddenInstrumentsChanged(mute);
     });
+
+    playbackConfiguration()->jackTransportEnableChanged().onReceive(this, [this](bool mute) {
+        emit jackTransportEnableChanged(mute);
+    });
 }
 
 QStringList AudioMidiPreferencesModel::audioApiList() const
@@ -188,3 +192,17 @@ void AudioMidiPreferencesModel::setMuteHiddenInstruments(bool mute)
 
     playbackConfiguration()->setMuteHiddenInstruments(mute);
 }
+
+bool AudioMidiPreferencesModel::jackTransportEnable() const
+{
+    return playbackConfiguration()->jackTransportEnable();
+}
+
+void AudioMidiPreferencesModel::setJackTransportEnable(bool enable)
+{
+    if (enable == jackTransportEnable()) {
+        return;
+    }
+
+    playbackConfiguration()->setJackTransportEnable(enable);
+}

src/appshell/view/preferences/audiomidipreferencesmodel.h

@@ -50,6 +50,8 @@ class AudioMidiPreferencesModel : public QObject, public muse::Injectable, publi
 
     Q_PROPERTY(bool muteHiddenInstruments READ muteHiddenInstruments WRITE setMuteHiddenInstruments NOTIFY muteHiddenInstrumentsChanged)
 
+    Q_PROPERTY(bool jackTransportEnable READ jackTransportEnable WRITE setJackTransportEnable NOTIFY jackTransportEnableChanged)
+
     muse::Inject<muse::audio::IAudioConfiguration> audioConfiguration = { this };
     muse::Inject<muse::midi::IMidiConfiguration> midiConfiguration = { this };
     muse::Inject<muse::midi::IMidiOutPort> midiOutPort = { this };
@@ -81,13 +83,17 @@ class AudioMidiPreferencesModel : public QObject, public muse::Injectable, publi
 
     bool muteHiddenInstruments() const;
 
+    bool jackTransportEnable() const;
+
 public slots:
     void setCurrentAudioApiIndex(int index);
 
     void setUseMIDI20Output(bool use);
 
     void setMuteHiddenInstruments(bool mute);
 
+    void setJackTransportEnable(bool enable);
+
 signals:
     void currentAudioApiIndexChanged(int index);
     void midiInputDeviceIdChanged();
@@ -100,6 +106,8 @@ public slots:
 
     void muteHiddenInstrumentsChanged(bool mute);
 
+    void jackTransportEnableChanged(bool enable);
+
 private:
     muse::midi::MidiDeviceID midiInputDeviceId(int index) const;
     muse::midi::MidiDeviceID midiOutputDeviceId(int index) const;

src/framework/audio/CMakeLists.txt

@@ -23,7 +23,15 @@ set(MODULE_ALIAS muse::audio)
 
 include(GetPlatformInfo)
 
-if (OS_IS_WIN)
+set(JACK_SRC "")
+if (MUSE_MODULE_AUDIO_JACK)
+    set(JACK_SRC
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/jackaudiodriver.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/jackaudiodriver.h
+    )
+endif(MUSE_MODULE_AUDIO_JACK)
+
+if (OS_IS_WIN AND (NOT MINGW))
     set(DRIVER_SRC
         #${CMAKE_CURRENT_LIST_DIR}/internal/platform/win/winmmdriver.cpp
         #${CMAKE_CURRENT_LIST_DIR}/internal/platform/win/winmmdriver.h
@@ -37,28 +45,23 @@ if (OS_IS_WIN)
         ${CMAKE_CURRENT_LIST_DIR}/internal/platform/win/audiodeviceslistener.cpp
         ${CMAKE_CURRENT_LIST_DIR}/internal/platform/win/audiodeviceslistener.h
     )
-elseif(OS_IS_LIN OR OS_IS_FBSD)
-    if (MUSE_MODULE_AUDIO_JACK)
-        set(DRIVER_SRC
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/jackaudiodriver.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/jackaudiodriver.h
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.h
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/audiodeviceslistener.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/audiodeviceslistener.h
-        )
-    else()
-        set(DRIVER_SRC
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.h
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/audiodeviceslistener.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/audiodeviceslistener.h
-        )
-    endif()
+elseif(OS_IS_LIN OR OS_IS_FBSD OR MINGW)
+    set(DRIVER_SRC
+        ${CMAKE_CURRENT_LIST_DIR}/internal/audiomidimanager.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/internal/audiomidimanager.h
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/audiodeviceslistener.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/audiodeviceslistener.h
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/alsa/alsaaudiodriver.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/internal/platform/alsa/alsaaudiodriver.h
+        ${JACK_SRC}
+       )
 elseif(OS_IS_MAC)
     set(DRIVER_SRC
+        ${CMAKE_CURRENT_LIST_DIR}/internal/audiomidimanager.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/internal/audiomidimanager.h
         ${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/osxaudiodriver.mm
         ${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/osxaudiodriver.h
+        ${JACK_SRC}
     )
 
     set_source_files_properties(
@@ -277,23 +280,22 @@ endif()
 
 if (MUSE_MODULE_AUDIO_JACK)
     find_package(Jack REQUIRED)
-    set(MODULE_INCLUDE_PRIVATE ${MODULE_INCLUDE_PRIVATE} ${JACK_INCLUDE_DIRS} )
-    set(MODULE_LINK ${MODULE_LINK} ${JACK_LIBRARIES} pthread )
+    set(MODULE_INCLUDE_PRIVATE ${MODULE_INCLUDE_PRIVATE} ${JACK_INCLUDE_DIRS})
+    set(MODULE_LINK ${MODULE_LINK} ${JACK_LDFLAGS} pthread)
+endif()
+
+if (OS_IS_MAC)
+    find_library(AudioToolbox NAMES AudioToolbox)
+    find_library(CoreAudio NAMES CoreAudio)
+    set(MODULE_LINK ${MODULE_LINK} ${AudioToolbox} ${CoreAudio})
+elseif (OS_IS_WIN AND (NOT (MINGW)))
+    set(MODULE_LINK ${MODULE_LINK} winmm mmdevapi mfplat)
+elseif (OS_IS_LIN)
     find_package(ALSA REQUIRED)
-    set(MODULE_INCLUDE_PRIVATE ${MODULE_INCLUDE_PRIVATE} ${ALSA_INCLUDE_DIRS} )
-    set(MODULE_LINK ${MODULE_LINK} ${ALSA_LIBRARIES} pthread )
-else ()
-    if (OS_IS_MAC)
-        find_library(AudioToolbox NAMES AudioToolbox)
-        find_library(CoreAudio NAMES CoreAudio)
-        set(MODULE_LINK ${MODULE_LINK} ${AudioToolbox} ${CoreAudio})
-    elseif (OS_IS_WIN)
-        set(MODULE_LINK ${MODULE_LINK} winmm mmdevapi mfplat)
-    elseif (OS_IS_LIN)
-        find_package(ALSA REQUIRED)
-        set(MODULE_INCLUDE_PRIVATE ${MODULE_INCLUDE_PRIVATE} ${ALSA_INCLUDE_DIRS} )
-        set(MODULE_LINK ${MODULE_LINK} ${ALSA_LIBRARIES} pthread )
-    endif()
+    set(MODULE_INCLUDE_PRIVATE ${MODULE_INCLUDE_PRIVATE} ${ALSA_INCLUDE_DIRS})
+    set(MODULE_LINK ${MODULE_LINK} ${ALSA_LIBRARIES} pthread)
+elseif (MINGW)
+    set(MODULE_LINK ${MODULE_LINK} winmm mmdevapi mfplat)
 endif()
 
 set(MODULE_QRC audio.qrc)