diff --git a/src/engine/platform/arcade.h b/src/engine/platform/arcade.h index e2e84b4d..77924ab6 100644 --- a/src/engine/platform/arcade.h +++ b/src/engine/platform/arcade.h @@ -60,10 +60,7 @@ class DivPlatformArcade: public DivPlatformOPM { void acquire_nuked(short* bufL, short* bufR, size_t start, size_t len); void acquire_ymfm(short* bufL, short* bufR, size_t start, size_t len); - - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - + public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/fmsharedbase.h b/src/engine/platform/fmsharedbase.h index 1e1722f9..76413952 100644 --- a/src/engine/platform/fmsharedbase.h +++ b/src/engine/platform/fmsharedbase.h @@ -123,6 +123,9 @@ class DivPlatformFMBase: public DivDispatch { } } + friend void putDispatchChip(void*,int); + friend void putDispatchChan(void*,int,int); + DivPlatformFMBase(): DivDispatch(), lastBusy(0), diff --git a/src/engine/platform/tx81z.h b/src/engine/platform/tx81z.h index 6c7b495c..943cc023 100644 --- a/src/engine/platform/tx81z.h +++ b/src/engine/platform/tx81z.h @@ -56,10 +56,7 @@ class DivPlatformTX81Z: public DivPlatformOPM { int octave(int freq); int toFreq(int freq); - - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - + public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/ym2203.h b/src/engine/platform/ym2203.h index ca129795..4125e3a4 100644 --- a/src/engine/platform/ym2203.h +++ b/src/engine/platform/ym2203.h @@ -50,10 +50,7 @@ class DivPlatformYM2203: public DivPlatformOPN { bool extMode, noExtMacros; unsigned char prescale; - - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - + public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/ym2203ext.h b/src/engine/platform/ym2203ext.h index c7a729a0..63ba2c35 100644 --- a/src/engine/platform/ym2203ext.h +++ b/src/engine/platform/ym2203ext.h @@ -24,8 +24,6 @@ class DivPlatformYM2203Ext: public DivPlatformYM2203 { OPNOpChannel opChan[4]; bool isOpMuted[4]; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); public: int dispatch(DivCommand c); void* getChanState(int chan); diff --git a/src/engine/platform/ym2608.h b/src/engine/platform/ym2608.h index 48317f24..6e285c01 100644 --- a/src/engine/platform/ym2608.h +++ b/src/engine/platform/ym2608.h @@ -65,9 +65,7 @@ class DivPlatformYM2608: public DivPlatformOPN { double NOTE_OPNB(int ch, int note); double NOTE_ADPCMB(int note); - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - + public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/ym2608ext.h b/src/engine/platform/ym2608ext.h index 45cbb292..58840528 100644 --- a/src/engine/platform/ym2608ext.h +++ b/src/engine/platform/ym2608ext.h @@ -24,8 +24,6 @@ class DivPlatformYM2608Ext: public DivPlatformYM2608 { OPNOpChannelStereo opChan[4]; bool isOpMuted[4]; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); public: int dispatch(DivCommand c); void* getChanState(int chan); diff --git a/src/engine/platform/ym2610.h b/src/engine/platform/ym2610.h index 1572b4a2..1b6edb9f 100644 --- a/src/engine/platform/ym2610.h +++ b/src/engine/platform/ym2610.h @@ -35,9 +35,6 @@ class DivPlatformYM2610: public DivPlatformYM2610Base<14> { 1, 2, 4, 5 }; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/ym2610b.h b/src/engine/platform/ym2610b.h index 1fba7061..2db90d9a 100644 --- a/src/engine/platform/ym2610b.h +++ b/src/engine/platform/ym2610b.h @@ -31,9 +31,6 @@ class DivPlatformYM2610B: public DivPlatformYM2610Base<16> { 0, 1, 2, 4, 5, 6 }; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); - public: void acquire(short* bufL, short* bufR, size_t start, size_t len); int dispatch(DivCommand c); diff --git a/src/engine/platform/ym2610bext.h b/src/engine/platform/ym2610bext.h index 80910cde..6c1f31a3 100644 --- a/src/engine/platform/ym2610bext.h +++ b/src/engine/platform/ym2610bext.h @@ -24,8 +24,6 @@ class DivPlatformYM2610BExt: public DivPlatformYM2610B { OPNOpChannelStereo opChan[4]; bool isOpMuted[4]; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); public: int dispatch(DivCommand c); void* getChanState(int chan); diff --git a/src/engine/platform/ym2610ext.h b/src/engine/platform/ym2610ext.h index 6e88d05c..a1810746 100644 --- a/src/engine/platform/ym2610ext.h +++ b/src/engine/platform/ym2610ext.h @@ -24,8 +24,6 @@ class DivPlatformYM2610Ext: public DivPlatformYM2610 { OPNOpChannelStereo opChan[4]; bool isOpMuted[4]; - friend void putDispatchChip(void*,int); - friend void putDispatchChan(void*,int,int); public: int dispatch(DivCommand c); void* getChanState(int chan);