NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: Remove libcamera class

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2018-12-19 11:45:45 +02:00
parent a591cc8655
commit 7e9e508093
5 changed files with 0 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/libcamera/libcamera.h
View file

@ -10,14 +10,4 @@
#include <libcamera/camera.h> #include <libcamera/camera.h>
#include <libcamera/camera_manager.h> #include <libcamera/camera_manager.h>
namespace libcamera {
class libcamera
{
public:
void init_lib(void);
};
};
#endif /* __LIBCAMERA_LIBCAMERA_H__ */ #endif /* __LIBCAMERA_LIBCAMERA_H__ */

19
src/libcamera/main.cpp
View file

@ -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";
}
};

1
src/libcamera/meson.build
View file

@ -3,7 +3,6 @@ libcamera_sources = files([
'camera_manager.cpp', 'camera_manager.cpp',
'device_enumerator.cpp', 'device_enumerator.cpp',
'log.cpp', 'log.cpp',
'main.cpp',
'media_device.cpp', 'media_device.cpp',
'media_object.cpp', 'media_object.cpp',
'pipeline_handler.cpp', 'pipeline_handler.cpp',

16
test/init.cpp
View file

@ -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;
}

5
test/meson.build
View file

@ -12,16 +12,11 @@ test_includes_internal = [
libcamera_internal_includes, libcamera_internal_includes,
] ]
test_init = executable('test_init', 'init.cpp',
link_with : test_libraries,
include_directories : test_includes_public)
list = executable('list', 'list.cpp', list = executable('list', 'list.cpp',
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_public) include_directories : test_includes_public)
subdir('media_device') subdir('media_device')
test('Initialisation test', test_init)
test('List Camera API tests', list) test('List Camera API tests', list)
test('Media Device Test', media_device_test) test('Media Device Test', media_device_test)