diff options
| author | David Robillard <d@drobilla.net> | 2020-11-28 12:02:55 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-28 12:45:57 +0100 |
| commit | 0ae4276ac187a9a361950f26bd67eb2d54636aff (patch) | |
| tree | cc46c2ff5df75d426de5e80b891042ae1ebb7bf3 /src/PatchageCanvas.cpp | |
| parent | 4ac8e622bb4ef5841435fc0815efb6bb756f76da (diff) | |
| download | patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.tar.gz patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.tar.bz2 patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.zip | |
Simplify driver connection interface
Diffstat (limited to 'src/PatchageCanvas.cpp')
| -rw-r--r-- | src/PatchageCanvas.cpp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 1433244..6bae432 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -207,22 +207,12 @@ PatchageCanvas::connect(Ganv::Node* port1, Ganv::Node* port2) (p1->type() == PortType::jack_osc && p2->type() == PortType::jack_osc)) { #if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) - _app->jack_driver()->connect(p1->id(), - p1->module_name(), - p1->name(), - p2->id(), - p2->module_name(), - p2->name()); + _app->jack_driver()->connect(p1->id(), p2->id()); #endif #ifdef HAVE_ALSA } else if (p1->type() == PortType::alsa_midi && p2->type() == PortType::alsa_midi) { - _app->alsa_driver()->connect(p1->id(), - p1->module_name(), - p1->name(), - p2->id(), - p2->module_name(), - p2->name()); + _app->alsa_driver()->connect(p1->id(), p2->id()); #endif } else { _app->log().warning("Cannot make connection, incompatible port types"); @@ -255,22 +245,12 @@ PatchageCanvas::disconnect(Ganv::Node* port1, Ganv::Node* port2) input->type() == PortType::jack_cv || input->type() == PortType::jack_osc) { #if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) - _app->jack_driver()->disconnect(output->id(), - output->module_name(), - output->name(), - input->id(), - input->module_name(), - input->name()); + _app->jack_driver()->disconnect(output->id(), input->id()); #endif #ifdef HAVE_ALSA } else if (input->type() == PortType::alsa_midi) { - _app->alsa_driver()->disconnect(output->id(), - output->module_name(), - output->name(), - input->id(), - input->module_name(), - input->name()); + _app->alsa_driver()->disconnect(output->id(), input->id()); #endif } else { _app->log().error("Attempt to disconnect ports with strange types"); |