[{"id":2473,"web_url":"https://patchwork.libcamera.org/comment/2473/","msgid":"<20190819085923.yjrxifcddaf5ntpp@uno.localdomain>","date":"2019-08-19T08:59:23","subject":"Re: [libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to\n\tMainWindow class","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\n for this and the next patches working the way to remove the\ninstance() method, I'll defer comments to when that discussion ends.\n\nOn Sun, Aug 18, 2019 at 04:13:19AM +0300, Laurent Pinchart wrote:\n> Pass the CameraManager instance from the main() function to the\n> MainWindow class instead of accessing it through\n> CameraManager::instance(). This prepares for the removal of the\n> CameraManager::instance() method.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/main.cpp | 2 +-\n> src/qcam/main_window.cpp | 7 +++----\n> src/qcam/main_window.h | 5 +++--\n> 3 files changed, 7 insertions(+), 7 deletions(-)\n>\n> diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> index da942f3daed6..05d3b77e9edb 100644\n> --- a/src/qcam/main.cpp\n> +++ b/src/qcam/main.cpp\n> @@ -73,7 +73,7 @@ int main(int argc, char **argv)\n> \t\treturn EXIT_FAILURE;\n> \t}\n>\n> -\tMainWindow *mainWindow = new MainWindow(options);\n> +\tMainWindow *mainWindow = new MainWindow(cm, options);\n> \tmainWindow->show();\n> \tret = app.exec();\n> \tdelete mainWindow;\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 33fde8b10fd8..ef4ad4a22dca 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -21,7 +21,7 @@\n>\n> using namespace libcamera;\n>\n> -MainWindow::MainWindow(const OptionsParser::Options &options)\n> +MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n> \t: options_(options), isCapturing_(false)\n> {\n> \tint ret;\n> @@ -35,7 +35,7 @@ MainWindow::MainWindow(const OptionsParser::Options &options)\n> \tviewfinder_->setFixedSize(500, 500);\n> \tadjustSize();\n>\n> -\tret = openCamera();\n> +\tret = openCamera(cm);\n> \tif (!ret)\n> \t\tret = startCapture();\n>\n> @@ -66,9 +66,8 @@ void MainWindow::updateTitle()\n> \tsetWindowTitle(title_ + \" : \" + QString::number(fps, 'f', 2) + \" fps\");\n> }\n>\n> -int MainWindow::openCamera()\n> +int MainWindow::openCamera(CameraManager *cm)\n> {\n> -\tCameraManager *cm = CameraManager::instance();\n> \tstd::string cameraName;\n>\n> \tif (!options_.isSet(OptCamera)) {\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index b45cbca725fa..6873155aaa03 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -16,6 +16,7 @@\n> #include \n>\n> #include \n> +#include \n> #include \n>\n> #include \"../cam/options.h\"\n> @@ -35,14 +36,14 @@ class MainWindow : public QMainWindow\n> \tQ_OBJECT\n>\n> public:\n> -\tMainWindow(const OptionsParser::Options &options);\n> +\tMainWindow(CameraManager *cm, const OptionsParser::Options &options);\n> \t~MainWindow();\n>\n> private Q_SLOTS:\n> \tvoid updateTitle();\n>\n> private:\n> -\tint openCamera();\n> +\tint openCamera(CameraManager *cm);\n>\n> \tint startCapture();\n> \tvoid stopCapture();\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D059D60E38\n\tfor ;\n\tMon, 19 Aug 2019 10:57:55 +0200 (CEST)","from uno.localdomain (unknown [87.18.63.98])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 15FBE1C0005;\n\tMon, 19 Aug 2019 08:57:54 +0000 (UTC)"],"X-Originating-IP":"87.18.63.98","Date":"Mon, 19 Aug 2019 10:59:23 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190819085923.yjrxifcddaf5ntpp@uno.localdomain>","References":"<20190818011329.14499-1-laurent.pinchart@ideasonboard.com>\n\t<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"g7ugik6ktnp24vtu\"","Content-Disposition":"inline","In-Reply-To":"<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to\n\tMainWindow class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 19 Aug 2019 08:57:56 -0000"}},{"id":2500,"web_url":"https://patchwork.libcamera.org/comment/2500/","msgid":"<20190819160659.ep2hzyv7no2ib6lp@uno.localdomain>","date":"2019-08-19T16:06:59","subject":"Re: [libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to\n\tMainWindow class","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n with the comment on 13/14 clarified, please add my tag to the two\npatches that depends on that.\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\nOn Sun, Aug 18, 2019 at 04:13:19AM +0300, Laurent Pinchart wrote:\n> Pass the CameraManager instance from the main() function to the\n> MainWindow class instead of accessing it through\n> CameraManager::instance(). This prepares for the removal of the\n> CameraManager::instance() method.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/main.cpp | 2 +-\n> src/qcam/main_window.cpp | 7 +++----\n> src/qcam/main_window.h | 5 +++--\n> 3 files changed, 7 insertions(+), 7 deletions(-)\n>\n> diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> index da942f3daed6..05d3b77e9edb 100644\n> --- a/src/qcam/main.cpp\n> +++ b/src/qcam/main.cpp\n> @@ -73,7 +73,7 @@ int main(int argc, char **argv)\n> \t\treturn EXIT_FAILURE;\n> \t}\n>\n> -\tMainWindow *mainWindow = new MainWindow(options);\n> +\tMainWindow *mainWindow = new MainWindow(cm, options);\n> \tmainWindow->show();\n> \tret = app.exec();\n> \tdelete mainWindow;\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 33fde8b10fd8..ef4ad4a22dca 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -21,7 +21,7 @@\n>\n> using namespace libcamera;\n>\n> -MainWindow::MainWindow(const OptionsParser::Options &options)\n> +MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n> \t: options_(options), isCapturing_(false)\n> {\n> \tint ret;\n> @@ -35,7 +35,7 @@ MainWindow::MainWindow(const OptionsParser::Options &options)\n> \tviewfinder_->setFixedSize(500, 500);\n> \tadjustSize();\n>\n> -\tret = openCamera();\n> +\tret = openCamera(cm);\n> \tif (!ret)\n> \t\tret = startCapture();\n>\n> @@ -66,9 +66,8 @@ void MainWindow::updateTitle()\n> \tsetWindowTitle(title_ + \" : \" + QString::number(fps, 'f', 2) + \" fps\");\n> }\n>\n> -int MainWindow::openCamera()\n> +int MainWindow::openCamera(CameraManager *cm)\n> {\n> -\tCameraManager *cm = CameraManager::instance();\n> \tstd::string cameraName;\n>\n> \tif (!options_.isSet(OptCamera)) {\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index b45cbca725fa..6873155aaa03 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -16,6 +16,7 @@\n> #include \n>\n> #include \n> +#include \n> #include \n>\n> #include \"../cam/options.h\"\n> @@ -35,14 +36,14 @@ class MainWindow : public QMainWindow\n> \tQ_OBJECT\n>\n> public:\n> -\tMainWindow(const OptionsParser::Options &options);\n> +\tMainWindow(CameraManager *cm, const OptionsParser::Options &options);\n> \t~MainWindow();\n>\n> private Q_SLOTS:\n> \tvoid updateTitle();\n>\n> private:\n> -\tint openCamera();\n> +\tint openCamera(CameraManager *cm);\n>\n> \tint startCapture();\n> \tvoid stopCapture();\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1B8B160C1E\n\tfor ;\n\tMon, 19 Aug 2019 18:05:32 +0200 (CEST)","from uno.localdomain (unknown [87.18.63.98])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 655884000F;\n\tMon, 19 Aug 2019 16:05:31 +0000 (UTC)"],"X-Originating-IP":"87.18.63.98","Date":"Mon, 19 Aug 2019 18:06:59 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190819160659.ep2hzyv7no2ib6lp@uno.localdomain>","References":"<20190818011329.14499-1-laurent.pinchart@ideasonboard.com>\n\t<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"czk2dzz7icfomrda\"","Content-Disposition":"inline","In-Reply-To":"<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to\n\tMainWindow class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 19 Aug 2019 16:05:32 -0000"}}]