summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-02-16 03:39:18 +0000
committerDavid Robillard <d@drobilla.net>2015-02-16 03:39:18 +0000
commit668f74cd5cbfa95b09a4fe9f74b99770c3c672c4 (patch)
tree2552e160590aa91850141e8bebc3746dac1182f2 /src
parent657d2b6bfeafef0a8c3c9da5f7b7b61eea555ad0 (diff)
downloadpatchage-668f74cd5cbfa95b09a4fe9f74b99770c3c672c4.tar.gz
patchage-668f74cd5cbfa95b09a4fe9f74b99770c3c672c4.tar.bz2
patchage-668f74cd5cbfa95b09a4fe9f74b99770c3c672c4.zip
Distinguish edge color from port color slighly.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@5577 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/AlsaDriver.cpp3
-rw-r--r--src/JackDriver.cpp3
-rw-r--r--src/PatchageCanvas.cpp6
-rw-r--r--src/PatchageCanvas.hpp4
-rw-r--r--src/PatchageEvent.cpp3
5 files changed, 6 insertions, 13 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) {