gearmulator

Emulation of classic VA synths of the late 90s/2000s that are based on Motorola 56300 family DSPs
Log | Files | Refs | Submodules | README | LICENSE

commit e8e820b04e37fb38d0371fef0809276a6b6b2ecd
parent 600efe48fc6de082a046e96be6b7b67847259b56
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 29 Sep 2024 11:34:53 +0200

adjust some variable names

Diffstat:
Msource/xtJucePlugin/weData.cpp | 44++++++++++++++++++++++----------------------
Msource/xtJucePlugin/weData.h | 10+++++-----
Msource/xtLib/xtState.cpp | 2+-
3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/source/xtJucePlugin/weData.cpp b/source/xtJucePlugin/weData.cpp @@ -89,7 +89,7 @@ namespace xtJucePlugin } } - std::optional<xt::WaveData> WaveEditorData::getWave(xt::WaveId _waveId) const + std::optional<xt::WaveData> WaveEditorData::getWave(const xt::WaveId _waveId) const { auto i = _waveId.rawId(); @@ -108,56 +108,56 @@ namespace xtJucePlugin return m_ramWaves[i]; } - xt::WaveId WaveEditorData::getWaveIndex(xt::TableId _tableIndex, xt::TableIndex _indexInTable) const + xt::WaveId WaveEditorData::getWaveIndex(const xt::TableId _tableId, const xt::TableIndex _tableIndex) const { - if(_tableIndex.rawId() >= m_tables.size()) + if(_tableId.rawId() >= m_tables.size()) return g_invalidWaveIndex; - if(_indexInTable.rawId() >= std::tuple_size<xt::TableData>()) + if(_tableIndex.rawId() >= std::tuple_size<xt::TableData>()) return g_invalidWaveIndex; - const auto table = m_tables[_tableIndex.rawId()]; + const auto table = m_tables[_tableId.rawId()]; if(!table) return g_invalidWaveIndex; - return (*table)[_indexInTable.rawId()]; + return (*table)[_tableIndex.rawId()]; } - std::optional<xt::TableData> WaveEditorData::getTable(xt::TableId _tableIndex) const + std::optional<xt::TableData> WaveEditorData::getTable(const xt::TableId _tableId) const { - if(_tableIndex.rawId() >= m_tables.size()) + if(_tableId.rawId() >= m_tables.size()) return {}; - return m_tables[_tableIndex.rawId()]; + return m_tables[_tableId.rawId()]; } - bool WaveEditorData::swapTableEntries(xt::TableId _table, xt::TableIndex _indexA, xt::TableIndex _indexB) + bool WaveEditorData::swapTableEntries(const xt::TableId _tableId, const xt::TableIndex _indexA, const xt::TableIndex _indexB) { if(_indexA == _indexB) return false; - if(_table.rawId() >= m_tables.size()) + if(_tableId.rawId() >= m_tables.size()) return false; - const auto& table = m_tables[_table.rawId()]; + const auto& table = m_tables[_tableId.rawId()]; if(!table) return false; auto t = *table; std::swap(t[_indexA.rawId()], t[_indexB.rawId()]); - m_tables[_table.rawId()] = t; - onTableChanged(_table); + m_tables[_tableId.rawId()] = t; + onTableChanged(_tableId); return true; } - bool WaveEditorData::setTableWave(xt::TableId _table, xt::TableIndex _index, xt::WaveId _waveIndex) + bool WaveEditorData::setTableWave(const xt::TableId _tableId, const xt::TableIndex _tableIndex, const xt::WaveId _waveId) { - if(_table.rawId() >= m_tables.size()) + if(_tableId.rawId() >= m_tables.size()) return false; - const auto& table = m_tables[_table.rawId()]; + const auto& table = m_tables[_tableId.rawId()]; if(!table) return false; auto t = *table; - if(_index.rawId() >= t.size()) + if(_tableIndex.rawId() >= t.size()) return false; - if(t[_index.rawId()] == _waveIndex) + if(t[_tableIndex.rawId()] == _waveId) return false; - t[_index.rawId()] = _waveIndex; - m_tables[_table.rawId()] = t; - onTableChanged(_table); + t[_tableIndex.rawId()] = _waveId; + m_tables[_tableId.rawId()] = t; + onTableChanged(_tableId); return true; } diff --git a/source/xtJucePlugin/weData.h b/source/xtJucePlugin/weData.h @@ -33,14 +33,14 @@ namespace xtJucePlugin void onReceiveWave(const pluginLib::MidiPacket::Data& _data, const std::vector<uint8_t>& _msg); void onReceiveTable(const pluginLib::MidiPacket::Data& _data, const std::vector<uint8_t>& _msg); - std::optional<xt::WaveData> getWave(xt::WaveId _waveIndex) const; + std::optional<xt::WaveData> getWave(xt::WaveId _waveId) const; std::optional<xt::WaveData> getWave(xt::TableId _tableIndex, xt::TableIndex _indexInTable) const; - xt::WaveId getWaveIndex(xt::TableId _tableIndex, xt::TableIndex _indexInTable) const; + xt::WaveId getWaveIndex(xt::TableId _tableId, xt::TableIndex _tableIndex) const; - std::optional<xt::TableData> getTable(xt::TableId _tableIndex) const; - bool swapTableEntries(xt::TableId _table, xt::TableIndex _indexA, xt::TableIndex _indexB); - bool setTableWave(xt::TableId _table, xt::TableIndex _index, xt::WaveId _waveIndex); + std::optional<xt::TableData> getTable(xt::TableId _tableId) const; + bool swapTableEntries(xt::TableId _tableId, xt::TableIndex _indexA, xt::TableIndex _indexB); + bool setTableWave(xt::TableId _tableId, xt::TableIndex _tableIndex, xt::WaveId _waveId); bool copyTable(const xt::TableId _dest, const xt::TableId _source); bool copyWave(const xt::WaveId _dest, const xt::WaveId _source); diff --git a/source/xtLib/xtState.cpp b/source/xtLib/xtState.cpp @@ -798,7 +798,7 @@ namespace xt } } - SysEx State::createTableData(const TableData& _table, uint32_t _tableIndex, bool _preview) + SysEx State::createTableData(const TableData& _table, const uint32_t _tableIndex, const bool _preview) { const auto hh = static_cast<uint8_t>(_tableIndex >> 7); const auto ll = static_cast<uint8_t>(_tableIndex & 0x7f);