This could happen if a property was flagged as changed, then updated, then flagged again, but gen_property_change_event() was called before the value was updated a second time. Then the function simply returned the old value, and would later trigger a new change event again. This was considered acceptable before, since property notifications are asynchronous anyway (so they may always be "outdated", it just mattered whether the most recent value was eventually delivered). But consider ordering with events. It seems desirable that specific important events (e.g. MPV_EVENT_START_FILE) should not be followed by property updates that happened before it, because that would make application logic really a mess, and property notification near-useless in certain cases. Avoid this by never returning a value if it was marked changed, but not updated yet. Unfortunately, this could lead to clients never receiving a value (or receiving it with a high random delay), if they're too slow to read it (or the property simply updates too often). Note that this is done for _all_ property notifications, not just returned events. Hopefully not a problem in practice. If it turns out to be one, this mechanism could be restricted to actually returned events, for which this really matters.
Unified · Split
| @@ -1638,10 +1638,12 @@ static void send_client_property_changes(struct mpv_handle *ctx) · 1637 unmodified lines | |||
| 1638 | changed = true; | 1638 | changed = true; |
| 1639 | } | 1639 | } |
| 1640 | 1640 | ||
| 1641 | if (changed) { | 1641 | // Avoid retriggering the change event if the property didn't change, |
| 1642 | ctx->new_property_events = true; | 1642 | // and the previous value was actually returned to the client. |
| 1643 | } else if (prop->value_ret_ts == prop->value_ts) { | 1643 | if (!changed && prop->value_ret_ts == prop->value_ts) { |
| 1644 | prop->value_ret_ts = prop->change_ts; // no change => no event | 1644 | prop->value_ret_ts = prop->change_ts; // no change => no event |
| 1645 | } else { | ||
| 1646 | ctx->new_property_events = true; | ||
| 1645 | } | 1647 | } |
| 1646 | 1648 | ||
| 1647 | prop->value_ts = prop->change_ts; | 1649 | prop->value_ts = prop->change_ts; |
| @@ -1698,7 +1700,9 @@ static bool gen_property_change_event(struct mpv_handle *ctx) · 50 unmodified lines | |||
| 1698 | 1700 | ||
| 1699 | struct observe_property *prop = ctx->properties[ctx->cur_property_index++]; | 1701 | struct observe_property *prop = ctx->properties[ctx->cur_property_index++]; |
| 1700 | 1702 | ||
| 1701 | if (prop->value_ret_ts != prop->value_ts) { | 1703 | if (prop->value_ts == prop->change_ts && // not a stale value? |
| 1704 | prop->value_ret_ts != prop->value_ts) // other value than last time? | ||
| 1705 | { | ||
| 1702 | prop->value_ret_ts = prop->value_ts; | 1706 | prop->value_ret_ts = prop->value_ts; |
| 1703 | prop_unref(ctx->cur_property); | 1707 | prop_unref(ctx->cur_property); |
| 1704 | ctx->cur_property = prop; | 1708 | ctx->cur_property = prop; |