summaryrefslogtreecommitdiffstats
path: root/player/client.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-06 19:24:30 +0200
committerwm4 <wm4@nowhere>2014-06-06 19:24:30 +0200
commit3b7402b51cc936e5c37eec226bbfc00d4fc3381a (patch)
treed887ed95b15daebf790fd0809c5b60d284e99675 /player/client.c
parent79e76abb4d87601b9e549bef1d90f577f107a6c2 (diff)
downloadmpv-3b7402b51cc936e5c37eec226bbfc00d4fc3381a.tar.bz2
mpv-3b7402b51cc936e5c37eec226bbfc00d4fc3381a.tar.xz
client API: call wakeup callback if there are new messages
Listening on messages currently uses polling (every time mpv_wait_event() has no new events, the message buffer is polled and a message event is possibly created). Improve this situation a bit, and call the user-supplied wakeup callback. This will increase the frequency with which the wakeup callback is called, but the client is already supposed to be able to deal with this situation. Also, as before, calling mpv_wait_event() from the wakeup callback is forbidden, so the client can't read new messages from the callback directly. The wakeup pipe is written either. Since the wakeup pipe is created lazily, we can't access the pipe handle without creating a race condition or a deadlock. (This is actually very silly, since in practice the race condition won't matter, but for now let's keep it clean.)
Diffstat (limited to 'player/client.c')
-rw-r--r--player/client.c30
1 files changed, 17 insertions, 13 deletions
diff --git a/player/client.c b/player/client.c
index eee401f089..5c480be561 100644
--- a/player/client.c
+++ b/player/client.c
@@ -114,6 +114,7 @@ struct mpv_handle {
};
static bool gen_property_change_event(struct mpv_handle *ctx);
+static void recreate_message_buffer(mpv_handle *ctx);
void mp_clients_init(struct MPContext *mpctx)
{
@@ -226,6 +227,8 @@ void mpv_set_wakeup_callback(mpv_handle *ctx, void (*cb)(void *d), void *d)
pthread_mutex_lock(&ctx->lock);
ctx->wakeup_cb = cb;
ctx->wakeup_cb_ctx = d;
+ // Update the message callback
+ recreate_message_buffer(ctx);
pthread_mutex_unlock(&ctx->lock);
}
@@ -1240,6 +1243,18 @@ int mpv_load_config_file(mpv_handle *ctx, const char *filename)
return 0;
}
+// called locked
+static void recreate_message_buffer(mpv_handle *ctx)
+{
+ mp_msg_log_buffer_destroy(ctx->messages);
+ ctx->messages = NULL;
+ if (ctx->messages_level >= 0) {
+ ctx->messages =
+ mp_msg_log_buffer_new(ctx->mpctx->global, 1000, ctx->messages_level,
+ ctx->wakeup_cb, ctx->wakeup_cb_ctx);
+ }
+}
+
int mpv_request_log_messages(mpv_handle *ctx, const char *min_level)
{
int level = -1;
@@ -1253,19 +1268,8 @@ int mpv_request_log_messages(mpv_handle *ctx, const char *min_level)
return MPV_ERROR_INVALID_PARAMETER;
pthread_mutex_lock(&ctx->lock);
-
- if (!ctx->messages)
- ctx->messages_level = -1;
-
- if (ctx->messages_level != level) {
- mp_msg_log_buffer_destroy(ctx->messages);
- ctx->messages = NULL;
- if (level >= 0) {
- ctx->messages =
- mp_msg_log_buffer_new(ctx->mpctx->global, 1000, level);
- }
- ctx->messages_level = level;
- }
+ ctx->messages_level = level;
+ recreate_message_buffer(ctx);
pthread_mutex_unlock(&ctx->lock);
return 0;