Skip to content

Commit

Permalink
apply cmake option suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
rtbo committed Aug 15, 2024
1 parent 6b9be3f commit 12a1581
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ option(MUE_ENABLE_ENGRAVING_LD_ACCESS "Enable diagnostic engraving check layout
option(MUE_ENABLE_ENGRAVING_LD_PASSES "Enable engraving layout by passes" OFF)

if (OS_IS_LIN)
option(MUSE_MODULE_AUDIO_PW "Build PipeWire audio module" ON)
option(MUSE_PIPEWIRE_AUDIO_DRIVER "Use PipeWire audio driver" ON)
endif()

###########################################
Expand Down
6 changes: 3 additions & 3 deletions src/framework/audio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ elseif(OS_IS_LIN OR OS_IS_FBSD)
${CMAKE_CURRENT_LIST_DIR}/internal/platform/jack/jackaudiodriver.h
)
endif()
if (MUSE_MODULE_AUDIO_PW)
if (MUSE_PIPEWIRE_AUDIO_DRIVER)
set(DRIVER_SRC
${DRIVER_SRC}
${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/pwaudiodriver.cpp
Expand Down Expand Up @@ -313,11 +313,11 @@ else ()
find_package(ALSA REQUIRED)
set(MODULE_INCLUDE ${MODULE_INCLUDE} ${ALSA_INCLUDE_DIRS} )
set(MODULE_LINK ${MODULE_LINK} ${ALSA_LIBRARIES} pthread )
if (MUSE_MODULE_AUDIO_PW)
if (MUSE_PIPEWIRE_AUDIO_DRIVER)
pkg_check_modules(PipeWire REQUIRED libpipewire-0.3)
set(MODULE_INCLUDE ${MODULE_INCLUDE} ${PipeWire_INCLUDE_DIRS} )
set(MODULE_LINK ${MODULE_LINK} ${PipeWire_LIBRARIES})
set(MODULE_DEF ${MODULE_DEF} -DMUSE_MODULE_AUDIO_PW)
set(MODULE_DEF ${MODULE_DEF} -DMUSE_PIPEWIRE_AUDIO_DRIVER)
message(STATUS "Found Pipewire: ${PipeWire_LIBRARIES}")
endif()
endif()
Expand Down
6 changes: 3 additions & 3 deletions src/framework/audio/audiomodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ using namespace muse::audio::fx;

#ifdef Q_OS_LINUX
#include "internal/platform/lin/alsaaudiodriver.h"
#ifdef MUSE_MODULE_AUDIO_PW
#ifdef MUSE_PIPEWIRE_AUDIO_DRIVER
#include "internal/platform/lin/pwaudiodriver.h"
#endif
#endif
Expand Down Expand Up @@ -114,13 +114,13 @@ std::string AudioModule::moduleName() const
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
std::shared_ptr<IAudioDriver> makeLinuxAudioDriver()
{
#if defined(Q_OS_LINUX) && defined(MUSE_MODULE_AUDIO_PW)
#if defined(Q_OS_LINUX) && defined(MUSE_PIPEWIRE_AUDIO_DRIVER)
auto driver = std::make_shared<PwAudioDriver>();
if (driver->connectedToPwServer()) {
LOGI() << "Using audio driver: Pipewire";
return driver;
}
#endif // Q_OS_LINUX && MUSE_MODULE_AUDIO_PW
#endif // Q_OS_LINUX && MUSE_PIPEWIRE_AUDIO_DRIVER
LOGI() << "Using audio driver: ALSA";
return std::make_shared<AlsaAudioDriver>();
}
Expand Down

0 comments on commit 12a1581

Please sign in to comment.