{"id":1268,"url":"https://patchwork.libcamera.org/api/1.1/patches/1268/?format=json","web_url":"https://patchwork.libcamera.org/patch/1268/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190523005534.9631-3-niklas.soderlund@ragnatech.se>","date":"2019-05-23T00:55:34","name":"[libcamera-devel,2/2] cam: Add CamApp class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cc09c1fef79db1e7552fa57006491cfa9b7ccfe2","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1268/mbox/","series":[{"id":321,"url":"https://patchwork.libcamera.org/api/1.1/series/321/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=321","date":"2019-05-23T00:55:32","name":"cam: cleanup code structure","version":1,"mbox":"https://patchwork.libcamera.org/series/321/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1268/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1268/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E2EF660C0D\n\tfor ;\n\tThu, 23 May 2019 02:55:48 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 7f33cb72-7cf5-11e9-8d05-005056917f90;\n\tThu, 23 May 2019 02:55:46 +0200 (CEST)"],"X-Halon-ID":"7f33cb72-7cf5-11e9-8d05-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 23 May 2019 02:55:34 +0200","Message-Id":"<20190523005534.9631-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190523005534.9631-1-niklas.soderlund@ragnatech.se>","References":"<20190523005534.9631-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] cam: Add CamApp 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":"Thu, 23 May 2019 00:55:49 -0000"},"content":"Add more structure to main.cpp by breaking up the logic into a CamApp\nclass. This makes the code easier to read and removes all but one of the\norganically grown global variables.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/main.cpp | 171 +++++++++++++++++++++++++++++++----------------\n 1 file changed, 112 insertions(+), 59 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex fe7d4f90dbf14ffd..5ca8356025a0c9f9 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -18,17 +18,101 @@\n \n using namespace libcamera;\n \n-OptionsParser::Options options;\n-std::shared_ptr camera;\n-EventLoop *loop;\n+class CamApp\n+{\n+public:\n+\tCamApp();\n+\n+\tint init(int argc, char **argv);\n+\tvoid cleanup();\n+\n+\tint run();\n+\n+\tEventLoop *loop;\n+private:\n+\tint parseOptions(int argc, char *argv[]);\n+\n+\tOptionsParser::Options options_;\n+\tCameraManager *cm_;\n+\tstd::shared_ptr camera_;\n+};\n+\n+CamApp::CamApp()\n+\t: cm_(nullptr), camera_(nullptr)\n+{\n+}\n+\n+int CamApp::init(int argc, char **argv)\n+{\n+\tint ret;\n+\n+\tret = parseOptions(argc, argv);\n+\tif (ret < 0)\n+\t\treturn ret == -EINTR ? 0 : ret;\n+\n+\tcm_ = CameraManager::instance();\n+\n+\tret = cm_->start();\n+\tif (ret) {\n+\t\tstd::cout << \"Failed to start camera manager: \"\n+\t\t\t << strerror(-ret) << std::endl;\n+\t\treturn ret;\n+\t}\n \n-void signalHandler(int signal)\n+\tif (options_.isSet(OptCamera)) {\n+\t\tcamera_ = cm_->get(options_[OptCamera]);\n+\t\tif (!camera_) {\n+\t\t\tstd::cout << \"Camera \"\n+\t\t\t\t << std::string(options_[OptCamera])\n+\t\t\t\t << \" not found\" << std::endl;\n+\t\t\tcm_->stop();\n+\t\t\treturn -ENODEV;\n+\t\t}\n+\n+\t\tif (camera_->acquire()) {\n+\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n+\t\t\tcamera_.reset();\n+\t\t\tcm_->stop();\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tstd::cout << \"Using camera \" << camera_->name() << std::endl;\n+\t}\n+\n+\tloop = new EventLoop(cm_->eventDispatcher());\n+\n+\treturn 0;\n+}\n+\n+void CamApp::cleanup()\n {\n-\tstd::cout << \"Exiting\" << std::endl;\n-\tloop->exit();\n+\tdelete loop;\n+\n+\tif (camera_) {\n+\t\tcamera_->release();\n+\t\tcamera_.reset();\n+\t}\n+\n+\tcm_->stop();\n+}\n+\n+int CamApp::run()\n+{\n+\tif (options_.isSet(OptList)) {\n+\t\tstd::cout << \"Available cameras:\" << std::endl;\n+\t\tfor (const std::shared_ptr &cam : cm_->cameras())\n+\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n+\t}\n+\n+\tif (options_.isSet(OptCapture)) {\n+\t\tCapture capture;\n+\t\treturn capture.run(camera_.get(), loop, options_);\n+\t}\n+\n+\treturn 0;\n }\n \n-static int parseOptions(int argc, char *argv[])\n+int CamApp::parseOptions(int argc, char *argv[])\n {\n \tKeyValueParser streamKeyValue;\n \tstreamKeyValue.addOption(\"role\", OptionString,\n@@ -58,77 +142,46 @@ static int parseOptions(int argc, char *argv[])\n \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n \n-\toptions = parser.parse(argc, argv);\n-\tif (!options.valid())\n+\toptions_ = parser.parse(argc, argv);\n+\tif (!options_.valid())\n \t\treturn -EINVAL;\n \n-\tif (options.empty() || options.isSet(OptHelp)) {\n+\tif (options_.empty() || options_.isSet(OptHelp)) {\n \t\tparser.usage();\n-\t\treturn options.empty() ? -EINVAL : -EINTR;\n+\t\treturn options_.empty() ? -EINVAL : -EINTR;\n \t}\n \n \treturn 0;\n }\n \n+CamApp app;\n+\n+void signalHandler(int signal)\n+{\n+\tstd::cout << \"Exiting\" << std::endl;\n+\n+\tif (app.loop)\n+\t\tapp.loop->exit();\n+}\n+\n int main(int argc, char **argv)\n {\n \tint ret;\n \n-\tret = parseOptions(argc, argv);\n-\tif (ret < 0)\n-\t\treturn ret == -EINTR ? 0 : EXIT_FAILURE;\n-\n-\tCameraManager *cm = CameraManager::instance();\n-\n-\tret = cm->start();\n-\tif (ret) {\n-\t\tstd::cout << \"Failed to start camera manager: \"\n-\t\t\t << strerror(-ret) << std::endl;\n+\tret = app.init(argc, argv);\n+\tif (ret)\n \t\treturn EXIT_FAILURE;\n-\t}\n-\n-\tloop = new EventLoop(cm->eventDispatcher());\n \n \tstruct sigaction sa = {};\n \tsa.sa_handler = &signalHandler;\n \tsigaction(SIGINT, &sa, nullptr);\n \n-\tif (options.isSet(OptList)) {\n-\t\tstd::cout << \"Available cameras:\" << std::endl;\n-\t\tfor (const std::shared_ptr &cam : cm->cameras())\n-\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n-\t}\n+\tret = app.run();\n \n-\tif (options.isSet(OptCamera)) {\n-\t\tcamera = cm->get(options[OptCamera]);\n-\t\tif (!camera) {\n-\t\t\tstd::cout << \"Camera \"\n-\t\t\t\t << std::string(options[OptCamera])\n-\t\t\t\t << \" not found\" << std::endl;\n-\t\t\tgoto out;\n-\t\t}\n+\tapp.cleanup();\n \n-\t\tif (camera->acquire()) {\n-\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n-\t\t\tgoto out;\n-\t\t}\n+\tif (ret)\n+\t\treturn EXIT_FAILURE;\n \n-\t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n-\t}\n-\n-\tif (options.isSet(OptCapture)) {\n-\t\tCapture capture;\n-\t\tret = capture.run(camera.get(), loop, options);\n-\t}\n-\n-\tif (camera) {\n-\t\tcamera->release();\n-\t\tcamera.reset();\n-\t}\n-out:\n-\tdelete loop;\n-\n-\tcm->stop();\n-\n-\treturn ret;\n+\treturn 0;\n }\n","prefixes":["libcamera-devel","2/2"]}