<div><br></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 18 Jun 2019 at 10:54 PM, Thomas Guillem <<a href="mailto:thomas@gllm.fr">thomas@gllm.fr</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
On Tue, Jun 18, 2019, at 17:38, Roland Bewick wrote:<br>
> <br>
> On 18/06/2019 10:28 PM, Thomas Guillem wrote:<br>
> > ---<br>
> >   include/vlc_player.h                          | 90 +++++++++--------<br>
> >   .../gui/macosx/playlist/VLCPlayerController.m | 27 ++---<br>
> >   .../gui/qt/components/player_controller.cpp   | 35 ++++---<br>
> >   src/input/player.c                            | 98 +++++++++----------<br>
> >   src/libvlccore.sym                            |  5 +-<br>
> >   test/src/input/player.c                       | 15 +--<br>
> >   6 files changed, 130 insertions(+), 140 deletions(-)<br>
> ><br>
> > diff --git a/include/vlc_player.h b/include/vlc_player.h<br>
> > index 403f405d52..3882ae29cf 100644<br>
> > --- a/include/vlc_player.h<br>
> > +++ b/include/vlc_player.h<br>
> > @@ -281,8 +281,7 @@ enum vlc_player_seek_speed<br>
> >    *<br>
> >    * @see vlc_player_SeekByPos()<br>
> >    * @see vlc_player_SeekByTime()<br>
> > - * @see vlc_player_SetAudioDelay()<br>
> > - * @see vlc_player_SetSubtitleDelay()<br>
> > + * @see vlc_player_SetCategoryDelay()<br>
> >    */<br>
> >   enum vlc_player_whence<br>
> >   {<br>
> > @@ -671,28 +670,17 @@ struct vlc_player_cbs<br>
> >           bool enabled, void *data);<br>
> >   <br>
> >       /**<br>
> > -     * Called when the player audio delay has changed<br>
> > +     * Called when the player category delay has changed<br>
> >        *<br>
> > -     * @see vlc_player_SetAudioDelay()<br>
> > +     * @see vlc_player_SetCategoryDelay()<br>
> >        *<br>
> >        * @param player locked player instance<br>
> > +     * @param cat AUDIO_ES or SPU_ES<br>
> >        * @param new_delay audio delay<br>
> >        * @param data opaque pointer set by vlc_player_AddListener()<br>
> >        */<br>
> > -    void (*on_audio_delay_changed)(vlc_player_t *player,<br>
> > -        vlc_tick_t new_delay, void *data);<br>
> > -<br>
> > -    /**<br>
> > -     * Called when the player subtitle delay has changed<br>
> > -     *<br>
> > -     * @see vlc_player_SetSubtitleDelay()<br>
> > -     *<br>
> > -     * @param player locked player instance<br>
> > -     * @param new_delay subtitle delay<br>
> > -     * @param data opaque pointer set by vlc_player_AddListener()<br>
> > -     */<br>
> > -    void (*on_subtitle_delay_changed)(vlc_player_t *player,<br>
> > -        vlc_tick_t new_delay, void *data);<br>
> > +    void (*on_category_delay_changed)(vlc_player_t *player,<br>
> > +         enum es_format_category_e cat, vlc_tick_t new_delay, void *data);<br>
> >   <br>
> >       /**<br>
> >        * Called when associated subtitle has changed<br>
> > @@ -2404,52 +2392,70 @@ vlc_player_ToggleRecording(vlc_player_t *player)<br>
> >   }<br>
> >   <br>
> >   /**<br>
> > - * Get the audio delay for the current media<br>
> > + * Get the delay of a category<br>
> >    *<br>
> > - * @see vlc_player_cbs.on_audio_delay_changed<br>
> > + * @see vlc_player_cbs.on_category_delay_changed<br>
> >    *<br>
> >    * @param player locked player instance<br>
> > + * @param cat AUDIO_ES or SPU_ES (VIDEO_ES not supported yet)<br>
> >    */<br>
> >   VLC_API vlc_tick_t<br>
> > -vlc_player_GetAudioDelay(vlc_player_t *player);<br>
> > +vlc_player_GetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat);<br>
> <br>
> With dual track support coming, how will you get the secondary subtitle <br>
> delay using this function? will you add an additional parameter here?<br>
<br>
I plan to use new functions:<br>
<br>
vlc_player_SetTrackDelay(vlc_player_t *, vlc_es_id_t *es_id, vlc_tick_t delay, whence);<br>
vlc_player_GetTrackDelay(vlc_player_t *, vlc_es_id_t *es_id, vlc_tick_t delay, whence);<br>
<br>
Calling vlc_player_SetTrackDelay() will overide delay previously set for that category and vice-versa.</blockquote><div dir="auto"><br></div><div dir="auto">To me it seems weird if setting the delay for the secondary subtitle track overrides the subtitle category delay. </div><div dir="auto"><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
Users will still be able to setup delay without taking care of tracks with vlc_player_SetCategoryDelay().</blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
By the way, here is my WIP branch <a href="https://code.videolan.org/tguillem/vlc/commits/multiple-es/2" rel="noreferrer" target="_blank">https://code.videolan.org/tguillem/vlc/commits/multiple-es/2</a> that is based on your work.<br>
It's not ready to be sent on the ML. I started from your commits, but did some modifications (I let your authorship). Do you agree with that ? As you can see, this branch is not complete and miss your last commits.</blockquote><div dir="auto"><br></div><div dir="auto">Yes, that’s fine. I can see you are making some good improvements :-)</div><div dir="auto"><br></div><div dir="auto"><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
> <br>
> >   <br>
> >   /**<br>
> > - * Set the audio delay for the current media<br>
> > + * Set the delay of one category for the current media<br>
> >    *<br>
> >    * @note A successful call will trigger the<br>
> > - * vlc_player_cbs.on_audio_delay_changed event.<br>
> > + * vlc_player_cbs.on_category_delay_changed event.<br>
> >    *<br>
> >    * @param player locked player instance<br>
> > + * @param cat AUDIO_ES or SPU_ES (VIDEO_ES not supported yet)<br>
> >    * @param delay a valid time<br>
> >    * @param whence absolute or relative<br>
> > + * @return VLC_SUCCESS or VLC_EGENERIC if the category is not handled<br>
> >    */<br>
> > -VLC_API void<br>
> > +VLC_API int<br>
> > +vlc_player_SetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat,<br>
> > +                            vlc_tick_t delay, enum vlc_player_whence whence);<br>
> > +<br>
> > +/**<br>
> > + * Helper to get the audio delay<br>
> > + */<br>
> > +static inline vlc_tick_t<br>
> > +vlc_player_GetAudioDelay(vlc_player_t *player)<br>
> > +{<br>
> > +    return vlc_player_GetCategoryDelay(player, AUDIO_ES);<br>
> > +}<br>
> > +<br>
> > +/**<br>
> > + * Helper to set the audio delay<br>
> > + */<br>
> > +static inline void<br>
> >   vlc_player_SetAudioDelay(vlc_player_t *player, vlc_tick_t delay,<br>
> > -                         enum vlc_player_whence whence);<br>
> > +                         enum vlc_player_whence whence)<br>
> > +<br>
> > +{<br>
> > +    vlc_player_SetCategoryDelay(player, AUDIO_ES, delay, whence);<br>
> > +}<br>
> >   <br>
> >   /**<br>
> > - * Get the subtitle delay for the current media<br>
> > - *<br>
> > - * @see vlc_player_cbs.on_subtitle_delay_changed<br>
> > - *<br>
> > - * @param player locked player instance<br>
> > + * Helper to get the subtitle delay<br>
> >    */<br>
> > -VLC_API vlc_tick_t<br>
> > -vlc_player_GetSubtitleDelay(vlc_player_t *player);<br>
> > +static inline vlc_tick_t<br>
> > +vlc_player_GetSubtitleDelay(vlc_player_t *player)<br>
> > +{<br>
> > +    return vlc_player_GetCategoryDelay(player, SPU_ES);<br>
> > +}<br>
> >   <br>
> >   /**<br>
> > - * Set the subtitle delay for the current media<br>
> > - *<br>
> > - * @note A successful call will trigger the<br>
> > - * vlc_player_cbs.on_subtitle_delay_changed event.<br>
> > - *<br>
> > - * @param player locked player instance<br>
> > - * @param delay a valid time<br>
> > - * @param whence absolute or relative<br>
> > + * Helper to set the subtitle delay<br>
> >    */<br>
> > -VLC_API void<br>
> > +static inline void<br>
> >   vlc_player_SetSubtitleDelay(vlc_player_t *player, vlc_tick_t delay,<br>
> > -                            enum vlc_player_whence whence);<br>
> > +                            enum vlc_player_whence whence)<br>
> > +{<br>
> > +    vlc_player_SetCategoryDelay(player, SPU_ES, delay, whence);<br>
> > +}<br>
> >   <br>
> >   /**<br>
> >    * Set the subtitle text scaling factor<br>
> > diff --git a/modules/gui/macosx/playlist/VLCPlayerController.m b/modules/gui/macosx/playlist/VLCPlayerController.m<br>
> > index 04f71258d0..a3478417ae 100644<br>
> > --- a/modules/gui/macosx/playlist/VLCPlayerController.m<br>
> > +++ b/modules/gui/macosx/playlist/VLCPlayerController.m<br>
> > @@ -284,21 +284,23 @@ static void cb_player_teletext_transparency_changed(vlc_player_t *p_player, bool<br>
> >       });<br>
> >   }<br>
> >   <br>
> > -static void cb_player_audio_delay_changed(vlc_player_t *p_player, vlc_tick_t newDelay, void *p_data)<br>
> > +static void cb_player_category_delay_changed(vlc_player_t *p_player, enum es_format_category_e cat,<br>
> > +                                             vlc_tick_t newDelay, void *p_data)<br>
> >   {<br>
> >       VLC_UNUSED(p_player);<br>
> >       dispatch_async(dispatch_get_main_queue(), ^{<br>
> >           VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;<br>
> > -        [playerController audioDelayChanged:newDelay];<br>
> > -    });<br>
> > -}<br>
> > -<br>
> > -static void cb_player_subtitle_delay_changed(vlc_player_t *p_player, vlc_tick_t newDelay, void *p_data)<br>
> > -{<br>
> > -    VLC_UNUSED(p_player);<br>
> > -    dispatch_async(dispatch_get_main_queue(), ^{<br>
> > -        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;<br>
> > -        [playerController subtitlesDelayChanged:newDelay];<br>
> > +        switch (cat)<br>
> > +        {<br>
> > +            case AUDIO_ES:<br>
> > +                [playerController audioDelayChanged:newDelay];<br>
> > +                break;<br>
> > +            case SPU_ES:<br>
> > +                [playerController subtitlesDelayChanged:newDelay];<br>
> > +                break;<br>
> > +            default:<br>
> > +                vlc_assert_unreachable();<br>
> > +        }<br>
> >       });<br>
> >   }<br>
> >   <br>
> > @@ -464,8 +466,7 @@ static const struct vlc_player_cbs player_callbacks = {<br>
> >       cb_player_teletext_enabled_changed,<br>
> >       cb_player_teletext_page_changed,<br>
> >       cb_player_teletext_transparency_changed,<br>
> > -    cb_player_audio_delay_changed,<br>
> > -    cb_player_subtitle_delay_changed,<br>
> > +    cb_player_category_delay_changed,<br>
> >       cb_player_associated_subs_fps_changed,<br>
> >       cb_player_renderer_changed,<br>
> >       cb_player_record_changed,<br>
> > diff --git a/modules/gui/qt/components/player_controller.cpp b/modules/gui/qt/components/player_controller.cpp<br>
> > index 3e386daf69..aeb5954cfa 100644<br>
> > --- a/modules/gui/qt/components/player_controller.cpp<br>
> > +++ b/modules/gui/qt/components/player_controller.cpp<br>
> > @@ -579,25 +579,25 @@ static void on_player_teletext_transparency_changed(vlc_player_t *, bool enabled<br>
> >       });<br>
> >   }<br>
> >   <br>
> > -static void on_player_audio_delay_changed(vlc_player_t *, vlc_tick_t new_delay,<br>
> > +static void on_player_category_delay_changed(vlc_player_t *,<br>
> > +                               enum es_format_category_e cat, vlc_tick_t new_delay,<br>
> >                                  void *data)<br>
> >   {<br>
> >       PlayerControllerPrivate* that = static_cast<PlayerControllerPrivate*>(data);<br>
> > -    msg_Dbg( that->p_intf, "on_player_audio_delay_changed");<br>
> > -    that->callAsync([that,new_delay] (){<br>
> > -        that->m_audioDelay = new_delay;<br>
> > -        emit that->q_func()->audioDelayChanged( new_delay );<br>
> > -    });<br>
> > -}<br>
> > -<br>
> > -static void on_player_subtitle_delay_changed(vlc_player_t *, vlc_tick_t new_delay,<br>
> > -                                  void *data)<br>
> > -{<br>
> > -    PlayerControllerPrivate* that = static_cast<PlayerControllerPrivate*>(data);<br>
> > -    msg_Dbg( that->p_intf, "on_player_subtitle_delay_changed");<br>
> > -    that->callAsync([that,new_delay] (){<br>
> > -        that->m_subtitleDelay = new_delay;<br>
> > -        emit that->q_func()->subtitleDelayChanged( new_delay );<br>
> > +    msg_Dbg( that->p_intf, "on_player_category_delay_changed: %d", cat );<br>
> > +    that->callAsync([that,cat,new_delay] (){<br>
> > +        switch (cat)<br>
> > +        {<br>
> > +            case AUDIO_ES:<br>
> > +                that->m_audioDelay = new_delay;<br>
> > +                emit that->q_func()->audioDelayChanged( new_delay );<br>
> > +                break;<br>
> > +            case SPU_ES:<br>
> > +                that->m_subtitleDelay = new_delay;<br>
> > +                emit that->q_func()->subtitleDelayChanged( new_delay );<br>
> > +                break;<br>
> > +            default: vlc_assert_unreachable();<br>
> > +        }<br>
> >       });<br>
> >   }<br>
> >   <br>
> > @@ -819,8 +819,7 @@ static const struct vlc_player_cbs player_cbs = {<br>
> >       on_player_teletext_enabled_changed,<br>
> >       on_player_teletext_page_changed,<br>
> >       on_player_teletext_transparency_changed,<br>
> > -    on_player_audio_delay_changed,<br>
> > -    on_player_subtitle_delay_changed,<br>
> > +    on_player_category_delay_changed,<br>
> >       on_player_associated_subs_fps_changed,<br>
> >       on_player_renderer_changed,<br>
> >       on_player_record_changed,<br>
> > diff --git a/src/input/player.c b/src/input/player.c<br>
> > index cdb170f167..b5f8a8f46c 100644<br>
> > --- a/src/input/player.c<br>
> > +++ b/src/input/player.c<br>
> > @@ -55,6 +55,7 @@ struct vlc_player_track_priv<br>
> >   {<br>
> >       struct vlc_player_track t;<br>
> >       vout_thread_t *vout; /* weak reference */<br>
> > +    vlc_tick_t delay;<br>
> >   };<br>
> >   <br>
> >   typedef struct VLC_VECTOR(struct vlc_player_program *)<br>
> > @@ -417,6 +418,7 @@ vlc_player_track_New(vlc_es_id_t *id, const char *name, const es_format_t *fmt)<br>
> >       struct vlc_player_track_priv *trackpriv = malloc(sizeof(*trackpriv));<br>
> >       if (!trackpriv)<br>
> >           return NULL;<br>
> > +    trackpriv->delay = 0;<br>
> >       struct vlc_player_track *track = &trackpriv->t;<br>
> >       track->name = strdup(name);<br>
> >       if (!track->name)<br>
> > @@ -2053,12 +2055,12 @@ input_thread_Events(input_thread_t *input_thread,<br>
> >               break;<br>
> >           case INPUT_EVENT_AUDIO_DELAY:<br>
> >               input->audio_delay = event->audio_delay;<br>
> > -            vlc_player_SendEvent(player, on_audio_delay_changed,<br>
> > +            vlc_player_SendEvent(player, on_category_delay_changed, AUDIO_ES,<br>
> >                                    input->audio_delay);<br>
> >               break;<br>
> >           case INPUT_EVENT_SUBTITLE_DELAY:<br>
> >               input->subtitle_delay = event->subtitle_delay;<br>
> > -            vlc_player_SendEvent(player, on_subtitle_delay_changed,<br>
> > +            vlc_player_SendEvent(player, on_category_delay_changed, SPU_ES,<br>
> >                                    input->subtitle_delay);<br>
> >               break;<br>
> >           case INPUT_EVENT_CACHE:<br>
> > @@ -2823,62 +2825,61 @@ vlc_player_SetRecordingEnabled(vlc_player_t *player, bool enable)<br>
> >                                  _("Recording") : _("Recording done"));<br>
> >   }<br>
> >   <br>
> > -void<br>
> > -vlc_player_SetAudioDelay(vlc_player_t *player, vlc_tick_t delay,<br>
> > -                         enum vlc_player_whence whence)<br>
> > +int<br>
> > +vlc_player_SetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat,<br>
> > +                         vlc_tick_t delay, enum vlc_player_whence whence)<br>
> >   {<br>
> >       bool absolute = whence == VLC_PLAYER_WHENCE_ABSOLUTE;<br>
> >       struct vlc_player_input *input = vlc_player_get_input_locked(player);<br>
> >       if (!input)<br>
> > -        return;<br>
> > +        return VLC_EGENERIC;<br>
> >   <br>
> > -    input_ControlPush(input->thread, INPUT_CONTROL_SET_AUDIO_DELAY,<br>
> > -        &(input_control_param_t) {<br>
> > -            .delay = {<br>
> > -                .b_absolute = whence == VLC_PLAYER_WHENCE_ABSOLUTE,<br>
> > -                .i_val = delay,<br>
> > -            },<br>
> > -    });<br>
> > +    switch (cat)<br>
> > +    {<br>
> > +        case AUDIO_ES:<br>
> > +            input_ControlPush(input->thread, INPUT_CONTROL_SET_AUDIO_DELAY,<br>
> > +                &(input_control_param_t) {<br>
> > +                    .delay = {<br>
> > +                        .b_absolute = absolute,<br>
> > +                        .i_val = delay,<br>
> > +                    },<br>
> > +            });<br>
> > +            break;<br>
> > +        case SPU_ES:<br>
> > +            input_ControlPush(input->thread, INPUT_CONTROL_SET_SPU_DELAY,<br>
> > +                &(input_control_param_t) {<br>
> > +                    .delay = {<br>
> > +                        .b_absolute = absolute,<br>
> > +                        .i_val = delay,<br>
> > +                    },<br>
> > +            });<br>
> > +            break;<br>
> > +        default:<br>
> > +            return VLC_EGENERIC;<br>
> > +    }<br>
> >   <br>
> > -    if (!absolute)<br>
> > -        delay += input->audio_delay;<br>
> > -    vlc_player_vout_OSDMessage(player, _("Audio delay: %i ms"),<br>
> > +    vlc_player_vout_OSDMessage(player, _("%s delay: %s%i ms"),<br>
> > +                               es_format_category_to_string(cat),<br>
> > +                               absolute ? "" : "+",<br>
> >                                  (int)MS_FROM_VLC_TICK(delay));<br>
> > +    return VLC_SUCCESS;<br>
> >   }<br>
> >   <br>
> >   vlc_tick_t<br>
> > -vlc_player_GetAudioDelay(vlc_player_t *player)<br>
> > +vlc_player_GetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat)<br>
> >   {<br>
> > -    struct vlc_player_input *input = vlc_player_get_input_locked(player);<br>
> > -    return input ? input->audio_delay : 0;<br>
> > -}<br>
> > -<br>
> > -static void<br>
> > -vlc_player_SetSubtitleDelayInternal(vlc_player_t *player, vlc_tick_t delay,<br>
> > -                                    enum vlc_player_whence whence)<br>
> > -{<br>
> > -    bool absolute = whence == VLC_PLAYER_WHENCE_ABSOLUTE;<br>
> >       struct vlc_player_input *input = vlc_player_get_input_locked(player);<br>
> >       if (!input)<br>
> > -        return;<br>
> > -<br>
> > -    input_ControlPush(input->thread, INPUT_CONTROL_SET_SPU_DELAY,<br>
> > -        &(input_control_param_t) {<br>
> > -            .delay = {<br>
> > -                .b_absolute = absolute,<br>
> > -                .i_val = delay,<br>
> > -            },<br>
> > -    });<br>
> > -}<br>
> > -<br>
> > -void<br>
> > -vlc_player_SetSubtitleDelay(vlc_player_t *player, vlc_tick_t delay,<br>
> > -                            enum vlc_player_whence whence)<br>
> > -{<br>
> > -    vlc_player_SetSubtitleDelayInternal(player, delay, whence);<br>
> > -    vlc_player_vout_OSDMessage(player, _("Subtitle delay: %s%i ms"),<br>
> > -                               whence == VLC_PLAYER_WHENCE_ABSOLUTE ? "" : "+",<br>
> > -                               (int)MS_FROM_VLC_TICK(delay));<br>
> > +        return 0;<br>
> > +    switch (cat)<br>
> > +    {<br>
> > +        case AUDIO_ES:<br>
> > +            return input->audio_delay;<br>
> > +        case SPU_ES:<br>
> > +            return input->subtitle_delay;<br>
> > +        default:<br>
> > +            return 0;<br>
> > +    }<br>
> >   }<br>
> >   <br>
> >   static struct {<br>
> > @@ -2931,13 +2932,6 @@ vlc_player_GetSubtitleTextScale(vlc_player_t *player)<br>
> >       return var_GetInteger(player, "sub-text-scale");<br>
> >   }<br>
> >   <br>
> > -vlc_tick_t<br>
> > -vlc_player_GetSubtitleDelay(vlc_player_t *player)<br>
> > -{<br>
> > -    struct vlc_player_input *input = vlc_player_get_input_locked(player);<br>
> > -    return input ? input->subtitle_delay : 0;<br>
> > -}<br>
> > -<br>
> >   int<br>
> >   vlc_player_GetSignal(vlc_player_t *player, float *quality, float *strength)<br>
> >   {<br>
> > diff --git a/src/libvlccore.sym b/src/libvlccore.sym<br>
> > index 8cca2bbc01..6a4cc6040c 100644<br>
> > --- a/src/libvlccore.sym<br>
> > +++ b/src/libvlccore.sym<br>
> > @@ -783,8 +783,8 @@ vlc_player_CondWait<br>
> >   vlc_player_DisplayPosition<br>
> >   vlc_player_DecrementRate<br>
> >   vlc_player_Delete<br>
> > -vlc_player_GetAudioDelay<br>
> >   vlc_player_GetCapabilities<br>
> > +vlc_player_GetCategoryDelay<br>
> >   vlc_player_GetCategoryLanguage<br>
> >   vlc_player_GetCurrentMedia<br>
> >   vlc_player_GetError<br>
> > @@ -801,7 +801,6 @@ vlc_player_GetSelectedTitleIdx<br>
> >   vlc_player_GetSignal<br>
> >   vlc_player_GetState<br>
> >   vlc_player_GetStatistics<br>
> > -vlc_player_GetSubtitleDelay<br>
> >   vlc_player_GetSubtitleTextScale<br>
> >   vlc_player_GetTeletextPage<br>
> >   vlc_player_GetTime<br>
> > @@ -848,7 +847,7 @@ vlc_player_SelectTitleIdx<br>
> >   vlc_player_SelectTrack<br>
> >   vlc_player_SetAssociatedSubsFPS<br>
> >   vlc_player_SetAtoBLoop<br>
> > -vlc_player_SetAudioDelay<br>
> > +vlc_player_SetCategoryDelay<br>
> >   vlc_player_SetCurrentMedia<br>
> >   vlc_player_SetMediaStoppedAction<br>
> >   vlc_player_SetRecordingEnabled<br>
> > diff --git a/test/src/input/player.c b/test/src/input/player.c<br>
> > index 2c031f83a4..e467f60073 100644<br>
> > --- a/test/src/input/player.c<br>
> > +++ b/test/src/input/player.c<br>
> > @@ -104,8 +104,7 @@ struct report_media_subitems<br>
> >       X(vlc_player_title_list *, on_titles_changed) \<br>
> >       X(size_t, on_title_selection_changed) \<br>
> >       X(struct report_chapter_selection, on_chapter_selection_changed) \<br>
> > -    X(vlc_tick_t, on_audio_delay_changed) \<br>
> > -    X(vlc_tick_t, on_subtitle_delay_changed) \<br>
> > +    X(vlc_tick_t, on_category_delay_changed) \<br>
> >       X(bool, on_recording_changed) \<br>
> >       X(struct report_signal, on_signal_changed) \<br>
> >       X(struct input_stats_t, on_statistics_changed) \<br>
> > @@ -389,19 +388,11 @@ player_on_chapter_selection_changed(vlc_player_t *player,<br>
> >   }<br>
> >   <br>
> >   static void<br>
> > -player_on_audio_delay_changed(vlc_player_t *player, vlc_tick_t new_delay,<br>
> > +player_on_category_delay_changed(vlc_player_t *player, vlc_tick_t new_delay,<br>
> >                                 void *data)<br>
> >   {<br>
> >       struct ctx *ctx = get_ctx(player, data);<br>
> > -    VEC_PUSH(on_audio_delay_changed, new_delay);<br>
> > -}<br>
> > -<br>
> > -static void<br>
> > -player_on_subtitle_delay_changed(vlc_player_t *player, vlc_tick_t new_delay,<br>
> > -                                 void *data)<br>
> > -{<br>
> > -    struct ctx *ctx = get_ctx(player, data);<br>
> > -    VEC_PUSH(on_subtitle_delay_changed, new_delay);<br>
> > +    VEC_PUSH(on_category_delay_changed, new_delay);<br>
> >   }<br>
> >   <br>
> >   static void<br>
> _______________________________________________<br>
> vlc-devel mailing list<br>
> To unsubscribe or modify your subscription options:<br>
> <a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a></blockquote></div></div>