From d297b0ee7f5a24ab0725f7145344c1c88291afb5 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 9 Oct 2021 02:48:48 -0400 Subject: [PATCH] Build and link PulseAudio on Linux. --- Makefile | 2 +- dep/Makefile | 2 +- src/rtaudio.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 251a5f30..b571fa88 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+- LDFLAGS += -static-libstdc++ -static-libgcc LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a LDFLAGS += -Wl,--no-whole-archive - LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack + LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple LDFLAGS += $(shell pkg-config --libs gtk+-3.0) STANDALONE_TARGET := Rack diff --git a/dep/Makefile b/dep/Makefile index 8b70a1df..61303b62 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -208,7 +208,7 @@ $(rtmidi): | rtmidi-4.0.0 RTAUDIO_FLAGS += -DRTAUDIO_BUILD_STATIC_LIBS=ON -DRTAUDIO_BUILD_TESTING=OFF ifdef ARCH_LIN -RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_OSS=OFF +RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=ON -DRTAUDIO_API_OSS=OFF endif ifdef ARCH_MAC RTAUDIO_FLAGS += -DRTAUDIO_API_CORE=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_JACK=OFF diff --git a/src/rtaudio.cpp b/src/rtaudio.cpp index c5e98fec..4d3144a1 100644 --- a/src/rtaudio.cpp +++ b/src/rtaudio.cpp @@ -372,8 +372,8 @@ void rtaudioInit() { // I don't like the order returned by getCompiledApi(), so reorder it here. std::vector orderedApis = { RtAudio::LINUX_ALSA, - RtAudio::UNIX_JACK, RtAudio::LINUX_PULSE, + RtAudio::UNIX_JACK, RtAudio::LINUX_OSS, RtAudio::WINDOWS_WASAPI, RtAudio::WINDOWS_ASIO,