[VM][FMTOWNS][MB87078][WIP] Fix terrible sound with CD-DA.Will FIX.

diff --git a/source/src/vm/fmtowns/cdrom.cpp b/source/src/vm/fmtowns/cdrom.cpp
index 179742d..c87ecd3 100644 (file)
--- a/source/src/vm/fmtowns/cdrom.cpp
+++ b/source/src/vm/fmtowns/cdrom.cpp
@@ -2531,8 +2531,18 @@ void TOWNS_CDROM::mix(int32_t* buffer, int cnt)
 
 void TOWNS_CDROM::set_volume(int ch, int decibel_l, int decibel_r)
 {
-       volume_l = decibel_to_volume(decibel_l + 6.0);
-       volume_r = decibel_to_volume(decibel_r + 6.0);
+       _decibel_l = decibel_l;
+       _decibel_r = decibel_r;
+       volume_l = decibel_to_volume(_decibel_l + 6.0);
+       volume_r = decibel_to_volume(_decibel_r + 6.0);
+}
+
+void TOWNS_CDROM::get_volume(int ch, int& decibel_l, int& decibel_r)
+{
+       decibel_l = _decibel_l;
+       decibel_r = _decibel_r;
+//     decibel_l = volume_l;
+//     decibel_r = volume_r;
 }
 
 
@@ -2747,7 +2757,7 @@ bool TOWNS_CDROM::get_debug_regs_info(_TCHAR *buffer, size_t buffer_len)
 /*
  * Note: 20200428 K.O: DO NOT USE STATE SAVE, STILL don't implement completely yet.
  */
-#define STATE_VERSION  9
+#define STATE_VERSION  10
 
 bool TOWNS_CDROM::process_state(FILEIO* state_fio, bool loading)
 {
@@ -2831,8 +2841,8 @@ bool TOWNS_CDROM::process_state(FILEIO* state_fio, bool loading)
        state_fio->StateValue(cdda_sample_r);
        state_fio->StateValue(cdda_stopped);
        
-       state_fio->StateValue(volume_l);
-       state_fio->StateValue(volume_r);
+       state_fio->StateValue(_decibel_l);
+       state_fio->StateValue(_decibel_r);
        
        if(loading) {
                offset = state_fio->FgetUint32_LE();
@@ -2863,6 +2873,10 @@ bool TOWNS_CDROM::process_state(FILEIO* state_fio, bool loading)
                } else {
                        close_from_cmd();
                }
+
+               volume_l = decibel_to_volume(_decibel_l + 6.0);
+               volume_r = decibel_to_volume(_decibel_r + 6.0);
+
        }
        state_fio->StateValue(event_seek);
        state_fio->StateValue(event_cdda);

diff --git a/source/src/vm/fmtowns/cdrom.h b/source/src/vm/fmtowns/cdrom.h
index 4a09a0d..f473aa9 100644 (file)
--- a/source/src/vm/fmtowns/cdrom.h
+++ b/source/src/vm/fmtowns/cdrom.h
@@ -36,6 +36,9 @@
 #define SIG_TOWNS_CDROM_RESET                          0x23
 #define SIG_TOWNS_CDROM_DMAINT                         0x24
 #define SIG_TOWNS_CDROM_DMAACK                         0x25
+#define SIG_TOWNS_CDROM_MUTE_L                         0x29
+#define SIG_TOWNS_CDROM_MUTE_R                         0x2a
+#define SIG_TOWNS_CDROM_MUTE_ALL                       0x2b
 
 class SCSI_HOST;
 class FIFO;
@@ -337,6 +340,8 @@ protected:
        int cdda_sample_l;
        int cdda_sample_r;
                
+       int _decibel_l;
+       int _decibel_r;
        int volume_l;
        int volume_r;
 
@@ -460,6 +465,9 @@ public:
                access = false;
                databuffer = NULL;
                status_queue = NULL;
+               _decibel_l = 0;
+               _decibel_r = 0;
+               
                memset(subq_buffer, 0x00, sizeof(subq_buffer));
                
                initialize_output_signals(&outputs_drq);
@@ -508,6 +516,7 @@ public:
 
        
        virtual void set_volume(int ch, int decibel_l, int decibel_r);
+       virtual void get_volume(int ch, int& decibel_l, int& decibel_r);
        virtual bool read_buffer(int sectors);
        
        virtual bool read_raw(int sectors);

diff --git a/source/src/vm/fmtowns/fmtowns.cpp b/source/src/vm/fmtowns/fmtowns.cpp
index 65bc913..800673d 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.cpp
+++ b/source/src/vm/fmtowns/fmtowns.cpp
@@ -42,7 +42,7 @@
 #include "./vram.h"
 
 // Electric Volume
-//#include "mb87078.h"
+#include "mb87078.h"
 //YM-2612 "OPN2"
 //#include "../ym2612.h"
 //RF5C68 PCM
@@ -168,8 +168,8 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        
        adc = new AD7820KR(this, emu);
        rf5c68 = new RF5C68(this, emu);
-//     e_volume[0] = new MB87878(this, emu);
-//     e_volume[1] = new MB87878(this, emu);
+       e_volumes[0] = new MB87078(this, emu);
+       e_volumes[1] = new MB87078(this, emu);
        
        sio = new I8251(this, emu);
        pit0 = new I8253(this, emu);
@@ -297,26 +297,12 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        mic_in_ch = -1;
 
        // Use pseudo mixer instead of event.Due to using ADC.
-#if 0
-       line_mix_ch = -1;
-       modem_mix_ch = -1;
-       mic_mix_ch = -1;
-       //line_mix_ch = mixer->set_context_sound(line_in);
-       //modem_mix_ch = mixer->set_context_sound(modem_in);
-       //mic_mix_ch = mixer->set_context_sound(mic_in);
-       beep_mix_ch = mixer->set_context_sound(beep);
-       pcm_mix_ch  = mixer->set_context_sound(rf5c68);
-       opn2_mix_ch = mixer->set_context_sound(opn2);
-       cdc_mix_ch = mixer->set_context_sound(cdrom);
-       mixer->set_interpolate_filter_freq(pcm_mix_ch, 4000); // channel, freq; disable if freq <= 0.
-       event->set_context_sound(mixer);
-#else
        // Temporally not use mixer.
        event->set_context_sound(beep);
        event->set_context_sound(opn2);
        event->set_context_sound(rf5c68);
        event->set_context_sound(cdrom);
-#endif
+
        fdc->set_context_noise_seek(seek_sound);
        fdc->set_context_noise_head_down(head_down_sound);
        fdc->set_context_noise_head_up(head_up_sound);
@@ -379,14 +365,22 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        crtc->set_context_vram(vram);
        crtc->set_context_font(fontrom);
 
-       //e_volume[0]->set_context_ch0(line_in, MB87878_VOLUME_LEFT);
-       //e_volume[0]->set_context_ch1(line_in, MB87878_VOLUME_RIGHT);
-       //e_volume[0]->set_context_ch2(NULL, MB87878_VOLUME_LEFT);
-       //e_volume[0]->set_context_ch3(NULL, MB87878_VOLUME_RIGHT);
-//     e_volume[1]->set_context_ch0(cdrom, MB87878_VOLUME_LEFT);
-//     e_volume[1]->set_context_ch1(cdrom, MB87878_VOLUME_RIGHT);
-       //e_volume[1]->set_context_ch2(mic, MB87878_VOLUME_LEFT | MB87878_VOLUME_RIGHT);
-       //e_volume[1]->set_context_ch3(modem, MB87878_VOLUME_LEFT | MB87878_VOLUME_RIGHT);
+//     e_volumes[0]->set_context_device(0, line_in, 0,
+//                                                                      MB87078_TYPE_MASK_LEFT);
+//     e_volumes[0]->set_context_device(1, line_in, 0,
+//                                                                      MB87078_TYPE_MASK_RIGHT);
+       e_volumes[1]->set_context_device(0, cdrom, 0,
+                                                                        MB87078_TYPE_MASK_LEFT, SIG_TOWNS_CDROM_MUTE_L,
+                                                                        0xffffffff,
+                                                                        0xffffffff,
+                                                                        false
+               );
+       e_volumes[1]->set_context_device(1, cdrom, 0,
+                                                                        MB87078_TYPE_MASK_RIGHT, SIG_TOWNS_CDROM_MUTE_R,
+                                                                        0xffffffff,
+                                                                        0xffffffff,
+                                                                        false
+               );
        
        memory->set_context_cpu(cpu);
        memory->set_context_dmac(dma);
@@ -599,10 +593,10 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        io->set_iomap_alias_w (0x04dc, opn2, 2);  // Addrreg 1(W)
        io->set_iomap_alias_w (0x04de, opn2, 3);  // Datareg 1(W)
        // Electrical volume
-//     io->set_iomap_alias_rw(0x04e0, e_volume[0], 0);
-//     io->set_iomap_alias_rw(0x04e1, e_volume[0], 1);
-//     io->set_iomap_alias_rw(0x04e2, e_volume[1], 0);
-//     io->set_iomap_alias_rw(0x04e3, e_volume[1], 1);
+       io->set_iomap_alias_rw(0x04e0, e_volumes[0], 0);
+       io->set_iomap_alias_rw(0x04e1, e_volumes[0], 1);
+       io->set_iomap_alias_rw(0x04e2, e_volumes[1], 0);
+       io->set_iomap_alias_rw(0x04e3, e_volumes[1], 1);
 
        // ADPCM
        io->set_iomap_range_rw(0x04e7, 0x04ec, adpcm); // A/D SAMPLING DATA REG 
@@ -1034,47 +1028,15 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r)
 #ifndef HAS_2ND_ADPCM
 //     if(ch >= 10) ch++;
 #endif
-#if 0  
-       if(ch == 0) { // BEEP
-               mixer->set_volume(beep_mix_ch, decibel_l, decibel_r);
-       }
-       else if(ch == 1) { // CD-ROM
-               //e_volume[1]->set_volume(0, decibel_l);
-               //e_volume[1]->set_volume(1, decibel_r);
-               mixer->set_volume(cdc_mix_ch, decibel_l, decibel_r);
-       }
-       else if(ch == 2) { // OPN2
-               mixer->set_volume(opn2_mix_ch, decibel_l, decibel_r);
-       }
-       else if(ch == 3) { // ADPCM
-               mixer->set_volume(pcm_mix_ch, decibel_l, decibel_r);
-       }
-       else if(ch == 4) { // LINE IN
-               //mixer->set_volume(line_mix_ch, decibel_l, decibel_r);
-       } 
-       else if(ch == 5) { // MIC
-               //mic->set_volume(0, (decibel_l + decibel_r) / 2);
-       } 
-       else if(ch == 6) { // MODEM
-               //modem->set_volume(0, (decibel_l + decibel_r) / 2);
-       }
-#ifdef HAS_2ND_ADPCM
-       else if(ch == 7) { // ADPCM
-               adpcm2->set_volume(0, decibel_l, decibel_r);
-       }
-#endif
-       else if(ch == 8) { // FDD
-               fdc->set_volume(0, decibel_l, decibel_r);
-       }
-       else if(ch == 9) { // HDD(ToDo)
-               fdc->set_volume(0, decibel_l, decibel_r);
-       }       
-#else
        if(ch == 0) { // BEEP
                beep->set_volume(0, decibel_l, decibel_r);
        }
        else if(ch == 1) { // CD-ROM
-               cdrom->set_volume(0, decibel_l, decibel_r);
+               if(e_volumes[1] != nullptr) {
+                       e_volumes[1]->set_volumes(0, decibel_l, 1, decibel_r);
+               } else {
+                       cdrom->set_volume(0, decibel_l, decibel_r);
+               }
        }       
        else if(ch == 2) { // OPN2
                opn2->set_volume(0, decibel_l, decibel_r);
@@ -1088,7 +1050,7 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r)
                head_down_sound->set_volume(0, decibel_l, decibel_r);
        }
        
-#endif
+
 }
 #endif
 
@@ -1210,7 +1172,7 @@ uint64_t VM::get_current_clock_uint64()
                return event->get_current_clock_uint64();
 }
 
-#define STATE_VERSION  3
+#define STATE_VERSION  4
 
 bool VM::process_state(FILEIO* state_fio, bool loading)
 {
@@ -1237,13 +1199,6 @@ bool VM::process_state(FILEIO* state_fio, bool loading)
                }
        }
        // Machine specified.
-       state_fio->StateValue(beep_mix_ch);
-       state_fio->StateValue(cdc_mix_ch);
-       state_fio->StateValue(opn2_mix_ch);
-       state_fio->StateValue(pcm_mix_ch);
-       state_fio->StateValue(line_mix_ch);
-       state_fio->StateValue(modem_mix_ch);
-       state_fio->StateValue(mic_mix_ch);
 
        state_fio->StateValue(boot_seq);
        

diff --git a/source/src/vm/fmtowns/fmtowns.h b/source/src/vm/fmtowns/fmtowns.h
index 1af1be6..6fe78fa 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.h
+++ b/source/src/vm/fmtowns/fmtowns.h
@@ -338,7 +338,7 @@ class NOISE;
 class IO;
 class RF5C68;      // DAC
 class YM2612;      // OPNB
-//class MB87078;     // VOLUME
+class MB87078;     // VOLUME
 class AD7820KR;    // A/D Converter.
 class PCM1BIT;
 
@@ -405,7 +405,7 @@ protected:
        NOISE*    head_down_sound;
        
        RF5C68*   rf5c68;
-//     MB87078*  e_volumes;
+       MB87078*  e_volumes[2];
        AD7820KR* adc;
        PCM1BIT*  beep;
        YM2612*   opn2;
@@ -449,13 +449,6 @@ protected:
        int modem_in_ch;
        int mic_in_ch;
 
-       int beep_mix_ch;
-       int cdc_mix_ch;
-       int opn2_mix_ch;
-       int pcm_mix_ch;
-       int line_mix_ch;
-       int modem_mix_ch;
-       int mic_mix_ch;
 /*
        scrntype_t *d_renderbuffer[2][2]; // [bank][layer]
        uint32_t renderbuffer_size[2][2];