diff options
| author | Zsolt Vadasz <zsolt_vadasz@protonmail.com> | 2021-05-09 19:05:13 +0200 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2021-05-19 15:57:01 +0000 |
| commit | 83b4bc622ab0d5947e97050a2ee0587c3f34b236 (patch) | |
| tree | d9799bdc05aa580d54f830ad8dd508df79655823 | |
| parent | 62f225ef9d6e30c286c6a94f3bef147f7114696c (diff) | |
| download | mpv-83b4bc622ab0d5947e97050a2ee0587c3f34b236.tar.bz2 mpv-83b4bc622ab0d5947e97050a2ee0587c3f34b236.tar.xz | |
player/command: add secondary-sub-text property
| -rw-r--r-- | DOCS/man/input.rst | 3 | ||||
| -rw-r--r-- | player/command.c | 24 |
2 files changed, 22 insertions, 5 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 8c17468a78..63021280be 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -2625,6 +2625,9 @@ Property list This property is experimental and might be removed in the future. +``secondary-sub-text`` + Same as ``sub-text``, but for the secondary subtitles. + ``sub-start`` The current subtitle start time (in seconds). If there's multiple current subtitles, returns the first start time. If no current subtitle is present diff --git a/player/command.c b/player/command.c index b3844e4e17..59266d1132 100644 --- a/player/command.c +++ b/player/command.c @@ -2830,12 +2830,12 @@ static int mp_property_sub_pos(void *ctx, struct m_property *prop, return mp_property_generic_option(mpctx, prop, action, arg); } -static int mp_property_sub_text(void *ctx, struct m_property *prop, - int action, void *arg) +static int get_sub_text(void *ctx, struct m_property *prop, + int action, void *arg, int sub_index) { int type = *(int *)prop->priv; MPContext *mpctx = ctx; - struct track *track = mpctx->current_track[0][STREAM_SUB]; + struct track *track = mpctx->current_track[sub_index][STREAM_SUB]; struct dec_sub *sub = track ? track->d_sub : NULL; double pts = mpctx->playback_pts; if (!sub || pts == MP_NOPTS_VALUE) @@ -2856,6 +2856,18 @@ static int mp_property_sub_text(void *ctx, struct m_property *prop, return M_PROPERTY_NOT_IMPLEMENTED; } +static int mp_property_sub_text(void *ctx, struct m_property *prop, + int action, void *arg) +{ + return get_sub_text(ctx, prop, action, arg, 0); +} + +static int mp_property_secondary_sub_text(void *ctx, struct m_property *prop, + int action, void *arg) +{ + return get_sub_text(ctx, prop, action, arg, 1); +} + static struct sd_times get_times(void *ctx, struct m_property *prop, int action, void *arg) { @@ -3658,6 +3670,8 @@ static const struct m_property mp_properties_base[] = { {"sub-pos", mp_property_sub_pos}, {"sub-text", mp_property_sub_text, .priv = (void *)&(const int){SD_TEXT_TYPE_PLAIN}}, + {"secondary-sub-text", mp_property_secondary_sub_text, + .priv = (void *)&(const int){SD_TEXT_TYPE_PLAIN}}, {"sub-text-ass", mp_property_sub_text, .priv = (void *)&(const int){SD_TEXT_TYPE_ASS}}, {"sub-start", mp_property_sub_start}, @@ -3738,8 +3752,8 @@ static const char *const *const mp_event_property_change[] = { "estimated-vf-fps", "drop-frame-count", "vo-drop-frame-count", "total-avsync-change", "audio-speed-correction", "video-speed-correction", "vo-delayed-frame-count", "mistimed-frame-count", "vsync-ratio", - "estimated-display-fps", "vsync-jitter", "sub-text", "audio-bitrate", - "video-bitrate", "sub-bitrate", "decoder-frame-drop-count", + "estimated-display-fps", "vsync-jitter", "sub-text", "secondary-sub-text", + "audio-bitrate", "video-bitrate", "sub-bitrate", "decoder-frame-drop-count", "frame-drop-count", "video-frame-info", "vf-metadata", "af-metadata", "sub-start", "sub-end"), E(MP_EVENT_DURATION_UPDATE, "duration"), |