commit b39b8d0cd238163ebb5f4bc7e35628c30595cd3e
parent c0058a19c993e91ec1fcec2e5fed0a647e38d187
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:31:08 +0200
move default impl of equals() to base class
Diffstat:
5 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/source/jucePluginLib/patchdb/db.h b/source/jucePluginLib/patchdb/db.h
@@ -98,7 +98,10 @@ namespace pluginLib::patchDB
virtual PatchPtr initializePatch(Data&& _sysex) = 0;
virtual Data prepareSave(const PatchPtr& _patch) const = 0;
virtual bool parseFileData(DataList& _results, const Data& _data);
- virtual bool equals(const PatchPtr& _a, const PatchPtr& _b) const = 0;
+ virtual bool equals(const PatchPtr& _a, const PatchPtr& _b) const
+ {
+ return _a == _b || _a->hash == _b->hash;
+ }
virtual void processDirty(const Dirty& _dirty) const = 0;
protected:
diff --git a/source/mqJucePlugin/mqPatchManager.cpp b/source/mqJucePlugin/mqPatchManager.cpp
@@ -97,17 +97,6 @@ namespace mqJucePlugin
static_cast<uint8_t>(program), parameterValues);
}
- bool PatchManager::equals(const pluginLib::patchDB::PatchPtr& _a, const pluginLib::patchDB::PatchPtr& _b) const
- {
- if(_a == _b)
- return true;
-
- if(_a->hash == _b->hash)
- return true;
-
- return false;
- }
-
uint32_t PatchManager::getCurrentPart() const
{
return m_editor.getProcessor().getController().getCurrentPart();
diff --git a/source/mqJucePlugin/mqPatchManager.h b/source/mqJucePlugin/mqPatchManager.h
@@ -19,7 +19,6 @@ namespace mqJucePlugin
bool loadRomData(pluginLib::patchDB::DataList& _results, uint32_t _bank, uint32_t _program) override;
pluginLib::patchDB::PatchPtr initializePatch(pluginLib::patchDB::Data&& _sysex) override;
pluginLib::patchDB::Data prepareSave(const pluginLib::patchDB::PatchPtr& _patch) const override;
- bool equals(const pluginLib::patchDB::PatchPtr& _a, const pluginLib::patchDB::PatchPtr& _b) const override;
uint32_t getCurrentPart() const override;
bool activatePatch(const pluginLib::patchDB::PatchPtr& _patch) override;
bool activatePatch(const pluginLib::patchDB::PatchPtr& _patch, uint32_t _part) override;
diff --git a/source/xtJucePlugin/xtPatchManager.cpp b/source/xtJucePlugin/xtPatchManager.cpp
@@ -103,17 +103,6 @@ namespace xtJucePlugin
return m_controller.createSingleDump(static_cast<xt::LocationH>(static_cast<uint8_t>(xt::LocationH::SingleBankA) + bank), static_cast<uint8_t>(program), parameterValues);
}
- bool PatchManager::equals(const pluginLib::patchDB::PatchPtr& _a, const pluginLib::patchDB::PatchPtr& _b) const
- {
- if(_a == _b)
- return true;
-
- if(_a->hash == _b->hash)
- return true;
-
- return false;
- }
-
uint32_t PatchManager::getCurrentPart() const
{
return m_editor.getProcessor().getController().getCurrentPart();
diff --git a/source/xtJucePlugin/xtPatchManager.h b/source/xtJucePlugin/xtPatchManager.h
@@ -19,7 +19,6 @@ namespace xtJucePlugin
bool loadRomData(pluginLib::patchDB::DataList& _results, uint32_t _bank, uint32_t _program) override;
pluginLib::patchDB::PatchPtr initializePatch(pluginLib::patchDB::Data&& _sysex) override;
pluginLib::patchDB::Data prepareSave(const pluginLib::patchDB::PatchPtr& _patch) const override;
- bool equals(const pluginLib::patchDB::PatchPtr& _a, const pluginLib::patchDB::PatchPtr& _b) const override;
uint32_t getCurrentPart() const override;
bool activatePatch(const pluginLib::patchDB::PatchPtr& _patch) override;
bool activatePatch(const pluginLib::patchDB::PatchPtr& _patch, uint32_t _part) override;