Browse Source

fix: Invoke device methods in deviceThread

Fix #2058
pull/4495/head
Diadlo 8 years ago
parent
commit
d86912eacd
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
  1. 17
      src/video/camerasource.cpp
  2. 6
      src/video/camerasource.h

17
src/video/camerasource.cpp

@ -103,6 +103,7 @@ CameraSource::CameraSource() @@ -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() @@ -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() @@ -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() @@ -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;

6
src/video/camerasource.h

@ -40,13 +40,15 @@ public: @@ -40,13 +40,15 @@ public:
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 @@ private: @@ -55,6 +57,8 @@ private:
CameraSource();
~CameraSource();
void stream();
private slots:
void openDevice();
void closeDevice();

Loading…
Cancel
Save