summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-30 19:44:09 +0100
committerwm4 <wm4@nowhere>2012-10-30 20:26:00 +0100
commitef93036d305ee00394e695bd40672128d13e0136 (patch)
tree23ccb1df0c2bd9edc5ee657f614ef0f4169856d5
parent6403ecdf8794ca920f98133e84bc281647ccc661 (diff)
downloadmpv-ef93036d305ee00394e695bd40672128d13e0136.tar.bz2
mpv-ef93036d305ee00394e695bd40672128d13e0136.tar.xz
commands: fix audio-delay property
SET simply didn't set the variable correctly. Chain the property as generic option, so the property code will return the correct type for the property, as well as implement the GET part.
-rw-r--r--command.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/command.c b/command.c
index e6295bc8a0..029b81a45f 100644
--- a/command.c
+++ b/command.c
@@ -579,15 +579,17 @@ static int mp_property_audio_delay(m_option_t *prop, int action,
{
if (!(mpctx->sh_audio && mpctx->sh_video))
return M_PROPERTY_UNAVAILABLE;
+ float delay = audio_delay;
switch (action) {
case M_PROPERTY_PRINT:
- *(char **)arg = format_delay(audio_delay);
+ *(char **)arg = format_delay(delay);
return M_PROPERTY_OK;
case M_PROPERTY_SET:
- mpctx->delay -= audio_delay - *(float *)arg;
+ audio_delay = *(float *)arg;
+ mpctx->delay -= audio_delay - delay;
return M_PROPERTY_OK;
}
- return M_PROPERTY_NOT_IMPLEMENTED;
+ return mp_property_generic_option(prop, action, arg, mpctx);
}
/// Audio codec tag (RO)