diff options
| author | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
| commit | 4c41b9240003e88c7dae7ba10dcca5ccd5a911dc (patch) | |
| tree | 6e79c9e5388d174b18a7706684f0e097a3abc430 /src/PatchageCanvas.cpp | |
| parent | f8381e5fa077ad03e270b8697fa9d094c845fe14 (diff) | |
| download | patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.gz patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.bz2 patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.zip | |
Fix configuration header define names to not stomp on global namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2794 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 48ce657..a8cd0e7 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -22,7 +22,7 @@ #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" -#elif defined(USE_LIBJACK) +#elif defined(PATCHAGE_LIBJACK) #include "JackDriver.hpp" #endif #ifdef HAVE_ALSA @@ -75,7 +75,7 @@ PatchageCanvas::find_port(const PortID& id) return i->second; } -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK // Alsa ports are always indexed (or don't exist at all) if (id.type == PortID::JACK_ID) { jack_port_t* jack_port = jack_port_by_id(_app->jack_driver()->client(), id.id.jack_id); @@ -95,7 +95,7 @@ PatchageCanvas::find_port(const PortID& id) if (pp) index_port(id, pp); } -#endif // USE_LIBJACK +#endif // PATCHAGE_LIBJACK return pp; } @@ -146,7 +146,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(USE_LIBJACK) || defined(HAVE_JACK_DBUS) +#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->connect(p1, p2); #endif #ifdef HAVE_ALSA @@ -182,7 +182,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(USE_LIBJACK) || defined(HAVE_JACK_DBUS) +#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->disconnect(output, input); #endif #ifdef HAVE_ALSA |