Plugin: modify CBackendThread

Author: KangLin

Plugins/Player/OperatePlayer.cpp

@@ -121,7 +121,7 @@ int COperatePlayer::InitialMenu()
     QAction* pStart = m_Menu.addAction(
         QIcon::fromTheme("media-playback-start"), tr("Start"));
     pStart->setCheckable(true);
-    check = connect(this, &CConnecterPlayer::sigRunning,
+    check = connect(this, &COperatePlayer::sigRunning,
                     pStart, &QAction::toggle);
     Q_ASSERT(check);
     check = connect(pStart, &QAction::toggled,

Plugins/Template/Base/BackendTemplateBase.cpp

@@ -36,7 +36,9 @@ CBackend::OnInitReturnValue CBackendTemplateBase::OnInit()
     OnInitReturnValue ret = OnInitReturnValue::NotUseOnProcess;
     // TODO: Modify Initialization
 
+    // When ready
     emit sigRunning();
+
     return ret;
 }
 
@@ -45,6 +47,7 @@ int CBackendTemplateBase::OnClean()
     int nRet = 0;
     // TODO: Modify clean
 
+    // When finished
     emit sigFinished();
     return nRet;
 }
@@ -68,5 +71,7 @@ int CBackendTemplateBase::OnProcess()
 {
     // TODO: add event dispatch (non-Qt event loop)
 
+    // TODO: When an error occurs. emit sigStop();
+
     return 0;
 }

Plugins/Template/Base/OperateTemplateBase.cpp

@@ -51,12 +51,11 @@ int COperateTemplateBase::Start()
 {
     int nRet = 0;
     // TODO: If backend threads are not needed, modifications are required.
-    m_pThread = new CBackendThread(this, false);
+    m_pThread = new CBackendThread(this, false, false);
     if(!m_pThread) {
         qCritical(log) << "new CBackendThread fail";
         return -1;
     }
-
     m_pThread->start();
     return nRet;
 }

Plugins/Template/Desktop/BackendTemplateDesktop.cpp

@@ -36,7 +36,9 @@ CBackend::OnInitReturnValue CBackendTemplateDesktop::OnInit()
     OnInitReturnValue ret = OnInitReturnValue::NotUseOnProcess;
     // TODO: Modify Initialization
 
+    // When ready
     emit sigRunning();
+
     return ret;
 }
 
@@ -45,7 +47,6 @@ int CBackendTemplateDesktop::OnClean()
     int nRet = 0;
     // TODO: Modify clean
 
-    emit sigFinished();
     return nRet;
 }
 
@@ -67,7 +68,9 @@ int CBackendTemplateDesktop::OnClean()
 int CBackendTemplateDesktop::OnProcess()
 {
     // TODO: add event dispatch (non-Qt event loop)
-    
+
+    // TODO: When an error occurs. emit sigStop();
+
     return 0;
 }
 

Plugins/Template/Server/BackendTemplateServer.cpp

@@ -67,7 +67,9 @@ int CBackendTemplateServer::OnClean()
 int CBackendTemplateServer::OnProcess()
 {
     // TODO: add event dispatch (non-Qt event loop)
-    
+
+    // TODO: When an error occurs. emit sigStop();
+
     return 0;
 }
 

Src/BackendThread.cpp

@@ -7,14 +7,15 @@
 
 static Q_LOGGING_CATEGORY(log, "BackendThread")
 
-CBackendThread::CBackendThread(COperate *pOperate, bool bFinishedSignal)
+CBackendThread::CBackendThread(COperate *pOperate,  bool bRunningSignal, bool bFinishedSignal)
     // Note that the parent object pointer cannot be set here.
     // If set the parent, the object is also deleted
     // when the parent object (CConnecterThread) is destroyed.
     // Because it is deleted when it is finished.
     : QThread()
     , m_pOperate(pOperate)
     , m_pBackend(nullptr)
+    , m_bRunningSignal(bRunningSignal)
     , m_bFinishedSignal(bFinishedSignal)
 {
     qDebug(log) << Q_FUNC_INFO;
@@ -94,6 +95,9 @@ void CBackendThread::run()
             emit m_pOperate->sigStop();
             emit m_pOperate->sigFinished();
             return;
+        } else {
+            if(m_bRunningSignal)
+                emit m_pOperate->sigRunning();
         }
     }
 

Src/BackendThread.h

@@ -14,16 +14,19 @@
 class PLUGIN_EXPORT CBackendThread : public QThread
 {
     Q_OBJECT
-    
+
 public:
     /*!
      * \brief CBackendThread
      * \param pOperate
+     * \param bRunningSignal
+     *          - true: when the thread is running, emit COperate::sigRunning signal
+     *          - false: not emit signal
      * \param bFinishedSignal
-     *          - true: When the thread is quit, emit a `COperate::sigFinished()` signal
+     *          - true: when the thread is quit, emit COperate::sigFinished signal
      *          - false: not emit signal
      */
-    explicit CBackendThread(COperate *pOperate = nullptr, bool bFinishedSignal = true);
+    explicit CBackendThread(COperate *pOperate, bool bRunningSignal, bool bFinishedSignal);
     virtual ~CBackendThread() override;
     /*!
      * \brief Quit
@@ -35,7 +38,7 @@ class PLUGIN_EXPORT CBackendThread : public QThread
     virtual void run() override;
     COperate* m_pOperate;
     CBackend* m_pBackend;
-    
-    //! When the thread is quit, emit a `COperate::sigFinished()` signal
+
+    bool m_bRunningSignal;
     bool m_bFinishedSignal;
 };

Src/FrmViewer.cpp

@@ -43,9 +43,9 @@ CFrmViewer::CFrmViewer(QWidget *parent)
     setFocusPolicy(Qt::WheelFocus);
     setFocus();
 
-    // When the connecter is not connected, don't accept keyboard and mouse event
-    // When the CConnecter::sigConnected() set true. accept keyboard and mouse event
-    // \see CConnecter::sigConnected()
+    // When the operate is not run, don't accept keyboard and mouse event
+    // When the COperate::sigRunning() set true. accept keyboard and mouse event
+    // \see COperate::sigRunning()
     setEnabled(false);
 
     bool check = connect(&m_TimerRecordVideo, SIGNAL(timeout()),

Src/OperateDesktop.cpp

@@ -368,11 +368,11 @@ int COperateDesktop::InitialMenu()
     Q_ASSERT(check);
     m_Menu.addAction(m_pRecordPause);
 #endif
-    
+
     m_Menu.addSeparator();
     if(m_pActionSettings)
         m_Menu.addAction(m_pActionSettings);
-    
+
     return nRet;
 }
 
@@ -385,15 +385,15 @@ int COperateDesktop::Start()
 {
     qDebug(log) << Q_FUNC_INFO;
     int nRet = 0;
-
-    m_pThread = new CBackendThread(this);
+    // When the operate is not running, the viewer does not accept keyboard and mouse events.
+    // Therefore, when the backend is ready, the sigRunning signal is emitted by the backend.
+    // See: CFrmViewer::CFrmViewer(), CFrmViewer::slotRunning()
+    m_pThread = new CBackendThread(this, false, true);
     if(!m_pThread) {
         qCritical(log) << "new CBackendThread fail";
         return -1;
     }
-    
     m_pThread->start();
-    
     return nRet;
 }
 

Src/OperateServer.cpp

@@ -26,28 +26,6 @@ QWidget *COperateServer::GetViewer()
     return m_pViewer;
 }
 
-int COperateServer::Start()
-{
-    qDebug(log) << Q_FUNC_INFO;
-    emit sigRunning();
-    return 0;
-}
-
-int COperateServer::Stop()
-{
-    qDebug(log) << Q_FUNC_INFO;
-    int nRet = 0;
-    if(m_pActionStart && m_pActionStart->isChecked()) {
-        bool check = connect(m_pThread, SIGNAL(finished()),
-                             this, SIGNAL(sigFinished()));
-        Q_ASSERT(check);
-        m_pActionStart->setChecked(false);
-    } else
-        emit sigFinished();
-
-    return nRet;
-}
-
 int COperateServer::Initial()
 {
     int nRet = 0;
@@ -85,6 +63,28 @@ int COperateServer::Clean()
     return nRet;
 }
 
+int COperateServer::Start()
+{
+    qDebug(log) << Q_FUNC_INFO;
+    emit sigRunning();
+    return 0;
+}
+
+int COperateServer::Stop()
+{
+    qDebug(log) << Q_FUNC_INFO;
+    int nRet = 0;
+    if(m_pActionStart && m_pActionStart->isChecked()) {
+        bool check = connect(m_pThread, SIGNAL(finished()),
+                             this, SIGNAL(sigFinished()));
+        Q_ASSERT(check);
+        m_pActionStart->setChecked(false);
+    } else
+        emit sigFinished();
+
+    return nRet;
+}
+
 void COperateServer::slotStart(bool checked)
 {
     qDebug(log) << Q_FUNC_INFO << m_pActionStart->isChecked();
@@ -107,7 +107,7 @@ void COperateServer::slotStart(bool checked)
     m_pActionStart->setToolTip(m_pActionStart->text());
     m_pActionStart->setIcon(QIcon::fromTheme("media-playback-stop"));
     Q_ASSERT(!m_pThread);
-    m_pThread = new CBackendThread(this, false);
+    m_pThread = new CBackendThread(this, false, false);
     if(!m_pThread) {
         qCritical(log) << "new CBackendThread fail";
         return;