diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m index f6e9efd65..06004e2c1 100644 --- a/Audio/AudioPlayer.m +++ b/Audio/AudioPlayer.m @@ -65,6 +65,8 @@ - (void)play:(NSURL *)url withUserInfo:(id)userInfo withRGInfo:(NSDictionary *)rgi startPaused:(BOOL)paused andSeekTo:(double)time { + ALog(@"Opening file for playback: %@ at seek offset %f%@", url, time, (paused) ? @", starting paused" : @""); + [self waitUntilCallbacksExit]; output = nil; output = [[OutputNode alloc] initWithController:self previous:nil]; diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index 1696d566f..5be883d66 100755 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -618,6 +618,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc progress += progressstep; [weakLock unlock]; + DLog(@"Loading metadata for %@", weakPe.URL); + NSMutableDictionary *entryInfo = [NSMutableDictionary dictionaryWithCapacity:32]; NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:weakPe.URL]; @@ -697,20 +699,22 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc } [load_info_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) - { - PlaylistEntry *pe = [entries objectAtIndex:idx]; - - NSMutableDictionary *entryInfo = [NSMutableDictionary dictionaryWithCapacity:32]; - - NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.URL]; - if (entryProperties == nil) - return; - - [entryInfo addEntriesFromDictionary:entryProperties]; - [entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]]; - - [pe setMetadata:entryInfo]; - [store trackUpdate:pe]; + { + PlaylistEntry *pe = [entries objectAtIndex:idx]; + + DLog(@"Loading metadata for %@", pe.URL); + + NSMutableDictionary *entryInfo = [NSMutableDictionary dictionaryWithCapacity:32]; + + NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.URL]; + if (entryProperties == nil) + return; + + [entryInfo addEntriesFromDictionary:entryProperties]; + [entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]]; + + [pe setMetadata:entryInfo]; + [store trackUpdate:pe]; }]; [self->playlistController updateTotalTime];