From patchwork Tue Jan 1 21:29:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 126 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 71BB660B34 for ; Tue, 1 Jan 2019 22:29:53 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E40381173; Tue, 1 Jan 2019 22:29:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1546378193; bh=y62Z5v0Dk62YxWcK+69sDcAC7FqfBI4qukPhaSgI2gU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ilsi/O9qwK8exehC7lOlkv03OBFNpvp8mLyOm9qGYcoh2zLe16I1h19XYqwvt94bT 4oyYQVIo4+Ri3By+Ks1MND3R3nOi8EzOEKbPSGz+AWl/uORM+udXgF+aMxakKMPtgZ FCwjJqCRogePO2U7m25FhPJyyMAmQ6QJ410wyF5Q= From: Kieran Bingham To: LibCamera Devel Date: Tue, 1 Jan 2019 21:29:47 +0000 Message-Id: <20190101212947.28098-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190101212947.28098-1-kieran.bingham@ideasonboard.com> References: <20190101212947.28098-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 5/5] libcamera: Remove libcamera 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: Tue, 01 Jan 2019 21:29:54 -0000 From: Laurent Pinchart The class was just a placeholder, now that we have other objects defined, remove it along with the associated test. The libcamera/libcamera.h header is kept as a shortcut to include the whole libcamera public API. Signed-off-by: Laurent Pinchart [Kieran: Rebase to master] Signed-off-by: Kieran Bingham --- include/libcamera/libcamera.h | 10 ---------- src/libcamera/main.cpp | 19 ------------------- src/libcamera/meson.build | 1 - test/init.cpp | 16 ---------------- test/meson.build | 1 - 5 files changed, 47 deletions(-) delete mode 100644 src/libcamera/main.cpp delete mode 100644 test/init.cpp diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h index 32fb1ff741a7..f9556a8bce62 100644 --- a/include/libcamera/libcamera.h +++ b/include/libcamera/libcamera.h @@ -10,14 +10,4 @@ #include #include -namespace libcamera { - -class libcamera -{ -public: - void init_lib(void); -}; - -}; - #endif /* __LIBCAMERA_LIBCAMERA_H__ */ diff --git a/src/libcamera/main.cpp b/src/libcamera/main.cpp deleted file mode 100644 index 7ed37dfcfd5b..000000000000 --- a/src/libcamera/main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2018, Google Inc. - * - * main.cpp - libcamera main class - */ - -#include - -#include "log.h" - -namespace libcamera { - -void libcamera::init_lib(void) -{ - LOG(Info) << "Lib Camera Init"; -} - -}; diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 2ff5bb5e7515..78562299fc42 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -3,7 +3,6 @@ libcamera_sources = files([ 'camera_manager.cpp', 'device_enumerator.cpp', 'log.cpp', - 'main.cpp', 'media_device.cpp', 'media_object.cpp', 'pipeline_handler.cpp', diff --git a/test/init.cpp b/test/init.cpp deleted file mode 100644 index 4ade4e7690fc..000000000000 --- a/test/init.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2018, Google Inc. - * - * init.cpp - libcamera initialization test - */ - -#include - -int main(void) -{ - libcamera::libcamera l = libcamera::libcamera(); - l.init_lib(); - - return 0; -} diff --git a/test/meson.build b/test/meson.build index 9270a55e052a..184a7eeb5e27 100644 --- a/test/meson.build +++ b/test/meson.build @@ -3,7 +3,6 @@ subdir('libtest') subdir('media_device') public_tests = [ - ['test_init', 'init.cpp'], ['list', 'list.cpp'], ]