sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #631 from jpcima/vst-cc-update

Browse source 
Update to CC controls panel
This commit is contained in:
JP Cimalando 2021-02-05 18:02:01 +01:00 • committed by GitHub
commit 1380978a55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/src/editor/GUIComponents.cpp
View file

@ -570,6 +570,8 @@ void SControlsPanel::setControlUsed(uint32_t index, bool used)
label->setStyle(CTextLabel::kRoundRectStyle); label->setStyle(CTextLabel::kRoundRectStyle);
label->setRoundRectRadius(5.0); label->setRoundRectRadius(5.0);
label->setBackColor(CColor(0x2e, 0x34, 0x36)); label->setBackColor(CColor(0x2e, 0x34, 0x36));
label->setTextTruncateMode(CTextLabel::kTruncateTail);
label->setTextInset({4.0, 0.0});
label->setText(getDefaultLabelText(index)); label->setText(getDefaultLabelText(index));
knob->setActiveTrackColor(CColor(0x00, 0xb6, 0x2a)); knob->setActiveTrackColor(CColor(0x00, 0xb6, 0x2a));
knob->setInactiveTrackColor(CColor(0x30, 0x30, 0x30)); knob->setInactiveTrackColor(CColor(0x30, 0x30, 0x30));
@ -630,11 +632,12 @@ void SControlsPanel::setControlLabelText(uint32_t index, UTF8StringPtr text)
if (!slot) if (!slot)
return; return;
CTextLabel* label = slot->label;
if (text && text[0] != '\0') if (text && text[0] != '\0')
slot->label->setText(text); label->setText(text);
else else
slot->label->setText(getDefaultLabelText(index).c_str()); label->setText(getDefaultLabelText(index).c_str());
slot->label->invalid(); label->invalid();
} }
void SControlsPanel::recalculateSubViews() void SControlsPanel::recalculateSubViews()

5
vst/SfizzVstProcessor.cpp
View file

@ -625,6 +625,11 @@ void SfizzVstProcessor::doBackgroundWork()
fprintf(stderr, "[Sfizz] sfz file has changed, reloading\n"); fprintf(stderr, "[Sfizz] sfz file has changed, reloading\n");
std::lock_guard<SpinMutex> lock(_processMutex); std::lock_guard<SpinMutex> lock(_processMutex);
loadSfzFileOrDefault(*_synth, _state.sfzFile); loadSfzFileOrDefault(*_synth, _state.sfzFile);
Steinberg::OPtr<Vst::IMessage> reply { allocateMessage() };
reply->setMessageID("LoadedSfz");
reply->getAttributes()->setBinary("File", _state.sfzFile.data(), _state.sfzFile.size());
sendMessage(reply);
} }
else if (_synth->shouldReloadScala()) { else if (_synth->shouldReloadScala()) {
fprintf(stderr, "[Sfizz] scala file has changed, reloading\n"); fprintf(stderr, "[Sfizz] scala file has changed, reloading\n");