diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-12-19 11:45:45 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-01-02 03:28:19 +0200 |
commit | 7e9e508093bfa22635155352e73a31efdf457419 (patch) | |
tree | 26caacb034107cef9ffda8e5cdb656d227bd52cb | |
parent | a591cc86555445a3cb3c11cb6e9a0489ea43d894 (diff) |
libcamera: Remove libcamera class
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 <laurent.pinchart@ideasonboard.com>
-rw-r--r-- | include/libcamera/libcamera.h | 10 | ||||
-rw-r--r-- | src/libcamera/main.cpp | 19 | ||||
-rw-r--r-- | src/libcamera/meson.build | 1 | ||||
-rw-r--r-- | test/init.cpp | 16 | ||||
-rw-r--r-- | test/meson.build | 5 |
5 files changed, 0 insertions, 51 deletions
diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h index 32fb1ff7..f9556a8b 100644 --- a/include/libcamera/libcamera.h +++ b/include/libcamera/libcamera.h @@ -10,14 +10,4 @@ #include <libcamera/camera.h> #include <libcamera/camera_manager.h> -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 7ed37dfc..00000000 --- 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 <libcamera/libcamera.h> - -#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 2ff5bb5e..78562299 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 4ade4e76..00000000 --- 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 <libcamera/libcamera.h> - -int main(void) -{ - libcamera::libcamera l = libcamera::libcamera(); - l.init_lib(); - - return 0; -} diff --git a/test/meson.build b/test/meson.build index aabe79dd..1394395c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -12,16 +12,11 @@ test_includes_internal = [ libcamera_internal_includes, ] -test_init = executable('test_init', 'init.cpp', - link_with : test_libraries, - include_directories : test_includes_public) - list = executable('list', 'list.cpp', link_with : test_libraries, include_directories : test_includes_public) subdir('media_device') -test('Initialisation test', test_init) test('List Camera API tests', list) test('Media Device Test', media_device_test) |