summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 02:06:55 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 16:11:10 +0100
commitf9ee72430735f749fb7d8fd4a8fe01ca88dc1f88 (patch)
tree3de5662a1ad584c4e69449fe8b00cdfedae8399c /include
parentb304bc013ef8022131ef0a146f20c6bad7ac45d5 (diff)
libcamera/base: Move event_notifier to base
Move the event notifier, and associated header updates. Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/base/event_notifier.h (renamed from include/libcamera/internal/event_notifier.h)6
-rw-r--r--include/libcamera/base/meson.build1
-rw-r--r--include/libcamera/internal/meson.build1
3 files changed, 4 insertions, 4 deletions
diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/base/event_notifier.h
index 8a6419f2..5aa2784a 100644
--- a/include/libcamera/internal/event_notifier.h
+++ b/include/libcamera/base/event_notifier.h
@@ -4,8 +4,8 @@
*
* event_notifier.h - File descriptor event notifier
*/
-#ifndef __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__
-#define __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__
+#ifndef __LIBCAMERA_BASE_EVENT_NOTIFIER_H__
+#define __LIBCAMERA_BASE_EVENT_NOTIFIER_H__
#include <libcamera/base/object.h>
#include <libcamera/base/signal.h>
@@ -45,4 +45,4 @@ private:
} /* namespace libcamera */
-#endif /* __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ */
+#endif /* __LIBCAMERA_BASE_EVENT_NOTIFIER_H__ */
diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
index 6fc6c138..83c664af 100644
--- a/include/libcamera/base/meson.build
+++ b/include/libcamera/base/meson.build
@@ -7,6 +7,7 @@ libcamera_base_headers = files([
'class.h',
'event_dispatcher.h',
'event_dispatcher_poll.h',
+ 'event_notifier.h',
'file.h',
'log.h',
'message.h',
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
index 60e9775b..16a76ebd 100644
--- a/include/libcamera/internal/meson.build
+++ b/include/libcamera/internal/meson.build
@@ -22,7 +22,6 @@ libcamera_internal_headers = files([
'device_enumerator.h',
'device_enumerator_sysfs.h',
'device_enumerator_udev.h',
- 'event_notifier.h',
'formats.h',
'ipa_manager.h',
'ipa_module.h',