diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-04-09 16:09:39 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-04-14 14:49:56 +0000 |
commit | f9145aca166ad2ca1514524ce88ded7834eb207c (patch) | |
tree | 66e6acb2ae354361250c0b3228a6c3cdb0366cfe /src/plugins/directshow/dsserviceplugin.h | |
parent | 07606dde9a1f6b89f582ff8f1fbc53e2d4eb2c22 (diff) |
DirectShow: correctly update camera list.
8923c0ff fixed the list not being updated after plugging/unplugging a
camera from the system. However, it was only a partial fix affecting
only QCameraInfo::availableCameras(). DSVideoDeviceControl was still
internally keeping a list of cameras that was never updated, causing
the QCamera constructor to not take into account new or removed
cameras.
Change-Id: Ie5e79c46002017b1e85bfc53c6391a2a747361a0
Task-number: QTBUG-39708
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/directshow/dsserviceplugin.h')
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h index 568253497..5cc178811 100644 --- a/src/plugins/directshow/dsserviceplugin.h +++ b/src/plugins/directshow/dsserviceplugin.h @@ -65,15 +65,6 @@ public: QByteArray defaultDevice(const QByteArray &service) const; QList<QByteArray> devices(const QByteArray &service) const; QString deviceDescription(const QByteArray &service, const QByteArray &device); - -private: -#ifdef QMEDIA_DIRECTSHOW_CAMERA - void updateDevices() const; - - mutable QByteArray m_defaultCameraDevice; - mutable QList<QByteArray> m_cameraDevices; - mutable QStringList m_cameraDescriptions; -#endif }; #endif // DSSERVICEPLUGIN_H |