Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Add PORTMIDI flag for compiling with(out) PortMidi #12913

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Build: Add PORTMIDI flag for compiling with(out) PortMidi #12913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adb4f8a
Build: Add flag for compiling with(out) PortMidi
fwcd Mar 4, 2024
59d6673
ControllerManager: Add missing controllerenumerator.h include
fwcd Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/controllers/midi/midimessage.cpp
src/controllers/midi/midioutputhandler.cpp
src/controllers/midi/midiutils.cpp
src/controllers/midi/portmidicontroller.cpp
src/controllers/midi/portmidienumerator.cpp
src/controllers/scripting/colormapper.cpp
src/controllers/scripting/colormapperjsproxy.cpp
src/controllers/scripting/controllerscriptenginebase.cpp
Expand Down Expand Up @@ -2574,9 +2572,17 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/portaudio)
target_link_libraries(mixxx-lib PRIVATE PortAudioRingBuffer)

# PortMidi
find_package(PortMidi REQUIRED)
target_include_directories(mixxx-lib SYSTEM PUBLIC ${PortMidi_INCLUDE_DIRS})
target_link_libraries(mixxx-lib PRIVATE ${PortMidi_LIBRARIES})
option(PORTMIDI "Enable the PortMidi backend for MIDI controllers" ON)
if(PORTMIDI)
target_compile_definitions(mixxx-lib PUBLIC __PORTMIDI__)
find_package(PortMidi REQUIRED)
target_include_directories(mixxx-lib SYSTEM PUBLIC ${PortMidi_INCLUDE_DIRS})
target_link_libraries(mixxx-lib PRIVATE ${PortMidi_LIBRARIES})
target_sources(mixxx-lib PRIVATE
src/controllers/midi/portmidicontroller.cpp
src/controllers/midi/portmidienumerator.cpp
)
endif()

# Protobuf
add_subdirectory(src/proto)
Expand Down
8 changes: 7 additions & 1 deletion src/controllers/controllermanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
#include "controllers/controllerlearningeventfilter.h"
#include "controllers/controllermappinginfoenumerator.h"
#include "controllers/defs_controllers.h"
#include "controllers/midi/portmidienumerator.h"
#include "moc_controllermanager.cpp"
#include "util/cmdlineargs.h"
#include "util/compatibility/qmutex.h"
#include "util/duration.h"
#include "util/time.h"

#ifdef __PORTMIDI__
#include "controllers/midi/portmidienumerator.h"
#endif

#ifdef __HSS1394__
#include "controllers/midi/hss1394enumerator.h"
#endif
Expand Down Expand Up @@ -148,7 +152,9 @@ void ControllerManager::slotInitialize() {

// Instantiate all enumerators. Enumerators can take a long time to
// construct since they interact with host MIDI APIs.
#ifdef __PORTMIDI__
m_enumerators.append(new PortMidiEnumerator());
#endif
#ifdef __HSS1394__
m_enumerators.append(new Hss1394Enumerator(m_pConfig));
#endif
Expand Down
1 change: 1 addition & 0 deletions src/controllers/controllermanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <QTimer>
#include <memory>

#include "controllers/controllerenumerator.h"
#include "preferences/usersettings.h"
#include "util/duration.h"

Expand Down