summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-09 15:48:47 +0200
committerwm4 <wm4@nowhere>2017-10-09 15:48:47 +0200
commitb6af3db5680586c209bae53a7eb779ad0d38edc8 (patch)
tree8f1a73aed6223ac70de94ff6e48e51450ac244af /player
parent622610bad50c48da106b58d458b3598aaf4a493b (diff)
downloadmpv-b6af3db5680586c209bae53a7eb779ad0d38edc8.tar.bz2
mpv-b6af3db5680586c209bae53a7eb779ad0d38edc8.tar.xz
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.
Diffstat (limited to 'player')
-rw-r--r--player/command.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/player/command.c b/player/command.c
index 1cf8dc2438..f3ab31aec5 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1970,17 +1970,6 @@ static int mp_property_ao(void *ctx, struct m_property *p, int action, void *arg
mpctx->ao ? ao_get_name(mpctx->ao) : NULL);
}
-static int mp_property_ao_detected_device(void *ctx,struct m_property *prop,
- int action, void *arg)
-{
- struct MPContext *mpctx = ctx;
- struct command_ctx *cmd = mpctx->command_ctx;
- create_hotplug(mpctx);
-
- const char *d = ao_hotplug_get_detected_device(cmd->hotplug);
- return m_property_strdup_ro(action, arg, d);
-}
-
/// Audio delay (RW)
static int mp_property_audio_delay(void *ctx, struct m_property *prop,
int action, void *arg)
@@ -3983,7 +3972,6 @@ static const struct m_property mp_properties_base[] = {
{"audio-device", mp_property_audio_device},
{"audio-device-list", mp_property_audio_devices},
{"current-ao", mp_property_ao},
- {"audio-out-detected-device", mp_property_ao_detected_device},
// Video
{"fullscreen", mp_property_fullscreen},
@@ -5773,10 +5761,8 @@ void handle_command_updates(struct MPContext *mpctx)
// This is a bit messy: ao_hotplug wakes up the player, and then we have
// to recheck the state. Then the client(s) will read the property.
- if (ctx->hotplug && ao_hotplug_check_update(ctx->hotplug)) {
+ if (ctx->hotplug && ao_hotplug_check_update(ctx->hotplug))
mp_notify_property(mpctx, "audio-device-list");
- mp_notify_property(mpctx, "audio-out-detected-device");
- }
}
void mp_notify(struct MPContext *mpctx, int event, void *arg)