From 49c0ed25d714b6cd0e1a235d2ce42e44f5b14ef0 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Fri, 28 Apr 2017 03:23:44 +0900 Subject: [PATCH] [VM] I forgot to update (and remove USE_SOUND_FILES*) defines. --- source/src/vm/bmjr/memory.cpp | 7 ------ source/src/vm/fm16pi/fm16pi.cpp | 5 ---- source/src/vm/fp200/fp200.cpp | 3 --- source/src/vm/fp200/io.cpp | 18 -------------- source/src/vm/hc80/hc80.h | 1 - source/src/vm/multi8/multi8.h | 1 - source/src/vm/mz2500/cmt.cpp | 37 ----------------------------- source/src/vm/mz700/mz700.h | 1 - source/src/vm/mz80k/mz80k.h | 18 ++++++-------- source/src/vm/n5200/n5200.cpp | 5 ---- source/src/vm/pv2000/pv2000.h | 9 +------ source/src/vm/smc777/smc777.h | 7 ++---- source/src/vm/x1/psub.cpp | 26 --------------------- source/src/vm/x1/sub.cpp | 52 ----------------------------------------- source/src/vm/yalky/yalky.h | 10 +------- 15 files changed, 11 insertions(+), 189 deletions(-) diff --git a/source/src/vm/bmjr/memory.cpp b/source/src/vm/bmjr/memory.cpp index b40fc64b8..cf420d698 100644 --- a/source/src/vm/bmjr/memory.cpp +++ b/source/src/vm/bmjr/memory.cpp @@ -191,13 +191,6 @@ uint32_t MEMORY::read_data8(uint32_t addr) case 0xee00: case 0xee20: d_drec->write_signal(SIG_DATAREC_REMOTE, addr, 0x20); -#if defined(USE_SOUND_FILES) - if(addr & 0x20) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_RELAY_ON, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_RELAY_OFF, 1, 1); - } -#endif return 0x01; case 0xee80: return drec_bit ? 0x80 : 0; diff --git a/source/src/vm/fm16pi/fm16pi.cpp b/source/src/vm/fm16pi/fm16pi.cpp index ca2b27ff9..41a4f1cf1 100644 --- a/source/src/vm/fm16pi/fm16pi.cpp +++ b/source/src/vm/fm16pi/fm16pi.cpp @@ -351,11 +351,6 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r) fdc->get_context_noise_head_down()->set_volume(0, decibel_l, decibel_r); fdc->get_context_noise_head_up()->set_volume(0, decibel_l, decibel_r); } -#if defined(USE_SOUND_FILES) - else if(ch == 1) { - fdc->set_volume(0, decibel_l, decibel_r); - } -#endif } #endif diff --git a/source/src/vm/fp200/fp200.cpp b/source/src/vm/fp200/fp200.cpp index 8314d4b34..b297c9f9a 100644 --- a/source/src/vm/fp200/fp200.cpp +++ b/source/src/vm/fp200/fp200.cpp @@ -225,9 +225,6 @@ void VM::rec_tape(int drv, const _TCHAR* file_path) void VM::close_tape(int drv) { -#if defined(USE_SOUND_FILES) - drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); -#endif emu->lock_vm(); drec->close_tape(); emu->unlock_vm(); diff --git a/source/src/vm/fp200/io.cpp b/source/src/vm/fp200/io.cpp index 20faed154..1274459f2 100644 --- a/source/src/vm/fp200/io.cpp +++ b/source/src/vm/fp200/io.cpp @@ -278,15 +278,6 @@ void IO::write_io8(uint32_t addr, uint32_t data) cmt_selected = ((data & 2) == 0); bool tmp_val = (CMT_PLAYING || CMT_RECORDING); d_drec->write_signal(SIG_DATAREC_REMOTE, tmp_val ? 1 : 0, 1); -#if defined(USE_SOUND_FILES) - if(cmt_selected != cmt_selected_old) { - if(tmp_val) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif } break; case 0x21: @@ -316,15 +307,6 @@ void IO::write_io8(uint32_t addr, uint32_t data) cmt_mode = data & 7; int tmp_val = (CMT_PLAYING || CMT_RECORDING); d_drec->write_signal(SIG_DATAREC_REMOTE, tmp_val ? 1 : 0, 1); -#if defined(USE_SOUND_FILES) - if(cmt_mode_old != cmt_mode) { - if(tmp_val) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif } break; } diff --git a/source/src/vm/hc80/hc80.h b/source/src/vm/hc80/hc80.h index f90d7f39b..7508ae32e 100644 --- a/source/src/vm/hc80/hc80.h +++ b/source/src/vm/hc80/hc80.h @@ -34,7 +34,6 @@ #define USE_ALT_F10_KEY #define USE_AUTO_KEY 6 #define USE_AUTO_KEY_RELEASE 10 -#define USE_SOUND_FILES 2 #define USE_SOUND_VOLUME 1 #define USE_DEBUGGER #define USE_STATE diff --git a/source/src/vm/multi8/multi8.h b/source/src/vm/multi8/multi8.h index c41882ac5..dd0ae8aaf 100644 --- a/source/src/vm/multi8/multi8.h +++ b/source/src/vm/multi8/multi8.h @@ -45,7 +45,6 @@ #define USE_SCANLINE #define SUPPORT_ROMA_KANA_CONVERSION -//#define USE_SOUND_FILES_RELAY #define USE_SOUND_VOLUME 3 #define USE_DEBUGGER #define USE_STATE diff --git a/source/src/vm/mz2500/cmt.cpp b/source/src/vm/mz2500/cmt.cpp index 7ef63ebd0..34e3d69e8 100644 --- a/source/src/vm/mz2500/cmt.cpp +++ b/source/src/vm/mz2500/cmt.cpp @@ -71,9 +71,6 @@ void CMT::forward() if(play || rec) { d_drec->set_ff_rew(0); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); -#endif } now_play = (play || rec); now_rewind = false; @@ -83,9 +80,6 @@ void CMT::stop() { if(play || rec) { d_drec->set_remote(false); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); -#endif } now_play = now_rewind = false; d_pio->write_signal(SIG_I8255_PORT_B, 0, 0x40); @@ -230,9 +224,6 @@ void CMT::write_signal(int id, uint32_t data, uint32_t mask) fast_rewind(); } #endif -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); -#endif now_play = false; } } else if(id == SIG_CMT_TOP) { @@ -242,9 +233,6 @@ void CMT::write_signal(int id, uint32_t data, uint32_t mask) forward(); } #endif -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); -#endif now_rewind = false; } } @@ -287,9 +275,6 @@ void CMT::event_callback(int event_id, int err) } else if(event_id == EVENT_EJECT) { emu->close_tape(0); register_id_eject = -1; -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); -#endif #ifndef _MZ80B } else if(event_id == EVENT_APSS) { d_pio->write_signal(SIG_I8255_PORT_B, 0, 0x40); @@ -303,16 +288,6 @@ void CMT::event_callback(int event_id, int err) void CMT::play_tape(bool value) { -#if defined(USE_SOUND_FILES) - if(play != value) { - if(value) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif - play = value; rec = false; d_pio->write_signal(SIG_I8255_PORT_B, play ? 0x10 : 0x30, 0x30); @@ -321,15 +296,6 @@ void CMT::play_tape(bool value) void CMT::rec_tape(bool value) { play = false; -#if defined(USE_SOUND_FILES) - if(rec != value) { - if(value) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif rec = value; d_pio->write_signal(SIG_I8255_PORT_B, rec ? 0 : 0x30, 0x30); } @@ -340,9 +306,6 @@ void CMT::close_tape() now_play = now_rewind = false; d_pio->write_signal(SIG_I8255_PORT_B, 0x30, 0x30); d_pio->write_signal(SIG_I8255_PORT_B, 0, 0x40); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); -#endif #ifndef _MZ80B if(register_id_apss != -1) { diff --git a/source/src/vm/mz700/mz700.h b/source/src/vm/mz700/mz700.h index 78f963f29..a803f219d 100644 --- a/source/src/vm/mz700/mz700.h +++ b/source/src/vm/mz700/mz700.h @@ -74,7 +74,6 @@ #define USE_SOUND_VOLUME 3 #elif defined(_MZ800) #define USE_SOUND_VOLUME 5 -//#define USE_SOUND_FILES_QD #elif defined(_MZ1500) #define USE_SOUND_VOLUME 6 #endif diff --git a/source/src/vm/mz80k/mz80k.h b/source/src/vm/mz80k/mz80k.h index 3b1bd314d..f09ffdd45 100644 --- a/source/src/vm/mz80k/mz80k.h +++ b/source/src/vm/mz80k/mz80k.h @@ -49,9 +49,6 @@ #define PRINTER_STROBE_RISING_EDGE // device informations for win32 -#define USE_SOUND_FILES 4 -#define USE_SOUND_FILES_FDD -#define USE_SOUND_FILES_BUTTONS #define USE_DIPSWITCH #define USE_TAPE1 #define USE_TAPE_BUTTON @@ -61,11 +58,6 @@ #define USE_AUTO_KEY 5 #define USE_AUTO_KEY_RELEASE 6 #define USE_AUTO_KEY_NO_CAPS -#if defined(USE_SOUND_FILES) -#define USE_SOUND_VOLUME 4 -#else -#define USE_SOUND_VOLUME 2 -#endif #define USE_PRINTER #define USE_PRINTER_TYPE 4 #define USE_DEBUGGER @@ -75,6 +67,9 @@ #define USE_FD2 #define USE_FD3 #define USE_FD4 +#define USE_SOUND_VOLUME 4 +#else +#define USE_SOUND_VOLUME 3 #endif #if defined(_MZ80K) #define USE_MONITOR_TYPE 2 @@ -85,10 +80,11 @@ #ifdef USE_SOUND_VOLUME static const _TCHAR *sound_device_caption[] = { - _T("Beep"), _T("CMT"), -#if defined(USE_SOUND_FILES) - _T("FDD SEEK"), _T("CMT Buttons"), + _T("Beep"), _T("CMT (Signal)"), +#if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO) + _T("Noise (FDD)"), #endif + _T("Noise (CMT)"), }; #endif diff --git a/source/src/vm/n5200/n5200.cpp b/source/src/vm/n5200/n5200.cpp index b80d00cd4..36ce11822 100644 --- a/source/src/vm/n5200/n5200.cpp +++ b/source/src/vm/n5200/n5200.cpp @@ -327,11 +327,6 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r) fdc->get_context_noise_head_down()->set_volume(0, decibel_l, decibel_r); fdc->get_context_noise_head_up()->set_volume(0, decibel_l, decibel_r); } -#if defined(USE_SOUND_FILES) - else if(ch == 1) { - fdc->set_volume(UPD765A_SND_TYPE_SEEK, decibel_l, decibel_r); - } -#endif } #endif diff --git a/source/src/vm/pv2000/pv2000.h b/source/src/vm/pv2000/pv2000.h index d62e3a0b1..359f7f98b 100644 --- a/source/src/vm/pv2000/pv2000.h +++ b/source/src/vm/pv2000/pv2000.h @@ -34,12 +34,7 @@ #define USE_AUTO_KEY 5 #define USE_AUTO_KEY_RELEASE 6 #define USE_AUTO_KEY_CAPS -//#define USE_SOUND_FILES 2 -//#if defined(USE_SOUND_FILES) -//#define USE_SOUND_VOLUME 2 -//#else -#define USE_SOUND_VOLUME 1 -//#endif +#define USE_SOUND_VOLUME 2 #define USE_JOYSTICK #define USE_DEBUGGER #define USE_STATE @@ -50,9 +45,7 @@ #ifdef USE_SOUND_VOLUME static const _TCHAR *sound_device_caption[] = { _T("PSG"), -#if defined(USE_SOUND_FILES) // _T("CMT Relay"), -#endif }; #endif diff --git a/source/src/vm/smc777/smc777.h b/source/src/vm/smc777/smc777.h index fe7a98a4f..f22c16bf3 100644 --- a/source/src/vm/smc777/smc777.h +++ b/source/src/vm/smc777/smc777.h @@ -54,13 +54,10 @@ #define USE_SCREEN_FILTER #define USE_SCANLINE #if defined(_SMC70) -#define USE_SOUND_FILES 5 +#define USE_SOUND_VOLUME 4 #else -#define USE_SOUND_FILES 4 +#define USE_SOUND_VOLUME 5 #endif -#define USE_SOUND_FILES_FDD -#define USE_SOUND_FILES_RELAY -#define USE_SOUND_VOLUME 4 #define USE_JOYSTICK #define USE_DEBUGGER #define USE_STATE diff --git a/source/src/vm/x1/psub.cpp b/source/src/vm/x1/psub.cpp index d6a5fb2b2..714dc27db 100644 --- a/source/src/vm/x1/psub.cpp +++ b/source/src/vm/x1/psub.cpp @@ -490,9 +490,6 @@ void PSUB::close_tape() databuf[0x1a][0] = CMT_EJECT; play = rec = false; d_drec->set_remote(false); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); -#endif } } @@ -628,9 +625,6 @@ void PSUB::process_cmd() if(play) { d_drec->set_ff_rew(0); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); -#endif } else if(rec) { new_status = CMT_STOP; } else { @@ -641,9 +635,6 @@ void PSUB::process_cmd() if(play) { d_drec->set_ff_rew(1); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - //d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_FF, 1, 1); -#endif } else if(rec) { new_status = CMT_STOP; } else { @@ -654,9 +645,6 @@ void PSUB::process_cmd() if(play) { d_drec->set_ff_rew(-1); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - //d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_REW, 1, 1); -#endif } else if(rec) { new_status = CMT_STOP; } else { @@ -666,9 +654,6 @@ void PSUB::process_cmd() case CMT_APSS_PLUS: case CMT_APSS_MINUS: if(play) { -#if defined(USE_SOUND_FILES) - //d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_REW, 1, 1); -#endif d_drec->do_apss((databuf[0x19][0] == CMT_APSS_PLUS) ? 1 : -1); new_status = CMT_STOP; } else if(rec) { @@ -681,9 +666,6 @@ void PSUB::process_cmd() if(play) { new_status = CMT_STOP; } else if(rec) { -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); -#endif d_drec->set_remote(true); } else { new_status = CMT_EJECT; @@ -695,16 +677,8 @@ void PSUB::process_cmd() break; #endif } -#if defined(USE_SOUND_FILES) - if(new_status == CMT_EJECT) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); - } else if(new_status == CMT_STOP) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } -#endif databuf[0x1a][0] = new_status; - } break; case 0xea: diff --git a/source/src/vm/x1/sub.cpp b/source/src/vm/x1/sub.cpp index 38c3d29e0..5a1ce52e0 100644 --- a/source/src/vm/x1/sub.cpp +++ b/source/src/vm/x1/sub.cpp @@ -14,9 +14,6 @@ #include "../i8255.h" #include "../mcs48.h" #include "../upd1990a.h" -#if defined(USE_SOUND_FILES) -#include "../wav_sounder.h" -#endif /* SUB CPU @@ -90,9 +87,6 @@ void SUB::reset() void SUB::write_io8(uint32_t addr, uint32_t data) { -#if defined(USE_SOUND_FILES) - bool ffrew_comp = false; -#endif // FIXME: this function is referred from both 80c48 and z80 if((addr & 0xff00) == 0x1900) { // for z80 @@ -116,35 +110,18 @@ void SUB::write_io8(uint32_t addr, uint32_t data) if((p2_out & 0x02) && !(data & 0x02)) { d_drec->set_ff_rew(0); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - ffrew_comp = true; -#endif } if((p2_out & 0x04) && !(data & 0x04)) { d_drec->set_ff_rew(1); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - ffrew_comp = true; -#endif } if((p2_out & 0x08) && !(data & 0x08)) { d_drec->set_ff_rew(-1); d_drec->set_remote(true); -#if defined(USE_SOUND_FILES) - ffrew_comp = true; -#endif } if((p2_out & 0x10) && !(data & 0x10)) { d_drec->set_remote(false); -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); -#endif } -#if defined(USE_SOUND_FILES) - if(ffrew_comp) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_FF, 1, 1); - } -#endif intr = ((data & 0x40) == 0); update_intr(); p2_out = data; @@ -201,14 +178,6 @@ void SUB::write_signal(int id, uint32_t data, uint32_t mask) portc = data; update_intr(); } else if(id == SIG_SUB_TAPE_END) { -#if defined(USE_SOUND_FILES) - { - bool f = ((data & mask) != 0); - if((f != tape_eot) && (f)) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif tape_eot = ((data & mask) != 0); update_tape(); } else if(id == SIG_SUB_TAPE_APSS) { @@ -219,15 +188,6 @@ void SUB::write_signal(int id, uint32_t data, uint32_t mask) void SUB::play_tape(bool value) { -#if defined(USE_SOUND_FILES) - if(tape_play != value) { - if(value) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif tape_play = value; tape_rec = tape_eot = tape_apss = false; update_tape(); @@ -235,15 +195,6 @@ void SUB::play_tape(bool value) void SUB::rec_tape(bool value) { -#if defined(USE_SOUND_FILES) - if(tape_rec != value) { - if(value) { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_PLAY, 1, 1); - } else { - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_STOP, 1, 1); - } - } -#endif tape_rec = value; tape_play = tape_eot = tape_apss = false; update_tape(); @@ -251,9 +202,6 @@ void SUB::rec_tape(bool value) void SUB::close_tape() { -#if defined(USE_SOUND_FILES) - d_drec->write_signal(SIG_SOUNDER_ADD + DATAREC_SNDFILE_EJECT, 1, 1); -#endif tape_play = tape_rec = tape_eot = tape_apss = false; update_tape(); } diff --git a/source/src/vm/yalky/yalky.h b/source/src/vm/yalky/yalky.h index 450c3f7d5..974f740ba 100644 --- a/source/src/vm/yalky/yalky.h +++ b/source/src/vm/yalky/yalky.h @@ -36,13 +36,7 @@ #define USE_AUTO_KEY 5 #define USE_AUTO_KEY_RELEASE 6 #define USE_AUTO_KEY_CAPS -#define USE_SOUND_FILES 5 -#define USE_SOUND_FILES_BUTTONS -#if defined(USE_SOUND_FILES) #define USE_SOUND_VOLUME 2 -#else -#define USE_SOUND_VOLUME 1 -#endif #define USE_DEBUGGER #define USE_STATE @@ -52,9 +46,7 @@ #ifdef USE_SOUND_VOLUME static const _TCHAR *sound_device_caption[] = { _T("CMT (Voice)"), -#if defined(USE_SOUND_FILES) - _T("CMT Relay"), -#endif + _T("Noise (CMT)"), }; #endif -- 2.11.0