diff options
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index bdd4bfb6e..b1b1bb4f5 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -170,22 +170,26 @@ bool DecoderFFmpeg::initialize() { QMap<Qmmp::MetaData, QString> metaData; AVDictionaryEntry *album = av_dict_get(ic->metadata,"album",nullptr,0); - if(!album) - album = av_dict_get(ic->metadata,"WM/AlbumTitle",nullptr,0); AVDictionaryEntry *album_artist = av_dict_get(ic->metadata,"album_artist",nullptr,0); AVDictionaryEntry *artist = av_dict_get(ic->metadata,"artist",nullptr,0); - if(!artist) - artist = av_dict_get(ic->metadata,"author",nullptr,0); AVDictionaryEntry *composer = av_dict_get(ic->metadata,"composer",nullptr,0); AVDictionaryEntry *comment = av_dict_get(ic->metadata,"comment",nullptr,0); AVDictionaryEntry *genre = av_dict_get(ic->metadata,"genre",nullptr,0); AVDictionaryEntry *title = av_dict_get(ic->metadata,"title",nullptr,0); - AVDictionaryEntry *year = av_dict_get(ic->metadata,"WM/Year",nullptr,0); + AVDictionaryEntry *year = av_dict_get(ic->metadata,"date",nullptr,0); + AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",nullptr,0); + + if(!album) + album = av_dict_get(ic->metadata,"WM/AlbumTitle",nullptr,0); + + if(!artist) + artist = av_dict_get(ic->metadata,"author",nullptr,0); + if(!year) - year = av_dict_get(ic->metadata,"year",nullptr,0); + year = av_dict_get(ic->metadata,"WM/Year",nullptr,0); if(!year) - year = av_dict_get(ic->metadata,"date",nullptr,0); - AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",nullptr,0); + year = av_dict_get(ic->metadata,"year",nullptr,0); + if(!track) track = av_dict_get(ic->metadata,"WM/Track",nullptr,0); if(!track) |