commit requested changes
This commit is contained in:
		
							parent
							
								
									44cee98868
								
							
						
					
					
						commit
						d3a3473f19
					
				| 
						 | 
					@ -86,7 +86,7 @@
 | 
				
			||||||
    return 2; \
 | 
					    return 2; \
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformOPNBase: public DivPlatformFMBase {
 | 
					class DivPlatformOPN: public DivPlatformFMBase {
 | 
				
			||||||
  protected:
 | 
					  protected:
 | 
				
			||||||
    const unsigned char ADDR_MULT_DT=0x30;
 | 
					    const unsigned char ADDR_MULT_DT=0x30;
 | 
				
			||||||
    const unsigned char ADDR_TL=0x40;
 | 
					    const unsigned char ADDR_TL=0x40;
 | 
				
			||||||
| 
						 | 
					@ -108,7 +108,7 @@ class DivPlatformOPNBase: public DivPlatformFMBase {
 | 
				
			||||||
    const double fmDivBase;
 | 
					    const double fmDivBase;
 | 
				
			||||||
    const unsigned char ayDiv;
 | 
					    const unsigned char ayDiv;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    DivPlatformOPNBase(double f=9440540.0, double d=72, unsigned char a=32):
 | 
					    DivPlatformOPN(double f=9440540.0, double d=72, unsigned char a=32):
 | 
				
			||||||
      DivPlatformFMBase(),
 | 
					      DivPlatformFMBase(),
 | 
				
			||||||
      fmFreqBase(f),
 | 
					      fmFreqBase(f),
 | 
				
			||||||
      fmDivBase(d),
 | 
					      fmDivBase(d),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,7 @@ class DivYM2612Interface: public ymfm::ymfm_interface {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformGenesis: public DivPlatformOPNBase {
 | 
					class DivPlatformGenesis: public DivPlatformOPN {
 | 
				
			||||||
  protected:
 | 
					  protected:
 | 
				
			||||||
    const unsigned short chanOffs[6]={
 | 
					    const unsigned short chanOffs[6]={
 | 
				
			||||||
      0x00, 0x01, 0x02, 0x100, 0x101, 0x102
 | 
					      0x00, 0x01, 0x02, 0x100, 0x101, 0x102
 | 
				
			||||||
| 
						 | 
					@ -155,7 +155,7 @@ class DivPlatformGenesis: public DivPlatformOPNBase {
 | 
				
			||||||
    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
					    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
				
			||||||
    void quit();
 | 
					    void quit();
 | 
				
			||||||
    DivPlatformGenesis():
 | 
					    DivPlatformGenesis():
 | 
				
			||||||
      DivPlatformOPNBase(9440540.0, 72, 32) {}
 | 
					      DivPlatformOPN(9440540.0, 72, 32) {}
 | 
				
			||||||
    ~DivPlatformGenesis();
 | 
					    ~DivPlatformGenesis();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,7 @@ class DivYM2203Interface: public ymfm::ymfm_interface {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformYM2203: public DivPlatformOPNBase {
 | 
					class DivPlatformYM2203: public DivPlatformOPN {
 | 
				
			||||||
  protected:
 | 
					  protected:
 | 
				
			||||||
    const unsigned short chanOffs[3]={
 | 
					    const unsigned short chanOffs[3]={
 | 
				
			||||||
      0x00, 0x01, 0x02
 | 
					      0x00, 0x01, 0x02
 | 
				
			||||||
| 
						 | 
					@ -118,7 +118,7 @@ class DivPlatformYM2203: public DivPlatformOPNBase {
 | 
				
			||||||
    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
					    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
				
			||||||
    void quit();
 | 
					    void quit();
 | 
				
			||||||
    DivPlatformYM2203():
 | 
					    DivPlatformYM2203():
 | 
				
			||||||
      DivPlatformOPNBase(4720270.0, 36, 16) {}
 | 
					      DivPlatformOPN(4720270.0, 36, 16) {}
 | 
				
			||||||
    ~DivPlatformYM2203();
 | 
					    ~DivPlatformYM2203();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,7 +34,7 @@ class DivYM2608Interface: public ymfm::ymfm_interface {
 | 
				
			||||||
    DivYM2608Interface(): adpcmBMem(NULL), sampleBank(0) {}
 | 
					    DivYM2608Interface(): adpcmBMem(NULL), sampleBank(0) {}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformYM2608: public DivPlatformOPNBase {
 | 
					class DivPlatformYM2608: public DivPlatformOPN {
 | 
				
			||||||
  protected:
 | 
					  protected:
 | 
				
			||||||
    const unsigned short chanOffs[6]={
 | 
					    const unsigned short chanOffs[6]={
 | 
				
			||||||
      0x00, 0x01, 0x02, 0x100, 0x101, 0x102
 | 
					      0x00, 0x01, 0x02, 0x100, 0x101, 0x102
 | 
				
			||||||
| 
						 | 
					@ -137,7 +137,7 @@ class DivPlatformYM2608: public DivPlatformOPNBase {
 | 
				
			||||||
    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
					    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
				
			||||||
    void quit();
 | 
					    void quit();
 | 
				
			||||||
    DivPlatformYM2608():
 | 
					    DivPlatformYM2608():
 | 
				
			||||||
      DivPlatformOPNBase(9440540.0, 72, 32) {}
 | 
					      DivPlatformOPN(9440540.0, 72, 32) {}
 | 
				
			||||||
    ~DivPlatformYM2608();
 | 
					    ~DivPlatformYM2608();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,7 +34,7 @@ class DivYM2610Interface: public ymfm::ymfm_interface {
 | 
				
			||||||
    DivYM2610Interface(): adpcmAMem(NULL), adpcmBMem(NULL), sampleBank(0) {}
 | 
					    DivYM2610Interface(): adpcmAMem(NULL), adpcmBMem(NULL), sampleBank(0) {}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformYM2610Base: public DivPlatformOPNBase {
 | 
					class DivPlatformYM2610Base: public DivPlatformOPN {
 | 
				
			||||||
  protected:
 | 
					  protected:
 | 
				
			||||||
    unsigned char* adpcmAMem;
 | 
					    unsigned char* adpcmAMem;
 | 
				
			||||||
    size_t adpcmAMemLen;
 | 
					    size_t adpcmAMemLen;
 | 
				
			||||||
| 
						 | 
					@ -50,7 +50,7 @@ class DivPlatformYM2610Base: public DivPlatformOPNBase {
 | 
				
			||||||
    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
					    int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
 | 
				
			||||||
    void quit();
 | 
					    void quit();
 | 
				
			||||||
    DivPlatformYM2610Base():
 | 
					    DivPlatformYM2610Base():
 | 
				
			||||||
      DivPlatformOPNBase(9440540.0, 72, 32) {}
 | 
					      DivPlatformOPN(9440540.0, 72, 32) {}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DivPlatformYM2610: public DivPlatformYM2610Base {
 | 
					class DivPlatformYM2610: public DivPlatformYM2610Base {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue