dev222 - Merge branch 'SID3'

This commit is contained in:
tildearrow 2024-09-21 18:04:08 -05:00
commit d838224d94
65 changed files with 10466 additions and 2376 deletions

View file

@ -2646,13 +2646,12 @@ unsigned short DivPlatformOPL::getPan(int ch) {
return ((chan[ch].pan&1)<<8)|((chan[ch].pan&2)>>1);
}
DivChannelPair DivPlatformOPL::getPaired(int ch) {
void DivPlatformOPL::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (oplType==3 && ch<12 && !(ch&1)) {
if (chan[ch].fourOp) {
return DivChannelPair("4OP",ch+1);
ret.push_back(DivChannelPair(_("4OP"),ch+1));
}
}
return DivChannelPair();
}
DivDispatchOscBuffer* DivPlatformOPL::getOscBuffer(int ch) {