diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-01-22 16:18:42 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 14:10:00 +0100 |
commit | b28ee24628f77fced393cacc45500be6761e4497 (patch) | |
tree | 811173f8a2caf84e0fa386010283ccfd32c6ad0d /src/plugins/directshow/dsserviceplugin.h | |
parent | d964388b38ec4762e315d86aacb779604bcdca1b (diff) |
New QCameraInfo class.
The class allows to get the list of available cameras on the system as
well as getting some static information about them such as their unique
ID, display name, physical position and sensor orientation.
This makes QCamera::availableDevices() and QCamera::deviceDescription()
obsolete.
This patch contains the API, documentation and auto-tests but not the
actual implementation by each backend (except for retrieving the default
camera device).
[ChangeLog][QtMultimedia] Added new QCameraInfo class
[ChangeLog][QtMultimedia] QCamera: availableDevices() and
deviceDescription() are deprecated, use QCameraInfo instead
Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/directshow/dsserviceplugin.h')
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h index 82f1acd6d..6d59de558 100644 --- a/src/plugins/directshow/dsserviceplugin.h +++ b/src/plugins/directshow/dsserviceplugin.h @@ -49,10 +49,12 @@ QT_USE_NAMESPACE class DSServicePlugin : public QMediaServiceProviderPlugin , public QMediaServiceSupportedDevicesInterface + , public QMediaServiceDefaultDeviceInterface , public QMediaServiceFeaturesInterface { Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) + Q_INTERFACES(QMediaServiceDefaultDeviceInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) // The player service provided by the WMF-plugin should preferably be used. // DirectShow should then only provide the camera (see QTBUG-29172, QTBUG-29175). @@ -68,6 +70,7 @@ public: QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; + QByteArray defaultDevice(const QByteArray &service) const; QList<QByteArray> devices(const QByteArray &service) const; QString deviceDescription(const QByteArray &service, const QByteArray &device); @@ -75,6 +78,7 @@ private: #ifdef QMEDIA_DIRECTSHOW_CAMERA void updateDevices() const; + mutable QByteArray m_defaultCameraDevice; mutable QList<QByteArray> m_cameraDevices; mutable QStringList m_cameraDescriptions; #endif |