slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DirectShow: Don't create the widget and renderer controls until requested.

Browse Source 
Task-number: QTBUG-32282
Change-Id: If37ed4c35bcc2cc879f50d3b2ea3720b90603e9a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Yoann Lopes
2013-07-19 12:29:12 +02:00
committed by The Qt Project
parent d599f7319a
commit d8e56bc4b8
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/directshow/camera/dscameraservice.h
View File

@@ -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;
};