From 25a2f96a28fe0256f39755d2c09e37d03d02aad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Fri, 25 Jan 2019 15:17:41 +0100 Subject: libcamera: pipelines: rename MediaDevice member for UVC and VIMC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The name dev_ does a poor job of representing that it holds a media device, rename it to media_. There is no functional change in this change just s/dev_/media_/. Suggested-by: Laurent Pinchart Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++--------- src/libcamera/pipeline/vimc.cpp | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index f84fa415..5de8a0cb 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -22,34 +22,34 @@ public: bool match(DeviceEnumerator *enumerator); private: - std::shared_ptr dev_; + std::shared_ptr media_; }; PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager) - : PipelineHandler(manager), dev_(nullptr) + : PipelineHandler(manager), media_(nullptr) { } PipelineHandlerUVC::~PipelineHandlerUVC() { - if (dev_) - dev_->release(); + if (media_) + media_->release(); } bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator) { DeviceMatch dm("uvcvideo"); - dev_ = std::move(enumerator->search(dm)); + media_ = std::move(enumerator->search(dm)); - if (!dev_) + if (!media_) return false; - dev_->acquire(); + media_->acquire(); - std::shared_ptr camera = Camera::create(this, dev_->model()); + std::shared_ptr camera = Camera::create(this, media_->model()); registerCamera(std::move(camera)); - hotplugMediaDevice(dev_.get()); + hotplugMediaDevice(media_.get()); return true; } diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index b714a076..f58a97d5 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -22,18 +22,18 @@ public: bool match(DeviceEnumerator *enumerator); private: - std::shared_ptr dev_; + std::shared_ptr media_; }; PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager) - : PipelineHandler(manager), dev_(nullptr) + : PipelineHandler(manager), media_(nullptr) { } PipeHandlerVimc::~PipeHandlerVimc() { - if (dev_) - dev_->release(); + if (media_) + media_->release(); } bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) @@ -50,11 +50,11 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) dm.add("RGB/YUV Input"); dm.add("Scaler"); - dev_ = std::move(enumerator->search(dm)); - if (!dev_) + media_ = std::move(enumerator->search(dm)); + if (!media_) return false; - dev_->acquire(); + media_->acquire(); std::shared_ptr camera = Camera::create(this, "Dummy VIMC Camera"); registerCamera(std::move(camera)); -- cgit v1.2.1