diff --git a/source/backend/plugin/CarlaPluginLV2.cpp b/source/backend/plugin/CarlaPluginLV2.cpp index 9508aff32..64d3c216c 100644 --- a/source/backend/plugin/CarlaPluginLV2.cpp +++ b/source/backend/plugin/CarlaPluginLV2.cpp @@ -133,11 +133,11 @@ enum CarlaLv2URIDs { kUridTimeTicksPerBeat, kUridMidiEvent, kUridParamSampleRate, + kUridScaleFactor, kUridWindowTitle, kUridCarlaAtomWorkerIn, kUridCarlaAtomWorkerResp, kUridCarlaTransientWindowId, - kUridCarlaUiScale, kUridCount }; @@ -316,7 +316,7 @@ struct CarlaPluginLV2Options { SequenceSize, SampleRate, TransientWinId, - UiScale, + ScaleFactor, WindowTitle, Null, Count @@ -374,13 +374,13 @@ struct CarlaPluginLV2Options { optSequenceSize.type = kUridAtomInt; optSequenceSize.value = &sequenceSize; - LV2_Options_Option& optUiScale(opts[UiScale]); - optUiScale.context = LV2_OPTIONS_INSTANCE; - optUiScale.subject = 0; - optUiScale.key = kUridCarlaUiScale; - optUiScale.size = sizeof(float); - optUiScale.type = kUridAtomFloat; - optUiScale.value = &uiScale; + LV2_Options_Option& optScaleFactor(opts[ScaleFactor]); + optScaleFactor.context = LV2_OPTIONS_INSTANCE; + optScaleFactor.subject = 0; + optScaleFactor.key = kUridScaleFactor; + optScaleFactor.size = sizeof(float); + optScaleFactor.type = kUridAtomFloat; + optScaleFactor.value = &uiScale; LV2_Options_Option& optSampleRate(opts[SampleRate]); optSampleRate.context = LV2_OPTIONS_INSTANCE; @@ -6610,6 +6610,8 @@ private: return kUridMidiEvent; if (std::strcmp(uri, LV2_PARAMETERS__sampleRate) == 0) return kUridParamSampleRate; + if (std::strcmp(uri, LV2_UI__scaleFactor) == 0) + return kUridScaleFactor; if (std::strcmp(uri, LV2_UI__windowTitle) == 0) return kUridWindowTitle; @@ -6620,8 +6622,6 @@ private: return kUridCarlaAtomWorkerResp; if (std::strcmp(uri, LV2_KXSTUDIO_PROPERTIES__TransientWindowId) == 0) return kUridCarlaTransientWindowId; - if (std::strcmp(uri, "urn:carla:scale") == 0) - return kUridCarlaUiScale; // Custom plugin types return ((CarlaPluginLV2*)handle)->getCustomURID(uri); @@ -6740,6 +6740,8 @@ private: return LV2_MIDI__MidiEvent; case kUridParamSampleRate: return LV2_PARAMETERS__sampleRate; + case kUridScaleFactor: + return LV2_UI__scaleFactor; case kUridWindowTitle: return LV2_UI__windowTitle; @@ -6750,8 +6752,6 @@ private: return URI_CARLA_ATOM_WORKER_RESP; case kUridCarlaTransientWindowId: return LV2_KXSTUDIO_PROPERTIES__TransientWindowId; - case kUridCarlaUiScale: - return "urn:carla:scale"; } // Custom plugin types diff --git a/source/bridges-ui/CarlaBridgeFormatLV2.cpp b/source/bridges-ui/CarlaBridgeFormatLV2.cpp index a380998eb..32cb40db3 100644 --- a/source/bridges-ui/CarlaBridgeFormatLV2.cpp +++ b/source/bridges-ui/CarlaBridgeFormatLV2.cpp @@ -93,11 +93,11 @@ enum CarlaLv2URIDs { kUridTimeTicksPerBeat, kUridMidiEvent, kUridParamSampleRate, + kUridScaleFactor, kUridWindowTitle, kUridCarlaAtomWorkerIn, kUridCarlaAtomWorkerResp, kUridCarlaTransientWindowId, - kUridCarlaUiScale, kUridCount }; @@ -131,7 +131,7 @@ struct Lv2PluginOptions { enum OptIndex { SampleRate, TransientWinId, - UiScale, + ScaleFactor, WindowTitle, Null, Count @@ -155,13 +155,13 @@ struct Lv2PluginOptions { optSampleRate.type = kUridAtomFloat; optSampleRate.value = &sampleRate; - LV2_Options_Option& optUiScale(opts[UiScale]); - optUiScale.context = LV2_OPTIONS_INSTANCE; - optUiScale.subject = 0; - optUiScale.key = kUridParamSampleRate; - optUiScale.size = sizeof(float); - optUiScale.type = kUridCarlaUiScale; - optUiScale.value = &uiScale; + LV2_Options_Option& optScaleFactor(opts[ScaleFactor]); + optScaleFactor.context = LV2_OPTIONS_INSTANCE; + optScaleFactor.subject = 0; + optScaleFactor.key = kUridScaleFactor; + optScaleFactor.size = sizeof(float); + optScaleFactor.type = kUridAtomFloat; + optScaleFactor.value = &uiScale; LV2_Options_Option& optTransientWinId(opts[TransientWinId]); optTransientWinId.context = LV2_OPTIONS_INSTANCE; @@ -1060,6 +1060,8 @@ private: return kUridMidiEvent; if (std::strcmp(uri, LV2_PARAMETERS__sampleRate) == 0) return kUridParamSampleRate; + if (std::strcmp(uri, LV2_UI__scaleFactor) == 0) + return kUridScaleFactor; if (std::strcmp(uri, LV2_UI__windowTitle) == 0) return kUridWindowTitle; @@ -1188,6 +1190,8 @@ private: return LV2_MIDI__MidiEvent; case kUridParamSampleRate: return LV2_PARAMETERS__sampleRate; + case kUridScaleFactor: + return LV2_UI__scaleFactor; case kUridWindowTitle: return LV2_UI__windowTitle; diff --git a/source/includes/lv2/ui.h b/source/includes/lv2/ui.h index e552e4515..406a19f1c 100644 --- a/source/includes/lv2/ui.h +++ b/source/includes/lv2/ui.h @@ -60,6 +60,7 @@ #define LV2_UI__floatProtocol LV2_UI_PREFIX "floatProtocol" ///< http://lv2plug.in/ns/extensions/ui#floatProtocol #define LV2_UI__peakProtocol LV2_UI_PREFIX "peakProtocol" ///< http://lv2plug.in/ns/extensions/ui#peakProtocol #define LV2_UI__resize LV2_UI_PREFIX "resize" ///< http://lv2plug.in/ns/extensions/ui#resize +#define LV2_UI__scaleFactor LV2_UI_PREFIX "scaleFactor" ///< http://lv2plug.in/ns/extensions/ui#scaleFactor #define LV2_UI__showInterface LV2_UI_PREFIX "showInterface" ///< http://lv2plug.in/ns/extensions/ui#showInterface #define LV2_UI__touch LV2_UI_PREFIX "touch" ///< http://lv2plug.in/ns/extensions/ui#touch #define LV2_UI__ui LV2_UI_PREFIX "ui" ///< http://lv2plug.in/ns/extensions/ui#ui