fix: Invoke device methods in deviceThread

Fix #2058
qTox · Jul 5, 2017 · d86912e · d86912e
1 parent d720cca
commit d86912e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/video/camerasource.cpp b/src/video/camerasource.cpp
@@ -103,6 +103,7 @@ CameraSource::CameraSource()
     , _isNone{true}
     , subscriptions{0}
 {
+    qRegisterMetaType<VideoMode>("VideoMode");
     deviceThread->setObjectName("Device thread");
     deviceThread->start();
     moveToThread(deviceThread);
@@ -155,6 +156,12 @@ void CameraSource::setupDefault()
  */
 void CameraSource::setupDevice(const QString& DeviceName, const VideoMode& Mode)
 {
+    if (QThread::currentThread() != deviceThread) {
+        QMetaObject::invokeMethod(this, "setupDevice", Q_ARG(const QString&, DeviceName),
+                                  Q_ARG(const VideoMode&, Mode));
+        return;
+    }
+
     QWriteLocker locker{&deviceMutex};
 
     if (DeviceName == deviceName && Mode == mode) {
@@ -240,6 +247,11 @@ void CameraSource::unsubscribe()
  */
 void CameraSource::openDevice()
 {
+    if (QThread::currentThread() != deviceThread) {
+        QMetaObject::invokeMethod(this, "openDevice");
+        return;
+    }
+
     QWriteLocker locker{&streamMutex};
     qDebug() << "Opening device " << deviceName;
 
@@ -347,6 +359,11 @@ void CameraSource::openDevice()
  */
 void CameraSource::closeDevice()
 {
+    if (QThread::currentThread() != deviceThread) {
+        QMetaObject::invokeMethod(this, "closeDevice");
+        return;
+    }
+
     QWriteLocker locker{&streamMutex};
     qDebug() << "Closing device " << deviceName;
 

diff --git a/src/video/camerasource.h b/src/video/camerasource.h
@@ -40,13 +40,15 @@ class CameraSource : public VideoSource
     static CameraSource& getInstance();
     static void destroyInstance();
     void setupDefault();
-    void setupDevice(const QString& deviceName, const VideoMode& mode);
     bool isNone() const;
 
     // VideoSource interface
     virtual void subscribe() override;
     virtual void unsubscribe() override;
 
+public slots:
+    void setupDevice(const QString& deviceName, const VideoMode& mode);
+
 signals:
     void deviceOpened();
     void openFailed();
@@ -55,6 +57,8 @@ class CameraSource : public VideoSource
     CameraSource();
     ~CameraSource();
     void stream();
+
+private slots:
     void openDevice();
     void closeDevice();