diff options
| -rw-r--r-- | src/AlsaDriver.cpp | 3 | ||||
| -rw-r--r-- | src/JackDriver.cpp | 3 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/PatchageCanvas.hpp | 4 | ||||
| -rw-r--r-- | src/PatchageEvent.cpp | 3 | ||||
| -rw-r--r-- | wscript | 2 |
6 files changed, 7 insertions, 14 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 641c55d..1ebd12d 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -160,8 +160,7 @@ AlsaDriver::refresh() const PortID id2(*addr2, true); PatchagePort* port2 = _app->canvas()->find_port(id2); if (port2 && !_app->canvas()->get_edge(port, port2)) { - _app->canvas()->make_connection( - port, port2, port->get_fill_color()); + _app->canvas()->make_connection(port, port2); } } diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index b0b5ae8..fdb3174 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -354,8 +354,7 @@ JackDriver::refresh() } if (src && dst && !_app->canvas()->get_edge(src, dst)) - _app->canvas()->make_connection( - src, dst, port1->get_fill_color()); + _app->canvas()->make_connection(src, dst); } jack_free(connected_ports); diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 468fa5b..4d63a4b 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -310,11 +310,9 @@ PatchageCanvas::on_event(GdkEvent* ev) } bool -PatchageCanvas::make_connection(Ganv::Node* tail, - Ganv::Node* head, - uint32_t color) +PatchageCanvas::make_connection(Ganv::Node* tail, Ganv::Node* head) { - new Ganv::Edge(*this, tail, head, color); + new Ganv::Edge(*this, tail, head); return true; } diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp index a44c18c..4b5fac1 100644 --- a/src/PatchageCanvas.hpp +++ b/src/PatchageCanvas.hpp @@ -63,9 +63,7 @@ public: void add_module(const std::string& name, PatchageModule* module); - bool make_connection(Ganv::Node* tail, - Ganv::Node* head, - uint32_t color); + bool make_connection(Ganv::Node* tail, Ganv::Node* head); void remove_port(const PortID& id); diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index f11ec97..93a1a02 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -91,8 +91,7 @@ PatchageEvent::execute(Patchage* patchage) patchage->error_msg((format("Unable to find port `%1%' to connect") % _port_2).str()); else - patchage->canvas()->make_connection( - port_1, port_2, port_1->get_fill_color()); + patchage->canvas()->make_connection(port_1, port_2); } else if (_type == DISCONNECTION) { @@ -58,7 +58,7 @@ def configure(conf): autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.12.0', mandatory=True) autowaf.check_pkg(conf, 'ganv-1', uselib_store='GANV', - atleast_version='1.5.0', mandatory=True) + atleast_version='1.5.1', mandatory=True) if conf.env.DEST_OS == 'darwin': autowaf.check_pkg(conf, 'gtk-mac-integration', uselib_store='GTK_OSX', |