summaryrefslogtreecommitdiffstats
path: root/src/libs/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-21 15:14:53 +0000
committerDavid Robillard <d@drobilla.net>2008-01-21 15:14:53 +0000
commitd6b87aa26ef482a8952437f7472b81a2240f01fd (patch)
tree620d233b902c78413dc17ee5f921633251239695 /src/libs/gui
parent2356f96fbd6c9d70dedcd0d64bf0d72786ea36bb (diff)
downloadingen-d6b87aa26ef482a8952437f7472b81a2240f01fd.tar.gz
ingen-d6b87aa26ef482a8952437f7472b81a2240f01fd.tar.bz2
ingen-d6b87aa26ef482a8952437f7472b81a2240f01fd.zip
Work on generic LV2 events.
git-svn-id: http://svn.drobilla.net/lad/ingen@1090 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui')
-rw-r--r--src/libs/gui/Configuration.cpp11
-rw-r--r--src/libs/gui/Configuration.hpp5
-rw-r--r--src/libs/gui/PatchCanvas.cpp2
3 files changed, 11 insertions, 7 deletions
diff --git a/src/libs/gui/Configuration.cpp b/src/libs/gui/Configuration.cpp
index 2e4fc1c2..36d5ad75 100644
--- a/src/libs/gui/Configuration.cpp
+++ b/src/libs/gui/Configuration.cpp
@@ -41,8 +41,9 @@ Configuration::Configuration()
// Colours from the Tango palette with modified V and alpha
: _audio_port_color( 0x244678C0)
, _control_port_color(0x4A8A0EC0)
- , _midi_port_color( 0x960909C0)
- , _osc_port_color( 0x5C3566C0)
+ , _event_port_color( 0x960909C0)
+// , _midi_port_color( 0x960909C0)
+// , _osc_port_color( 0x5C3566C0)
{
}
@@ -91,11 +92,13 @@ Configuration::get_port_color(const PortModel* p)
return _control_port_color;
} else if (p->type().is_audio()) {
return _audio_port_color;
- } else if (p->type().is_midi()) {
+ } else if (p->type().is_event()) {
+ return _event_port_color;
+ }/* else if (p->type().is_midi()) {
return _midi_port_color;
} else if (p->type().is_osc()) {
return _osc_port_color;
- }
+ }*/
cerr << "[Configuration] Unknown port type " << p->type().uri()
<< ", port will appear black." << endl;
diff --git a/src/libs/gui/Configuration.hpp b/src/libs/gui/Configuration.hpp
index 0a3f94db..5baa7a09 100644
--- a/src/libs/gui/Configuration.hpp
+++ b/src/libs/gui/Configuration.hpp
@@ -59,8 +59,9 @@ private:
uint32_t _audio_port_color;
uint32_t _control_port_color;
- uint32_t _midi_port_color;
- uint32_t _osc_port_color;
+ uint32_t _event_port_color;
+ //uint32_t _midi_port_color;
+ //uint32_t _osc_port_color;
};
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index 90e873a9..ecd97318 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -363,7 +363,7 @@ PatchCanvas::connect(boost::shared_ptr<FlowCanvas::Connectable> src_port,
return;
// Midi binding/learn shortcut
- if (src->model()->type().is_midi() && dst->model()->type().is_control())
+ if (src->model()->type().is_event() && dst->model()->type().is_control())
{
cerr << "[PatchCanvas] FIXME: MIDI binding shortcut" << endl;
#if 0