Test

Author: reesque

src/core/controller.cpp

@@ -8,16 +8,11 @@ Controller::Controller(std::shared_ptr<Settings> setting, QWidget *parent)
     m_setting = setting;
 
     // Debounce timer
-    acceptDpad = false;
-    acceptFaceBtn = false;
-
     m_faceBtnDebounceTimer = new QTimer(this);
-    connect(m_faceBtnDebounceTimer, &QTimer::timeout, this, &Controller::onFaceBtnTimerTimeout);
     m_faceBtnDebounceTimer->setSingleShot(true);
     m_faceBtnDebounceTimer->setInterval(levelToMillisec(m_setting->getFaceBtnResponsiveLevel()));
 
     m_dpadDebounceTimer = new QTimer(this);
-    connect(m_dpadDebounceTimer, &QTimer::timeout, this, &Controller::onDpadTimerTimeout);
     m_dpadDebounceTimer->setSingleShot(true);
     m_dpadDebounceTimer->setInterval(levelToMillisec(m_setting->getDpadResponsiveLevel()));
 
@@ -106,76 +101,70 @@ void Controller::connectGamepad(int id)
 
 void Controller::controllerButtonUpChanged(bool value)
 {
-    if (value || !acceptDpad)
+    if (!value || m_dpadDebounceTimer->isActive())
     {
         return;
     }
 
     toggleDpad(false);
-    acceptDpad = false;
     m_dpadDebounceTimer->start();
     emit triggerUpAction();
 }
 
 void Controller::controllerButtonDownChanged(bool value)
 {
-    if (value || !acceptDpad)
+    if (!value || m_dpadDebounceTimer->isActive())
     {
         return;
     }
 
     toggleDpad(false);
-    acceptDpad = false;
     m_dpadDebounceTimer->start();
     emit triggerDownAction();
 }
 
 void Controller::controllerButtonLeftChanged(bool value)
 {
-    if (value || !acceptDpad)
+    if (!value || m_dpadDebounceTimer->isActive())
     {
         return;
     }
 
     toggleDpad(false);
-    acceptDpad = false;
     m_dpadDebounceTimer->start();
     emit triggerLeftAction();
 }
 
 void Controller::controllerButtonRightChanged(bool value)
 {
-    if (value || !acceptDpad)
+    if (!value || m_dpadDebounceTimer->isActive())
     {
         return;
     }
 
     toggleDpad(false);
-    acceptDpad = false;
     m_dpadDebounceTimer->start();
     emit triggerRightAction();
 }
 
 void Controller::controllerButtonAChanged(bool value)
 {
-    if (value || !acceptFaceBtn)
+    if (!value || m_faceBtnDebounceTimer->isActive())
     {
         return;
     }
 
-    acceptFaceBtn = false;
     m_faceBtnDebounceTimer->start();
     emit triggerConfirmAction();
 }
 
 void Controller::controllerButtonBChanged(bool value)
 {
-    if (value || !acceptFaceBtn)
+    if (!value || m_faceBtnDebounceTimer->isActive())
     {
         return;
     }
 
-    acceptFaceBtn = false;
     m_faceBtnDebounceTimer->start();
     emit triggerBackAction();
 }
@@ -203,14 +192,3 @@ int Controller::levelToMillisec(int level)
     // 250 base level
     return 250 + level * 250;
 }
-
-void Controller::onDpadTimerTimeout()
-{
-    acceptDpad = true;
-    toggleDpad(true);
-}
-
-void Controller::onFaceBtnTimerTimeout()
-{
-    acceptFaceBtn = true;
-}

src/core/controller.h

@@ -39,9 +39,6 @@ private slots:
     void controllerButtonAChanged(bool value);
     void controllerButtonBChanged(bool value);
 
-    void onDpadTimerTimeout();
-    void onFaceBtnTimerTimeout();
-
 private:
     void disconnectGamepad();
     void connectGamepad(int id);
@@ -61,9 +58,6 @@ private slots:
     QTimer *m_faceBtnDebounceTimer;
     QTimer *m_dpadDebounceTimer;
     QGamepad *m_currentGamepad;
-
-    bool acceptDpad;
-    bool acceptFaceBtn;
 };
 
 #endif // CONTROLLER_H