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

Correct some clang warnings

Browse source
This commit is contained in:
Paul Ferrand 2022-07-25 11:46:19 +02:00
parent cb2c1e9650
commit 0953936184
6 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/common/plugin/RMSFollower.h
View file

@ -40,6 +40,8 @@ public:
memSize_ = numOutputs % 4 == 0 ? numOutputs * sizeof(float) : (numOutputs / 4 + 1) * 4 * sizeof(float); memSize_ = numOutputs % 4 == 0 ? numOutputs * sizeof(float) : (numOutputs / 4 + 1) * 4 * sizeof(float);
#ifdef _WIN32 #ifdef _WIN32
mem_ = (float *)_aligned_malloc(memSize_, 4 * sizeof(float)); mem_ = (float *)_aligned_malloc(memSize_, 4 * sizeof(float));
#elif __APPLE__
mem_ = (float *)malloc(memSize_); // Should be 16 aligned
#else #else
mem_ = (float *)aligned_alloc(4 * sizeof(float), memSize_); mem_ = (float *)aligned_alloc(4 * sizeof(float), memSize_);
#endif #endif

2
plugins/editor/src/editor/Editor.cpp
View file

@ -1042,7 +1042,7 @@ void Editor::Impl::createFrameContents()
return panel; return panel;
}; };
auto createCheckbox = [this, &palette](const CRect& bounds, int tag, const char* label, CHoriTxtAlign, int) { auto createCheckbox = [this](const CRect& bounds, int tag, const char* label, CHoriTxtAlign, int) {
auto* checkbox = new CCheckBox(bounds, this, tag, label); auto* checkbox = new CCheckBox(bounds, this, tag, label);
return checkbox; return checkbox;
}; };

8
plugins/editor/src/editor/GUIHelpers.cpp
View file

@ -25,10 +25,10 @@ protected:
void onKeyboardEvent(KeyboardEvent& event, CFrame* frame) override; void onKeyboardEvent(KeyboardEvent& event, CFrame* frame) override;
void onMouseEvent(MouseEvent& event, CFrame* frame) override; void onMouseEvent(MouseEvent& event, CFrame* frame) override;
#else #else
int32_t onKeyDown(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } int32_t onKeyDown(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; }
int32_t onKeyUp(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } int32_t onKeyUp(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; }
CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; }
CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; }
#endif #endif
private: private:

28
plugins/vst/SfizzVstProcessor.cpp
View file

@ -655,44 +655,44 @@ bool SfizzVstProcessor::processUpdate(FUnknown* changedUnknown, int32 message)
} }
if (OSCUpdate* update = FCast<OSCUpdate>(changedUnknown)) { if (OSCUpdate* update = FCast<OSCUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (PlayStateUpdate* update = FCast<PlayStateUpdate>(changedUnknown)) { if (PlayStateUpdate* update = FCast<PlayStateUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (NoteUpdate* update = FCast<NoteUpdate>(changedUnknown)) { if (NoteUpdate* update = FCast<NoteUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (SfzUpdate* update = FCast<SfzUpdate>(changedUnknown)) { if (SfzUpdate* update = FCast<SfzUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (SfzDescriptionUpdate* update = FCast<SfzDescriptionUpdate>(changedUnknown)) { if (SfzDescriptionUpdate* update = FCast<SfzDescriptionUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (ScalaUpdate* update = FCast<ScalaUpdate>(changedUnknown)) { if (ScalaUpdate* update = FCast<ScalaUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }
if (AutomationUpdate* update = FCast<AutomationUpdate>(changedUnknown)) { if (AutomationUpdate* update = FCast<AutomationUpdate>(changedUnknown)) {
if (IPtr<Vst::IMessage> message = update->convertToMessage(this)) if (IPtr<Vst::IMessage> msg = update->convertToMessage(this))
sendMessage(message); sendMessage(msg);
return true; return true;
} }

1
src/sfizz/MidiState.cpp
View file

@ -300,6 +300,7 @@ int sfz::MidiState::getProgram() const noexcept
void sfz::MidiState::programChangeEvent(int delay, int program) noexcept void sfz::MidiState::programChangeEvent(int delay, int program) noexcept
{ {
UNUSED(delay);
ASSERT(program >= 0 && program <= 127); ASSERT(program >= 0 && program <= 127);
currentProgram = program; currentProgram = program;
} }

2
src/sfizz/parser/Parser.cpp
View file

@ -293,7 +293,7 @@ void Parser::processOpcode()
// If we're parsing a base64 data field, ignore comments and process until the next header/directive // If we're parsing a base64 data field, ignore comments and process until the next header/directive
if (nameExpanded == "base64data") { if (nameExpanded == "base64data") {
std::string valueRaw; std::string valueRaw;
reader.extractWhile(&valueRaw, [&reader](char c) { reader.extractWhile(&valueRaw, [&](char c) {
if (c == '<' || c == '#') if (c == '<' || c == '#')
return false; return false;