diff --git a/Audio/AudioPropertiesReader.h b/Audio/AudioPropertiesReader.h index 2712181a4..99e2a8539 100644 --- a/Audio/AudioPropertiesReader.h +++ b/Audio/AudioPropertiesReader.h @@ -12,5 +12,6 @@ } + (NSDictionary *)propertiesForURL:(NSURL *)url; ++ (NSDictionary *)propertiesForURL:(NSURL *)url skipCue:(BOOL)skip; @end diff --git a/Audio/AudioPropertiesReader.m b/Audio/AudioPropertiesReader.m index 7da798fd6..4ca63cdb5 100644 --- a/Audio/AudioPropertiesReader.m +++ b/Audio/AudioPropertiesReader.m @@ -15,7 +15,13 @@ + (NSDictionary *)propertiesForURL:(NSURL *)url { @autoreleasepool { - return [[PluginController sharedPluginController] propertiesForURL:url]; + return [[PluginController sharedPluginController] propertiesForURL:url skipCue:NO]; + } +} + ++ (NSDictionary *)propertiesForURL:(NSURL *)url skipCue:(BOOL)skip { + @autoreleasepool { + return [[PluginController sharedPluginController] propertiesForURL:url skipCue:skip]; } } diff --git a/Audio/Plugin.h b/Audio/Plugin.h index aebf2f4bb..0db7ec560 100644 --- a/Audio/Plugin.h +++ b/Audio/Plugin.h @@ -93,7 +93,7 @@ - (id)audioSourceForURL:(NSURL *)url; - (NSArray *)urlsForContainerURL:(NSURL *)url; - (NSDictionary *)metadataForURL:(NSURL *)url skipCue:(BOOL)skip; -- (NSDictionary *)propertiesForURL:(NSURL *)url; +- (NSDictionary *)propertiesForURL:(NSURL *)url skipCue:(BOOL)skip; - (id)audioDecoderForSource:(id)source skipCue:(BOOL)skip; - (int)putMetadataInURL:(NSURL *)url; diff --git a/Audio/PluginController.m b/Audio/PluginController.m index c43fde8c9..89068d408 100644 --- a/Audio/PluginController.m +++ b/Audio/PluginController.m @@ -486,7 +486,7 @@ static PluginController *sharedPluginController = nil; } // If no properties reader is defined, use the decoder's properties. -- (NSDictionary *)propertiesForURL:(NSURL *)url { +- (NSDictionary *)propertiesForURL:(NSURL *)url skipCue:(BOOL)skip { NSString *urlScheme = [url scheme]; if([urlScheme isEqualToString:@"http"] || [urlScheme isEqualToString:@"https"]) @@ -531,7 +531,7 @@ static PluginController *sharedPluginController = nil; } { - id decoder = [self audioDecoderForSource:source skipCue:NO]; + id decoder = [self audioDecoderForSource:source skipCue:skip]; if(![decoder open:source]) { return nil; } diff --git a/Plugins/CueSheet/CueSheetContainer.m b/Plugins/CueSheet/CueSheetContainer.m index 7a4f33f8a..1fd287394 100644 --- a/Plugins/CueSheet/CueSheetContainer.m +++ b/Plugins/CueSheet/CueSheetContainer.m @@ -48,7 +48,7 @@ // Embedded cuesheet check fileMetadata = [NSClassFromString(@"AudioMetadataReader") metadataForURL:url skipCue:YES]; - NSDictionary *alsoMetadata = [NSClassFromString(@"AudioPropertiesReader") propertiesForURL:url]; + NSDictionary *alsoMetadata = [NSClassFromString(@"AudioPropertiesReader") propertiesForURL:url skipCue:YES]; NSString *sheet = [fileMetadata objectForKey:@"cuesheet"]; if(!sheet || ![sheet length]) sheet = [alsoMetadata objectForKey:@"cuesheet"]; diff --git a/Plugins/CueSheet/CueSheetMetadataReader.m b/Plugins/CueSheet/CueSheetMetadataReader.m index 96b8beeaa..7d56bcca3 100644 --- a/Plugins/CueSheet/CueSheetMetadataReader.m +++ b/Plugins/CueSheet/CueSheetMetadataReader.m @@ -45,7 +45,7 @@ // Embedded cuesheet check fileMetadata = [audioMetadataReader metadataForURL:url skipCue:YES]; - NSDictionary *alsoMetadata = [NSClassFromString(@"AudioPropertiesReader") propertiesForURL:url]; + NSDictionary *alsoMetadata = [NSClassFromString(@"AudioPropertiesReader") propertiesForURL:url skipCue:YES]; NSString *sheet = [fileMetadata objectForKey:@"cuesheet"]; if(!sheet || ![sheet length]) sheet = [alsoMetadata objectForKey:@"cuesheet"];