From patchwork Fri Aug 27 02:38:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13522 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 1A795BD87D for ; Fri, 27 Aug 2021 02:38:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 90BB168920; Fri, 27 Aug 2021 04:38:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oEtzj+be"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 56C4368920 for ; Fri, 27 Aug 2021 04:38:46 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DADF9739 for ; Fri, 27 Aug 2021 04:38:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1630031926; bh=A78D8AItOpk0oS9bj5WE47DSTohUsopQK6EwoK7txjU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=oEtzj+beX3W5b5VMeLp4zT/y1Y0YRftGOjvuhUxyTwybfBkeyHJS54zzBObDG5fBM BMJ/YEXKYt9oupBHFzVN7HNTO0HXaPlmwzr6NIpPpGP8VyhHC/EV4ezJHKtuWDlGqX xNYdvdS0Y20X4Du4Jm4ZCF+nrECdRie93aAUS4Sk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 27 Aug 2021 05:38:24 +0300 Message-Id: <20210827023829.5871-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827023829.5871-1-laurent.pinchart@ideasonboard.com> References: <20210827023829.5871-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 1/6] libcamera: Use simpler Signal::disconnect() function X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When disconnecting a signal from a receiver, it is usually not necessary to specify the receiver's slot function explicitly, as the signal is often connected to a single slot for a given receiver. We can thus use a simpler version of Signal::disconnect() that takes a pointer to the receiver object only. This reduces code size, as the disconnect() function is a template function. Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/lc-compliance/simple_capture.cpp | 2 +- src/libcamera/camera_manager.cpp | 2 +- src/qcam/main_window.cpp | 4 ++-- test/camera/camera_reconfigure.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp index 25097f28a603..ab5cb35c11f2 100644 --- a/src/lc-compliance/simple_capture.cpp +++ b/src/lc-compliance/simple_capture.cpp @@ -62,7 +62,7 @@ void SimpleCapture::stop() camera_->stop(); - camera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete); + camera_->requestCompleted.disconnect(this); Stream *stream = config_->at(0).stream(); allocator_->free(stream); diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index fe80a46f5d20..08457030b6f7 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -170,7 +170,7 @@ void CameraManager::Private::createPipelineHandlers() void CameraManager::Private::cleanup() { - enumerator_->devicesAdded.disconnect(this, &Private::createPipelineHandlers); + enumerator_->devicesAdded.disconnect(this); /* * Release all references to cameras to ensure they all get destroyed diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 1adaae60d83b..dea81bb43774 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -531,7 +531,7 @@ int MainWindow::startCapture() return 0; error_disconnect: - camera_->requestCompleted.disconnect(this, &MainWindow::requestComplete); + camera_->requestCompleted.disconnect(this); camera_->stop(); error: @@ -571,7 +571,7 @@ void MainWindow::stopCapture() if (ret) qInfo() << "Failed to stop capture"; - camera_->requestCompleted.disconnect(this, &MainWindow::requestComplete); + camera_->requestCompleted.disconnect(this); for (auto &iter : mappedBuffers_) { const Span &buffer = iter.second; diff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp index 5adef16e1c9e..48d61c00709c 100644 --- a/test/camera/camera_reconfigure.cpp +++ b/test/camera/camera_reconfigure.cpp @@ -130,7 +130,7 @@ private: return TestFail; } - camera_->requestCompleted.disconnect(this, &CameraReconfigure::requestComplete); + camera_->requestCompleted.disconnect(this); requests_.clear();