summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-12-17 23:11:15 +0100
committerwm4 <wm4@nowhere>2019-12-17 23:11:15 +0100
commit13dff3073d85a4288ee317680fc44b9dc4ca096d (patch)
tree978aefa44c73909016461b7f1424fc70706b4c8a
parente75d28effd324d9383ee92304f2eba9a4f0d13c6 (diff)
downloadmpv-13dff3073d85a4288ee317680fc44b9dc4ca096d.tar.bz2
mpv-13dff3073d85a4288ee317680fc44b9dc4ca096d.tar.xz
client API: remove some dead code
This was for the "suspend" API, which has been removed (turned into stubs) a long time ago.
-rw-r--r--player/client.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/player/client.c b/player/client.c
index bc9785d04c..44ec7fad8c 100644
--- a/player/client.c
+++ b/player/client.c
@@ -126,7 +126,6 @@ struct mpv_handle {
uint64_t event_mask;
bool queued_wakeup;
- int suspend_count;
mpv_event *events; // ringbuffer of max_events entries
int max_events; // allocated number of entries in events
@@ -831,11 +830,6 @@ mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout)
event->event_id = MPV_EVENT_QUEUE_OVERFLOW;
break;
}
- // This will almost surely lead to a deadlock. (Polling is still ok.)
- if (ctx->suspend_count && timeout > 0) {
- MP_ERR(ctx, "attempting to wait while core is suspended");
- break;
- }
if (ctx->num_events) {
*event = ctx->events[ctx->first_event];
ctx->first_event = (ctx->first_event + 1) % ctx->max_events;