diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-11-28 05:07:54 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-12-03 19:20:31 +0200 |
| commit | 6c6acaa7ea1893b99adbf2becc46238e4a5c78b2 (patch) | |
| tree | 56c89594833ade5b8018de1e77d0e94f8be24f10 /include | |
| parent | 6b1e25693402a1db6cde995ae8e1b8bf74b88e17 (diff) | |
libcamera: Move file_descriptor.h to base/
The FileDescriptor class is a generic helper that matches the criteria
for the base library. Move it there.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/base/file_descriptor.h (renamed from include/libcamera/file_descriptor.h) | 0 | ||||
| -rw-r--r-- | include/libcamera/base/meson.build | 1 | ||||
| -rw-r--r-- | include/libcamera/framebuffer.h | 3 | ||||
| -rw-r--r-- | include/libcamera/internal/ipc_pipe.h | 3 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/include/libcamera/file_descriptor.h b/include/libcamera/base/file_descriptor.h index 8d764f8b..8d764f8b 100644 --- a/include/libcamera/file_descriptor.h +++ b/include/libcamera/base/file_descriptor.h diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 210a54f8..abd4cfc7 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -11,6 +11,7 @@ libcamera_base_headers = files([ 'event_dispatcher_poll.h', 'event_notifier.h', 'file.h', + 'file_descriptor.h', 'flags.h', 'log.h', 'message.h', diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h index 4e710e33..2fbea9c5 100644 --- a/include/libcamera/framebuffer.h +++ b/include/libcamera/framebuffer.h @@ -13,10 +13,9 @@ #include <vector> #include <libcamera/base/class.h> +#include <libcamera/base/file_descriptor.h> #include <libcamera/base/span.h> -#include <libcamera/file_descriptor.h> - namespace libcamera { class Request; diff --git a/include/libcamera/internal/ipc_pipe.h b/include/libcamera/internal/ipc_pipe.h index bd8824f2..986f8d88 100644 --- a/include/libcamera/internal/ipc_pipe.h +++ b/include/libcamera/internal/ipc_pipe.h @@ -9,10 +9,9 @@ #include <vector> +#include <libcamera/base/file_descriptor.h> #include <libcamera/base/signal.h> -#include <libcamera/file_descriptor.h> - #include "libcamera/internal/ipc_unixsocket.h" namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index a8cca2a8..5f42977c 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -6,7 +6,6 @@ libcamera_public_headers = files([ 'camera.h', 'camera_manager.h', 'controls.h', - 'file_descriptor.h', 'framebuffer.h', 'framebuffer_allocator.h', 'geometry.h', |