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

Allow to request the keyswitch ranges

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-23 17:59:00 +01:00
parent 34ca6d69e3
commit c1e47b0702
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sfizz/Synth.cpp
View file

@ -250,6 +250,7 @@ void Synth::Impl::clear()
changedCCsThisCycle_.clear();
keyLabels_.clear();
keySlots_.clear();
swSlots_.clear();
keyswitchLabels_.clear();
globalOpcodes_.clear();
masterOpcodes_.clear();
@ -745,6 +746,18 @@ void Synth::Impl::finalizeSfzLoad()
for (unsigned key = loKey; key <= hiKey; ++key)
keySlots_.set(key);
}
// cache the set of keyswitches assigned
for (const RegionPtr& regionPtr : regions_) {
if (absl::optional<uint8_t> sw = regionPtr->lastKeyswitch) {
swSlots_.set(*sw);
}
else if (absl::optional<Range<uint8_t>> swRange = regionPtr->lastKeyswitchRange) {
unsigned loKey = swRange->getStart();
unsigned hiKey = swRange->getEnd();
for (unsigned key = loKey; key <= hiKey; ++key)
swSlots_.set(key);
}
}
}
bool Synth::loadScalaFile(const fs::path& path)

8
src/sfizz/SynthMessaging.cpp
View file

@ -46,6 +46,14 @@ void sfz::Synth::dispatchMessage(Client& client, int delay, const char* path, co
//----------------------------------------------------------------------
MATCH("/sw/slots", "") {
const BitArray<128>& switches = impl.swSlots_;
sfizz_blob_t blob { switches.data(), static_cast<uint32_t>(switches.byte_size()) };
client.receive<'b'>(delay, path, &blob);
} break;
//----------------------------------------------------------------------
MATCH("/cc/slots", "") {
const BitArray<config::numCCs>& ccs = impl.currentUsedCCs_;
sfizz_blob_t blob { ccs.data(), static_cast<uint32_t>(ccs.byte_size()) };

1
src/sfizz/SynthPrivate.h
View file

@ -217,6 +217,7 @@ struct Synth::Impl final: public Parser::Listener {
std::map<int, size_t> ccLabelsMap_;
std::vector<NoteNamePair> keyLabels_;
BitArray<128> keySlots_;
BitArray<128> swSlots_;
std::vector<NoteNamePair> keyswitchLabels_;
// Set as sw_default if present in the file