From f420ac286a303bc235b8c1047f8c845314df1f8a Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Thu, 4 Dec 2014 14:45:43 +0100
Subject: GStreamer: better camera device name logic.

Use the device ID for QCameraInfo::description() when the driver
doesn't provide any display name.

Change-Id: Iff1f17187ecb52262412f85db04d7108fae71717
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
---
 src/gsttools/qgstutils.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/gsttools')

diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 556fc03cc..1281d3fc5 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -510,6 +510,8 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
             } else {
                 driver = QByteArray((const char*)vcap.driver);
                 name = QString::fromUtf8((const char*)vcap.card);
+                if (name.isEmpty())
+                    name = entryInfo.fileName();
             }
             //qDebug() << "found camera: " << name;
 
-- 
cgit v1.2.3