[UI][Qt][OOPs] Fix LACK of DATARECORDER BUTTONS(abolish of USE_TAPE_BUTTON): Lack...

diff --git a/source/src/qt/common/emu_thread_slots.cpp b/source/src/qt/common/emu_thread_slots.cpp
index 246cbe4..ea95fdd 100644 (file)
--- a/source/src/qt/common/emu_thread_slots.cpp
+++ b/source/src/qt/common/emu_thread_slots.cpp
@@ -572,44 +572,32 @@ void EmuThreadClass::do_close_tape(int drv)
 
 void EmuThreadClass::do_cmt_push_play(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_play(drv);
-#endif
 }
 
 void EmuThreadClass::do_cmt_push_stop(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_stop(drv);
-#endif
 }
 
 void EmuThreadClass::do_cmt_push_fast_forward(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_fast_forward(drv);
-#endif
 }
 
 void EmuThreadClass::do_cmt_push_fast_rewind(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_fast_rewind(drv);
-#endif
 }
 
 void EmuThreadClass::do_cmt_push_apss_forward(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_apss_forward(drv);
-#endif
 }
 
 void EmuThreadClass::do_cmt_push_apss_rewind(int drv)
 {
-#if defined(USE_TAPE_BUTTON)
        p_emu->push_apss_rewind(drv);
-#endif 
 }
 
 

diff --git a/source/src/qt/common/menu_flags.cpp b/source/src/qt/common/menu_flags.cpp
index da9fa41..d412724 100644 (file)
--- a/source/src/qt/common/menu_flags.cpp
+++ b/source/src/qt/common/menu_flags.cpp
@@ -281,9 +281,7 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
        #if defined(USE_TAPE_BAUD)
                use_tape_baud = true;
        #endif
-       #if defined(USE_TAPE_BUTTON)
-               use_tape_button = true;
-       #endif
+       use_tape_button = true;
        #if defined(USE_TAPE_PTR)
                use_tape_ptr = true;
        #endif

diff --git a/source/src/qt/common/qt_utils.cpp b/source/src/qt/common/qt_utils.cpp
index c254b99..9488664 100644 (file)
--- a/source/src/qt/common/qt_utils.cpp
+++ b/source/src/qt/common/qt_utils.cpp
@@ -177,14 +177,12 @@ void Ui_MainWindow::LaunchEmuThread(void)
        connect(this, SIGNAL(sig_rec_tape(int, QString)),  hRunEmu, SLOT(do_rec_tape(int, QString)));
        connect(this, SIGNAL(sig_close_tape(int)),   hRunEmu, SLOT(do_close_tape(int)));
        //connect(hRunEmu, SIGNAL(sig_change_osd_cmt(QString)), this, SLOT(do_change_osd_cmt(QString)));
-# if defined(USE_TAPE_BUTTON)
        connect(this, SIGNAL(sig_cmt_push_play(int)), hRunEmu, SLOT(do_cmt_push_play(int)));
        connect(this, SIGNAL(sig_cmt_push_stop(int)), hRunEmu, SLOT(do_cmt_push_stop(int)));
        connect(this, SIGNAL(sig_cmt_push_fast_forward(int)), hRunEmu, SLOT(do_cmt_push_fast_forward(int)));
        connect(this, SIGNAL(sig_cmt_push_fast_rewind(int)),  hRunEmu, SLOT(do_cmt_push_fast_rewind(int)));
        connect(this, SIGNAL(sig_cmt_push_apss_forward(int)), hRunEmu, SLOT(do_cmt_push_apss_forward(int)));
        connect(this, SIGNAL(sig_cmt_push_apss_rewind(int)),  hRunEmu, SLOT(do_cmt_push_apss_rewind(int)));
-# endif
 #endif
 #if defined(USE_QUICK_DISK)
        connect(this, SIGNAL(sig_write_protect_quickdisk(int, bool)), hRunEmu, SLOT(do_write_protect_quickdisk(int, bool)));

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index e7468eb..917a742 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/gui")
 
-set(THIS_LIB_VERSION 2.19.1)
+set(THIS_LIB_VERSION 2.19.2)
 #include(cotire)
 #include(PrecompiledHeader)
 

diff --git a/source/src/qt/gui/menu_cmt.cpp b/source/src/qt/gui/menu_cmt.cpp
index 5c6dd3e..2845b33 100644 (file)
--- a/source/src/qt/gui/menu_cmt.cpp
+++ b/source/src/qt/gui/menu_cmt.cpp
@@ -111,7 +111,7 @@ void Menu_CMTClass::create_pulldown_menu_device_sub(void)
                        action_direct_load_mzt->setChecked(true);
                }
        }
-       if(using_flags->is_use_tape_button()) {
+       /*if(using_flags->is_use_tape_button())*/ {
                action_play_start = new Action_Control(p_wid, using_flags);
                action_play_start->setVisible(true);
                action_play_start->setCheckable(true);
@@ -155,7 +155,7 @@ void Menu_CMTClass::connect_menu_device_sub(void)
                this->addSeparator();
                this->addAction(action_recording);
                this->addSeparator();
-               if(using_flags->is_use_tape_button()) {
+               /*if(using_flags->is_use_tape_button())*/ {
                        this->addAction(action_play_start);
                        this->addAction(action_play_stop);
                        this->addSeparator();
@@ -185,7 +185,7 @@ void Menu_CMTClass::connect_menu_device_sub(void)
                
                connect(this, SIGNAL(sig_write_protect_media(int, bool)), p_wid, SLOT(do_write_protect_cmt(int, bool)));        
                connect(this, SIGNAL(sig_set_recent_media(int, int)), p_wid, SLOT(set_recent_cmt(int, int)));
-               if(using_flags->is_use_tape_button()) {
+               /*if(using_flags->is_use_tape_button())*/ {
                        connect(action_play_start, SIGNAL(triggered()), this, SLOT(do_push_play_tape(void)));
                        connect(action_play_stop,  SIGNAL(triggered()), this, SLOT(do_push_stop_tape(void)));
                        connect(action_fast_forward,  SIGNAL(triggered()), this, SLOT(do_push_fast_forward_tape(void)));
@@ -269,7 +269,7 @@ void Menu_CMTClass::retranslate_pulldown_menu_device_sub(void)
        this->setTitle(QApplication::translate("MenuMedia", "Cassette Tape" , 0));
        action_insert->setIcon(icon_cmt);
 
-       if(using_flags->is_use_tape_button()) {
+       /*if(using_flags->is_use_tape_button())*/ {
                action_play_start->setIcon(icon_play_start);
                action_play_stop->setIcon(icon_play_stop);
                action_fast_forward->setIcon(icon_ff);