apps: cam: Fix include order

Several .cpp files in the cam application don't include their
corresponding header first, as usually done by libcamera to ensure that
headers are self-contained. Reorder headers to fix it. This shows
through a compilation error that file_sink.h is missing
libcamera/controls.h, fix it as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>

src/apps/cam/camera_session.cpp

@@ -5,6 +5,8 @@
  * Camera capture session
  */
 
+#include "camera_session.h"
+
 #include <iomanip>
 #include <iostream>
 #include <limits.h>
@@ -16,7 +18,6 @@
 #include "../common/event_loop.h"
 #include "../common/stream_options.h"
 
-#include "camera_session.h"
 #include "capture_script.h"
 #include "file_sink.h"
 #ifdef HAVE_KMS

src/apps/cam/file_sink.cpp

@@ -5,6 +5,8 @@
  * File Sink
  */
 
+#include "file_sink.h"
+
 #include <array>
 #include <assert.h>
 #include <fcntl.h>
@@ -21,8 +23,6 @@
 #include "../common/image.h"
 #include "../common/ppm_writer.h"
 
-#include "file_sink.h"
-
 using namespace libcamera;
 
 FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera,

src/apps/cam/file_sink.h

@@ -11,6 +11,7 @@
 #include <memory>
 #include <string>
 
+#include <libcamera/controls.h>
 #include <libcamera/stream.h>
 
 #include "frame_sink.h"

src/apps/cam/main.cpp

@@ -5,6 +5,8 @@
  * cam - The libcamera swiss army knife
  */
 
+#include "main.h"
+
 #include <atomic>
 #include <iomanip>
 #include <iostream>
@@ -19,7 +21,6 @@
 #include "../common/stream_options.h"
 
 #include "camera_session.h"
-#include "main.h"
 
 using namespace libcamera;