diff options
author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-01-25 15:17:41 +0100 |
---|---|---|
committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-01-25 16:14:16 +0100 |
commit | 25a2f96a28fe0256f39755d2c09e37d03d02aad0 (patch) | |
tree | 254c3841eaed15992cab9ccc9c5fee73e7295359 /src/libcamera/pipeline/vimc.cpp | |
parent | 6013b58fee4b442bce0d3672de4e459a73487280 (diff) |
libcamera: pipelines: rename MediaDevice member for UVC and VIMC
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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/vimc.cpp')
-rw-r--r-- | src/libcamera/pipeline/vimc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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<MediaDevice> dev_; + std::shared_ptr<MediaDevice> 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 = Camera::create(this, "Dummy VIMC Camera"); registerCamera(std::move(camera)); |