Browse Source

camera: Renamed "video_capture" files to "camera" and moved to own subdir.

Ryan C. Gordon 1 year ago
parent
commit
f49ce4a15d

+ 2 - 1
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)

+ 1 - 1
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_ */

+ 6 - 6
include/SDL3/SDL_video_capture.h → 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_ */

+ 4 - 4
src/video/SDL_video_capture.c → 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

+ 1 - 1
src/video/SDL_video_capture_c.h → 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_

+ 0 - 0
src/video/SDL_sysvideocapture.h → src/camera/SDL_syscamera.h


+ 0 - 0
src/video/android/SDL_android_video_capture.c → src/camera/android/SDL_camera_android.c


+ 0 - 0
src/video/SDL_video_capture_apple.m → src/camera/apple/SDL_camera_apple.m


+ 0 - 0
src/video/SDL_video_capture_v4l2.c → src/camera/v4l2/SDL_camera_v4l2.c


+ 1 - 1
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>

+ 0 - 0
test/testvideocapture.c → test/testcamera.c


+ 1 - 1
test/testvideocaptureminimal.c → 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>