Skip to content

Add JACK support #60

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

Open
NexAdn wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add JACK support #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1e790e
ci: Install libjack-dev for Linux
NexAdn Nov 13, 2022
cf9dbdc
audio: Add JACK plugin
NexAdn Nov 13, 2022
8d163a0
build: Make JACK support optional
NexAdn Dec 2, 2022
5a04a68
travis: Enable JACK support for Linux build
NexAdn Dec 2, 2022
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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ before_install:
install:
- sudo apt-get install build-essential libgl1-mesa-dev
- sudo apt-get install qt514base qt514multimedia qt514quickcontrols2
- sudo apt-get install libjack-dev
- source /opt/qt514/bin/qt514-env.sh


script:
- /opt/qt514/bin/qmake PREFIX=/usr
- /opt/qt514/bin/qmake PREFIX=/usr CONFIG+=jack
- make
- # Generate AppImage
# - sudo apt-get -y install checkinstall
Expand Down
12 changes: 12 additions & 0 deletions OpenSoundMeter.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,18 @@ unix:!macx:!ios {
src/audio/plugins/alsa.cpp

LIBS += -lasound

CONFIG(jack) {
HEADERS += \
src/audio/plugins/jack.h

SOURCES += \
src/audio/plugins/jack.cpp

LIBS += -ljack

DEFINES += USE_JACK
}
}

GRAPH = $$(GRAPH_BACKEND)
Expand Down
8 changes: 8 additions & 0 deletions src/audio/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
#include "plugins/alsa.h"
#endif

#ifdef USE_JACK
#include "plugins/jack.h"
#endif

#ifdef USE_ASIO
#include "plugins/asioplugin.h"
#endif
Expand Down Expand Up @@ -89,6 +93,10 @@ void Client::initPlugins()
m_plugins.push_back(QSharedPointer<Plugin>(new AlsaPlugin()));
#endif

#ifdef USE_JACK
m_plugins.push_back(QSharedPointer<Plugin>(new JackPlugin()));
#endif

for (auto &&plugin : m_plugins) {
connect(plugin.data(), &Plugin::deviceListChanged, this, [this]() {
refreshDeviceList();
Expand Down
Loading