From 196619671d8bde5112f82b5ec5db881ff8e99f43 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 14 Apr 2014 22:33:41 +0200 Subject: client API: remove mpv_event_pause_reason And slightly adjust the semantics of MPV_EVENT_PAUSE/MPV_EVENT_UNPAUSE. The real pause state can now be queried with the "core-idle" property, the user pause state with the "pause" property, whether the player is paused due to cache with "paused-for-cache", and the keep open event can be guessed with the "eof-reached" property. --- player/core.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'player/core.h') diff --git a/player/core.h b/player/core.h index 8a8a13cb97..a360be4aa8 100644 --- a/player/core.h +++ b/player/core.h @@ -97,11 +97,6 @@ enum seek_type { MPSEEK_FACTOR, }; -// A bit-mask would be best, but I preferred not to use that with the client API. -#define PAUSE_BY_COMMAND ((mpv_event_pause_reason){.by_command=1}) -#define PAUSE_BY_CACHE ((mpv_event_pause_reason){.by_cache=1}) -#define PAUSE_BY_KEEP_OPEN ((mpv_event_pause_reason){.by_keep_open=1}) - struct track { enum stream_type type; @@ -431,8 +426,8 @@ void set_osd_function(struct MPContext *mpctx, int osd_function); void set_osd_subtitle(struct MPContext *mpctx, const char *text); // playloop.c -void pause_player(struct MPContext *mpctx, mpv_event_pause_reason reason); -void unpause_player(struct MPContext *mpctx, mpv_event_pause_reason reason); +void pause_player(struct MPContext *mpctx); +void unpause_player(struct MPContext *mpctx); void add_step_frame(struct MPContext *mpctx, int dir); void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount, int exact, bool immediate); -- cgit v1.2.3