From bd088c2f99118bfbd19e260fb8394b17c07859ab Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 27 Aug 2023 13:42:20 -0700
Subject: [PATCH] Revert "Clarify whether an audio function expects a physical
or logical device ID"
This reverts commit 506a133d84660f097c748f66f969e0d375bf3856.
Physical and logical audio devices are intended to be interchangeable at the API level.
---
src/audio/SDL_audio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 0ab9fa1f29b1..b48d2b97dcde 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -634,7 +634,7 @@ void SDL_QuitAudio(void)
SDL_AtomicSet(¤t_audio.output_device_count, 0);
SDL_AtomicSet(¤t_audio.capture_device_count, 0);
SDL_UnlockRWLock(current_audio.device_list_lock);
-
+
// mark all devices for shutdown so all threads can begin to terminate.
for (SDL_AudioDevice *i = devices; i != NULL; i = i->next) {
SDL_AtomicSet(&i->shutdown, 1);
@@ -926,7 +926,7 @@ static SDL_LogicalAudioDevice *ObtainLogicalAudioDevice(SDL_AudioDeviceID devid)
}
if (!logdev) {
- SDL_SetError("Invalid logical audio device instance ID");
+ SDL_SetError("Invalid audio device instance ID");
}
return logdev;
@@ -968,7 +968,7 @@ static SDL_AudioDevice *ObtainPhysicalAudioDevice(SDL_AudioDeviceID devid)
SDL_UnlockRWLock(current_audio.device_list_lock);
if (!dev) {
- SDL_SetError("Invalid physical audio device instance ID");
+ SDL_SetError("Invalid audio device instance ID");
}
return dev;