From 509f6f5a9bbaec44e253bf355233f428e50321c4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 25 Oct 2019 00:50:38 +0200 Subject: [PATCH] command: remove some unused property metadata Also add an OSD entry for the video aspect. --- player/command.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/player/command.c b/player/command.c index 0b26e7c9a0..1d0da8e105 100644 --- a/player/command.c +++ b/player/command.c @@ -3710,8 +3710,7 @@ static const char *const *const mp_event_property_change[] = { E(MPV_EVENT_VIDEO_RECONFIG, "video-out-params", "video-params", "video-format", "video-codec", "video-bitrate", "dwidth", "dheight", "width", "height", "fps", "aspect", "vo-configured", "current-vo", - "colormatrix", "colormatrix-input-range", "colormatrix-output-range", - "colormatrix-primaries", "video-aspect", "video-dec-params", + "video-aspect", "video-dec-params", "hwdec", "hwdec-current", "hwdec-interop"), E(MPV_EVENT_AUDIO_RECONFIG, "audio-format", "audio-codec", "audio-bitrate", "samplerate", "channels", "audio", "volume", "mute", @@ -3918,16 +3917,6 @@ static const struct property_osd_display { {"border", "Border"}, {"framedrop", "Framedrop"}, {"deinterlace", "Deinterlace"}, - {"colormatrix", - .msg = "YUV colormatrix:\n${colormatrix}"}, - {"colormatrix-input-range", - .msg = "YUV input range:\n${colormatrix-input-range}"}, - {"colormatrix-output-range", - .msg = "RGB output range:\n${colormatrix-output-range}"}, - {"colormatrix-primaries", - .msg = "Colorspace primaries:\n${colormatrix-primaries}"}, - {"colormatrix-gamma", - .msg = "Colorspace gamma:\n${colormatrix-gamma}"}, {"gamma", "Gamma", .osd_progbar = OSD_BRIGHTNESS }, {"brightness", "Brightness", .osd_progbar = OSD_BRIGHTNESS}, {"contrast", "Contrast", .osd_progbar = OSD_CONTRAST}, @@ -3949,14 +3938,11 @@ static const struct property_osd_display { {"sub-ass-override", "ASS subtitle style override"}, {"vf", "Video filters", .msg = "Video filters:\n${vf}"}, {"af", "Audio filters", .msg = "Audio filters:\n${af}"}, - {"tv-brightness", "Brightness", .osd_progbar = OSD_BRIGHTNESS}, - {"tv-hue", "Hue", .osd_progbar = OSD_HUE}, - {"tv-saturation", "Saturation", .osd_progbar = OSD_SATURATION}, - {"tv-contrast", "Contrast", .osd_progbar = OSD_CONTRAST}, {"ab-loop-a", "A-B loop start"}, {"ab-loop-b", .msg = "A-B loop: ${ab-loop-a} - ${ab-loop-b}"}, {"audio-device", "Audio device"}, {"hwdec", .msg = "Hardware decoding: ${hwdec-current}"}, + {"video-aspect-override", "Aspect ratio override"}, // By default, don't display the following properties on OSD {"pause", NULL}, {"fullscreen", NULL},