DPF

commit 636835f63cb1b7ffa5278c4f206a0bcb95fd6b5a
parent 07703215e7f88bdcdd1028b8701aca7542c8cd23
Author: falkTX <falktx@falktx.com>
Date:   Sat, 16 Mar 2019 17:46:25 +0100

Merge branch 'master' into develop

Signed-off-by: falkTX <falktx@falktx.com>

Conflicts:
	distrho/src/DistrhoPluginLV2export.cpp

Diffstat:
M
distrho/src/DistrhoPluginLV2export.cpp
 | 
2
+-
M
distrho/src/DistrhoUILV2.cpp
 | 
2
++

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git 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
@@ -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;