diff options
| author | David Robillard <d@drobilla.net> | 2008-05-01 21:16:31 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-05-01 21:16:31 +0000 |
| commit | cf3b42691ab193c19062ae22370d518139543a24 (patch) | |
| tree | b8b7a87348535037b969f583fc4c05edfbc0b20f | |
| parent | 6fdb4298b3688ea03a9cae4175a21e4d96a62070 (diff) | |
| download | patchage-cf3b42691ab193c19062ae22370d518139543a24.tar.gz patchage-cf3b42691ab193c19062ae22370d518139543a24.tar.bz2 patchage-cf3b42691ab193c19062ae22370d518139543a24.zip | |
GCC 4.3 fixes.
git-svn-id: http://svn.drobilla.net/lad/patchage@1191 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/JackDriver.cpp | 2 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index fc6472b..44c3b99 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -126,7 +126,7 @@ JackDriver::destroy_all_ports() PortVector ports = module->ports(); // copy for (PortVector::iterator p = ports.begin(); p != ports.end(); ++p) { boost::shared_ptr<PatchagePort> port = boost::dynamic_pointer_cast<PatchagePort>(*p); - if (port && port->type() == JACK_AUDIO || port->type() == JACK_MIDI) { + if ((port && port->type() == JACK_AUDIO) || (port->type() == JACK_MIDI)) { module->remove_port(port); port->hide(); } diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index f2cce36..1a06674 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -140,8 +140,8 @@ PatchageCanvas::connect(boost::shared_ptr<Connectable> port1, boost::shared_ptr< if (!p1 || !p2) return; - if (p1->type() == JACK_AUDIO && p2->type() == JACK_AUDIO - || (p1->type() == JACK_MIDI && p2->type() == JACK_MIDI)) + if ((p1->type() == JACK_AUDIO && p2->type() == JACK_AUDIO) + || ((p1->type() == JACK_MIDI && p2->type() == JACK_MIDI))) _app->jack_driver()->connect(p1, p2); #ifdef HAVE_ALSA else if (p1->type() == ALSA_MIDI && p2->type() == ALSA_MIDI) @@ -175,8 +175,8 @@ PatchageCanvas::disconnect(boost::shared_ptr<Connectable> port1, boost::shared_p return; } - if (input->type() == JACK_AUDIO && output->type() == JACK_AUDIO - || input->type() == JACK_MIDI && output->type() == JACK_MIDI) + if ((input->type() == JACK_AUDIO && output->type() == JACK_AUDIO) + || (input->type() == JACK_MIDI && output->type() == JACK_MIDI)) _app->jack_driver()->disconnect(output, input); #ifdef HAVE_ALSA else if (input->type() == ALSA_MIDI && output->type() == ALSA_MIDI) |