From 7e9e508093bfa22635155352e73a31efdf457419 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 19 Dec 2018 11:45:45 +0200
Subject: 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>
---
 include/libcamera/libcamera.h | 10 ----------
 src/libcamera/main.cpp        | 19 -------------------
 src/libcamera/meson.build     |  1 -
 test/init.cpp                 | 16 ----------------
 test/meson.build              |  5 -----
 5 files changed, 51 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 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)
-- 
cgit v1.2.1