From patchwork Mon Feb 4 15:56:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 499 Return-Path: Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 662DA60DBB for ; Mon, 4 Feb 2019 16:55:54 +0100 (CET) Received: from uno.localdomain (d51A4137F.access.telenet.be [81.164.19.127]) (Authenticated sender: jacopo@jmondi.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 04A9A100003; Mon, 4 Feb 2019 15:55:53 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 4 Feb 2019 16:56:05 +0100 Message-Id: <20190204155605.7900-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: v4l2_device: Construct from MediaEntity* X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Feb 2019 15:55:54 -0000 The V4L2Device constructor wanted a "const MediaEntity &", while entities are usually retrieved by pointer before being used to construct a V4L2Device. Change the constructor argument to "MediaEntity *". Signed-off-by: Jacopo Mondi --- src/libcamera/include/v4l2_device.h | 2 +- src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +- src/libcamera/pipeline/uvcvideo.cpp | 2 +- src/libcamera/v4l2_device.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h index 4ff48fb..1067e45 100644 --- a/src/libcamera/include/v4l2_device.h +++ b/src/libcamera/include/v4l2_device.h @@ -72,7 +72,7 @@ class V4L2Device { public: explicit V4L2Device(const std::string &deviceNode); - explicit V4L2Device(const MediaEntity &entity); + explicit V4L2Device(MediaEntity *entity); V4L2Device(const V4L2Device &) = delete; ~V4L2Device(); diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 7823bbb..fa3c522 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -182,7 +182,7 @@ V4L2Device *PipelineHandlerIPU3::createVideoDevice(unsigned int id) if (!cio2) return nullptr; - V4L2Device *dev = new V4L2Device(*cio2); + V4L2Device *dev = new V4L2Device(cio2); if (dev->open()) { delete dev; return nullptr; diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 821e4c2..e31816b 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -91,7 +91,7 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator) for (MediaEntity *entity : media_->entities()) { if (entity->flags() & MEDIA_ENT_FL_DEFAULT) { - video_ = new V4L2Device(*entity); + video_ = new V4L2Device(entity); break; } } diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 4d1f76b..61db7f6 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -169,8 +169,8 @@ V4L2Device::V4L2Device(const std::string &deviceNode) * * Construct a V4L2Device from a MediaEntity's device node path. */ -V4L2Device::V4L2Device(const MediaEntity &entity) - : V4L2Device(entity.deviceNode()) +V4L2Device::V4L2Device(MediaEntity *entity) + : V4L2Device(entity->deviceNode()) { }