mirror of
https://github.com/libsdl-org/SDL.git
synced 2024-12-04 01:03:29 +08:00
camera: Renamed "video_capture" files to "camera" and moved to own subdir.
This commit is contained in:
parent
4d000ae3bd
commit
f49ce4a15d
@ -453,6 +453,7 @@ sdl_glob_sources(
|
|||||||
"${SDL3_SOURCE_DIR}/src/*.c"
|
"${SDL3_SOURCE_DIR}/src/*.c"
|
||||||
"${SDL3_SOURCE_DIR}/src/atomic/*.c"
|
"${SDL3_SOURCE_DIR}/src/atomic/*.c"
|
||||||
"${SDL3_SOURCE_DIR}/src/audio/*.c"
|
"${SDL3_SOURCE_DIR}/src/audio/*.c"
|
||||||
|
"${SDL3_SOURCE_DIR}/src/camera/*.c"
|
||||||
"${SDL3_SOURCE_DIR}/src/core/*.c"
|
"${SDL3_SOURCE_DIR}/src/core/*.c"
|
||||||
"${SDL3_SOURCE_DIR}/src/cpuinfo/*.c"
|
"${SDL3_SOURCE_DIR}/src/cpuinfo/*.c"
|
||||||
"${SDL3_SOURCE_DIR}/src/dynapi/*.c"
|
"${SDL3_SOURCE_DIR}/src/dynapi/*.c"
|
||||||
@ -2019,7 +2020,7 @@ elseif(APPLE)
|
|||||||
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/cocoa/*.m")
|
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/cocoa/*.m")
|
||||||
|
|
||||||
if(IOS OR TVOS OR MACOSX OR DARWIN)
|
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()
|
endif()
|
||||||
|
|
||||||
if(IOS OR TVOS OR VISIONOS)
|
if(IOS OR TVOS OR VISIONOS)
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include <SDL3/SDL_audio.h>
|
#include <SDL3/SDL_audio.h>
|
||||||
#include <SDL3/SDL_bits.h>
|
#include <SDL3/SDL_bits.h>
|
||||||
#include <SDL3/SDL_blendmode.h>
|
#include <SDL3/SDL_blendmode.h>
|
||||||
|
#include <SDL3/SDL_camera.h>
|
||||||
#include <SDL3/SDL_clipboard.h>
|
#include <SDL3/SDL_clipboard.h>
|
||||||
#include <SDL3/SDL_cpuinfo.h>
|
#include <SDL3/SDL_cpuinfo.h>
|
||||||
#include <SDL3/SDL_endian.h>
|
#include <SDL3/SDL_endian.h>
|
||||||
@ -76,7 +77,6 @@
|
|||||||
#include <SDL3/SDL_touch.h>
|
#include <SDL3/SDL_touch.h>
|
||||||
#include <SDL3/SDL_version.h>
|
#include <SDL3/SDL_version.h>
|
||||||
#include <SDL3/SDL_video.h>
|
#include <SDL3/SDL_video.h>
|
||||||
#include "SDL3/SDL_video_capture.h"
|
|
||||||
#include <SDL3/SDL_oldnames.h>
|
#include <SDL3/SDL_oldnames.h>
|
||||||
|
|
||||||
#endif /* SDL_h_ */
|
#endif /* SDL_h_ */
|
||||||
|
@ -20,13 +20,13 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file SDL_video_capture.h
|
* \file SDL_camera.h
|
||||||
*
|
*
|
||||||
* Video Capture for the SDL library.
|
* Video Capture for the SDL library.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SDL_video_capture_h_
|
#ifndef SDL_camera_h_
|
||||||
#define SDL_video_capture_h_
|
#define SDL_camera_h_
|
||||||
|
|
||||||
#include "SDL3/SDL_video.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);
|
extern DECLSPEC int SDLCALL SDL_StopVideoCapture(SDL_VideoCaptureDevice *device);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use this function to shut down video_capture processing and close the
|
* Use this function to shut down camera processing and close the
|
||||||
* video_capture device.
|
* camera device.
|
||||||
*
|
*
|
||||||
* \param device opened video capture device
|
* \param device opened video capture device
|
||||||
*
|
*
|
||||||
@ -374,4 +374,4 @@ extern DECLSPEC void SDLCALL SDL_CloseVideoCapture(SDL_VideoCaptureDevice *devic
|
|||||||
#endif
|
#endif
|
||||||
#include <SDL3/SDL_close_code.h>
|
#include <SDL3/SDL_close_code.h>
|
||||||
|
|
||||||
#endif /* SDL_video_capture_h_ */
|
#endif /* SDL_camera_h_ */
|
@ -21,10 +21,10 @@
|
|||||||
#include "SDL_internal.h"
|
#include "SDL_internal.h"
|
||||||
|
|
||||||
#include "SDL3/SDL.h"
|
#include "SDL3/SDL.h"
|
||||||
#include "SDL3/SDL_video_capture.h"
|
#include "SDL3/SDL_camera.h"
|
||||||
#include "SDL_sysvideocapture.h"
|
#include "SDL_syscamera.h"
|
||||||
#include "SDL_video_capture_c.h"
|
#include "SDL_camera_c.h"
|
||||||
#include "SDL_pixels_c.h"
|
#include "../video/SDL_pixels_c.h"
|
||||||
#include "../thread/SDL_systhread.h"
|
#include "../thread/SDL_systhread.h"
|
||||||
|
|
||||||
#define DEBUG_VIDEO_CAPTURE_CAPTURE 0
|
#define DEBUG_VIDEO_CAPTURE_CAPTURE 0
|
@ -19,7 +19,7 @@
|
|||||||
3. This notice may not be removed or altered from any source distribution.
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
*/
|
*/
|
||||||
#include "../SDL_internal.h"
|
#include "../SDL_internal.h"
|
||||||
#include "../../include/SDL3/SDL_video_capture.h"
|
#include "../../include/SDL3/SDL_camera.h"
|
||||||
|
|
||||||
#ifndef SDL_video_capture_c_h_
|
#ifndef SDL_video_capture_c_h_
|
||||||
#define SDL_video_capture_c_h_
|
#define SDL_video_capture_c_h_
|
@ -33,7 +33,7 @@
|
|||||||
#include "../SDL_hints_c.h"
|
#include "../SDL_hints_c.h"
|
||||||
#include "../SDL_properties_c.h"
|
#include "../SDL_properties_c.h"
|
||||||
#include "../timer/SDL_timer_c.h"
|
#include "../timer/SDL_timer_c.h"
|
||||||
#include "SDL_video_capture_c.h"
|
#include "../camera/SDL_camera_c.h"
|
||||||
|
|
||||||
#ifdef SDL_VIDEO_OPENGL
|
#ifdef SDL_VIDEO_OPENGL
|
||||||
#include <SDL3/SDL_opengl.h>
|
#include <SDL3/SDL_opengl.h>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "SDL3/SDL_main.h"
|
#include "SDL3/SDL_main.h"
|
||||||
#include "SDL3/SDL.h"
|
#include "SDL3/SDL.h"
|
||||||
#include "SDL3/SDL_test.h"
|
#include "SDL3/SDL_test.h"
|
||||||
#include "SDL3/SDL_video_capture.h"
|
#include "SDL3/SDL_camera.h"
|
||||||
|
|
||||||
#ifdef SDL_PLATFORM_EMSCRIPTEN
|
#ifdef SDL_PLATFORM_EMSCRIPTEN
|
||||||
#include <emscripten/emscripten.h>
|
#include <emscripten/emscripten.h>
|
Loading…
Reference in New Issue
Block a user