From df6372612880d0f96227386268cc90de36eeb443 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Wed, 9 Feb 2022 21:26:17 -0800 Subject: [PATCH] Track properties take priority over metadata read from tag readers This allows inputs to override things with self-read tags and such, such as ReplayGain tags. Signed-off-by: Christopher Snowhill --- Audio/Chain/InputNode.m | 2 +- Playlist/PlaylistLoader.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Audio/Chain/InputNode.m b/Audio/Chain/InputNode.m index 59dbb48e4..d666548b5 100644 --- a/Audio/Chain/InputNode.m +++ b/Audio/Chain/InputNode.m @@ -122,8 +122,8 @@ if(entryProperties == nil) return; - [entryInfo addEntriesFromDictionary:entryProperties]; [entryInfo addEntriesFromDictionary:[decoder metadata]]; + [entryInfo addEntriesFromDictionary:entryProperties]; NSDictionary * info = [NSDictionary dictionaryWithDictionary:entryInfo]; diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index b158735ae..365a4cb71 100644 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -561,8 +561,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc if(entryProperties == nil) return; - [entryInfo addEntriesFromDictionary:entryProperties]; [entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:weakPe.URL]]; + [entryInfo addEntriesFromDictionary:entryProperties]; [weakLock lock]; [weakArray addObject:weakPe]; @@ -641,8 +641,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc if(entryProperties == nil) return; - [entryInfo addEntriesFromDictionary:entryProperties]; [entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]]; + [entryInfo addEntriesFromDictionary:entryProperties]; [pe setMetadata:entryInfo]; [store trackUpdate:pe];