[vlc-commits] player: handle secondary-sub-margin notification

Roland Bewick git at videolan.org
Tue Jun 25 20:55:24 CEST 2019


vlc | branch: master | Roland Bewick <roland.bewick at gmail.com> | Fri Jun 14 17:08:11 2019 +0200| [e36167286d3ec9d72c01f120e923d6524bb5d859] | committer: Thomas Guillem

player: handle secondary-sub-margin notification

Only used for OSD.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e36167286d3ec9d72c01f120e923d6524bb5d859
---

 src/input/player.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/input/player.c b/src/input/player.c
index 807e1f3b2f..44a1867aa4 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -2046,10 +2046,10 @@ vlc_player_input_HandleVoutEvent(struct vlc_player_input *input,
     assert(ev->vout);
     assert(ev->id);
 
-    static const char osd_vars[][sizeof("deinterlace-mode")] = {
+    static const char osd_vars[][sizeof("secondary-sub-margin")] = {
         "aspect-ratio", "autoscale", "crop", "crop-bottom",
         "crop-top", "crop-left", "crop-right", "deinterlace",
-        "deinterlace-mode", "sub-margin", "zoom"
+        "deinterlace-mode", "sub-margin", "secondary-sub-margin", "zoom"
     };
 
     vlc_player_t *player = input->player;
@@ -3527,6 +3527,9 @@ vlc_player_VoutOSDCallback(vlc_object_t *this, const char *var,
     else if (strcmp(var, "sub-margin") == 0)
         vouts_osd_Message(&vout, 1, _("Subtitle position %d px"), newval.i_int);
 
+    else if (strcmp(var, "secondary-sub-margin") == 0)
+        vouts_osd_Message(&vout, 1, _("Secondary subtitle position %d px"), newval.i_int);
+
     else if (strcmp(var, "sub-text-scale") == 0)
         vouts_osd_Message(&vout, 1, _("Subtitle text scale %d%%"), newval.i_int);
 



More information about the vlc-commits mailing list