Use moniker display name for device string.

Moniker names are unique, while device friendly names are not.

Change-Id: Ic3e842e49d04c502cf5ad1fc40f89db657f0401a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h
index 7dbf24827..0a621d07e 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.h
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h
@@ -43,6 +43,7 @@
 #define DSVIDEODEVICECONTROL_H
 
 #include <qvideodeviceselectorcontrol.h>
+#include <QStringList>
 
 QT_BEGIN_HEADER
 
@@ -63,14 +64,16 @@ public:
     int defaultDevice() const;
     int selectedDevice() const;
 
+    static void enumerateDevices(QList<QByteArray> *devices, QStringList *descriptions);
+
 public Q_SLOTS:
     void setSelectedDevice(int index);
 
 private:
     DSCameraSession* m_session;
 
-    QList<QString> devices;
-    QList<QString> descriptions;
+    QList<QByteArray> m_devices;
+    QStringList m_descriptions;
 
     int selected;
 };