Commit c10e43a9 authored by Timothy B. Terriberry's avatar Timothy B. Terriberry Committed by Jean-Baptiste Kempf

Update FLAC/Vorbis cover scores to match ID3v2.

taglib.cpp had a completely ordered priority list of picture types to
use for album art from ID3v2 tags.
Since FLAC uses the same picture type field as ID3v2, use the same
priorities.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7af45378
...@@ -28,17 +28,29 @@ ...@@ -28,17 +28,29 @@
static input_attachment_t* ParseFlacPicture( const uint8_t *p_data, int i_data, static input_attachment_t* ParseFlacPicture( const uint8_t *p_data, int i_data,
int i_attachments, int *i_cover_score, int *i_cover_idx ) int i_attachments, int *i_cover_score, int *i_cover_idx )
{ {
/* TODO: Merge with ID3v2 copy in modules/meta_engine/taglib.cpp. */
static const char pi_cover_score[] = { static const char pi_cover_score[] = {
0, /* other */ 0, /* Other */
2, 1, /* icons */ 5, /* 32x32 PNG image that should be used as the file icon */
10, /* front cover */ 4, /* File icon of a different size or format. */
9, /* back cover */ 20, /* Front cover image of the album. */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, /* Back cover image of the album. */
6, /* movie/video screen capture */ 13, /* Inside leaflet page of the album. */
0, 18, /* Image from the album itself. */
7, /* Illustration */ 17, /* Picture of the lead artist or soloist. */
8, /* Band/Artist logotype */ 16, /* Picture of the artist or performer. */
0, /* Publisher/Studio */ 14, /* Picture of the conductor. */
15, /* Picture of the band or orchestra. */
9, /* Picture of the composer. */
8, /* Picture of the lyricist or text writer. */
7, /* Picture of the recording location or studio. */
10, /* Picture of the artists during recording. */
11, /* Picture of the artists during performance. */
6, /* Picture from a movie or video related to the track. */
1, /* Picture of a large, coloured fish. */
12, /* Illustration related to the track. */
3, /* Logo of the band or performer. */
2 /* Logo of the publisher (record company). */
}; };
int i_len; int i_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment