diff options
| -rw-r--r-- | src/Patchage.cpp | 11 | ||||
| -rw-r--r-- | src/Patchage.hpp | 6 |
2 files changed, 6 insertions, 11 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(); } diff --git a/src/Patchage.hpp b/src/Patchage.hpp index c48ff05..0e81afb 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -54,7 +54,7 @@ #include <set> #include <string> -class JackDriver; +class AudioDriver; class PatchageCanvas; class Configuration; @@ -159,8 +159,8 @@ protected: std::shared_ptr<PatchageCanvas> _canvas; - std::unique_ptr<JackDriver> _jack_driver; - Configuration _conf; + std::unique_ptr<AudioDriver> _jack_driver; + Configuration _conf; Gtk::Main* _gtk_main; |