diff options
| author | falkTX <falktx@falktx.com> | 2019-03-16 17:46:52 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2019-03-16 17:46:52 +0100 |
| commit | 636835f63cb1b7ffa5278c4f206a0bcb95fd6b5a (patch) | |
| tree | 75d9e3efcc7f07700f63759fac5dc49b366edefa | |
| parent | 07703215e7f88bdcdd1028b8701aca7542c8cd23 (diff) | |
| parent | e5d7199cb3610a90ec79230c4c3ae18b6e49ad60 (diff) | |
Merge branch 'master' into develop
Signed-off-by: falkTX <falktx@falktx.com>
Conflicts:
distrho/src/DistrhoPluginLV2export.cpp
| -rw-r--r-- | distrho/src/DistrhoPluginLV2export.cpp | 2 | ||||
| -rw-r--r-- | distrho/src/DistrhoUILV2.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/distrho/src/DistrhoPluginLV2export.cpp b/distrho/src/DistrhoPluginLV2export.cpp index fce2e3f7..68b26721 100644 --- a/distrho/src/DistrhoPluginLV2export.cpp +++ b/distrho/src/DistrhoPluginLV2export.cpp @@ -157,7 +157,7 @@ void lv2_generate_ttl(const char* const basename) manifestString += " <" LV2_INSTANCE_ACCESS_URI "> ,\n"; manifestString += " <" LV2_OPTIONS__options "> ,\n"; manifestString += " <" LV2_URID__map "> ;\n"; - manifestString += " opts:supportedOption <" LV2_PARAMETERS__sampleRate "> ;\n"; + manifestString += " opts:supportedOption <" LV2_PARAMETERS__sampleRate "> .\n"; # else // DISTRHO_PLUGIN_WANT_DIRECT_ACCESS manifestString += " rdfs:seeAlso <" + uiTTL + "> .\n"; # endif // DISTRHO_PLUGIN_WANT_DIRECT_ACCESS diff --git a/distrho/src/DistrhoUILV2.cpp b/distrho/src/DistrhoUILV2.cpp index 79c7e212..6431f9d7 100644 --- a/distrho/src/DistrhoUILV2.cpp +++ b/distrho/src/DistrhoUILV2.cpp @@ -388,6 +388,8 @@ static LV2UI_Handle lv2ui_instantiate(const LV2UI_Descriptor*, const char* uri, uiResize = (const LV2UI_Resize*)features[i]->data; else if (std::strcmp(features[i]->URI, LV2_UI__parent) == 0) parentId = features[i]->data; + else if (std::strcmp(features[i]->URI, LV2_UI__touch) == 0) + uiTouch = (const LV2UI_Touch*)features[i]->data; #if DISTRHO_PLUGIN_WANT_DIRECT_ACCESS else if (std::strcmp(features[i]->URI, LV2_DATA_ACCESS_URI) == 0) extData = (const LV2_Extension_Data_Feature*)features[i]->data; |