From b6af3db5680586c209bae53a7eb779ad0d38edc8 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 Oct 2017 15:48:47 +0200
Subject: command: drop "audio-out-detected-device" property

Coreaudio stopped setting it a few releases ago (66a958bb4fa). There is
not much of a user- or API-visible change, so remove it without
deprecation.
---
 audio/out/ao.c       | 7 -------
 audio/out/ao.h       | 1 -
 audio/out/internal.h | 3 ---
 3 files changed, 11 deletions(-)

(limited to 'audio')

diff --git a/audio/out/ao.c b/audio/out/ao.c
index c38c04c6a9..da2dacdcae 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -550,13 +550,6 @@ bool ao_hotplug_check_update(struct ao_hotplug *hp)
     return false;
 }
 
-const char *ao_hotplug_get_detected_device(struct ao_hotplug *hp)
-{
-    if (!hp || !hp->ao)
-        return NULL;
-    return hp->ao->detected_device;
-}
-
 // The return value is valid until the next call to this API.
 struct ao_device_list *ao_hotplug_get_device_list(struct ao_hotplug *hp)
 {
diff --git a/audio/out/ao.h b/audio/out/ao.h
index fbbd76fee8..116733fb39 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -112,7 +112,6 @@ struct ao_hotplug *ao_hotplug_create(struct mpv_global *global,
                                      void *wakeup_ctx);
 void ao_hotplug_destroy(struct ao_hotplug *hp);
 bool ao_hotplug_check_update(struct ao_hotplug *hp);
-const char *ao_hotplug_get_detected_device(struct ao_hotplug *hp);
 struct ao_device_list *ao_hotplug_get_device_list(struct ao_hotplug *hp);
 
 void ao_print_devices(struct mpv_global *global, struct mp_log *log);
diff --git a/audio/out/internal.h b/audio/out/internal.h
index 28deefe128..a6fcf7c5f6 100644
--- a/audio/out/internal.h
+++ b/audio/out/internal.h
@@ -61,9 +61,6 @@ struct ao {
     // default device should be used, this is set to NULL.
     char *device;
 
-    // Device actually chosen by the AO
-    char *detected_device;
-
     // Application name to report to the audio API.
     char *client_name;
 
-- 
cgit v1.2.3