[vlc-devel] [PATCH 4/4] vout: remove function vout_IntfReinit

[Rémi Denis-Courmont]

On Mon, 10 Feb 2014 19:14:53 +0100, Felix Abecassis
<felix.abecassis at gmail.com> wrote:
> Triggering callback is overwriting initialization done by
> VoutGetDisplayCfg. The structure vout_display_cfg_t is saved when
> reusing a vout and thus should be responsible of saving user
> preferences instead of doing this through callback trigger.

For zoom, aspect-ration, and maybe crop.

What about the other values? Maybe it works, but the comment is explaining
how.

> ---
>  src/video_output/video_output.c  |  1 -
>  src/video_output/vout_internal.h |  1 -
>  src/video_output/vout_intf.c     | 17 -----------------
>  3 files changed, 19 deletions(-)
> 
> diff --git a/src/video_output/video_output.c
> b/src/video_output/video_output.c
> index 629b8d2..52910da 100644
> --- a/src/video_output/video_output.c
> +++ b/src/video_output/video_output.c
> @@ -222,7 +222,6 @@ vout_thread_t *vout_Request(vlc_object_t *object,
>  
>          if (!vout->p->dead) {
>              msg_Dbg(object, "reusing provided vout");
> -            vout_IntfReinit(vout);
>              return vout;
>          }
>          vout_CloseAndRelease(vout);
> diff --git a/src/video_output/vout_internal.h
> b/src/video_output/vout_internal.h
> index f6ad269..1de0305 100644
> --- a/src/video_output/vout_internal.h
> +++ b/src/video_output/vout_internal.h
> @@ -154,7 +154,6 @@ void vout_ControlChangeSubMargin(vout_thread_t *,
int);
>  
>  /* */
>  void vout_IntfInit( vout_thread_t * );
> -void vout_IntfReinit( vout_thread_t * );
>  
>  /* */
>  int  vout_OpenWrapper (vout_thread_t *, const char *, const
>  vout_display_state_t *);
> diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
> index 20e262a..c492bac 100644
> --- a/src/video_output/vout_intf.c
> +++ b/src/video_output/vout_intf.c
> @@ -323,23 +323,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
>      var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
>      var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
>      var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
> -
> -    vout_IntfReinit( p_vout );
> -}
> -
> -void vout_IntfReinit( vout_thread_t *p_vout )
> -{
> -    var_TriggerCallback( p_vout, "zoom" );
> -    var_TriggerCallback( p_vout, "crop" );
> -    var_TriggerCallback( p_vout, "aspect-ratio" );
> -
> -    var_TriggerCallback( p_vout, "video-on-top" );
> -    var_TriggerCallback( p_vout, "video-wallpaper" );
> -
> -    var_TriggerCallback( p_vout, "video-filter" );
> -    var_TriggerCallback( p_vout, "sub-source" );
> -    var_TriggerCallback( p_vout, "sub-filter" );
> -    var_TriggerCallback( p_vout, "sub-margin" );
>  }
>  
> 
/*****************************************************************************

-- 
Rémi Denis-Courmont
Sent from my collocated server