From e774285eb8d6401870df282cb8d4e70612199eb0 Mon Sep 17 00:00:00 2001
From: neonloop
Date: Sat, 3 Jul 2021 20:20:32 +0000
Subject: Revert "USB headphone detection"

This reverts commit 960d776dfcd5d2f071107be1ff08b1a16d275a3f.

This is now handled in custom SDL, so each emulator doesn't need to
handle it.
---
 frontend/audio_hotplug.h | 49 ------------------------------------------------
 frontend/plat_trimui.c   |  9 ---------
 2 files changed, 58 deletions(-)
 delete mode 100644 frontend/audio_hotplug.h

diff --git a/frontend/audio_hotplug.h b/frontend/audio_hotplug.h
deleted file mode 100644
index db4eb59..0000000
--- a/frontend/audio_hotplug.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CHECK_AUDIO_H
-#define CHECK_AUDIO_H
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-
-/* Only check once every 60 calls, so this can be called every frame
- * without much penalty */
-#define AUDIO_CHECK_THROTTLE 60
-
-bool found_usb_audio = false;
-bool has_usb_audio = false;
-
-/* Every AUDIO_CHECK_THROTTLE calls, check to see if the USB audio
- * device has been plugged or unplugged. When the status changes,
- * calls `reinit_callback` with the new status. */
-void audio_hotplug_check(void (*reinit_callback)(bool has_usb_audio)) {
-  static int count;
-
-  if (++count < AUDIO_CHECK_THROTTLE) return;
-
-  count = 0;
-
-  if (access("/dev/dsp1", R_OK | W_OK) == 0) {
-    found_usb_audio = true;
-  } else {
-    found_usb_audio = false;
-  }
-
-  if (!has_usb_audio && found_usb_audio) {
-    has_usb_audio = true;
-    reinit_callback(true);
-  } else if (has_usb_audio && !found_usb_audio) {
-    has_usb_audio = false;
-    reinit_callback(false);
-  }
-}
-
-/* For SDL apps, set audio to the correct device. */
-void audio_hotplug_set_device(bool has_usb_audio) {
-  if (has_usb_audio) {
-    SDL_putenv("AUDIODEV=/dev/dsp1");
-  } else {
-    SDL_putenv("AUDIODEV=/dev/dsp");
-  }
-}
-
-#endif
diff --git a/frontend/plat_trimui.c b/frontend/plat_trimui.c
index 2925f5f..bdd5a92 100644
--- a/frontend/plat_trimui.c
+++ b/frontend/plat_trimui.c
@@ -1,7 +1,6 @@
 #include <SDL/SDL.h>
 #include "common.h"
 
-#include "frontend/audio_hotplug.h"
 #include "frontend/main.h"
 #include "frontend/plat.h"
 #include "frontend/scale.h"
@@ -186,7 +185,6 @@ int plat_sound_init(void)
 
   if (SDL_OpenAudio(&spec, NULL) < 0) {
     plat_sound_finish();
-    fprintf(stderr, "SDL audio failed to open: %s\n", SDL_GetError());
     return -1;
   }
 
@@ -194,12 +192,6 @@ int plat_sound_init(void)
   return 0;
 }
 
-static void plat_sound_reinit(bool has_usb_audio) {
-  plat_sound_finish();
-  audio_hotplug_set_device(has_usb_audio);
-  plat_sound_init();
-}
-
 float plat_sound_capacity(void)
 {
   int buffered = 0;
@@ -213,7 +205,6 @@ float plat_sound_capacity(void)
 void plat_sound_write(void *data, int bytes)
 {
   short *sound_data = (short *)data;
-  audio_hotplug_check(plat_sound_reinit);
   SDL_LockAudio();
 
   while (bytes > 0) {
-- 
cgit v1.2.3