diff options
| author | David Robillard <d@drobilla.net> | 2008-10-01 02:43:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-01 02:43:56 +0000 |
| commit | df9adc430fe5f3d3d4c9c02a0dad1826da474799 (patch) | |
| tree | 919e125f948c11d9c7907fcb1428a19b2d495c93 /src/PatchageCanvas.cpp | |
| parent | 0925126286b9e01964e065452f4b16b43923c75c (diff) | |
| download | patchage-df9adc430fe5f3d3d4c9c02a0dad1826da474799.tar.gz patchage-df9adc430fe5f3d3d4c9c02a0dad1826da474799.tar.bz2 patchage-df9adc430fe5f3d3d4c9c02a0dad1826da474799.zip | |
Integrate patchage into build system.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1569 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/PatchageCanvas.cpp')
| -rw-r--r-- | src/PatchageCanvas.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 6b610e4..2735a61 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -21,7 +21,7 @@ #include "Patchage.hpp" #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" -#elif defined(HAVE_JACK) +#elif defined(USE_LIBJACK) #include "JackDriver.hpp" #endif #include "PatchageModule.hpp" @@ -70,7 +70,7 @@ PatchageCanvas::find_port(const PortID& id) string module_name; string port_name; -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) jack_port_t* jack_port = NULL; #endif @@ -79,7 +79,7 @@ PatchageCanvas::find_port(const PortID& id) // TODO: filthy. keep a port map and make this O(log(n)) switch (id.type) { -#if defined(HAVE_JACK) && !defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) && !defined(HAVE_JACK_DBUS) case PortID::JACK_ID: jack_port = jack_port_by_id(_app->jack_driver()->client(), id.id.jack_id); if (!jack_port) @@ -145,7 +145,7 @@ PatchageCanvas::connect(boost::shared_ptr<Connectable> port1, boost::shared_ptr< if ((p1->type() == JACK_AUDIO && p2->type() == JACK_AUDIO) || ((p1->type() == JACK_MIDI && p2->type() == JACK_MIDI))) { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->connect(p1, p2); #endif #ifdef HAVE_ALSA @@ -183,7 +183,7 @@ PatchageCanvas::disconnect(boost::shared_ptr<Connectable> port1, boost::shared_p if ((input->type() == JACK_AUDIO && output->type() == JACK_AUDIO) || (input->type() == JACK_MIDI && output->type() == JACK_MIDI)) { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->disconnect(output, input); #endif #ifdef HAVE_ALSA |