summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera/dsvideodevicecontrol.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/directshow/camera/dsvideodevicecontrol.h')
-rw-r--r--src/plugins/directshow/camera/dsvideodevicecontrol.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h
index d0c7f0160..523b5b876 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.h
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h
@@ -42,6 +42,8 @@ class DSCameraSession;
//QTM_USE_NAMESPACE
+typedef QPair<QByteArray, QString> DSVideoDeviceInfo;
+
class DSVideoDeviceControl : public QVideoDeviceSelectorControl
{
Q_OBJECT
@@ -54,17 +56,15 @@ public:
int defaultDevice() const;
int selectedDevice() const;
- static void enumerateDevices(QList<QByteArray> *devices, QStringList *descriptions);
+ static const QList<DSVideoDeviceInfo> &availableDevices();
public Q_SLOTS:
void setSelectedDevice(int index);
private:
- DSCameraSession* m_session;
-
- QList<QByteArray> m_devices;
- QStringList m_descriptions;
+ static void updateDevices();
+ DSCameraSession* m_session;
int selected;
};