[vlc-commits] Fix broken NowPlaying (close #9960, #11796, #12850)

[Ludovic Fauvet]

vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Dec 17 14:26:50 2014 +0100| [d4ccd7a5b404f62435c60ecc65f772dab83f5937] | committer: Ludovic Fauvet

Fix broken NowPlaying (close #9960, #11796, #12850)

Prevent the es_out from overriding the NowPlaying state by splitting
the meta into NowPlaying and ESNowPlaying.

The function input_item_GetNowPlayingFb can be used to return the
preferred meta value.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d4ccd7a5b404f62435c60ecc65f772dab83f5937
---

 include/vlc_input_item.h     |    2 ++
 include/vlc_meta.h           |    1 +
 lib/media.c                  |   21 +++++++++++++++------
 modules/notify/growl.m       |    4 ++--
 src/input/es_out.c           |   10 +++++-----
 src/input/input.c            |    1 +
 src/input/item.c             |   11 +++++++++++
 src/input/meta.c             |    1 +
 src/input/resource.c         |    2 +-
 src/libvlccore.sym           |    1 +
 src/text/strings.c           |   36 +++++++++++++++++++++++++++---------
 src/video_output/video_epg.c |    2 +-
 12 files changed, 68 insertions(+), 24 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=d4ccd7a5b404f62435c60ecc65f772dab83f5937