diff options
| author | David Robillard <d@drobilla.net> | 2011-09-14 22:49:22 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-14 22:49:22 +0000 |
| commit | 728f510e8c542db2907dcd439a9ab99d07282220 (patch) | |
| tree | 6aa01740b1def7a1fa0a32e22fef929bdc231a62 /src/shared | |
| parent | e18380569bdbe1926be7540f3e2f9ebdf49a8e70 (diff) | |
| download | ingen-728f510e8c542db2907dcd439a9ab99d07282220.tar.gz ingen-728f510e8c542db2907dcd439a9ab99d07282220.tar.bz2 ingen-728f510e8c542db2907dcd439a9ab99d07282220.zip | |
Support lv2:sampleRate controls (mostly) correctly.
Fix initial control port values (was always 0.0).
Fix numeric values in control window.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3460 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/LV2URIMap.cpp | 3 | ||||
| -rw-r--r-- | src/shared/LV2URIMap.hpp | 3 | ||||
| -rw-r--r-- | src/shared/ResourceImpl.cpp | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp index d2c4f270..4ca5a033 100644 --- a/src/shared/LV2URIMap.cpp +++ b/src/shared/LV2URIMap.cpp @@ -81,10 +81,12 @@ LV2URIMap::LV2URIMap() , ingen_controlBinding (NS_INGEN "controlBinding") , ingen_document (NS_INGEN "document") , ingen_enabled (NS_INGEN "enabled") + , ingen_engine (NS_INGEN "engine") , ingen_nil (NS_INGEN "nil") , ingen_node (NS_INGEN "node") , ingen_polyphonic (NS_INGEN "polyphonic") , ingen_polyphony (NS_INGEN "polyphony") + , ingen_sampleRate (NS_INGEN "sampleRate") , ingen_selected (NS_INGEN "selected") , ingen_value (NS_INGEN "value") , ingenui_canvas_x (NS_INGENUI "canvas-x") @@ -101,6 +103,7 @@ LV2URIMap::LV2URIMap() , lv2_minimum (NS_LV2 "minimum") , lv2_name (NS_LV2 "name") , lv2_portProperty (NS_LV2 "portProperty") + , lv2_sampleRate (NS_LV2 "sampleRate") , lv2_symbol (NS_LV2 "symbol") , lv2_toggled (NS_LV2 "toggled") , midi_Bender (NS_MIDI "Bender") diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp index b7d0ff7b..75f6748e 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -113,10 +113,12 @@ public: const Quark ingen_controlBinding; const Quark ingen_document; const Quark ingen_enabled; + const Quark ingen_engine; const Quark ingen_nil; const Quark ingen_node; const Quark ingen_polyphonic; const Quark ingen_polyphony; + const Quark ingen_sampleRate; const Quark ingen_selected; const Quark ingen_value; const Quark ingenui_canvas_x; @@ -133,6 +135,7 @@ public: const Quark lv2_minimum; const Quark lv2_name; const Quark lv2_portProperty; + const Quark lv2_sampleRate; const Quark lv2_symbol; const Quark lv2_toggled; const Quark midi_Bender; diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp index 9f663be1..d315b8f0 100644 --- a/src/shared/ResourceImpl.cpp +++ b/src/shared/ResourceImpl.cpp @@ -152,11 +152,9 @@ ResourceImpl::type( void ResourceImpl::set_properties(const Properties& p) { - typedef Resource::Properties::const_iterator iterator; - for (iterator i = p.begin(); i != p.end(); ++i) - _properties.erase(i->first); - for (iterator i = p.begin(); i != p.end(); ++i) - add_property(i->first, i->second); + for (Resource::Properties::const_iterator i = p.begin(); i != p.end(); ++i) { + set_property(i->first, i->second); + } } void |