From ae4597427092c4c500c0e4b5138f8fd5d72cf941 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 2 Jan 2020 16:01:24 +0000 Subject: ffmpeg: refactoring git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9178 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp') 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 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) -- cgit v1.2.3-13-gbd6f