Browse Source

Revert "Fixed audio device removed events for ALSA"

This reverts commit e57fef8f0b7270952aae8b204e998f6164be43cf.

We actually need to match on a unique handle
Sam Lantinga 1 year ago
parent
commit
5ba03d377a
3 changed files with 1 additions and 19 deletions
  1. 0 15
      src/audio/SDL_audio.c
  2. 0 3
      src/audio/SDL_sysaudio.h
  3. 1 1
      src/audio/alsa/SDL_alsa_audio.c

+ 0 - 15
src/audio/SDL_audio.c

@@ -1265,21 +1265,6 @@ SDL_AudioDevice *SDL_FindPhysicalAudioDeviceByHandle(void *handle)
     return SDL_FindPhysicalAudioDeviceByCallback(TestDeviceHandleCallback, handle);
 }
 
-static SDL_bool TestDeviceHandleStringCallback(SDL_AudioDevice *device, void *handle)
-{
-    if (handle && device->handle) {
-        if (SDL_strcmp((char *)handle, (char *)device->handle) == 0) {
-            return SDL_TRUE;
-        }
-    }
-    return SDL_FALSE;
-}
-
-SDL_AudioDevice *SDL_FindPhysicalAudioDeviceByHandleString(const char *handle)
-{
-    return SDL_FindPhysicalAudioDeviceByCallback(TestDeviceHandleStringCallback, (void *)handle);
-}
-
 char *SDL_GetAudioDeviceName(SDL_AudioDeviceID devid)
 {
     SDL_AudioDevice *device = ObtainPhysicalAudioDevice(devid);

+ 0 - 3
src/audio/SDL_sysaudio.h

@@ -97,9 +97,6 @@ extern int SDL_AudioDeviceFormatChangedAlreadyLocked(SDL_AudioDevice *device, co
 // Find the SDL_AudioDevice associated with the handle supplied to SDL_AddAudioDevice. NULL if not found. DOES NOT LOCK THE DEVICE.
 extern SDL_AudioDevice *SDL_FindPhysicalAudioDeviceByHandle(void *handle);
 
-// Find the SDL_AudioDevice associated with the handle as a string supplied to SDL_AddAudioDevice. NULL if not found. DOES NOT LOCK THE DEVICE.
-extern SDL_AudioDevice *SDL_FindPhysicalAudioDeviceByHandleString(const char *handle);
-
 // Find an SDL_AudioDevice, selected by a callback. NULL if not found. DOES NOT LOCK THE DEVICE.
 extern SDL_AudioDevice *SDL_FindPhysicalAudioDeviceByCallback(SDL_bool (*callback)(SDL_AudioDevice *device, void *userdata), void *userdata);
 

+ 1 - 1
src/audio/alsa/SDL_alsa_audio.c

@@ -877,7 +877,7 @@ static void ALSA_HotplugIteration(SDL_bool *has_default_output, SDL_bool *has_de
         for (ALSA_Device *dev = unseen; dev; dev = next) {
             //SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: removing %s device '%s'", dev->iscapture ? "capture" : "output", dev->name);
             next = dev->next;
-            SDL_AudioDeviceDisconnected(SDL_FindPhysicalAudioDeviceByHandleString(dev->name));
+            SDL_AudioDeviceDisconnected(SDL_FindPhysicalAudioDeviceByHandle(dev->name));
             SDL_free(dev->name);
             SDL_free(dev);
         }