summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-23 17:23:07 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-24 12:18:37 +0000
commitc296c91a71bcaeddd042f2d0535d56efc6c371a3 (patch)
treefdcb6419aba85dd3f804d5589151953044ad069e /src
parent2c72ca70e2918b6bd919bcb2fa5b0fdb5f6d5165 (diff)
gstreamer: Convert to pragma once
Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/gstreamer/gstlibcamera-utils.h5
-rw-r--r--src/gstreamer/gstlibcameraallocator.h5
-rw-r--r--src/gstreamer/gstlibcamerapad.h5
-rw-r--r--src/gstreamer/gstlibcamerapool.h6
-rw-r--r--src/gstreamer/gstlibcameraprovider.h6
-rw-r--r--src/gstreamer/gstlibcamerasrc.h5
6 files changed, 6 insertions, 26 deletions
diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h
index 7087fef0..d54f1588 100644
--- a/src/gstreamer/gstlibcamera-utils.h
+++ b/src/gstreamer/gstlibcamera-utils.h
@@ -6,8 +6,7 @@
* gstlibcamera-utils.h - GStreamer libcamera Utility Functions
*/
-#ifndef __GST_LIBCAMERA_UTILS_H__
-#define __GST_LIBCAMERA_UTILS_H__
+#pragma once
#include <libcamera/camera_manager.h>
#include <libcamera/stream.h>
@@ -71,5 +70,3 @@ public:
private:
GRecMutex *mutex_;
};
-
-#endif /* __GST_LIBCAMERA_UTILS_H__ */
diff --git a/src/gstreamer/gstlibcameraallocator.h b/src/gstreamer/gstlibcameraallocator.h
index 0dbd00d0..0a08c3bb 100644
--- a/src/gstreamer/gstlibcameraallocator.h
+++ b/src/gstreamer/gstlibcameraallocator.h
@@ -6,8 +6,7 @@
* gstlibcameraallocator.h - GStreamer Custom Allocator
*/
-#ifndef __GST_LIBCAMERA_ALLOCATOR_H__
-#define __GST_LIBCAMERA_ALLOCATOR_H__
+#pragma once
#include <gst/gst.h>
#include <gst/allocators/allocators.h>
@@ -30,5 +29,3 @@ gsize gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *allocator,
libcamera::Stream *stream);
libcamera::FrameBuffer *gst_libcamera_memory_get_frame_buffer(GstMemory *mem);
-
-#endif /* __GST_LIBCAMERA_ALLOCATOR_H__ */
diff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h
index 779f2d13..20769517 100644
--- a/src/gstreamer/gstlibcamerapad.h
+++ b/src/gstreamer/gstlibcamerapad.h
@@ -6,8 +6,7 @@
* gstlibcamerapad.h - GStreamer Capture Element
*/
-#ifndef __GST_LIBCAMERA_PAD_H__
-#define __GST_LIBCAMERA_PAD_H__
+#pragma once
#include "gstlibcamerapool.h"
@@ -33,5 +32,3 @@ GstFlowReturn gst_libcamera_pad_push_pending(GstPad *pad);
bool gst_libcamera_pad_has_pending(GstPad *pad);
void gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency);
-
-#endif /* __GST_LIBCAMERA_PAD_H__ */
diff --git a/src/gstreamer/gstlibcamerapool.h b/src/gstreamer/gstlibcamerapool.h
index a3f1b685..05795d21 100644
--- a/src/gstreamer/gstlibcamerapool.h
+++ b/src/gstreamer/gstlibcamerapool.h
@@ -9,8 +9,7 @@
* only. This pool cannot be configured or activated.
*/
-#ifndef __GST_LIBCAMERA_POOL_H__
-#define __GST_LIBCAMERA_POOL_H__
+#pragma once
#include "gstlibcameraallocator.h"
@@ -29,6 +28,3 @@ libcamera::Stream *gst_libcamera_pool_get_stream(GstLibcameraPool *self);
libcamera::Stream *gst_libcamera_buffer_get_stream(GstBuffer *buffer);
libcamera::FrameBuffer *gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer);
-
-
-#endif /* __GST_LIBCAMERA_POOL_H__ */
diff --git a/src/gstreamer/gstlibcameraprovider.h b/src/gstreamer/gstlibcameraprovider.h
index bdd19db8..aaceabf5 100644
--- a/src/gstreamer/gstlibcameraprovider.h
+++ b/src/gstreamer/gstlibcameraprovider.h
@@ -6,8 +6,7 @@
* gstlibcameraprovider.h - GStreamer Device Provider
*/
-#ifndef __GST_LIBCAMERA_PROVIDER_H__
-#define __GST_LIBCAMERA_PROVIDER_H__
+#pragma once
#include <gst/gst.h>
@@ -18,6 +17,3 @@ G_DECLARE_FINAL_TYPE(GstLibcameraProvider, gst_libcamera_provider,
GST_LIBCAMERA, PROVIDER, GstDeviceProvider)
G_END_DECLS
-
-#endif /* __GST_LIBCAMERA_PROVIDER_H__ */
-
diff --git a/src/gstreamer/gstlibcamerasrc.h b/src/gstreamer/gstlibcamerasrc.h
index 0144cbc4..fdea2f10 100644
--- a/src/gstreamer/gstlibcamerasrc.h
+++ b/src/gstreamer/gstlibcamerasrc.h
@@ -6,8 +6,7 @@
* gstlibcamerasrc.h - GStreamer Capture Element
*/
-#ifndef __GST_LIBCAMERA_SRC_H__
-#define __GST_LIBCAMERA_SRC_H__
+#pragma once
#include <gst/gst.h>
@@ -18,5 +17,3 @@ G_DECLARE_FINAL_TYPE(GstLibcameraSrc, gst_libcamera_src,
GST_LIBCAMERA, SRC, GstElement)
G_END_DECLS
-
-#endif /* __GST_LIBCAMERA_SRC_H__ */