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

Fixed bug where playlist saved as kss files. 

Fixed bug where multi-track files were consolidated into a single entry on saving/loading a playlist.
CQTexperiment
vspader 2007-10-13 04:53:48 +00:00
parent 74bfd92971
commit 6f6b01b15c
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/AppController.m
View File

@ -150,7 +150,7 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
p = [NSSavePanel savePanel];
[p setAllowedFileTypes:[playlistLoader acceptableContainerTypes]];
[p setAllowedFileTypes:[playlistLoader acceptablePlaylistTypes]];
[p beginSheetForDirectory:nil file:nil modalForWindow:mainWindow modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:NULL];
}

1
Playlist/PlaylistLoader.h
View File

@ -31,6 +31,7 @@ typedef enum {
- (BOOL)savePls:(NSString *)filename;
- (NSArray *)acceptableFileTypes;
- (NSArray *)acceptablePlaylistTypes; //Only m3u and pls saving
- (NSArray *)acceptableContainerTypes;
@end

33
Playlist/PlaylistLoader.m
View File

@ -48,7 +48,7 @@
{
NSString *basePath = [[[filename stringByStandardizingPath] stringByDeletingLastPathComponent] stringByAppendingString:@"/"];
if ([entryURL isFileURL]) {
if ([entryURL isFileURL] && [[entryURL fragment] isEqualToString:@""]) {
//We want relative paths.
NSMutableString *entryPath = [[[[entryURL path] stringByStandardizingPath] mutableCopy] autorelease];
@ -62,32 +62,6 @@
}
}
- (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename
{
if ([path hasPrefix:@"/"]) {
return [NSURL fileURLWithPath:path];
}
NSEnumerator *e = [[AudioPlayer schemes] objectEnumerator];
NSString *scheme;
while (scheme = [e nextObject])
{
if ([path hasPrefix:[scheme stringByAppendingString:@"://"]])
{
return [NSURL URLWithString:path];
}
}
NSString *basePath = [[[baseFilename stringByStandardizingPath] stringByDeletingLastPathComponent] stringByAppendingString:@"/"];
NSMutableString *unixPath = [path mutableCopy];
//Only relative paths would have windows backslashes.
[unixPath replaceOccurrencesOfString:@"\\" withString:@"/" options:0 range:NSMakeRange(0, [unixPath length])];
return [NSURL fileURLWithPath:[basePath stringByAppendingString:[unixPath autorelease]]];
}
- (BOOL)saveM3u:(NSString *)filename
{
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filename createFile:YES];
@ -318,6 +292,11 @@
return [[self acceptableContainerTypes] arrayByAddingObjectsFromArray:[AudioPlayer fileTypes]];
}
- (NSArray *)acceptablePlaylistTypes
{
return [NSArray arrayWithObjects:@"m3u", @"pls", nil];
}
- (NSArray *)acceptableContainerTypes
{
return [AudioPlayer containerTypes];