[VM] Fix FTBFS for Upstream 2017-03-12.

[csp-qt/common_source_project-fm7.git] / source / src / vm / rx78 / rx78.cpp

diff --git a/source/src/vm/rx78/rx78.cpp b/source/src/vm/rx78/rx78.cpp
index 307abbb..d57a821 100644 (file)
--- a/source/src/vm/rx78/rx78.cpp
+++ b/source/src/vm/rx78/rx78.cpp
@@ -38,9 +38,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        first_device = last_device = NULL;
        dummy = new DEVICE(this, emu);  // must be 1st device
        event = new EVENT(this, emu);   // must be 2nd device
-#if defined(_USE_QT)
        dummy->set_device_name(_T("1st Dummy"));
-#endif 
        
        drec = new DATAREC(this, emu);
        drec->set_context_noise_play(new NOISE(this, emu));
@@ -49,31 +47,20 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        io = new IO(this, emu);
        psg = new SN76489AN(this, emu);
        cpu = new Z80(this, emu);
-#if defined(_USE_QT)
-       cpu->set_device_name(_T("CPU(Z80)"));
-#endif 
        
        cmt = new CMT(this, emu);
        key = new KEYBOARD(this, emu);
        memory = new MEMORY(this, emu);
        prt = new PRINTER(this, emu);
        vdp = new VDP(this, emu);
-#if defined(_USE_QT)
-       cmt->set_device_name(_T("CMT I/F"));
-       key->set_device_name(_T("KEYBOARD I/F"));
-       memory->set_device_name(_T("MEMORY"));
-       prt->set_device_name(_T("PRINTER I/F"));
-       vdp->set_device_name(_T("VIDEO"));
-#endif 
        
        // set contexts
        event->set_context_cpu(cpu);
        event->set_context_sound(psg);
        event->set_context_sound(drec);
-#if defined(USE_SOUND_FILES)
-       drec->load_sound_data(DATAREC_SNDFILE_RELAY_ON,  _T("RELAY_ON.WAV"));
-       drec->load_sound_data(DATAREC_SNDFILE_RELAY_OFF, _T("RELAYOFF.WAV"));
-#endif
+       event->set_context_sound(drec->get_context_noise_play());
+       event->set_context_sound(drec->get_context_noise_stop());
+       event->set_context_sound(drec->get_context_noise_fast());
        
        drec->set_context_ear(cmt, SIG_CMT_IN, 1);
        cmt->set_context_drec(drec);
@@ -199,13 +186,6 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r)
                drec->get_context_noise_stop()->set_volume(0, decibel_l, decibel_r);
                drec->get_context_noise_fast()->set_volume(0, decibel_l, decibel_r);
        }
-#if defined(USE_SOUND_FILES)
-       else if(ch == 2) {
-                for(int i = 0; i < DATAREC_SNDFILE_END; i++) {
-                        drec->set_volume(i + 2, decibel_l, decibel_r);
-                }
-        }
-#endif
 }
 #endif