From 9cb6073c28264abd2a88ced37d3b7ac2bc1f5a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 23 Mar 2015 12:05:17 -0400 Subject: [PATCH] use a common camera:// prefix for video input Refs #69017 --- src/video/sourcesmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/sourcesmodel.cpp b/src/video/sourcesmodel.cpp index f4a76786..d6403635 100644 --- a/src/video/sourcesmodel.cpp +++ b/src/video/sourcesmodel.cpp @@ -33,7 +33,7 @@ public: constexpr static const char* NONE = "" ; constexpr static const char* DISPLAY = "display://"; constexpr static const char* FILE = "file://" ; - constexpr static const char* V4L2 = "v4l2://" ; + constexpr static const char* CAMERA = "camera://" ; }; struct Display { @@ -164,7 +164,7 @@ void Video::SourcesModel::switchTo(const int idx) ); break; default: - DBus::VideoManager::instance().switchInput(Video::SourcesModelPrivate::ProtocolPrefix::V4L2 + + DBus::VideoManager::instance().switchInput(Video::SourcesModelPrivate::ProtocolPrefix::CAMERA + Video::DeviceModel::instance()->index(idx-ExtendedDeviceList::COUNT__,0).data(Qt::DisplayRole).toString()); break; }; @@ -173,7 +173,7 @@ void Video::SourcesModel::switchTo(const int idx) void Video::SourcesModel::switchTo(Video::Device* device) { - DBus::VideoManager::instance().switchInput(Video::SourcesModelPrivate::ProtocolPrefix::V4L2 + device->id()); + DBus::VideoManager::instance().switchInput(Video::SourcesModelPrivate::ProtocolPrefix::CAMERA + device->id()); } Video::Device* Video::SourcesModel::deviceAt(const QModelIndex& idx) const -- GitLab