{"id":153,"url":"https://patchwork.libcamera.org/api/1.1/patches/153/?format=json","web_url":"https://patchwork.libcamera.org/patch/153/","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":"<20190106023328.10989-4-laurent.pinchart@ideasonboard.com>","date":"2019-01-06T02:33:21","name":"[libcamera-devel,04/11] libcamera: camera_manager: Make the class a singleton","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"31c188216c36dc753ffc91915a265288bb78b23d","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/153/mbox/","series":[{"id":53,"url":"https://patchwork.libcamera.org/api/1.1/series/53/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=53","date":"2019-01-06T02:33:18","name":"[libcamera-devel,01/11] libcamera: log: Add a LogFatal log level","version":1,"mbox":"https://patchwork.libcamera.org/series/53/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/153/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/153/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D3D6060B2E\n\tfor ;\n\tSun, 6 Jan 2019 03:32:27 +0100 (CET)","from avalon.bb.dnainternet.fi\n\t(dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7478598C\n\tfor ;\n\tSun, 6 Jan 2019 03:32:27 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546741947;\n\tbh=Ul2/eLTgDrmri2CL85FO+TRHiaTiObBDZCXmYikoYVg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=P3dPAmzry7mPw36XJ4sncVzQ79FblW/EIzNyc9ko7PJAogR9bQKgy8JUv00l9bYDM\n\tOZsFzSUGIk/HHCNNkMdxwjRynGTyXdl6Yu+PPXP3eAgg+oqPkBKIGrOAnqU6nG5vRb\n\thC5LLn2nwoWv9L+1fcSSREjg9a05riaGSYit+J9Q=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 6 Jan 2019 04:33:21 +0200","Message-Id":"<20190106023328.10989-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","References":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 04/11] libcamera: camera_manager: Make the\n\tclass a singleton","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":"Sun, 06 Jan 2019 02:32:28 -0000"},"content":"There can only be a single camera manager instance in the application.\nCreating it as a singleton helps avoiding mistakes. It also allows the\ncamera manager to be used as a storage of global data, such as the\nfuture event dispatcher.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/camera_manager.h | 6 ++++--\n src/libcamera/camera_manager.cpp | 15 +++++++++++++++\n test/list.cpp | 4 +---\n 3 files changed, 20 insertions(+), 5 deletions(-)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 2768a5bd2384..56a3f32d8b6f 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -19,15 +19,17 @@ class PipelineHandler;\n class CameraManager\n {\n public:\n-\tCameraManager();\n-\n \tint start();\n \tvoid stop();\n \n \tstd::vector list() const;\n \tCamera *get(const std::string &name);\n \n+\tstatic CameraManager *instance();\n+\n private:\n+\tCameraManager();\n+\n \tDeviceEnumerator *enumerator_;\n \tstd::vector pipes_;\n };\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 50a805fc665c..db2bc4b7424e 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -161,4 +161,19 @@ Camera *CameraManager::get(const std::string &name)\n \treturn nullptr;\n }\n \n+/**\n+ * \\brief Retrieve the camera manager instance\n+ *\n+ * The CameraManager is a singleton and can't be constructed manually. This\n+ * function can instead be used to retrieve the single global instance of the\n+ * manager.\n+ *\n+ * \\return The camera manager instance\n+ */\n+CameraManager *CameraManager::instance()\n+{\n+\tstatic CameraManager manager;\n+\treturn &manager;\n+}\n+\n } /* namespace libcamera */\ndiff --git a/test/list.cpp b/test/list.cpp\nindex 39b8a41d1fef..49610c697c63 100644\n--- a/test/list.cpp\n+++ b/test/list.cpp\n@@ -19,7 +19,7 @@ class ListTest : public Test\n protected:\n \tint init()\n \t{\n-\t\tcm = new CameraManager();\n+\t\tcm = CameraManager::instance();\n \t\tif (!cm)\n \t\t\treturn -ENOMEM;\n \n@@ -43,8 +43,6 @@ protected:\n \tvoid cleanup()\n \t{\n \t\tcm->stop();\n-\n-\t\tdelete cm;\n \t}\n \n private:\n","prefixes":["libcamera-devel","04/11"]}