diff options
Diffstat (limited to 'src/v4l2')
-rw-r--r-- | src/v4l2/v4l2_camera.cpp | 2 | ||||
-rw-r--r-- | src/v4l2/v4l2_camera.h | 4 | ||||
-rw-r--r-- | src/v4l2/v4l2_camera_proxy.cpp | 4 | ||||
-rw-r--r-- | src/v4l2/v4l2_compat_manager.cpp | 7 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 97825c71..157ab94e 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -10,7 +10,7 @@ #include <errno.h> #include <unistd.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> using namespace libcamera; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index d2380462..dbe0573b 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -12,13 +12,13 @@ #include <mutex> #include <utility> +#include <libcamera/base/semaphore.h> + #include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/file_descriptor.h> #include <libcamera/framebuffer_allocator.h> -#include "libcamera/internal/semaphore.h" - using namespace libcamera; class V4L2Camera diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index a5a25507..7682c4bd 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -18,12 +18,12 @@ #include <libcamera/camera.h> #include <libcamera/formats.h> -#include <libcamera/object.h> +#include <libcamera/base/log.h> +#include <libcamera/base/object.h> #include <libcamera/base/utils.h> #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "v4l2_camera.h" #include "v4l2_camera_file.h" diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 27de6c50..e566125a 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -19,12 +19,11 @@ #include <sys/types.h> #include <unistd.h> -#include <libcamera/camera.h> -#include <libcamera/camera_manager.h> - +#include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#include "libcamera/internal/log.h" +#include <libcamera/camera.h> +#include <libcamera/camera_manager.h> #include "v4l2_camera_file.h" |