[vlc-devel] [PATCH 1/5] es_out: split controls range

[Thomas Guillem]

On Mon, Apr 20, 2020, at 20:37, Thomas Guillem wrote:
> 
> 
> On Mon, Apr 20, 2020, at 20:27, Francois Cartegnie wrote:
> > you can't have assert() between priv/public spaces
> > if the enums can collide
> 
> This is partial revert of 33c53b0d6fdf90f42c656addac1db85868f68437
> Enums can collide, indeed.
> 
> Maybe the asserts are wrong instead.

I forgot to test timeshift after doing these changes, I'm sorry for that.

> 
> > ---
> >  include/vlc_es_out.h | 2 +-
> >  src/input/es_out.h   | 4 +++-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
> > index 49635f8594..a839688050 100644
> > --- a/include/vlc_es_out.h
> > +++ b/include/vlc_es_out.h
> > @@ -114,7 +114,7 @@ enum es_out_query_e
> >                                   arg2= const vlc_spu_highlight_t *, 
> > res=can fail  */
> >  
> >      /* First value usable for private control */
> > -    ES_OUT_PRIVATE_START = 0x10000,
> > +    ES_OUT_PRIVATE_START = 0x20000,
> >  };
> >  
> >  enum es_out_policy_e
> > diff --git a/src/input/es_out.h b/src/input/es_out.h
> > index cc8ce55a6a..79087aa963 100644
> > --- a/src/input/es_out.h
> > +++ b/src/input/es_out.h
> > @@ -35,10 +35,12 @@ enum es_out_mode_e
> >      ES_OUT_MODE_END     /* mark the es_out as dead */
> >  };
> >  
> > +#define ES_OUT_TIMESHIFT_PRIVATE_START 0x10000
> > +
> >  enum es_out_query_private_e
> >  {
> >      /* set/get mode */
> > -    ES_OUT_PRIV_SET_MODE,                           /* arg1= int */
> > +    ES_OUT_PRIV_SET_MODE = ES_OUT_TIMESHIFT_PRIVATE_START, /* arg1= int */
> >  
> >      /* Same than ES_OUT_SET_ES/ES_OUT_UNSET_ES/ES_OUT_RESTART_ES, but 
> > with vlc_es_id_t * */
> >      ES_OUT_PRIV_SET_ES,      /* arg1= vlc_es_id_t*                   */
> > -- 
> > 2.25.3
> > 
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel