diff options
| author | David Robillard <d@drobilla.net> | 2020-11-29 17:19:06 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-29 18:03:31 +0100 |
| commit | 9964717f1c5bf56f24c81ff5597085a62e966a7b (patch) | |
| tree | d75f55e06a890d308ef2254078c52ed5ec60ed81 /src/Patchage.cpp | |
| parent | 78b359c44b67f4f1fff9e31dd9243af5e996f38a (diff) | |
| download | patchage-9964717f1c5bf56f24c81ff5597085a62e966a7b.tar.gz patchage-9964717f1c5bf56f24c81ff5597085a62e966a7b.tar.bz2 patchage-9964717f1c5bf56f24c81ff5597085a62e966a7b.zip | |
Use Jack driver exclusively through AudioDriver interface
Diffstat (limited to 'src/Patchage.cpp')
| -rw-r--r-- | src/Patchage.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 5936107..4f522f7 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -289,15 +289,15 @@ Patchage::Patchage(Options options) #endif #if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) - _jack_driver = std::unique_ptr<JackDriver>{new JackDriver( + _jack_driver = std::unique_ptr<AudioDriver>{new JackDriver( _log, [this](const PatchageEvent& event) { on_driver_event(event); })}; _connector.add_driver(PortID::Type::jack, _jack_driver.get()); _menu_jack_connect->signal_activate().connect(sigc::bind( - sigc::mem_fun(_jack_driver.get(), &JackDriver::attach), true)); + sigc::mem_fun(_jack_driver.get(), &AudioDriver::attach), true)); _menu_jack_disconnect->signal_activate().connect( - sigc::mem_fun(_jack_driver.get(), &JackDriver::detach)); + sigc::mem_fun(_jack_driver.get(), &AudioDriver::detach)); #endif #ifdef HAVE_ALSA @@ -342,13 +342,8 @@ Patchage::Patchage(Options options) Patchage::~Patchage() { -#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) _jack_driver.reset(); -#endif -#ifdef HAVE_ALSA _alsa_driver.reset(); -#endif - _about_win.destroy(); _xml.reset(); } |