diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Patchage.cpp | 7 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 9 | ||||
| -rw-r--r-- | src/PatchageEvent.cpp | 7 |
4 files changed, 18 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index d097e4a..610022a 100644 --- a/configure.ac +++ b/configure.ac @@ -197,8 +197,14 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([Configuration:]) AC_MSG_RESULT([]) -AC_MSG_RESULT([Jack support: $build_jack]) -AC_MSG_RESULT([Jack D-Bus: $build_jack_dbus]) +# we are not building libjack driver if jackdbus driver is being built (src/Makefile.am) +if test "$build_jack_dbus" = "yes"; then +AC_MSG_RESULT([Jack support: yes (D-Bus)]) +elif test "$build_jack" = "yes"; then +AC_MSG_RESULT([Jack support: yes (libjack)]) +else +AC_MSG_RESULT([Jack support: no]) +fi AC_MSG_RESULT([LASH support: $build_lash]) AC_MSG_RESULT([ALSA support: $ALSA_FOUND]) AC_MSG_RESULT([]) diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 33b60ad..b91150f 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -27,11 +27,10 @@ #include CONFIG_H_PATH #include "GladeFile.hpp" -#ifdef HAVE_JACK -#include "JackDriver.hpp" -#endif -#ifdef HAVE_JACK_DBUS +#if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) +#include "JackDriver.hpp" #endif #include "JackSettingsDialog.hpp" #include "Patchage.hpp" diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 6619c01..b2b2858 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -19,11 +19,10 @@ #include CONFIG_H_PATH #include "PatchageCanvas.hpp" #include "Patchage.hpp" -#ifdef HAVE_JACK -#include "JackDriver.hpp" -#endif -#ifdef HAVE_JACK_DBUS +#if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) +#include "JackDriver.hpp" #endif #include "PatchageModule.hpp" #include "PatchagePort.hpp" @@ -77,7 +76,7 @@ PatchageCanvas::find_port(const PatchageEvent::PortRef& ref) // TODO: filthy. keep a port map and make this O(log(n)) switch (ref.type) { -#if HAVE_JACK +#if defined(HAVE_JACK) && !defined(HAVE_JACK_DBUS) case PatchageEvent::PortRef::JACK_ID: jack_port = jack_port_by_id(_app->jack_driver()->client(), ref.id.jack_id); if (!jack_port) diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 53dd612..1c1f755 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -22,11 +22,10 @@ #include "PatchageModule.hpp" #include "PatchageEvent.hpp" #include "Driver.hpp" -#ifdef HAVE_JACK -#include "JackDriver.hpp" -#endif -#ifdef HAVE_JACK_DBUS +#if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) +#include "JackDriver.hpp" #endif #ifdef HAVE_ALSA #include "AlsaDriver.hpp" |