Browse Source

Fix crash on windows (camera)

pull/36/head
Tux3 / Mlkj / !Lev.uXFMLA 11 years ago
parent
commit
5f649d6f85
  1. 2
      widget/camera.cpp
  2. 1
      widget/widget.cpp

2
widget/camera.cpp

@ -10,11 +10,13 @@ Camera::Camera() @@ -10,11 +10,13 @@ Camera::Camera()
camera->setCaptureMode(QCamera::CaptureVideo);
camera->setViewfinder(this);
/* CRASHES ON WINDOWS !
QMediaService *m = camera->service();
QVideoEncoderSettingsControl *enc = m->requestControl<QVideoEncoderSettingsControl*>();
QVideoEncoderSettings sets = enc->videoSettings();
sets.setResolution(640, 480);
enc->setVideoSettings(sets);
*/
connect(camera, SIGNAL(error(QCamera::Error)), this, SLOT(onCameraError(QCamera::Error)));

1
widget/widget.cpp

@ -44,6 +44,7 @@ Widget::Widget(QWidget *parent) : @@ -44,6 +44,7 @@ Widget::Widget(QWidget *parent) :
qRegisterMetaType<ToxFile::FileDirection>("ToxFile::FileDirection");
core = new Core(camera);
core = new Core(nullptr);
coreThread = new QThread(this);
core->moveToThread(coreThread);
connect(coreThread, &QThread::started, core, &Core::start);

Loading…
Cancel
Save