[vlc-devel] [PATCH] RFC: attempt to fix the NowPlaying issue #9960 #11796 #12850

[Ludovic Fauvet]

On Wed, Dec 17, 2014, at 14:56, Rémi Denis-Courmont wrote:
> Le 2014-12-17 16:48, Ludovic Fauvet a écrit :
> > Based on a discussion with Courmisch I splitted the NowPlaying meta 
> > in
> > two. ItemNowPlaying for the input and ESNowPlaying for the elementary
> > stream. The new function input_item_GetNowPlaying is in charge of
> > returning the preferred meta.
> > ---
> >  include/vlc_input_item.h           |  4 +++-
> >  include/vlc_meta.h                 |  7 ++++---
> >  lib/media.c                        | 25 +++++++++++++++++--------
> >  modules/access/http.c              |  2 +-
> >  modules/demux/mp4/meta.c           |  2 +-
> >  modules/demux/playlist/b4s.c       |  2 +-
> >  modules/demux/playlist/shoutcast.c |  2 +-
> >  modules/lua/libs/input.c           |  4 ++--
> >  modules/lua/libs/sd.c              |  2 +-
> >  modules/lua/vlc.c                  |  2 +-
> >  src/input/es_out.c                 | 10 +++++-----
> >  src/input/input.c                  |  3 ++-
> >  src/input/item.c                   | 11 +++++++++++
> >  src/input/meta.c                   |  3 ++-
> >  src/libvlccore.sym                 |  1 +
> >  src/text/strings.c                 | 36 
> > +++++++++++++++++++++++++++---------
> >  16 files changed, 80 insertions(+), 36 deletions(-)
> >
> > diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
> > index 1bfb2f9..5d82d33 100644
> > --- a/include/vlc_input_item.h
> > +++ b/include/vlc_input_item.h
> > @@ -192,6 +192,7 @@ VLC_API char * input_item_GetMeta( input_item_t
> > *p_i, vlc_meta_type_t meta_type
> >  VLC_API char * input_item_GetName( input_item_t * p_i ) VLC_USED;
> >  VLC_API char * input_item_GetTitleFbName( input_item_t * p_i ) 
> > VLC_USED;
> >  VLC_API char * input_item_GetURI( input_item_t * p_i ) VLC_USED;
> > +VLC_API char * input_item_GetNowPlaying( input_item_t *p_item ) 
> > VLC_USED;
> >  VLC_API void input_item_SetURI( input_item_t * p_i, const char 
> > *psz_uri );
> >  VLC_API mtime_t input_item_GetDuration( input_item_t * p_i );
> >  VLC_API void input_item_SetDuration( input_item_t * p_i, mtime_t
> > i_duration );
> > @@ -222,7 +223,8 @@ INPUT_META(Date)
> >  INPUT_META(Setting)
> >  INPUT_META(URL)
> >  INPUT_META(Language)
> > -INPUT_META(NowPlaying)
> > +INPUT_META(ItemNowPlaying)
> 
> I'd leave that name alone. It's no more and no less "item's" than the 
> other existing meta-data elements.

Agreed. The new patch makes it work that way. The
input_item_GetNowPlaying function was renamed to
input_item_GetNowPlayingFb in order to avoid conflicts with the macro
though.

> > +INPUT_META(ESNowPlaying)
> >  INPUT_META(Publisher)
> >  INPUT_META(EncodedBy)
> >  INPUT_META(ArtworkURL)

-- 
Ludovic Fauvet
www.videolan.org