From f49ce4a15d00b989eb339bde5bde1c6f3d626cd7 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 27 Nov 2023 19:27:58 -0500
Subject: [PATCH] camera: Renamed "video_capture" files to "camera" and moved
to own subdir.
---
CMakeLists.txt | 3 ++-
include/SDL3/SDL.h | 2 +-
include/SDL3/{SDL_video_capture.h => SDL_camera.h} | 12 ++++++------
.../SDL_video_capture.c => camera/SDL_camera.c} | 8 ++++----
.../SDL_video_capture_c.h => camera/SDL_camera_c.h} | 2 +-
.../SDL_sysvideocapture.h => camera/SDL_syscamera.h} | 0
.../android/SDL_camera_android.c} | 0
.../apple/SDL_camera_apple.m} | 0
.../v4l2/SDL_camera_v4l2.c} | 0
src/video/SDL_video.c | 2 +-
test/{testvideocapture.c => testcamera.c} | 0
...testvideocaptureminimal.c => testcameraminimal.c} | 2 +-
12 files changed, 16 insertions(+), 15 deletions(-)
rename include/SDL3/{SDL_video_capture.h => SDL_camera.h} (98%)
rename src/{video/SDL_video_capture.c => camera/SDL_camera.c} (99%)
rename src/{video/SDL_video_capture_c.h => camera/SDL_camera_c.h} (96%)
rename src/{video/SDL_sysvideocapture.h => camera/SDL_syscamera.h} (100%)
rename src/{video/android/SDL_android_video_capture.c => camera/android/SDL_camera_android.c} (100%)
rename src/{video/SDL_video_capture_apple.m => camera/apple/SDL_camera_apple.m} (100%)
rename src/{video/SDL_video_capture_v4l2.c => camera/v4l2/SDL_camera_v4l2.c} (100%)
rename test/{testvideocapture.c => testcamera.c} (100%)
rename test/{testvideocaptureminimal.c => testcameraminimal.c} (99%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fe68734439b..c7686fd1ff77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,6 +453,7 @@ sdl_glob_sources(
"${SDL3_SOURCE_DIR}/src/*.c"
"${SDL3_SOURCE_DIR}/src/atomic/*.c"
"${SDL3_SOURCE_DIR}/src/audio/*.c"
+ "${SDL3_SOURCE_DIR}/src/camera/*.c"
"${SDL3_SOURCE_DIR}/src/core/*.c"
"${SDL3_SOURCE_DIR}/src/cpuinfo/*.c"
"${SDL3_SOURCE_DIR}/src/dynapi/*.c"
@@ -2019,7 +2020,7 @@ elseif(APPLE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/cocoa/*.m")
if(IOS OR TVOS OR MACOSX OR DARWIN)
- sdl_sources("${SDL3_SOURCE_DIR}/src/video/SDL_video_capture_apple.m")
+ sdl_sources("${SDL3_SOURCE_DIR}/src/camera/apple/SDL_camera_apple.m")
endif()
if(IOS OR TVOS OR VISIONOS)
diff --git a/include/SDL3/SDL.h b/include/SDL3/SDL.h
index a0a77e539d9c..d7716399de05 100644
--- a/include/SDL3/SDL.h
+++ b/include/SDL3/SDL.h
@@ -35,6 +35,7 @@
#include <SDL3/SDL_audio.h>
#include <SDL3/SDL_bits.h>
#include <SDL3/SDL_blendmode.h>
+#include <SDL3/SDL_camera.h>
#include <SDL3/SDL_clipboard.h>
#include <SDL3/SDL_cpuinfo.h>
#include <SDL3/SDL_endian.h>
@@ -76,7 +77,6 @@
#include <SDL3/SDL_touch.h>
#include <SDL3/SDL_version.h>
#include <SDL3/SDL_video.h>
-#include "SDL3/SDL_video_capture.h"
#include <SDL3/SDL_oldnames.h>
#endif /* SDL_h_ */
diff --git a/include/SDL3/SDL_video_capture.h b/include/SDL3/SDL_camera.h
similarity index 98%
rename from include/SDL3/SDL_video_capture.h
rename to include/SDL3/SDL_camera.h
index 80a21605460a..7325fb8ca6f6 100644
--- a/include/SDL3/SDL_video_capture.h
+++ b/include/SDL3/SDL_camera.h
@@ -20,13 +20,13 @@
*/
/**
- * \file SDL_video_capture.h
+ * \file SDL_camera.h
*
* Video Capture for the SDL library.
*/
-#ifndef SDL_video_capture_h_
-#define SDL_video_capture_h_
+#ifndef SDL_camera_h_
+#define SDL_camera_h_
#include "SDL3/SDL_video.h"
@@ -356,8 +356,8 @@ extern DECLSPEC int SDLCALL SDL_ReleaseVideoCaptureFrame(SDL_VideoCaptureDevice
extern DECLSPEC int SDLCALL SDL_StopVideoCapture(SDL_VideoCaptureDevice *device);
/**
- * Use this function to shut down video_capture processing and close the
- * video_capture device.
+ * Use this function to shut down camera processing and close the
+ * camera device.
*
* \param device opened video capture device
*
@@ -374,4 +374,4 @@ extern DECLSPEC void SDLCALL SDL_CloseVideoCapture(SDL_VideoCaptureDevice *devic
#endif
#include <SDL3/SDL_close_code.h>
-#endif /* SDL_video_capture_h_ */
+#endif /* SDL_camera_h_ */
diff --git a/src/video/SDL_video_capture.c b/src/camera/SDL_camera.c
similarity index 99%
rename from src/video/SDL_video_capture.c
rename to src/camera/SDL_camera.c
index 357240fbb07c..f11601f0cd26 100644
--- a/src/video/SDL_video_capture.c
+++ b/src/camera/SDL_camera.c
@@ -21,10 +21,10 @@
#include "SDL_internal.h"
#include "SDL3/SDL.h"
-#include "SDL3/SDL_video_capture.h"
-#include "SDL_sysvideocapture.h"
-#include "SDL_video_capture_c.h"
-#include "SDL_pixels_c.h"
+#include "SDL3/SDL_camera.h"
+#include "SDL_syscamera.h"
+#include "SDL_camera_c.h"
+#include "../video/SDL_pixels_c.h"
#include "../thread/SDL_systhread.h"
#define DEBUG_VIDEO_CAPTURE_CAPTURE 0
diff --git a/src/video/SDL_video_capture_c.h b/src/camera/SDL_camera_c.h
similarity index 96%
rename from src/video/SDL_video_capture_c.h
rename to src/camera/SDL_camera_c.h
index d7f1aa17d2e9..dc4b342933d7 100644
--- a/src/video/SDL_video_capture_c.h
+++ b/src/camera/SDL_camera_c.h
@@ -19,7 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
#include "../SDL_internal.h"
-#include "../../include/SDL3/SDL_video_capture.h"
+#include "../../include/SDL3/SDL_camera.h"
#ifndef SDL_video_capture_c_h_
#define SDL_video_capture_c_h_
diff --git a/src/video/SDL_sysvideocapture.h b/src/camera/SDL_syscamera.h
similarity index 100%
rename from src/video/SDL_sysvideocapture.h
rename to src/camera/SDL_syscamera.h
diff --git a/src/video/android/SDL_android_video_capture.c b/src/camera/android/SDL_camera_android.c
similarity index 100%
rename from src/video/android/SDL_android_video_capture.c
rename to src/camera/android/SDL_camera_android.c
diff --git a/src/video/SDL_video_capture_apple.m b/src/camera/apple/SDL_camera_apple.m
similarity index 100%
rename from src/video/SDL_video_capture_apple.m
rename to src/camera/apple/SDL_camera_apple.m
diff --git a/src/video/SDL_video_capture_v4l2.c b/src/camera/v4l2/SDL_camera_v4l2.c
similarity index 100%
rename from src/video/SDL_video_capture_v4l2.c
rename to src/camera/v4l2/SDL_camera_v4l2.c
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 3cfa955db8b1..7bcd62dd411c 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -33,7 +33,7 @@
#include "../SDL_hints_c.h"
#include "../SDL_properties_c.h"
#include "../timer/SDL_timer_c.h"
-#include "SDL_video_capture_c.h"
+#include "../camera/SDL_camera_c.h"
#ifdef SDL_VIDEO_OPENGL
#include <SDL3/SDL_opengl.h>
diff --git a/test/testvideocapture.c b/test/testcamera.c
similarity index 100%
rename from test/testvideocapture.c
rename to test/testcamera.c
diff --git a/test/testvideocaptureminimal.c b/test/testcameraminimal.c
similarity index 99%
rename from test/testvideocaptureminimal.c
rename to test/testcameraminimal.c
index 33396936d18e..956b7e77a5ac 100644
--- a/test/testvideocaptureminimal.c
+++ b/test/testcameraminimal.c
@@ -12,7 +12,7 @@
#include "SDL3/SDL_main.h"
#include "SDL3/SDL.h"
#include "SDL3/SDL_test.h"
-#include "SDL3/SDL_video_capture.h"
+#include "SDL3/SDL_camera.h"
#ifdef SDL_PLATFORM_EMSCRIPTEN
#include <emscripten/emscripten.h>