kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed alternate file extension code so Cog does not encourage broken cuesheets.

CQTexperiment
vspader 2007-10-20 19:14:12 +00:00
parent d376d2e3ca
commit 8a5db0dd33
4 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cog.xcodeproj/project.pbxproj
View File

@ -136,14 +136,14 @@
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */; containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = 99B989F40CC7E10400C256E9 /* APL.bundle */; remoteGlobalIDString = 99B989F40CC7E10400C256E9;
remoteInfo = "APL Plugin"; remoteInfo = "APL Plugin";
}; };
171D09410CCA6027009FF3AB /* PBXContainerItemProxy */ = { 171D09410CCA6027009FF3AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */; containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 99B989F30CC7E10400C256E9 /* APL Plugin */; remoteGlobalIDString = 99B989F30CC7E10400C256E9;
remoteInfo = "APL Plugin"; remoteInfo = "APL Plugin";
}; };
17C808780C3BD167005707C4 /* PBXContainerItemProxy */ = { 17C808780C3BD167005707C4 /* PBXContainerItemProxy */ = {

1
Playlist/PlaylistController.m
View File

@ -368,7 +368,6 @@
{ {
[[shuffleList objectAtIndex:i] setShuffleIndex:[NSNumber numberWithInt:i]]; [[shuffleList objectAtIndex:i] setShuffleIndex:[NSNumber numberWithInt:i]];
} }
} }
- (void)resetShuffleList - (void)resetShuffleList

29
Plugins/CueSheet/CueSheet.m
View File

@ -170,36 +170,9 @@
track = @"01"; track = @"01";
} }
//Sometimes cue sheets will contain .wav tracks when they were actually reencoded.
NSFileManager *fm = [NSFileManager defaultManager];
NSURL *url = [self urlForPath:path relativeTo:filename];
if ([url isFileURL] && ![fm fileExistsAtPath:[url absoluteString]] && [[[url absoluteString] pathExtension] isEqualToString:@"wav"]) {
//creator fogot to edit cue... happens
NSString* originalURL = [url path];
NSString *ext;
NSEnumerator *e = [[[[NSClassFromString(@"PluginController") sharedPluginController] decodersByExtension] allKeys] objectEnumerator];
while (ext = [e nextObject])
{
if ([ext isEqualToString:@"cue"])
continue;
NSMutableString* newURL = [originalURL mutableCopy];
[newURL replaceOccurrencesOfString:@"wav" withString:ext options:(NSAnchoredSearch | NSBackwardsSearch) range:NSMakeRange(0, [newURL length])];
if ([fm fileExistsAtPath:newURL])
{
url = [NSURL fileURLWithPath:newURL];
[newURL release];
break;
}
[newURL release];
}
}
//Need to add basePath, and convert to URL //Need to add basePath, and convert to URL
[entries addObject: [entries addObject:
[CueSheetTrack trackWithURL:url [CueSheetTrack trackWithURL:[self urlForPath:path relativeTo:filename];
track: track track: track
time: seconds time: seconds
artist:artist artist:artist