etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix YM2151 LFO shapes, correct some presets (#741) 

* fix YM2151 LFO shapes, correct some presets

* pc-98 beeper clocks

1 for less advanced, earlier sound sources, 2 for more advanced, later era

* revert the last commit

* Revert "revert the last commit"

This reverts commit 0746f37052.

	zmieniono:       src/gui/presets.cpp

* Revert "pc-98 beeper clocks"

This reverts commit ba78cd44d8.

	zmieniono:       src/gui/presets.cpp

* remove beeper from zx128

finally caring about hw playback ey
This commit is contained in:
freq-mod 2022-11-13 22:59:28 +01:00 committed by GitHub
parent ea643c574c
commit 9ef3ec19bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/insEdit.cpp
View File

@ -411,7 +411,7 @@ String macroLFOWaves(int id, float val, void* u) {
case 1:
return "Square";
case 2:
return "Sine";
return "Triangle";
case 3:
return "Random";
default:

21
src/gui/presets.cpp
View File

@ -442,12 +442,14 @@ void FurnaceGUI::initSystemPresets() {
cat.systems.push_back(FurnaceGUISysDef(
"NEC PC-98 (with PC-9801-26/K)", {
DIV_SYSTEM_OPN, 64, 0, 4, // 3.9936MHz but some compatible card has 4MHz
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef(
"NEC PC-98 (with PC-9801-26/K; extended channel 3)", {
DIV_SYSTEM_OPN_EXT, 64, 0, 4, // 3.9936MHz but some compatible card has 4MHz
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -455,6 +457,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra)", {
DIV_SYSTEM_OPN, 64, 0, 4,
DIV_SYSTEM_OPL2, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -462,6 +465,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra; extended channel 3)", {
DIV_SYSTEM_OPN_EXT, 64, 0, 4,
DIV_SYSTEM_OPL2, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -469,6 +473,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra in drums mode)", {
DIV_SYSTEM_OPN, 64, 0, 4,
DIV_SYSTEM_OPL2_DRUMS, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -476,6 +481,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra in drums mode; extended channel 3)", {
DIV_SYSTEM_OPN_EXT, 64, 0, 4,
DIV_SYSTEM_OPL2_DRUMS, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -483,6 +489,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra V)", {
DIV_SYSTEM_OPN, 64, 0, 4,
DIV_SYSTEM_Y8950, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -490,6 +497,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra V; extended channel 3)", {
DIV_SYSTEM_OPN_EXT, 64, 0, 4,
DIV_SYSTEM_Y8950, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -497,6 +505,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra V in drums mode)", {
DIV_SYSTEM_OPN, 64, 0, 4,
DIV_SYSTEM_Y8950_DRUMS, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -504,6 +513,7 @@ void FurnaceGUI::initSystemPresets() {
"NEC PC-98 (with Sound Orchestra V in drums mode; extended channel 3)", {
DIV_SYSTEM_OPN_EXT, 64, 0, 4,
DIV_SYSTEM_Y8950_DRUMS, 64, 0, 4,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -512,6 +522,7 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_PC98, 64, 0, 1,
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16), // 2x 16-bit Burr Brown DAC
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -520,18 +531,21 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_PC98_EXT, 64, 0, 1,
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef(
"NEC PC-98 (with PC-9801-73)", {
DIV_SYSTEM_PC98, 64, 0, 1,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef(
"NEC PC-98 (with PC-9801-73; extended channel 3)", {
DIV_SYSTEM_PC98_EXT, 64, 0, 1,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -540,6 +554,7 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
DIV_SYSTEM_OPL3, 64, 0, 0,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -548,6 +563,7 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
DIV_SYSTEM_OPL3, 64, 0, 0,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -556,6 +572,7 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
DIV_SYSTEM_OPL3_DRUMS, 64, 0, 2,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
@ -564,19 +581,19 @@ void FurnaceGUI::initSystemPresets() {
DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
DIV_SYSTEM_OPL3_DRUMS, 64, 0, 2,
DIV_SYSTEM_PCSPKR, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef(
"ZX Spectrum (48K)", {
DIV_SYSTEM_AY8910, 64, 0, 2,
DIV_SYSTEM_SFX_BEEPER, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef(
"ZX Spectrum (128K)", {
DIV_SYSTEM_AY8910, 64, 0, 1,
DIV_SYSTEM_AY8910, 64, 0, 1, //beeper was also included
0
}
));