From c4194cd8a1db038c6236f4621e52d26ca82ed7f8 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 19 Oct 2019 07:20:24 -0400 Subject: [PATCH] Fix missing LEDSliderHandle.svg. --- CHANGELOG.md | 5 +++- plugin.json | 2 +- res/LEDSliderHandle.svg | 66 +++++++++++++++++++++++++++++++++++++++++ src/Random.cpp | 4 +-- src/VCMixer.cpp | 8 ++--- src/plugin.hpp | 8 +++++ 6 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 res/LEDSliderHandle.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index f321b49..f70802a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -### 1.3.0 (in development) +### 1.3.1 (2019-10-19) +- Added missing LEDSliderHandle.svg from future version of Rack. + +### 1.3.0 (2019-10-19) - Add Random and Noise modules. - Make VCA-1 display polyphonic CV. - Add VU meters to level sliders in Mixer. diff --git a/plugin.json b/plugin.json index 1cc12cf..e5877eb 100644 --- a/plugin.json +++ b/plugin.json @@ -1,6 +1,6 @@ { "slug": "Fundamental", - "version": "1.3.0", + "version": "1.3.1", "license": "GPL-3.0-only", "name": "Fundamental", "brand": "VCV", diff --git a/res/LEDSliderHandle.svg b/res/LEDSliderHandle.svg new file mode 100644 index 0000000..737514c --- /dev/null +++ b/res/LEDSliderHandle.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/Random.cpp b/src/Random.cpp index a887b6a..68fe944 100644 --- a/src/Random.cpp +++ b/src/Random.cpp @@ -184,8 +184,8 @@ struct RandomWidget : ModuleWidget { addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); - addParam(createLightParamCentered>(mm2px(Vec(7.215, 30.858)), module, Random::RATE_PARAM, Random::RATE_LIGHT)); - addParam(createLightParamCentered>(mm2px(Vec(18.214, 30.858)), module, Random::SHAPE_PARAM, Random::SHAPE_LIGHT)); + addParam(createLightParamCentered>(mm2px(Vec(7.215, 30.858)), module, Random::RATE_PARAM, Random::RATE_LIGHT)); + addParam(createLightParamCentered>(mm2px(Vec(18.214, 30.858)), module, Random::SHAPE_PARAM, Random::SHAPE_LIGHT)); addParam(createParamCentered(mm2px(Vec(7.214, 78.259)), module, Random::OFFSET_PARAM)); addParam(createParamCentered(mm2px(Vec(18.214, 78.259)), module, Random::MODE_PARAM)); diff --git a/src/VCMixer.cpp b/src/VCMixer.cpp index 60c6a86..19ccc5b 100644 --- a/src/VCMixer.cpp +++ b/src/VCMixer.cpp @@ -133,10 +133,10 @@ struct VCMixerWidget : ModuleWidget { addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addParam(createParam(mm2px(Vec(19.049999, 21.161154)), module, VCMixer::MIX_LVL_PARAM)); - addParam(createLightParam>(mm2px(Vec(5.8993969, 44.33149).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 0, VCMixer::LVL_LIGHTS + 0)); - addParam(createLightParam>(mm2px(Vec(17.899343, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 1, VCMixer::LVL_LIGHTS + 1)); - addParam(createLightParam>(mm2px(Vec(29.899292, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 2, VCMixer::LVL_LIGHTS + 2)); - addParam(createLightParam>(mm2px(Vec(41.90065, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 3, VCMixer::LVL_LIGHTS + 3)); + addParam(createLightParam>(mm2px(Vec(5.8993969, 44.33149).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 0, VCMixer::LVL_LIGHTS + 0)); + addParam(createLightParam>(mm2px(Vec(17.899343, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 1, VCMixer::LVL_LIGHTS + 1)); + addParam(createLightParam>(mm2px(Vec(29.899292, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 2, VCMixer::LVL_LIGHTS + 2)); + addParam(createLightParam>(mm2px(Vec(41.90065, 44.331486).plus(Vec(-2, 0))), module, VCMixer::LVL_PARAMS + 3, VCMixer::LVL_LIGHTS + 3)); // Use old interleaved order for backward compatibility with <0.6 addInput(createInput(mm2px(Vec(3.2935331, 23.404598)), module, VCMixer::MIX_CV_INPUT)); diff --git a/src/plugin.hpp b/src/plugin.hpp index 846b2b9..ad9e933 100644 --- a/src/plugin.hpp +++ b/src/plugin.hpp @@ -32,3 +32,11 @@ extern Model* modelViz; extern Model* modelMidSide; extern Model* modelNoise; extern Model* modelRandom; + + +template +struct LEDLightSliderFixed : LEDLightSlider { + LEDLightSliderFixed() { + this->setHandleSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LEDSliderHandle.svg"))); + } +};