RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

command: avoid some direct MPOpts write accesses 

This is working towards a change intended in the future: nothing should
write to the option struct directly, but use functions that raise proper
notifications. Until this is complete it will take a while, and this
commit does not change all cases of direct access, just some simple
ones.

In all of these 3 changes, the actual write access is done by the
generic property-option bridge.
This commit is contained in:
wm4 2018-05-22 18:24:53 +02:00
parent 0317d7350e
commit 115aaec76c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
player/command.c
View File

@ -453,10 +453,10 @@ static int mp_property_playback_speed(void *ctx, struct m_property *prop,
double speed = mpctx->opts->playback_speed; double speed = mpctx->opts->playback_speed;
switch (action) { switch (action) {
case M_PROPERTY_SET: { case M_PROPERTY_SET: {
mpctx->opts->playback_speed = *(double *)arg; int r = mp_property_generic_option(mpctx, prop, action, arg);
update_playback_speed(mpctx); update_playback_speed(mpctx);
mp_wakeup_core(mpctx); mp_wakeup_core(mpctx);
return M_PROPERTY_OK; return r;
} }
case M_PROPERTY_PRINT: case M_PROPERTY_PRINT:
*(char **)arg = talloc_asprintf(NULL, "%.2f", speed); *(char **)arg = talloc_asprintf(NULL, "%.2f", speed);
@ -1143,11 +1143,10 @@ static int mp_property_edition(void *ctx, struct m_property *prop,
case M_PROPERTY_SET: { case M_PROPERTY_SET: {
edition = *(int *)arg; edition = *(int *)arg;
if (edition != demuxer->edition) { if (edition != demuxer->edition) {
mpctx->opts->edition_id = edition;
if (!mpctx->stop_play) if (!mpctx->stop_play)
mpctx->stop_play = PT_CURRENT_ENTRY; mpctx->stop_play = PT_CURRENT_ENTRY;
mp_wakeup_core(mpctx); mp_wakeup_core(mpctx);
break; // make it accessible to the demuxer via option change notify break; // write value, trigger option change notify
} }
return M_PROPERTY_OK; return M_PROPERTY_OK;
} }
@ -2056,12 +2055,13 @@ static int mp_property_audio_delay(void *ctx, struct m_property *prop,
case M_PROPERTY_PRINT: case M_PROPERTY_PRINT:
*(char **)arg = format_delay(delay); *(char **)arg = format_delay(delay);
return M_PROPERTY_OK; return M_PROPERTY_OK;
case M_PROPERTY_SET: case M_PROPERTY_SET: {
mpctx->opts->audio_delay = *(float *)arg; int r = mp_property_generic_option(mpctx, prop, action, arg);
if (mpctx->ao_chain && mpctx->vo_chain) if (mpctx->ao_chain && mpctx->vo_chain)
mpctx->delay += mpctx->opts->audio_delay - delay; mpctx->delay += mpctx->opts->audio_delay - delay;
mp_wakeup_core(mpctx); mp_wakeup_core(mpctx);
return M_PROPERTY_OK; return r;
}
} }
return mp_property_generic_option(mpctx, prop, action, arg); return mp_property_generic_option(mpctx, prop, action, arg);
} }