diff --git a/plugins/common/plugin/RMSFollower.h b/plugins/common/plugin/RMSFollower.h index 77274b92..10d2f027 100644 --- a/plugins/common/plugin/RMSFollower.h +++ b/plugins/common/plugin/RMSFollower.h @@ -40,6 +40,8 @@ public: memSize_ = numOutputs % 4 == 0 ? numOutputs * sizeof(float) : (numOutputs / 4 + 1) * 4 * sizeof(float); #ifdef _WIN32 mem_ = (float *)_aligned_malloc(memSize_, 4 * sizeof(float)); +#elif __APPLE__ + mem_ = (float *)malloc(memSize_); // Should be 16 aligned #else mem_ = (float *)aligned_alloc(4 * sizeof(float), memSize_); #endif diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index a286981e..38a6e5c7 100644 --- a/plugins/editor/src/editor/Editor.cpp +++ b/plugins/editor/src/editor/Editor.cpp @@ -1042,7 +1042,7 @@ void Editor::Impl::createFrameContents() 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); return checkbox; }; diff --git a/plugins/editor/src/editor/GUIHelpers.cpp b/plugins/editor/src/editor/GUIHelpers.cpp index 63410172..e0ab2197 100644 --- a/plugins/editor/src/editor/GUIHelpers.cpp +++ b/plugins/editor/src/editor/GUIHelpers.cpp @@ -25,10 +25,10 @@ protected: void onKeyboardEvent(KeyboardEvent& event, CFrame* frame) override; void onMouseEvent(MouseEvent& event, CFrame* frame) override; #else - int32_t onKeyDown(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } - int32_t onKeyUp(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } - CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } - CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } + int32_t onKeyDown(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; } + int32_t onKeyUp(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; } + CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } + CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } #endif private: diff --git a/plugins/vst/SfizzVstProcessor.cpp b/plugins/vst/SfizzVstProcessor.cpp index 7df8689d..115bf47f 100644 --- a/plugins/vst/SfizzVstProcessor.cpp +++ b/plugins/vst/SfizzVstProcessor.cpp @@ -655,44 +655,44 @@ bool SfizzVstProcessor::processUpdate(FUnknown* changedUnknown, int32 message) } if (OSCUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (PlayStateUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (NoteUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (SfzUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (SfzDescriptionUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (ScalaUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (AutomationUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp index b1992f26..354750c0 100644 --- a/src/sfizz/MidiState.cpp +++ b/src/sfizz/MidiState.cpp @@ -300,6 +300,7 @@ int sfz::MidiState::getProgram() const noexcept void sfz::MidiState::programChangeEvent(int delay, int program) noexcept { + UNUSED(delay); ASSERT(program >= 0 && program <= 127); currentProgram = program; } diff --git a/src/sfizz/parser/Parser.cpp b/src/sfizz/parser/Parser.cpp index f8ffa933..26911739 100644 --- a/src/sfizz/parser/Parser.cpp +++ b/src/sfizz/parser/Parser.cpp @@ -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 (nameExpanded == "base64data") { std::string valueRaw; - reader.extractWhile(&valueRaw, [&reader](char c) { + reader.extractWhile(&valueRaw, [&](char c) { if (c == '<' || c == '#') return false;