diff options
| author | David Robillard <d@drobilla.net> | 2011-10-22 03:08:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-10-22 03:08:06 +0000 |
| commit | ac1d6d135bda8d739fdb8bf564f89c38b664c097 (patch) | |
| tree | d750da79dd88b64ab2a88cca1651c2a5a240bd72 /src/gui/Configuration.cpp | |
| parent | 143968e38cc2f058dd7c500e984904a39864d652 (diff) | |
| download | ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.gz ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.bz2 ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.zip | |
De-singleton-ify GUI.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3584 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/Configuration.cpp')
| -rw-r--r-- | src/gui/Configuration.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp index 8358dc34..51eec5bc 100644 --- a/src/gui/Configuration.cpp +++ b/src/gui/Configuration.cpp @@ -37,9 +37,10 @@ namespace GUI { using namespace Ingen::Client; -Configuration::Configuration() +Configuration::Configuration(App& app) // Colours from the Tango palette with modified V and alpha - : _name_style(HUMAN) + : _app(app) + , _name_style(HUMAN) , _audio_port_color( 0x4A8A0EC0) // Green , _control_port_color(0x244678C0) // Blue , _event_port_color( 0x960909C0) // Red @@ -83,12 +84,12 @@ uint32_t Configuration::get_port_color(const PortModel* p) { assert(p != NULL); - const Shared::URIs& uris = App::instance().uris(); + const Shared::URIs& uris = _app.uris(); if (p->is_a(uris.lv2_AudioPort)) { return _audio_port_color; } else if (p->supports(uris.atom_String)) { return _string_port_color; - } else if (App::instance().can_control(p)) { + } else if (_app.can_control(p)) { return _control_port_color; } else if (p->is_a(uris.ev_EventPort) || p->is_a(uris.atom_MessagePort)) { return _event_port_color; |