[VM][FM7][YM2203] Add stereo volume feature for YM2203 (OPN/OPNA) w/o MAME DLL.

See vm/ym2203.h and vm/fm7/sound.cpp .

diff --git a/source/src/vm/fm7/sound.cpp b/source/src/vm/fm7/sound.cpp
index f020205..0f21ffa 100644 (file)
--- a/source/src/vm/fm7/sound.cpp
+++ b/source/src/vm/fm7/sound.cpp
@@ -85,7 +85,19 @@ void FM7_MAINIO::reset_sound(void)
        //beep->write_signal(SIG_BEEP_ON, 0x00, 0x01);
        pcm1bit->write_signal(SIG_PCM1BIT_MUTE, 0x01, 0x01);
        pcm1bit->write_signal(SIG_PCM1BIT_ON, 0x00, 0x01);
-
+#if defined(SIG_YM2203_LVOLUME)
+       // IT's test.
+       opn[0]->write_signal(SIG_YM2203_LVOLUME, 256, 0xffffffff); // OPN: LEFT
+       opn[0]->write_signal(SIG_YM2203_RVOLUME, 64, 0xffffffff); // OPN: LEFT
+       opn[1]->write_signal(SIG_YM2203_LVOLUME, 64, 0xffffffff); // WHG: RIGHT
+       opn[1]->write_signal(SIG_YM2203_RVOLUME, 256, 0xffffffff); // WHG: RIGHT
+       opn[2]->write_signal(SIG_YM2203_LVOLUME, 256, 0xffffffff); // THG: CENTER
+       opn[2]->write_signal(SIG_YM2203_RVOLUME, 256, 0xffffffff); // THG: CENTER
+# if !defined(_FM77AV_VARIANTS)
+       psg->write_signal(SIG_YM2203_LVOLUME, 64, 0xffffffff); // PSG : RIGHT
+       psg->write_signal(SIG_YM2203_RVOLUME, 256, 0xffffffff); // PSG : RIGHT
+# endif
+#endif   
 }
 
 

diff --git a/source/src/vm/ym2203.cpp b/source/src/vm/ym2203.cpp
index 4b90d05..08f04c0 100644 (file)
--- a/source/src/vm/ym2203.cpp
+++ b/source/src/vm/ym2203.cpp
@@ -31,6 +31,10 @@ void YM2203::initialize()
        register_vline_event(this);
        mute = false;
        clock_prev = clock_accum = clock_busy = 0;
+#ifndef SUPPORT_MAME_FM_DLL
+       left_volume = 256;
+       right_volume = 256;
+#endif
 }
 
 void YM2203::release()
@@ -230,7 +234,14 @@ void YM2203::write_signal(int id, uint32 data, uint32 mask)
        } else if(id == SIG_YM2203_PORT_B) {
                port[1].rreg = (port[1].rreg & ~mask) | (data & mask);
 #endif
+       } 
+#ifndef SUPPORT_MAME_FM_DLL
+       else if(id == SIG_YM2203_RVOLUME) {
+               right_volume = (data > 256) ? 256 : (int32)data;
+       } else if(id == SIG_YM2203_LVOLUME) {
+               left_volume  = (data > 256) ? 256 : (int32)data;
        }
+#endif   
 }
 
 void YM2203::event_vline(int v, int clock)
@@ -276,19 +287,62 @@ void YM2203::update_interrupt()
 }
 #endif
 
+static inline int32 VCALC(int32 x, int32 y)
+{
+       x = x * y;
+       if(x < -0x800000) x = -0x800000;
+       if(x >  0x7fffff) x =  0x7fffff;    
+       x = x >> 8;
+       return x;
+}
+
+
 void YM2203::mix(int32* buffer, int cnt)
 {
        if(cnt > 0 && !mute) {
+#ifdef SUPPORT_MAME_FM_DLL
+               int32 *dbuffer = buffer;
+#else
+               int32 *dbuffer = malloc((cnt * 2 + 2) * sizeof(int32));
+               memset(dbuffer, 0x00, (cnt * 2 + 2) * sizeof(int32));
+#endif
+          
 #ifdef HAS_YM2608
                if(is_ym2608) {
-                       opna->Mix(buffer, cnt);
+                       opna->Mix(dbuffer, cnt);
                } else
 #endif
-               opn->Mix(buffer, cnt);
+               opn->Mix(dbuffer, cnt);
 #ifdef SUPPORT_MAME_FM_DLL
                if(dllchip) {
-                       fmdll->Mix(dllchip, buffer, cnt);
+                       fmdll->Mix(dllchip, dbuffer, cnt);
+               }
+#else
+               int32 *p = dbuffer;
+               int32 *q = buffer;
+               int i;
+               for(i = 0; i < cnt / 4; i++) {
+                       q[0] += VCALC(p[0], left_volume);
+                       q[1] += VCALC(p[1], right_volume);
+                       q[2] += VCALC(p[2], left_volume);
+                       q[3] += VCALC(p[3], right_volume);
+                       q[4] += VCALC(p[4], left_volume);
+                       q[5] += VCALC(p[5], right_volume);
+                       q[6] += VCALC(p[6], left_volume);
+                       q[7] += VCALC(p[7], right_volume);
+                       q += 8;
+                       p += 8;
+               }
+               if((cnt & 3) != 0) {
+                       for(i = 0; i < (cnt & 3); i++) {
+                               q[0] += VCALC(p[0], left_volume);
+                               q[1] += VCALC(p[1], right_volume);
+                               q += 2;
+                               p += 2;
+                          
+                       }
                }
+               free(dbuffer);
 #endif
        }
 }

diff --git a/source/src/vm/ym2203.h b/source/src/vm/ym2203.h
index 9fb10ff..a1b4478 100644 (file)
--- a/source/src/vm/ym2203.h
+++ b/source/src/vm/ym2203.h
@@ -44,6 +44,8 @@
 #define SIG_YM2203_PORT_B      1
 #endif
 #define SIG_YM2203_MUTE                2
+#define SIG_YM2203_LVOLUME     3
+#define SIG_YM2203_RVOLUME     4
 
 class YM2203 : public DEVICE
 {
@@ -68,7 +70,10 @@ private:
 #ifdef HAS_YM2608
        uint8 ch1, data1;
 #endif
-       
+#ifndef SUPPORT_MAME_FM_DLL
+       int32 right_volume;
+       int32 left_volume;
+#endif   
 #ifdef SUPPORT_YM2203_PORT
        struct {
                uint8 wreg;
@@ -95,7 +100,6 @@ private:
        outputs_t outputs_irq;
        void update_interrupt();
 #endif
-       
 public:
        YM2203(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {