otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add primary MultiPCM support

Browse source 
Partially revert previous commit
Add notifyInsAddition in dispatch for instrument addition
Refresh sample memory when instrument type changed
Fix naming for consistency
Also, this commit fixes a some possible issue in MultiPCM on openMSX core.
Chip ID: Already determined
This commit is contained in:
cam900 2025-08-29 16:24:32 +09:00
parent bd8d9a56a0
commit 957b57f3d9
19 changed files with 1085 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/gui/gui.cpp
View file

@ -1861,13 +1861,13 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
int sampleCountBefore=e->song.sampleLen;
std::vector<DivInstrument*> instruments=e->instrumentFromFile(path,false);
if (!instruments.empty()) {
int hasSampleInst=false;
int hasSampleIns=false;
for (int s=0; s<e->song.systemLen; s++) {
if (e->getDispatch(s)->hasSampleInstHeader()) {
hasSampleInst=true;
if (e->getDispatch(s)->hasSampleInsHeader()) {
hasSampleIns=true;
}
}
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleInst) {
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleIns) {
e->renderSamplesP();
}
if (curFileDialog==GUI_FILE_INS_OPEN_REPLACE) {
@ -3934,13 +3934,13 @@ bool FurnaceGUI::loop() {
DivWavetable* droppedWave=NULL;
//DivSample* droppedSample=NULL;
if (!instruments.empty()) {
bool hasSampleInst=false;
bool hasSampleIns=false;
for (int s=0; s<e->song.systemLen; s++) {
if (e->getDispatch(s)->hasSampleInstHeader()) {
hasSampleInst=true;
if (e->getDispatch(s)->hasSampleInsHeader()) {
hasSampleIns=true;
}
}
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleInst) {
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleIns) {
e->renderSamplesP();
}
if (!e->getWarnings().empty()) {
@ -5533,13 +5533,13 @@ bool FurnaceGUI::loop() {
instruments.push_back(j);
}
}
bool hasSampleInst=false;
bool hasSampleIns=false;
for (int s=0; s<e->song.systemLen; s++) {
if (e->getDispatch(s)->hasSampleInstHeader()) {
hasSampleInst=true;
if (e->getDispatch(s)->hasSampleInsHeader()) {
hasSampleIns=true;
}
}
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleInst) {
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleIns) {
e->renderSamplesP();
}
if (warn) {
@ -5579,13 +5579,13 @@ bool FurnaceGUI::loop() {
int sampleCountBefore=e->song.sampleLen;
std::vector<DivInstrument*> instruments=e->instrumentFromFile(copyOfName.c_str(),true,settings.readInsNames);
if (!instruments.empty()) {
bool hasSampleInst=false;
bool hasSampleIns=false;
for (int s=0; s<e->song.systemLen; s++) {
if (e->getDispatch(s)->hasSampleInstHeader()) {
hasSampleInst=true;
if (e->getDispatch(s)->hasSampleInsHeader()) {
hasSampleIns=true;
}
}
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleInst) {
if ((e->song.sampleLen!=sampleCountBefore) || hasSampleIns) {
e->renderSamplesP();
}
if (!e->getWarnings().empty()) {