Unify shared channel struct, De-duplicate channel debug

This commit is contained in:
cam900 2022-12-13 16:22:48 +09:00
parent f455d2d942
commit ce09edef84
55 changed files with 209 additions and 714 deletions

View file

@ -19,23 +19,18 @@
#ifndef _MSM6295_H
#define _MSM6295_H
#include "../dispatch.h"
#include "../macroInt.h"
#include <queue>
#include "vgsound_emu/src/msm6295/msm6295.hpp"
class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
protected:
struct Channel: public SharedChannel, public SharedChannelVolume<int> {
struct Channel: public SharedChannel<int> {
bool furnacePCM;
int sample;
DivMacroInt std;
void macroInit(DivInstrument* which) {
std.init(which);
}
Channel():
SharedChannel(),
SharedChannelVolume<int>(8),
SharedChannel<int>(8),
furnacePCM(false),
sample(-1) {}
};
@ -96,8 +91,7 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
virtual void quit() override;
DivPlatformMSM6295():
DivDispatch(),
DivPlatformMSM6295():DivDispatch(),
vgsound_emu_mem_intf(),
msm(*this) {}
~DivPlatformMSM6295();