diff options
| author | David Robillard <d@drobilla.net> | 2010-12-15 00:23:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-15 00:23:38 +0000 |
| commit | ba2863f012866398efab12b6b3e6a113d5eb60bd (patch) | |
| tree | d6eeb5c5e009bc3f42bd354afa25cfa684ed212d /src/PatchageCanvas.cpp | |
| parent | fb6cff045de58c304527efea4e85d53fd80d2758 (diff) | |
| download | patchage-ba2863f012866398efab12b6b3e6a113d5eb60bd.tar.gz patchage-ba2863f012866398efab12b6b3e6a113d5eb60bd.tar.bz2 patchage-ba2863f012866398efab12b6b3e6a113d5eb60bd.zip | |
Fix removal of ALSA duplex ports (remove both corresponding canvas ports).
Use simpler (and seemingly less lockup prone) blocking ALSA sequencer event API.
Only use a ringbuffer for JACK driver.
Reduce memory usage.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2690 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/PatchageCanvas.cpp')
| -rw-r--r-- | src/PatchageCanvas.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 4f6a12e..f3ffca0 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -115,8 +115,8 @@ PatchageCanvas::find_port(const PortID& id) && pp->alsa_addr()->client == id.id.alsa_addr.client && pp->alsa_addr()->port == id.id.alsa_addr.port) { if ((module->type() == InputOutput) - || (id.is_input && (module->type() == Input)) - || (!id.is_input && (module->type() == Output))) { + || (id.id.is_input && (module->type() == Input)) + || (!id.id.is_input && (module->type() == Output))) { return pp; } } @@ -158,10 +158,8 @@ PatchageCanvas::connect(boost::shared_ptr<Connectable> port1, boost::shared_ptr< void PatchageCanvas::disconnect(boost::shared_ptr<Connectable> port1, boost::shared_ptr<Connectable> port2) { - boost::shared_ptr<PatchagePort> input - = boost::dynamic_pointer_cast<PatchagePort>(port1); - boost::shared_ptr<PatchagePort> output - = boost::dynamic_pointer_cast<PatchagePort>(port2); + boost::shared_ptr<PatchagePort> input = boost::dynamic_pointer_cast<PatchagePort>(port1); + boost::shared_ptr<PatchagePort> output = boost::dynamic_pointer_cast<PatchagePort>(port2); if (!input || !output) return; |