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

Merge branch 'master' into minmod

Browse source
This commit is contained in:
tildearrow 2024-03-17 18:07:34 -05:00
commit 7392915291
10 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/engine/platform/ay.cpp
View file

@ -879,10 +879,10 @@ void DivPlatformAY8910::setFlags(const DivConfig& flags) {
if (ay!=NULL) delete ay;
switch (flags.getInt("chipType",0)) {
case 1:
clockSel=flags.getBool("halfClock",false);
ay=new ym2149_device(rate,clockSel);
sunsoft=false;
intellivision=false;
clockSel=flags.getBool("halfClock",false);
break;
case 2:
ay=new sunsoft_5b_sound_device(rate);

9
src/engine/platform/nds.cpp
View file

@ -239,11 +239,9 @@ void DivPlatformNDS::tick(bool sysTick) {
if (chan[i].freq<0) chan[i].freq=0;
if (chan[i].freq>65535) chan[i].freq=65535;
ctrl=(chan[i].active?0xe8:0)|(chan[i].duty&7);
rWrite8(0x03+i*16,ctrl&~0x80); // force keyoff first
}
if (!chan[i].std.vol.had) {
chan[i].outVol=chan[i].vol;
writeOutVol(i);
if (chan[i].keyOff || chan[i].keyOn) {
rWrite8(0x03+i*16,ctrl&~0x80); // force keyoff first
}
}
chan[i].keyOn=false;
if (chan[i].keyOff) {
@ -422,6 +420,7 @@ void DivPlatformNDS::forceIns() {
chan[i].sample=-1;
rWrite8(0x02+i*16,chan[i].panning);
writeOutVol(i);
}
}

1
src/gui/about.cpp
View file

@ -152,6 +152,7 @@ const char* aboutLine[]={
"RevvoBolt",
"Rockyfan75000",
"scooblee",
"sheffield^2",
"sillygoose",
"smaybius",
"SnugglyBun",

2
src/gui/settings.cpp
View file

@ -5635,7 +5635,6 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fur",uiColors[GUI_COLOR_FILE_SONG_NATIVE],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fui",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fuw",uiColors[GUI_COLOR_FILE_WAVE],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".dmf",uiColors[GUI_COLOR_FILE_SONG_NATIVE],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".dmp",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".dmw",uiColors[GUI_COLOR_FILE_WAVE],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".wav",uiColors[GUI_COLOR_FILE_AUDIO],ICON_FA_FILE_AUDIO_O);
@ -5651,6 +5650,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".pcf",uiColors[GUI_COLOR_FILE_FONT],ICON_FA_FONT);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".psf",uiColors[GUI_COLOR_FILE_FONT],ICON_FA_FONT);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".dmf",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".mod",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fc13",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fc14",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);