1 files changed, 30 insertions, 21 deletions

diff --git a/src/sync_square.c b/src/sync_square.c
index 4ac7d1a..38fdaf5 100644
--- a/src/sync_square.c
+++ b/src/sync_square.c
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include "lv2/lv2plug.in/ns/ext/morph/morph.h"
+#include "lv2/lv2plug.in/ns/ext/options/options.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "uris.h"
 
@@ -64,29 +65,37 @@ connect_port(LV2_Handle instance,
 	}
 }
 
-static LV2_Morph_Status
-morph_port(LV2_Handle                      instance,
-           uint32_t                        port,
-           LV2_URID                        type,
-           const LV2_Morph_Property*const* properties)
+static uint32_t
+options_set(LV2_Handle                instance,
+            const LV2_Options_Option* options)
 {
 	SyncSquare* plugin = (SyncSquare*)instance;
-
-	switch (port) {
-	case SYNCSQUARE_FREQUENCY:
-		if (type == plugin->uris.lv2_ControlPort) {
-			plugin->frequency_is_cv = 0;
-		} else if (type == plugin->uris.lv2_CVPort) {
-			plugin->frequency_is_cv = 1;
+	uint32_t    ret    = 0;
+	for (const LV2_Options_Option* o = options; o->key; ++o) {
+		if (o->context != LV2_OPTIONS_PORT) {
+			ret |= LV2_OPTIONS_ERR_BAD_SUBJECT;
+		} else if (o->key != plugin->uris.morph_currentType) {
+			ret |= LV2_OPTIONS_ERR_BAD_KEY;
+		} else if (o->type != plugin->uris.atom_URID) {
+			ret |= LV2_OPTIONS_ERR_BAD_VALUE;
 		} else {
-			return LV2_MORPH_ERR_BAD_TYPE;
+			LV2_URID port_type = *(const LV2_URID*)(o->value);
+			if (port_type != plugin->uris.lv2_ControlPort &&
+			    port_type != plugin->uris.lv2_CVPort) {
+				ret |= LV2_OPTIONS_ERR_BAD_VALUE;
+				continue;
+			}
+
+			switch (o->subject) {
+			case SYNCSQUARE_FREQUENCY:
+				plugin->frequency_is_cv = (port_type == plugin->uris.lv2_CVPort);
+				break;
+			default:
+				ret |= LV2_OPTIONS_ERR_BAD_SUBJECT;
+			}
 		}
-		return LV2_MORPH_SUCCESS;
-	default:
-		return LV2_MORPH_ERR_BAD_PORT;
 	}
-
-	return LV2_MORPH_SUCCESS;
+	return ret;
 }
 
 static LV2_Handle
@@ -164,9 +173,9 @@ run(LV2_Handle instance,
 static const void*
 extension_data(const char* uri)
 {
-	static const LV2_Morph_Interface morph = { morph_port, NULL };
-	if (!strcmp(uri, LV2_MORPH__interface)) {
-		return &morph;
+	static const LV2_Options_Interface options = { NULL, options_set };
+	if (!strcmp(uri, LV2_OPTIONS__interface)) {
+		return &options;
 	}
 	return NULL;
 }