From 9fadc92eb1a194978a07b6774a2a1c72a0ace182 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 13 Jul 2014 20:12:55 +0200 Subject: command: don't show VO information in colorspace properties Until now, changing the properties showed the VO colorspace parameters on OSD. This didn't work quite well, because it showed the VO parameters _before_ the change. This is because at least one video frame with the new parameters has to be shown, and this doesn't happen right after changing the property, but a bit later. Also fix a random typo in unrelated code. --- player/command.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 5451c13a16..fffa63bb70 100644 --- a/player/command.c +++ b/player/command.c @@ -1845,7 +1845,6 @@ static int mp_property_colormatrix(void *ctx, struct m_property *prop, char *res = talloc_strdup(NULL, ""); append_csp(&res, "*Requested", mp_csp_names, opts->requested_colorspace); append_csp(&res, "Video decoder", mp_csp_names, vd_csp.colorspace); - append_csp(&res, "Video output", mp_csp_names, vo_csp.colorspace); *(char **)arg = res; return M_PROPERTY_OK; } @@ -1871,7 +1870,6 @@ static int mp_property_colormatrix_input_range(void *ctx, struct m_property *pro append_csp(&res, "*Requested", mp_csp_levels_names, opts->requested_input_range); append_csp(&res, "Video decoder", mp_csp_levels_names, vd_csp.colorlevels); - append_csp(&res, "Video output", mp_csp_levels_names, vo_csp.colorlevels); *(char **)arg = res; return M_PROPERTY_OK; } @@ -2884,7 +2882,7 @@ static const struct property_osd_display { int seek_msg, seek_bar; // Free-form message (if NULL, osd_name or the property name is used) const char *msg; - // Extra free-from message (just for volume) + // Extra free-form message (just for volume) const char *extra_msg; } property_osd_display[] = { // general -- cgit v1.2.3