From 244f896318543ca65673db1503a94901cee26be0 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Wed, 19 Jan 2022 22:06:36 -0800 Subject: [PATCH] CUE Sheet input: Fix for regular cue sheets, and for existing URLs for embed supported tracks --- Plugins/CueSheet/CueSheetDecoder.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Plugins/CueSheet/CueSheetDecoder.m b/Plugins/CueSheet/CueSheetDecoder.m index bfd7c7f38..8d409608e 100644 --- a/Plugins/CueSheet/CueSheetDecoder.m +++ b/Plugins/CueSheet/CueSheetDecoder.m @@ -97,7 +97,7 @@ //Kind of a hackish way of accessing outside classes. source = [NSClassFromString(@"AudioSource") audioSourceForURL:trackUrl]; - if (![source open:url]) { + if (![source open:trackUrl]) { ALog(@"Could not open cuesheet source"); return NO; } @@ -145,10 +145,9 @@ } } else { - NSURL *trackUrl = (embedded) ? baseURL : [track url]; - - //Kind of a hackish way of accessing outside classes. - source = [NSClassFromString(@"AudioSource") audioSourceForURL:trackUrl]; + // Fix for embedded cuesheet handler parsing non-embedded files, + // or files that are already in the playlist without a fragment + source = [NSClassFromString(@"AudioSource") audioSourceForURL:url]; if (![source open:url]) { ALog(@"Could not open cuesheet source");