diff options
| author | David Robillard <d@drobilla.net> | 2008-03-16 18:40:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-03-16 18:40:20 +0000 |
| commit | 1297842468ec49ed1a7fb3155347f11c4b65f1c4 (patch) | |
| tree | c8b80f552b11414e8a837e561b938903a43138c2 /src | |
| parent | 2f1463e0f028a2e1fc122242dcffb9595d924a3b (diff) | |
| download | patchage-1297842468ec49ed1a7fb3155347f11c4b65f1c4.tar.gz patchage-1297842468ec49ed1a7fb3155347f11c4b65f1c4.tar.bz2 patchage-1297842468ec49ed1a7fb3155347f11c4b65f1c4.zip | |
Yet more Patchage D-Bus fixes.
git-svn-id: http://svn.drobilla.net/lad/patchage@1172 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Patchage.cpp | 7 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 9 | ||||
| -rw-r--r-- | src/PatchageEvent.cpp | 7 |
3 files changed, 10 insertions, 13 deletions
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" |