summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera/dscameraservice.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2013-07-19 12:29:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-19 12:35:20 +0200
commitd8e56bc4b8d2bb35074d1158a068832054386c1a (patch)
tree0149f9acc8bfd641e079c8369b4013797880e2ef /src/plugins/directshow/camera/dscameraservice.h
parentd599f7319af86265083bae96f21d942aeff24737 (diff)
DirectShow: Don't create the widget and renderer controls until requested.
Task-number: QTBUG-32282 Change-Id: If37ed4c35bcc2cc879f50d3b2ea3720b90603e9a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/directshow/camera/dscameraservice.h')
-rw-r--r--src/plugins/directshow/camera/dscameraservice.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index e39ea0adc..fb8b7886a 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -52,9 +52,7 @@ class DSCameraControl;
class DSCameraSession;
class DSVideoOutputControl;
class DSVideoDeviceControl;
-class DSVideoRendererControl;
class DSImageCaptureControl;
-class DSVideoWidgetControl;
class DSCameraService : public QMediaService
@@ -73,10 +71,10 @@ private:
DSCameraSession *m_session;
DSVideoOutputControl *m_videoOutput;
#if defined(HAVE_WIDGETS)
- DSVideoWidgetControl *m_viewFinderWidget;
+ QMediaControl *m_viewFinderWidget;
#endif
DSVideoDeviceControl *m_videoDevice;
- DSVideoRendererControl *m_videoRenderer;
+ QMediaControl *m_videoRenderer;
DSImageCaptureControl *m_imageCapture;
QByteArray m_device;
};