From 77f1ca3339aa1e0522daea40350eba19a77248e0 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 5 Mar 2023 14:01:21 -0500 Subject: [PATCH] rename D65784221391491G18414119492 to PV1000 it probably was only used there anyway --- CMakeLists.txt | 2 +- src/engine/dispatchContainer.cpp | 6 +-- src/engine/instrument.cpp | 2 +- src/engine/instrument.h | 2 +- .../platform/{d65010g031.cpp => pv1000.cpp} | 46 +++++++++---------- .../platform/{d65010g031.h => pv1000.h} | 8 ++-- src/engine/song.h | 2 +- src/engine/sysDef.cpp | 12 ++--- src/gui/dataList.cpp | 4 +- src/gui/gui.h | 2 +- src/gui/guiConst.cpp | 8 ++-- src/gui/insEdit.cpp | 6 +-- src/gui/presets.cpp | 4 +- src/gui/settings.cpp | 2 +- src/gui/sysConf.cpp | 2 +- 15 files changed, 54 insertions(+), 54 deletions(-) rename src/engine/platform/{d65010g031.cpp => pv1000.cpp} (83%) rename src/engine/platform/{d65010g031.h => pv1000.h} (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d22d8f3..549f5d79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -546,7 +546,7 @@ src/engine/platform/snes.cpp src/engine/platform/k007232.cpp src/engine/platform/ga20.cpp src/engine/platform/sm8521.cpp -src/engine/platform/d65010g031.cpp +src/engine/platform/pv1000.cpp src/engine/platform/pcmdac.cpp src/engine/platform/dummy.cpp ) diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp index 32bf1268..de37948f 100644 --- a/src/engine/dispatchContainer.cpp +++ b/src/engine/dispatchContainer.cpp @@ -76,7 +76,7 @@ #include "platform/k007232.h" #include "platform/ga20.h" #include "platform/sm8521.h" -#include "platform/d65010g031.h" +#include "platform/pv1000.h" #include "platform/pcmdac.h" #include "platform/dummy.h" #include "../ta-log.h" @@ -494,8 +494,8 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do case DIV_SYSTEM_SM8521: dispatch=new DivPlatformSM8521; break; - case DIV_SYSTEM_D65010G031: - dispatch=new DivPlatformD65010G031; + case DIV_SYSTEM_PV1000: + dispatch=new DivPlatformPV1000; break; case DIV_SYSTEM_PCM_DAC: dispatch=new DivPlatformPCMDAC; diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp index 263ad5d3..faa9f86c 100644 --- a/src/engine/instrument.cpp +++ b/src/engine/instrument.cpp @@ -928,7 +928,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) { checkForWL=true; if (ws.enabled) featureWS=true; break; - case DIV_INS_D65010G031: + case DIV_INS_PV1000: break; case DIV_INS_MAX: diff --git a/src/engine/instrument.h b/src/engine/instrument.h index 9d50f0ec..c53688ec 100644 --- a/src/engine/instrument.h +++ b/src/engine/instrument.h @@ -79,7 +79,7 @@ enum DivInstrumentType: unsigned short { DIV_INS_GA20=46, DIV_INS_POKEMINI=47, DIV_INS_SM8521=48, - DIV_INS_D65010G031=49, + DIV_INS_PV1000=49, DIV_INS_MAX, DIV_INS_NULL }; diff --git a/src/engine/platform/d65010g031.cpp b/src/engine/platform/pv1000.cpp similarity index 83% rename from src/engine/platform/d65010g031.cpp rename to src/engine/platform/pv1000.cpp index 8f13ab2a..37217ccb 100644 --- a/src/engine/platform/d65010g031.cpp +++ b/src/engine/platform/pv1000.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "d65010g031.h" +#include "pv1000.h" #include "../engine.h" #include @@ -25,18 +25,18 @@ #define CHIP_DIVIDER 1024 -const char* regCheatSheetD65010G031[]={ +const char* regCheatSheetPV1000[]={ "CH1_Pitch", "00", "CH2_Pitch", "01", "CH3_Pitch", "02", NULL }; -const char** DivPlatformD65010G031::getRegisterSheet() { - return regCheatSheetD65010G031; +const char** DivPlatformPV1000::getRegisterSheet() { + return regCheatSheetPV1000; } -void DivPlatformD65010G031::acquire(short** buf, size_t len) { +void DivPlatformPV1000::acquire(short** buf, size_t len) { for (size_t h=0; hgetIns(chan[c.chan].ins,DIV_INS_VIC); @@ -175,7 +175,7 @@ int DivPlatformD65010G031::dispatch(DivCommand c) { return 1; } -void DivPlatformD65010G031::muteChannel(int ch, bool mute) { +void DivPlatformPV1000::muteChannel(int ch, bool mute) { isMuted[ch]=mute; if (mute) { chan[ch].keyOff=true; @@ -184,34 +184,34 @@ void DivPlatformD65010G031::muteChannel(int ch, bool mute) { } } -void DivPlatformD65010G031::forceIns() { +void DivPlatformPV1000::forceIns() { for (int i=0; i<3; i++) { chan[i].insChanged=true; chan[i].freqChanged=true; } } -void* DivPlatformD65010G031::getChanState(int ch) { +void* DivPlatformPV1000::getChanState(int ch) { return &chan[ch]; } -DivMacroInt* DivPlatformD65010G031::getChanMacroInt(int ch) { +DivMacroInt* DivPlatformPV1000::getChanMacroInt(int ch) { return &chan[ch].std; } -DivDispatchOscBuffer* DivPlatformD65010G031::getOscBuffer(int ch) { +DivDispatchOscBuffer* DivPlatformPV1000::getOscBuffer(int ch) { return oscBuf[ch]; } -unsigned char* DivPlatformD65010G031::getRegisterPool() { +unsigned char* DivPlatformPV1000::getRegisterPool() { return regPool; } -int DivPlatformD65010G031::getRegisterPoolSize() { +int DivPlatformPV1000::getRegisterPoolSize() { return 3; } -void DivPlatformD65010G031::reset() { +void DivPlatformPV1000::reset() { memset(regPool,0,3); for (int i=0; i<3; i++) { chan[i]=Channel(); @@ -220,17 +220,17 @@ void DivPlatformD65010G031::reset() { d65010g031_reset(&d65010g031); } -int DivPlatformD65010G031::getOutputCount() { +int DivPlatformPV1000::getOutputCount() { return 1; } -void DivPlatformD65010G031::notifyInsDeletion(void* ins) { +void DivPlatformPV1000::notifyInsDeletion(void* ins) { for (int i=0; i<3; i++) { chan[i].std.notifyInsDeletion((DivInstrument*)ins); } } -void DivPlatformD65010G031::setFlags(const DivConfig& flags) { +void DivPlatformPV1000::setFlags(const DivConfig& flags) { chipClock=COLOR_NTSC*5.0; CHECK_CUSTOM_CLOCK; rate=chipClock/1024; @@ -239,15 +239,15 @@ void DivPlatformD65010G031::setFlags(const DivConfig& flags) { } } -void DivPlatformD65010G031::poke(unsigned int addr, unsigned short val) { +void DivPlatformPV1000::poke(unsigned int addr, unsigned short val) { rWrite(addr,val); } -void DivPlatformD65010G031::poke(std::vector& wlist) { +void DivPlatformPV1000::poke(std::vector& wlist) { for (DivRegWrite& i: wlist) rWrite(i.addr,i.val); } -int DivPlatformD65010G031::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { +int DivPlatformPV1000::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { parent=p; dumpWrites=false; skipRegisterWrites=false; @@ -260,11 +260,11 @@ int DivPlatformD65010G031::init(DivEngine* p, int channels, int sugRate, const D return 4; } -void DivPlatformD65010G031::quit() { +void DivPlatformPV1000::quit() { for (int i=0; i<3; i++) { delete oscBuf[i]; } } -DivPlatformD65010G031::~DivPlatformD65010G031() { +DivPlatformPV1000::~DivPlatformPV1000() { } diff --git a/src/engine/platform/d65010g031.h b/src/engine/platform/pv1000.h similarity index 94% rename from src/engine/platform/d65010g031.h rename to src/engine/platform/pv1000.h index cc46ced7..59484bcd 100644 --- a/src/engine/platform/d65010g031.h +++ b/src/engine/platform/pv1000.h @@ -17,14 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _D65010G031_H -#define _D65010G031_H +#ifndef _PV1000_H +#define _PV1000_H #include "../dispatch.h" #include "sound/d65010g031.h" #include -class DivPlatformD65010G031: public DivDispatch { +class DivPlatformPV1000: public DivDispatch { struct Channel: public SharedChannel { Channel(): SharedChannel(15) {} @@ -57,7 +57,7 @@ class DivPlatformD65010G031: public DivDispatch { const char** getRegisterSheet(); int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags); void quit(); - ~DivPlatformD65010G031(); + ~DivPlatformPV1000(); }; #endif diff --git a/src/engine/song.h b/src/engine/song.h index e9c4058c..cfed6b4c 100644 --- a/src/engine/song.h +++ b/src/engine/song.h @@ -126,7 +126,7 @@ enum DivSystem { DIV_SYSTEM_YM2203_CSM, DIV_SYSTEM_YM2608_CSM, DIV_SYSTEM_SM8521, - DIV_SYSTEM_D65010G031 + DIV_SYSTEM_PV1000 }; struct DivGroovePattern { diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 84fbce7a..3bf5da5e 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -1833,13 +1833,13 @@ void DivEngine::registerSystems() { waveOnlyEffectHandlerMap ); - sysDefs[DIV_SYSTEM_D65010G031]=new DivSysDef( - "NEC D65010G031", NULL, 0xcb, 0, 3, false, true, 0, false, 0, - "Used at Casio PV1000, Nothing but 3 square wave channels.", - {"Channel 1", "Channel 2", "Channel 3"}, - {"CH1", "CH2", "CH3"}, + sysDefs[DIV_SYSTEM_PV1000]=new DivSysDef( + "Casio PV-1000", NULL, 0xcb, 0, 3, false, true, 0, false, 0, + "a game console with 3 channels of square wave. it's what happens after fusing TIA and VIC together.", + {"Square 1", "Square 2", "Square 3"}, + {"S1", "S2", "S3"}, {DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE}, - {DIV_INS_D65010G031, DIV_INS_D65010G031, DIV_INS_D65010G031} + {DIV_INS_PV1000, DIV_INS_PV1000, DIV_INS_PV1000} ); sysDefs[DIV_SYSTEM_DUMMY]=new DivSysDef( diff --git a/src/gui/dataList.cpp b/src/gui/dataList.cpp index 0d99de03..3715583f 100644 --- a/src/gui/dataList.cpp +++ b/src/gui/dataList.cpp @@ -434,8 +434,8 @@ void FurnaceGUI::drawInsList(bool asChild) { ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SM8521]); name=fmt::sprintf(ICON_FA_GAMEPAD "##_INS%d",i);/*placeholder*/ break; - case DIV_INS_D65010G031: - ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_D65010G031]); + case DIV_INS_PV1000: + ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_PV1000]); name=fmt::sprintf(ICON_FA_GAMEPAD "##_INS%d",i); break; default: diff --git a/src/gui/gui.h b/src/gui/gui.h index 85dee4e3..167e8236 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -190,7 +190,7 @@ enum FurnaceGUIColors { GUI_COLOR_INSTR_GA20, GUI_COLOR_INSTR_POKEMINI, GUI_COLOR_INSTR_SM8521, - GUI_COLOR_INSTR_D65010G031, + GUI_COLOR_INSTR_PV1000, GUI_COLOR_INSTR_UNKNOWN, GUI_COLOR_CHANNEL_BG, diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 58eac2a3..790e8547 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -130,7 +130,7 @@ const char* insTypes[DIV_INS_MAX+1]={ "GA20", "Pokémon Mini", "SM8521", - "D65010G031", + "PV-1000", NULL }; @@ -821,7 +821,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={ D(GUI_COLOR_INSTR_GA20,"",ImVec4(0.1f,1.0f,0.4f,1.0f)), D(GUI_COLOR_INSTR_POKEMINI,"",ImVec4(1.0f,1.0f,0.3f,1.0f)), D(GUI_COLOR_INSTR_SM8521,"",ImVec4(0.5f,0.55f,0.6f,1.0f)), - D(GUI_COLOR_INSTR_D65010G031,"",ImVec4(0.5f,0.55f,0.6f,1.0f)),/*placeholder*/ + D(GUI_COLOR_INSTR_PV1000,"",ImVec4(0.4f,0.6f,0.7f,1.0f)), D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)), D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)), @@ -1003,7 +1003,7 @@ const int availableSystems[]={ DIV_SYSTEM_K007232, DIV_SYSTEM_GA20, DIV_SYSTEM_SM8521, - DIV_SYSTEM_D65010G031, + DIV_SYSTEM_PV1000, DIV_SYSTEM_PCM_DAC, DIV_SYSTEM_PONG, 0 // don't remove this last one! @@ -1053,7 +1053,7 @@ const int chipsSquare[]={ DIV_SYSTEM_VIC20, DIV_SYSTEM_MSM5232, DIV_SYSTEM_T6W28, - DIV_SYSTEM_D65010G031, + DIV_SYSTEM_PV1000, 0 // don't remove this last one! }; diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index 0d85aef8..ceb866ce 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -5048,7 +5048,7 @@ void FurnaceGUI::drawInsEdit() { if (ins->type==DIV_INS_ES5506) { volMax=4095; } - if (ins->type==DIV_INS_MSM6258 || ins->type==DIV_INS_D65010G031) { + if (ins->type==DIV_INS_MSM6258 || ins->type==DIV_INS_PV1000) { volMax=0; } if (ins->type==DIV_INS_MSM6295) { @@ -5118,7 +5118,7 @@ void FurnaceGUI::drawInsEdit() { if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_AMIGA || ins->type==DIV_INS_SCC || ins->type==DIV_INS_PET || ins->type==DIV_INS_VIC || ins->type==DIV_INS_SEGAPCM || ins->type==DIV_INS_FM || ins->type==DIV_INS_K007232 || ins->type==DIV_INS_GA20 || - ins->type==DIV_INS_SM8521 || ins->type==DIV_INS_D65010G031) { + ins->type==DIV_INS_SM8521 || ins->type==DIV_INS_PV1000) { dutyMax=0; } if (ins->type==DIV_INS_VBOY) { @@ -5191,7 +5191,7 @@ void FurnaceGUI::drawInsEdit() { waveBitMode=true; } if (ins->type==DIV_INS_STD || ins->type==DIV_INS_VRC6_SAW || ins->type==DIV_INS_NES || - ins->type==DIV_INS_T6W28 || ins->type==DIV_INS_D65010G031) + ins->type==DIV_INS_T6W28 || ins->type==DIV_INS_PV1000) waveMax=0; if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_VIC || ins->type==DIV_INS_OPLL) waveMax=15; if (ins->type==DIV_INS_C64) waveMax=4; diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 9d48dbf1..3354914c 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -263,7 +263,7 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Casio PV-1000", { - CH(DIV_SYSTEM_D65010G031, 1.0f, 0, "") + CH(DIV_SYSTEM_PV1000, 1.0f, 0, "") } ); CATEGORY_END; @@ -2377,7 +2377,7 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "NEC D65010G031", { - CH(DIV_SYSTEM_D65010G031, 1.0f, 0, "") + CH(DIV_SYSTEM_PV1000, 1.0f, 0, "") } ); CATEGORY_END; diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 0ee6cb09..fef592df 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -1929,7 +1929,7 @@ void FurnaceGUI::drawSettings() { UI_COLOR_CONFIG(GUI_COLOR_INSTR_GA20,"GA20"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_POKEMINI,"Pokémon Mini"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_SM8521,"SM8521"); - UI_COLOR_CONFIG(GUI_COLOR_INSTR_D65010G031,"D65010G031"); + UI_COLOR_CONFIG(GUI_COLOR_INSTR_PV1000,"PV-1000"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,"Other/Unknown"); ImGui::TreePop(); } diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index 3a4e70f7..ef35cfc4 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -1723,7 +1723,7 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo case DIV_SYSTEM_PET: case DIV_SYSTEM_VBOY: case DIV_SYSTEM_GA20: - case DIV_SYSTEM_D65010G031: + case DIV_SYSTEM_PV1000: ImGui::Text("nothing to configure"); break; case DIV_SYSTEM_VERA: