diff --git a/extern/Nuked-OPN2 b/extern/Nuked-OPN2 new file mode 160000 index 000000000..b0e9de0f8 --- /dev/null +++ b/extern/Nuked-OPN2 @@ -0,0 +1 @@ +Subproject commit b0e9de0f816943ad3820ddfefa0fff276d659250 diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h index 60c2865c1..566d57538 100644 --- a/src/engine/dispatch.h +++ b/src/engine/dispatch.h @@ -185,18 +185,6 @@ enum DivDispatchCmds { DIV_CMD_N163_GLOBAL_WAVE_LOADLEN, DIV_CMD_N163_GLOBAL_WAVE_LOADMODE, - DIV_CMD_ES5506_FILTER_MODE, // (value) - DIV_CMD_ES5506_FILTER_K1, // (value, mask) - DIV_CMD_ES5506_FILTER_K2, // (value, mask) - DIV_CMD_ES5506_FILTER_K1_SLIDE, // (value, negative) - DIV_CMD_ES5506_FILTER_K2_SLIDE, // (value, negative) - DIV_CMD_ES5506_ENVELOPE_COUNT, // (count) - DIV_CMD_ES5506_ENVELOPE_LVRAMP, // (ramp) - DIV_CMD_ES5506_ENVELOPE_RVRAMP, // (ramp) - DIV_CMD_ES5506_ENVELOPE_K1RAMP, // (ramp, slowdown) - DIV_CMD_ES5506_ENVELOPE_K2RAMP, // (ramp, slowdown) - DIV_CMD_ES5506_PAUSE, // (value) - DIV_CMD_SU_SWEEP_PERIOD_LOW, // (which, val) DIV_CMD_SU_SWEEP_PERIOD_HIGH, // (which, val) DIV_CMD_SU_SWEEP_BOUND, // (which, val) @@ -225,6 +213,18 @@ enum DivDispatchCmds { DIV_CMD_MACRO_OFF, // (which) DIV_CMD_MACRO_ON, // (which) + DIV_CMD_ES5506_FILTER_MODE, // (value) + DIV_CMD_ES5506_FILTER_K1, // (value, mask) + DIV_CMD_ES5506_FILTER_K2, // (value, mask) + DIV_CMD_ES5506_FILTER_K1_SLIDE, // (value, negative) + DIV_CMD_ES5506_FILTER_K2_SLIDE, // (value, negative) + DIV_CMD_ES5506_ENVELOPE_COUNT, // (count) + DIV_CMD_ES5506_ENVELOPE_LVRAMP, // (ramp) + DIV_CMD_ES5506_ENVELOPE_RVRAMP, // (ramp) + DIV_CMD_ES5506_ENVELOPE_K1RAMP, // (ramp, slowdown) + DIV_CMD_ES5506_ENVELOPE_K2RAMP, // (ramp, slowdown) + DIV_CMD_ES5506_PAUSE, // (value) + DIV_ALWAYS_SET_VOLUME, // () -> alwaysSetVol DIV_CMD_MAX diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index 77cd5b34d..66d944477 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -185,18 +185,6 @@ const char* cmdName[]={ "N163_GLOBAL_WAVE_LOADLEN", "N163_GLOBAL_WAVE_LOADMODE", - "ES5506_FILTER_MODE", - "ES5506_FILTER_K1", - "ES5506_FILTER_K2", - "ES5506_FILTER_K1_SLIDE", - "ES5506_FILTER_K2_SLIDE", - "ES5506_ENVELOPE_COUNT", - "ES5506_ENVELOPE_LVRAMP", - "ES5506_ENVELOPE_RVRAMP", - "ES5506_ENVELOPE_K1RAMP", - "ES5506_ENVELOPE_K2RAMP", - "ES5506_PAUSE", - "SU_SWEEP_PERIOD_LOW", "SU_SWEEP_PERIOD_HIGH", "SU_SWEEP_BOUND", @@ -225,6 +213,18 @@ const char* cmdName[]={ "MACRO_OFF", "MACRO_ON", + "ES5506_FILTER_MODE", + "ES5506_FILTER_K1", + "ES5506_FILTER_K2", + "ES5506_FILTER_K1_SLIDE", + "ES5506_FILTER_K2_SLIDE", + "ES5506_ENVELOPE_COUNT", + "ES5506_ENVELOPE_LVRAMP", + "ES5506_ENVELOPE_RVRAMP", + "ES5506_ENVELOPE_K1RAMP", + "ES5506_ENVELOPE_K2RAMP", + "ES5506_PAUSE", + "ALWAYS_SET_VOLUME" }; diff --git a/src/engine/song.h b/src/engine/song.h index d9702215c..d7c287368 100644 --- a/src/engine/song.h +++ b/src/engine/song.h @@ -124,8 +124,7 @@ enum DivSystem { DIV_SYSTEM_YM2610_CSM, DIV_SYSTEM_YM2610B_CSM, DIV_SYSTEM_YM2203_CSM, - DIV_SYSTEM_YM2608_CSM, - DIV_SYSTEM_MAX // boundary for max system number + DIV_SYSTEM_YM2608_CSM }; struct DivSubSong {