[vlc-devel] [PATCH] Jack: use var_Inherit*

[Rémi Denis-Courmont]

Le 2015-04-15 00:39, Jean-Baptiste Kempf a écrit :
> --
> Any idea why this was not done?

Because you want the same value across calls.

> ---
>  modules/access/jack.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/modules/access/jack.c b/modules/access/jack.c
> index 16e7634..a3d51f1 100644
> --- a/modules/access/jack.c
> +++ b/modules/access/jack.c
> @@ -139,12 +139,6 @@ static int Open( vlc_object_t *p_this )
>      /* Parse MRL */
>      Parse( p_demux );
>
> -    /* Create var */
> -    var_Create( p_demux, "jack-input-use-vlc-pace",
> -        VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
> -    var_Create( p_demux, "jack-input-auto-connect",
> -        VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
> -
>      /* JACK connexions */
>      /* define name and connect to jack server */
>      char p_vlc_client_name[32];
> @@ -243,7 +237,7 @@ static int Open( vlc_object_t *p_this )
>      }
>
>      /* connect vlc input to specifics jack output ports if requested 
> */
> -   /*  if( var_GetBool( p_demux, "jack-input-auto-connect" ) &&
> p_sys->psz_ports ) */
> +   /*  if( var_InheritBool( p_demux, "jack-input-auto-connect" ) &&
> p_sys->psz_ports ) */
>      if( p_sys->psz_ports )
>      {
>          int        i_input_ports;
> @@ -261,7 +255,7 @@ static int Open( vlc_object_t *p_this )
>      }
>
>      /* connect vlc input to all jack output ports if requested */
> -    if( var_GetBool( p_demux, "jack-input-auto-connect" ) &&
> !p_sys->psz_ports )
> +    if( var_InheritBool( p_demux, "jack-input-auto-connect" ) &&
> !p_sys->psz_ports )
>      {
>          int        i_input_ports;
>          int        j;
> @@ -351,7 +345,7 @@ static int Control( demux_t *p_demux, int
> i_query, va_list args )
>          return VLC_SUCCESS;
>      case DEMUX_CAN_CONTROL_PACE:
>          pb = ( bool* )va_arg( args, bool * );
> -        *pb = var_GetBool( p_demux, "jack-input-use-vlc-pace" );
> +        *pb = var_InheritBool( p_demux, "jack-input-use-vlc-pace" );
>          return VLC_SUCCESS;
>
>      case DEMUX_GET_PTS_DELAY:

-- 
Rémi Denis-Courmont