From patchwork Sun Aug 18 01:13:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1841 Return-Path: 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 AA0A461927 for ; Sun, 18 Aug 2019 03:13:41 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4D3472AF for ; Sun, 18 Aug 2019 03:13:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566090821; bh=79g8zplm2yqjHVhgw8g1CBhk0Qf8+hiFQ6MvHv/zW5k=; h=From:To:Subject:Date:In-Reply-To:References:From; b=woHO4YTe0TcMLCE+cQbs7tDi4se8+cImrOMklSYIhdIyieDppmUiojR9XP+akDbdP 6Jz9qAn546VLIamoiIfuxb0lOBDOmGWShV4RToWxwsd1Z17yy8X2+pAGBgbjX6CbY2 iiP7JTw1eWZRycAPCeQaQW7zjFkyycbQWN1KrMxM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 18 Aug 2019 04:13:19 +0300 Message-Id: <20190818011329.14499-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190818011329.14499-1-laurent.pinchart@ideasonboard.com> References: <20190818011329.14499-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to MainWindow class 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: Sun, 18 Aug 2019 01:13:41 -0000 Pass the CameraManager instance from the main() function to the MainWindow class instead of accessing it through CameraManager::instance(). This prepares for the removal of the CameraManager::instance() method. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/qcam/main.cpp | 2 +- src/qcam/main_window.cpp | 7 +++---- src/qcam/main_window.h | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index da942f3daed6..05d3b77e9edb 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - MainWindow *mainWindow = new MainWindow(options); + MainWindow *mainWindow = new MainWindow(cm, options); mainWindow->show(); ret = app.exec(); delete mainWindow; diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 33fde8b10fd8..ef4ad4a22dca 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -21,7 +21,7 @@ using namespace libcamera; -MainWindow::MainWindow(const OptionsParser::Options &options) +MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) : options_(options), isCapturing_(false) { int ret; @@ -35,7 +35,7 @@ MainWindow::MainWindow(const OptionsParser::Options &options) viewfinder_->setFixedSize(500, 500); adjustSize(); - ret = openCamera(); + ret = openCamera(cm); if (!ret) ret = startCapture(); @@ -66,9 +66,8 @@ void MainWindow::updateTitle() setWindowTitle(title_ + " : " + QString::number(fps, 'f', 2) + " fps"); } -int MainWindow::openCamera() +int MainWindow::openCamera(CameraManager *cm) { - CameraManager *cm = CameraManager::instance(); std::string cameraName; if (!options_.isSet(OptCamera)) { diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index b45cbca725fa..6873155aaa03 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -16,6 +16,7 @@ #include #include +#include #include #include "../cam/options.h" @@ -35,14 +36,14 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(const OptionsParser::Options &options); + MainWindow(CameraManager *cm, const OptionsParser::Options &options); ~MainWindow(); private Q_SLOTS: void updateTitle(); private: - int openCamera(); + int openCamera(CameraManager *cm); int startCapture(); void stopCapture();