diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 037121c18b..fc083958d9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -82,7 +82,7 @@ jobs:
- name: Build test apk's (CMake)
if: ${{ matrix.platform.cmake }}
run: |
- cmake --build build --config Release --parallel --verbose --target testautomation-apk testaudiocapture-apk testcontroller-apk testmultiaudio-apk testsprite-apk
+ cmake --build build --config Release --parallel --verbose --target testautomation-apk testaudiorecording-apk testcontroller-apk testmultiaudio-apk testsprite-apk
- name: Install (CMake)
if: ${{ matrix.platform.cmake }}
run: |
diff --git a/.gitignore b/.gitignore
index 109fe04417..ef5cc7137a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,7 +94,7 @@ test/gamepadmap
test/loopwave
test/loopwavequeue
test/testatomic
-test/testaudiocapture
+test/testaudiorecording
test/testaudiohotplug
test/testaudioinfo
test/testautomation
diff --git a/VisualC-GDK/SDL/SDL.vcxproj.filters b/VisualC-GDK/SDL/SDL.vcxproj.filters
index eb8308ff04..d0dde99d3f 100644
--- a/VisualC-GDK/SDL/SDL.vcxproj.filters
+++ b/VisualC-GDK/SDL/SDL.vcxproj.filters
@@ -221,7 +221,6 @@
-
diff --git a/VisualC-GDK/tests/testgdk/src/testgdk.cpp b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
index bddecf3c52..cd8f5e321c 100644
--- a/VisualC-GDK/tests/testgdk/src/testgdk.cpp
+++ b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
@@ -438,7 +438,7 @@ main(int argc, char *argv[])
SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
- stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_OUTPUT, &wave.spec, NULL, NULL);
+ stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &wave.spec, NULL, NULL);
if (!stream) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create audio stream: %s\n", SDL_GetError());
return -1;
diff --git a/WhatsNew.txt b/WhatsNew.txt
index 654997118d..6e5a1dbedd 100644
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -18,7 +18,7 @@ There have been too many changes to list them all, but here are some of the high
* An example of hardware accelerated video playback using ffmpeg has been added in test/testffmpeg.c
* The shaped window API has been replaced with transparent windows
* Time and date functions have been added in SDL_time.h
-* Support for webcam video capture has been added in SDL_camera.h
+* Support for webcam video recording has been added in SDL_camera.h
* Support for handling pens and tablets has been added in SDL_pen.h
* Support for file open and save dialogs has been added in SDL_dialog.h
* Cross-platform functions for working with files and directories are available in SDL_filesystem.h
diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
index 85c840650b..c0c1cb8a58 100644
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -4677,7 +4677,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- INFOPLIST_KEY_NSCameraUsageDescription = "Testing camera capture";
+ INFOPLIST_KEY_NSCameraUsageDescription = "Testing camera recording";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4689,7 +4689,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- INFOPLIST_KEY_NSCameraUsageDescription = "Testing camera capture";
+ INFOPLIST_KEY_NSCameraUsageDescription = "Testing camera recording";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/android-project/app/proguard-rules.pro b/android-project/app/proguard-rules.pro
index ab66646aff..c0462d9829 100644
--- a/android-project/app/proguard-rules.pro
+++ b/android-project/app/proguard-rules.pro
@@ -68,12 +68,12 @@
void audioWriteFloatBuffer(float[]);
void audioWriteShortBuffer(short[]);
void audioWriteByteBuffer(byte[]);
- int[] captureOpen(int, int, int, int, int);
- int captureReadFloatBuffer(float[], boolean);
- int captureReadShortBuffer(short[], boolean);
- int captureReadByteBuffer(byte[], boolean);
+ int[] recordingOpen(int, int, int, int, int);
+ int recordingReadFloatBuffer(float[], boolean);
+ int recordingReadShortBuffer(short[], boolean);
+ int recordingReadByteBuffer(byte[], boolean);
void audioClose();
- void captureClose();
+ void recordingClose();
void audioSetThreadPriority(boolean, int);
int nativeSetupJNI();
void removeAudioDevice(boolean, int);
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 98821942e4..acefc495db 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
android:required="false" />
-
+
@@ -55,7 +55,7 @@
-
+