From 4fa8af3e205b3b7c5d2c400dfbe8517a3881b78d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 24 Dec 2021 21:56:00 +0100 Subject: [PATCH] prefer ARDOUR::ui_scale_factor over ARDOUR::ui_scale_factor --- libs/ardour/ardour/lv2_plugin.h | 4 ---- libs/ardour/lv2_plugin.cc | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index c94eb65b22..ccbe187ff3 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -182,9 +182,6 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee static void set_global_ui_contrasting_color (uint32_t c) { _ui_contrasting_color = c; } - static void set_global_ui_scale_factor (float s) { - _ui_scale_factor = s; - } static void set_global_ui_style_boxy (bool yn) { _ui_style_boxy = yn ? 1 : 0; } @@ -346,7 +343,6 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee static uint32_t _ui_background_color; static uint32_t _ui_foreground_color; static uint32_t _ui_contrasting_color; - static float _ui_scale_factor; static unsigned long _ui_transient_win_id; mutable unsigned _state_version; diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index d158287192..a8f957b8a0 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -135,7 +135,6 @@ int32_t LV2Plugin::_ui_style_boxy = 0; uint32_t LV2Plugin::_ui_background_color = 0x000000ff; // RGBA uint32_t LV2Plugin::_ui_foreground_color = 0xffffffff; // RGBA uint32_t LV2Plugin::_ui_contrasting_color = 0x33ff33ff; // RGBA -float LV2Plugin::_ui_scale_factor = 1.0; unsigned long LV2Plugin::_ui_transient_win_id = 0; class LV2World : boost::noncopyable { @@ -576,7 +575,7 @@ LV2Plugin::init(const void* c_plugin, samplecnt_t rate) { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id("http://lv2plug.in/ns/extensions/ui#contrastingColor"), sizeof(int32_t), atom_Int, &_ui_contrasting_color }, { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id("http://lv2plug.in/ns/extensions/ui#scaleFactor"), - sizeof(float), atom_Float, &_ui_scale_factor }, + sizeof(float), atom_Float, &ARDOUR::ui_scale_factor }, { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id("http://ardour.org/lv2/theme/#styleBoxy"), sizeof(int32_t), atom_Bool, &_ui_style_boxy }, { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id("http://ardour.org/lv2/theme/#styleFlat"),