[VM][PC8801] Fix double install DEBUGGER:: for OPN#1,#2.Thanks to https://matsuri...

diff --git a/source/src/vm/pc8801/pc8801.cpp b/source/src/vm/pc8801/pc8801.cpp
index c3c1ad0..556297b 100644 (file)
--- a/source/src/vm/pc8801/pc8801.cpp
+++ b/source/src/vm/pc8801/pc8801.cpp
@@ -107,9 +107,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        //      4: 44h:OPNA A4h:OPNA            PC-8801FH/MH or later  + PC-8801-24
        //      5: 44h:OPNA A4h:OPN             PC-8801FH/MH or later  + PC-8801-11
        pc88opn1 = new YM2203(this, emu);
        //      4: 44h:OPNA A4h:OPNA            PC-8801FH/MH or later  + PC-8801-24
        //      5: 44h:OPNA A4h:OPN             PC-8801FH/MH or later  + PC-8801-11
        pc88opn1 = new YM2203(this, emu);

-#ifdef USE_DEBUGGER
-       pc88opn1->set_context_debugger(new DEBUGGER(this, emu));
-#endif

        if(config.sound_type == 0 || config.sound_type == 4 || config.sound_type == 5) {
                pc88opn1->is_ym2608 = true;
                pc88opn1->set_device_name(_T("YM2608 OPNA #1"));
        if(config.sound_type == 0 || config.sound_type == 4 || config.sound_type == 5) {
                pc88opn1->is_ym2608 = true;
                pc88opn1->set_device_name(_T("YM2608 OPNA #1"));


@@ -119,9 +116,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        }
        if(config.sound_type >= 2) {
                pc88opn2 = new YM2203(this, emu);
        }
        if(config.sound_type >= 2) {
                pc88opn2 = new YM2203(this, emu);

-       #ifdef USE_DEBUGGER
-               pc88opn2->set_context_debugger(new DEBUGGER(this, emu));
-       #endif

                if(config.sound_type == 2 || config.sound_type == 4) {
                        pc88opn2->is_ym2608 = true;
                        pc88opn2->set_device_name(_T("YM2608 OPNA #2"));
                if(config.sound_type == 2 || config.sound_type == 4) {
                        pc88opn2->is_ym2608 = true;
                        pc88opn2->set_device_name(_T("YM2608 OPNA #2"));


@@ -139,17 +133,11 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        pc88opn1 = new YM2203(this, emu);
        pc88opn1->is_ym2608 = false;
        pc88opn1->set_device_name(_T("YM2203 OPN #1"));
        pc88opn1 = new YM2203(this, emu);
        pc88opn1->is_ym2608 = false;
        pc88opn1->set_device_name(_T("YM2203 OPN #1"));

-#ifdef USE_DEBUGGER
-       pc88opn1->set_context_debugger(new DEBUGGER(this, emu));
-#endif

        if(config.sound_type == 1) {
                pc88opn2 = new YM2203(this, emu);
 //             pc88opn2->set_context_event_manager(pc88event);
                pc88opn2->is_ym2608 = false;
                pc88opn2->set_device_name(_T("YM2203 OPN #2"));
        if(config.sound_type == 1) {
                pc88opn2 = new YM2203(this, emu);
 //             pc88opn2->set_context_event_manager(pc88event);
                pc88opn2->is_ym2608 = false;
                pc88opn2->set_device_name(_T("YM2203 OPN #2"));

-       #ifdef USE_DEBUGGER
-               pc88opn2->set_context_debugger(new DEBUGGER(this, emu));
-       #endif

        } else {
                pc88opn2 = NULL;
        }
        } else {
                pc88opn2 = NULL;
        }


@@ -160,9 +148,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
                pc88opn2 = new YM2203(this, emu);
                pc88opn2->is_ym2608 = false;
                pc88opn2->set_device_name(_T("YM2203 OPN #2"));
                pc88opn2 = new YM2203(this, emu);
                pc88opn2->is_ym2608 = false;
                pc88opn2->set_device_name(_T("YM2203 OPN #2"));

-       #ifdef USE_DEBUGGER
-               pc88opn2->set_context_debugger(new DEBUGGER(this, emu));
-       #endif

        } else {
                pc88opn2 = NULL;
        }
        } else {
                pc88opn2 = NULL;
        }


@@ -176,9 +161,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
                        pc88opn1->is_ym2608 = false;
                        pc88opn1->set_device_name(_T("YM2203 OPN #1"));
                #endif
                        pc88opn1->is_ym2608 = false;
                        pc88opn1->set_device_name(_T("YM2203 OPN #1"));
                #endif

-               #ifdef USE_DEBUGGER
-                       pc88opn1->set_context_debugger(new DEBUGGER(this, emu));
-               #endif

        #endif
        #if defined(SUPPORT_PC88_OPN2)
                pc88opn2 = new YM2203(this, emu);
        #endif
        #if defined(SUPPORT_PC88_OPN2)
                pc88opn2 = new YM2203(this, emu);


@@ -189,9 +171,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
                        pc88opn2->is_ym2608 = false;
                        pc88opn2->set_device_name(_T("YM2203 OPN #2"));
                #endif
                        pc88opn2->is_ym2608 = false;
                        pc88opn2->set_device_name(_T("YM2203 OPN #2"));
                #endif

-               #ifdef USE_DEBUGGER
-                       pc88opn2->set_context_debugger(new DEBUGGER(this, emu));
-               #endif

        #endif
 #endif
 #ifdef USE_DEBUGGER
        #endif
 #endif
 #ifdef USE_DEBUGGER