summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-12-01 23:08:55 +0000
committerDavid Robillard <d@drobilla.net>2011-12-01 23:08:55 +0000
commit05b451e8be70bb49c1ac663cdbef6640fc2c5045 (patch)
tree9e205bde374787485ab58b2f263b39192e24e03f
parentab32c5c1c32beacfd34489683627ca253966bc6b (diff)
downloadpatchage-05b451e8be70bb49c1ac663cdbef6640fc2c5045.tar.gz
patchage-05b451e8be70bb49c1ac663cdbef6640fc2c5045.tar.bz2
patchage-05b451e8be70bb49c1ac663cdbef6640fc2c5045.zip
Move color stuff down to C level.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3733 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/AlsaDriver.cpp5
-rw-r--r--src/JackDriver.cpp3
-rw-r--r--src/PatchageEvent.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 7ddb3d1..87c149e 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -163,9 +163,8 @@ AlsaDriver::refresh()
PatchagePort* port2 = _app->canvas()->find_port(PortID(*addr2, true));
if (port2 && !_app->canvas()->get_connection(port, port2)) {
- _app->canvas()->make_connection(port,
- port2,
- port->color() + 0x22222200);
+ _app->canvas()->make_connection(
+ port, port2, port->get_fill_color() + 0x22222200);
snd_seq_query_subscribe_set_index(
subsinfo, snd_seq_query_subscribe_get_index(subsinfo) + 1);
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index e2e6d2b..94cc575 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -313,7 +313,8 @@ JackDriver::refresh()
}
if (src && dst && !_app->canvas()->get_connection(src, dst))
- _app->canvas()->make_connection(src, dst, port1->color() + 0x22222200);
+ _app->canvas()->make_connection(
+ src, dst, port1->get_fill_color() + 0x22222200);
}
jack_free(connected_ports);
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index 4f3c8d5..b6cd6e1 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -92,7 +92,7 @@ PatchageEvent::execute(Patchage* patchage)
% _port_2).str());
else
patchage->canvas()->make_connection(
- port_1, port_2, port_1->color() + 0x22222200);
+ port_1, port_2, port_1->get_fill_color() + 0x22222200);
} else if (_type == DISCONNECTION) {