Merge pull request #88 from nevack/nevack/inhibit-third-party-warnings

Inhibit ThirdParty libraries warnings and refactor+modernize several classes
CQTexperiment
Christopher Snowhill 2021-01-30 17:46:38 -08:00 committed by GitHub
commit 5d9cc6faea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
122 changed files with 1755 additions and 1874 deletions

View File

@ -101,7 +101,7 @@
{ {
BOOL shouldHandleMediaKeyEventLocally = ![SPMediaKeyTap usesGlobalMediaKeyTap]; BOOL shouldHandleMediaKeyEventLocally = ![SPMediaKeyTap usesGlobalMediaKeyTap];
if(shouldHandleMediaKeyEventLocally && [event type] == NSSystemDefined && [event subtype] == 8 ) if(shouldHandleMediaKeyEventLocally && [event type] == NSEventTypeSystemDefined && [event subtype] == 8 )
{ {
[self mediaKeyTap:nil receivedMediaKeyEvent:event]; [self mediaKeyTap:nil receivedMediaKeyEvent:event];
} }
@ -111,7 +111,7 @@
-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event; -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
{ {
NSAssert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:"); NSAssert([event type] == NSEventTypeSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:");
int keyCode = (([event data1] & 0xFFFF0000) >> 16); int keyCode = (([event data1] & 0xFFFF0000) >> 16);
int keyFlags = ([event data1] & 0x0000FFFF); int keyFlags = ([event data1] & 0x0000FFFF);

View File

@ -9,6 +9,7 @@
#import "Node.h" #import "Node.h"
#import "Logging.h" #import "Logging.h"
#import "BufferChain.h"
@implementation Node @implementation Node

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -3,5 +3,6 @@
// //
#ifdef __OBJC__ #ifdef __OBJC__
#import <AssertMacros.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#endif #endif

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -11,16 +11,12 @@
@class PathNode; @class PathNode;
@class PathWatcher; @class PathWatcher;
@interface FileTreeDataSource : NSObject { @interface FileTreeDataSource : NSObject <NSOutlineViewDataSource>
PathNode *rootNode;
IBOutlet NSPathControl *pathControl; @property(nonatomic, weak) IBOutlet NSOutlineView *outlineView;
IBOutlet PathWatcher *watcher; @property(nonatomic, weak) IBOutlet NSPathControl *pathControl;
IBOutlet NSOutlineView *outlineView; @property(nonatomic, weak) IBOutlet PathWatcher *watcher;
}
- (NSURL *)rootURL;
- (void)setRootURL:(NSURL *)rootURL;
- (void)changeURL:(NSURL *)rootURL; - (void)changeURL:(NSURL *)rootURL;
- (void)reloadPathNode:(PathNode *)item; - (void)reloadPathNode:(PathNode *)item;

View File

@ -8,89 +8,96 @@
#import "FileTreeDataSource.h" #import "FileTreeDataSource.h"
#import "DNDArrayController.h"
#import "DirectoryNode.h" #import "DirectoryNode.h"
#import "PathWatcher.h" #import "PathWatcher.h"
#import "Logging.h" #import "Logging.h"
@implementation FileTreeDataSource NSURL *defaultMusicDirectory() {
return [[NSFileManager defaultManager] URLForDirectory:NSMusicDirectory
inDomain:NSUserDomainMask
appropriateForURL:nil
create:NO
error:nil];
}
+ (void)initialize @interface FileTreeDataSource()
{
NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary];
[userDefaultsValuesDict setObject:[[NSURL fileURLWithPath:[@"~/Music" stringByExpandingTildeInPath]] absoluteString] forKey:@"fileTreeRootURL"]; @property NSURL *rootURL;
@end
@implementation FileTreeDataSource {
PathNode *rootNode;
}
+ (void)initialize {
NSString *path = [defaultMusicDirectory() absoluteString];
NSDictionary *userDefaultsValuesDict = @{@"fileTreeRootURL": path};
[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
} }
- (void)awakeFromNib - (void)awakeFromNib {
{ [self.pathControl setTarget:self];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileTreeRootURL" options:0 context:nil]; [self.pathControl setAction:@selector(pathControlAction:)];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
[self setRootURL: [NSURL URLWithString:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]]]; forKeyPath:@"values.fileTreeRootURL"
options:NSKeyValueObservingOptionNew |
[pathControl setTarget:self]; NSKeyValueObservingOptionInitial
[pathControl setAction:@selector(pathControlAction:)]; context:nil];
} }
- (void) observeValueForKeyPath:(NSString *)keyPath - (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object ofObject:(id)object
change:(NSDictionary *)change change:(NSDictionary *)change
context:(void *)context context:(void *)context {
{
DLog(@"File tree root URL: %@\n", [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]);
if ([keyPath isEqualToString:@"values.fileTreeRootURL"]) { if ([keyPath isEqualToString:@"values.fileTreeRootURL"]) {
[self setRootURL:[NSURL URLWithString:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]]]; NSString *url =
[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"];
DLog(@"File tree root URL: %@\n", url);
self.rootURL = [NSURL URLWithString:url];
} }
} }
- (void)changeURL:(NSURL *)url - (void)changeURL:(NSURL *)url {
{ if (url != nil) {
if (url != nil) [[[NSUserDefaultsController sharedUserDefaultsController] defaults] setObject:[url absoluteString]
{ forKey:@"fileTreeRootURL"];
[[[NSUserDefaultsController sharedUserDefaultsController] defaults] setObject:[url absoluteString] forKey:@"fileTreeRootURL"];
} }
} }
- (void)pathControlAction:(id)sender - (void)pathControlAction:(id)sender {
{ NSPathControlItem *item = [self.pathControl clickedPathItem];
if ([pathControl clickedPathComponentCell] != nil && [[pathControl clickedPathComponentCell] URL] != nil) if (item != nil && item.URL != nil) {
{ [self changeURL:item.URL];
[self changeURL:[[pathControl clickedPathComponentCell] URL]];
} }
} }
- (NSURL *)rootURL - (NSURL *)rootURL {
{
return [rootNode URL]; return [rootNode URL];
} }
- (void)setRootURL: (NSURL *)rootURL - (void)setRootURL:(NSURL *)rootURL {
{ if (![[NSFileManager defaultManager] fileExistsAtPath:[rootURL path]]) {
if (![[NSFileManager defaultManager] fileExistsAtPath:[rootURL path]]) rootURL = defaultMusicDirectory();
rootURL = [NSURL fileURLWithPath:[@"~/Music" stringByExpandingTildeInPath]]; }
rootNode = [[DirectoryNode alloc] initWithDataSource:self url:rootURL]; rootNode = [[DirectoryNode alloc] initWithDataSource:self url:rootURL];
[watcher setPath:[rootURL path]]; [self.watcher setPath:[rootURL path]];
[self reloadPathNode:rootNode]; [self reloadPathNode:rootNode];
} }
- (PathNode *)nodeForPath:(NSString *)path - (PathNode *)nodeForPath:(NSString *)path {
{
NSString *relativePath = [[path stringByReplacingOccurrencesOfString:[[[self rootURL] path] stringByAppendingString:@"/"] NSString *relativePath = [[path stringByReplacingOccurrencesOfString:[[[self rootURL] path] stringByAppendingString:@"/"]
withString:@"" withString:@""
options:NSAnchoredSearch options:NSAnchoredSearch
range:NSMakeRange(0, [path length]) range:NSMakeRange(0, [path length])
] stringByStandardizingPath]; ] stringByStandardizingPath];
PathNode *node = rootNode; PathNode *node = rootNode;
DLog(@"Root | Relative | Path: %@ | %@ | %@",[[self rootURL] path], relativePath, path); DLog(@"Root | Relative | Path: %@ | %@ | %@", [[self rootURL] path], relativePath, path);
for (NSString *c in [relativePath pathComponents]) for (NSString *c in [relativePath pathComponents]) {
{
DLog(@"COMPONENT: %@", c); DLog(@"COMPONENT: %@", c);
BOOL found = NO; BOOL found = NO;
for (PathNode *subnode in [node subpaths]) { for (PathNode *subnode in [node subpaths]) {
@ -100,8 +107,7 @@
} }
} }
if (!found) if (!found) {
{
DLog(@"Not found!"); DLog(@"Not found!");
return nil; return nil;
} }
@ -110,8 +116,7 @@
return node; return node;
} }
- (void)pathDidChange:(NSString *)path - (void)pathDidChange:(NSString *)path {
{
DLog(@"PATH DID CHANGE: %@", path); DLog(@"PATH DID CHANGE: %@", path);
//Need to find the corresponding node...and call [node reloadPath], then [self reloadPathNode:node] //Need to find the corresponding node...and call [node reloadPath], then [self reloadPathNode:node]
PathNode *node = [self nodeForPath:path]; PathNode *node = [self nodeForPath:path];
@ -120,63 +125,41 @@
[self reloadPathNode:node]; [self reloadPathNode:node];
} }
- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
{
PathNode *n = (item == nil ? rootNode : item); PathNode *n = (item == nil ? rootNode : item);
return (int) [[n subpaths] count]; return (int) [[n subpaths] count];
} }
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
PathNode *n = (item == nil ? rootNode : item); PathNode *n = (item == nil ? rootNode : item);
return ([n isLeaf] == NO); return ![n isLeaf];
} }
- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
{
PathNode *n = (item == nil ? rootNode : item); PathNode *n = (item == nil ? rootNode : item);
return [[n subpaths] objectAtIndex:index]; return [n subpaths][(NSUInteger) index];
} }
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
{
PathNode *n = (item == nil ? rootNode : item); PathNode *n = (item == nil ? rootNode : item);
return n; return n;
} }
//Drag it drop it - (id <NSPasteboardWriting>)outlineView:(NSOutlineView *)outlineView pasteboardWriterForItem:(id)item {
- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray*)items toPasteboard:(NSPasteboard*)pboard { NSPasteboardItem *paste = [[NSPasteboardItem alloc] init];
//Get selected paths [paste setData:[[item URL] dataRepresentation] forType:NSPasteboardTypeFileURL];
NSMutableArray *urls = [NSMutableArray arrayWithCapacity:[items count]]; return paste;
NSMutableArray *paths = [NSMutableArray arrayWithCapacity:[items count]];
for (id p in items) {
[urls addObject:[p URL]];
[paths addObject:[[p URL] path]];
}
DLog(@"Paths: %@", paths);
[pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPboardType,nil] owner:nil]; //add it to pboard
[pboard setData:[NSArchiver archivedDataWithRootObject:urls] forType:CogUrlsPboardType];
[pboard addTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:self];
[pboard setPropertyList:paths forType:NSFilenamesPboardType];
return YES;
} }
- (void)reloadPathNode:(PathNode *)item - (void)reloadPathNode:(PathNode *)item {
{ if (item == rootNode) {
if (item == rootNode) [self.outlineView reloadData];
{ } else {
[outlineView reloadData]; [self.outlineView reloadItem:item reloadChildren:YES];
}
else
{
[outlineView reloadItem:item reloadChildren:YES];
} }
} }

View File

@ -21,7 +21,7 @@
- (void)keyDown:(NSEvent *)e - (void)keyDown:(NSEvent *)e
{ {
unsigned int modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask); unsigned int modifiers = [e modifierFlags] & (NSEventModifierFlagCommand | NSEventModifierFlagShift | NSEventModifierFlagControl | NSEventModifierFlagOption);
NSString *characters = [e characters]; NSString *characters = [e characters];
unichar c; unichar c;

View File

@ -738,6 +738,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -792,6 +793,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -606,6 +606,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -645,6 +646,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1589,6 +1589,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1629,6 +1630,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -286,6 +286,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -330,6 +331,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -256,6 +256,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -307,6 +308,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -304,6 +304,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -357,6 +358,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -387,6 +387,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -425,6 +426,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -340,6 +340,7 @@
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -380,6 +381,7 @@
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1390,6 +1390,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1454,6 +1455,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1485,10 +1487,7 @@
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = "$(inherited)";
"$(inherited)",
"$(PROJECT_DIR)/OpenMPT/include/foobar2000sdk/foobar2000/shared",
);
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT; PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -1509,10 +1508,7 @@
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = "$(inherited)";
"$(inherited)",
"$(PROJECT_DIR)/OpenMPT/include/foobar2000sdk/foobar2000/shared",
);
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT; PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

View File

@ -1354,6 +1354,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1401,6 +1402,7 @@
GCC_PREPROCESSOR_DEFINITIONS = __OPTIMIZE__; GCC_PREPROCESSOR_DEFINITIONS = __OPTIMIZE__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -331,6 +331,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -376,6 +377,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1130,6 +1130,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1172,6 +1173,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -853,6 +853,7 @@
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -893,6 +894,7 @@
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -448,6 +448,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -487,6 +488,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -422,6 +422,7 @@
"$(inherited)", "$(inherited)",
"VAR_ARRAYS=1", "VAR_ARRAYS=1",
); );
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@ -448,6 +449,7 @@
DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks"; DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks";
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_PREPROCESSOR_DEFINITIONS = "VAR_ARRAYS=1"; GCC_PREPROCESSOR_DEFINITIONS = "VAR_ARRAYS=1";
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1122,6 +1122,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1167,6 +1168,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -292,6 +292,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -347,6 +348,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -119,7 +119,7 @@
TargetAttributes = { TargetAttributes = {
83D3C67A201D37D8005564CB = { 83D3C67A201D37D8005564CB = {
CreatedOnToolsVersion = 9.2; CreatedOnToolsVersion = 9.2;
ProvisioningStyle = Manual; ProvisioningStyle = Automatic;
}; };
}; };
}; };
@ -213,6 +213,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -267,6 +268,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1025,6 +1025,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -1081,6 +1082,7 @@
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1366,6 +1366,7 @@
"HAVE_STRTOF_L=1", "HAVE_STRTOF_L=1",
MGBA_STANDALONE, MGBA_STANDALONE,
); );
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(SRCROOT)/mGBA/mgba/src", "$(SRCROOT)/mGBA/mgba/src",
"$(SRCROOT)/mGBA/mgba/include", "$(SRCROOT)/mGBA/mgba/include",
@ -1399,6 +1400,7 @@
"HAVE_STRTOF_L=1", "HAVE_STRTOF_L=1",
MGBA_STANDALONE, MGBA_STANDALONE,
); );
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(SRCROOT)/mGBA/mgba/src", "$(SRCROOT)/mGBA/mgba/src",
"$(SRCROOT)/mGBA/mgba/include", "$(SRCROOT)/mGBA/mgba/include",

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -274,6 +274,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -320,6 +321,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -323,7 +323,7 @@
TargetAttributes = { TargetAttributes = {
8313E30E1901FBDC00B4B6F1 = { 8313E30E1901FBDC00B4B6F1 = {
DevelopmentTeam = N6E749HJ2X; DevelopmentTeam = N6E749HJ2X;
ProvisioningStyle = Manual; ProvisioningStyle = Automatic;
}; };
}; };
}; };
@ -515,6 +515,7 @@
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
INFOPLIST_FILE = "mpg123/mpg123-Info.plist"; INFOPLIST_FILE = "mpg123/mpg123-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@ -532,6 +533,7 @@
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
INFOPLIST_FILE = "mpg123/mpg123-Info.plist"; INFOPLIST_FILE = "mpg123/mpg123-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -303,6 +303,7 @@
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
INFOPLIST_FILE = "psflib/psflib-Info.plist"; INFOPLIST_FILE = "psflib/psflib-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.psflib; PRODUCT_BUNDLE_IDENTIFIER = net.kode54.psflib;
@ -325,6 +326,7 @@
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
INFOPLIST_FILE = "psflib/psflib-Info.plist"; INFOPLIST_FILE = "psflib/psflib-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.psflib; PRODUCT_BUNDLE_IDENTIFIER = net.kode54.psflib;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -2295,7 +2295,7 @@
836F6B3018BDB8880095E648 /* Project object */ = { 836F6B3018BDB8880095E648 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1150; LastUpgradeCheck = 1230;
ORGANIZATIONNAME = "Christopher Snowhill"; ORGANIZATIONNAME = "Christopher Snowhill";
TargetAttributes = { TargetAttributes = {
836F6B3818BDB8880095E648 = { 836F6B3818BDB8880095E648 = {
@ -2998,6 +2998,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3027,6 +3028,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -3066,6 +3068,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3092,6 +3095,7 @@
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -3119,7 +3123,6 @@
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Cog-egaqitgoybntfwaoqzgiynizucrq/Build/Products/Debug",
../mpg123, ../mpg123,
); );
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
@ -3149,7 +3152,6 @@
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Cog-egaqitgoybntfwaoqzgiynizucrq/Build/Products/Debug",
../mpg123, ../mpg123,
); );
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -403,6 +403,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -448,6 +449,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,22 +1,32 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
extern NSString *MovedRowsType; extern NSString *CogDNDIndexType;
extern NSString *CogUrlsPboardType; extern NSString *CogUrlsPboardType;
extern NSString *iTunesDropType; extern NSString *iTunesDropType;
@interface DNDArrayController : NSArrayController @interface DNDArrayController : NSArrayController <NSTableViewDataSource>
{
IBOutlet NSTableView *tableView; @property IBOutlet NSTableView *tableView;
}
// table view drag and drop support // table view drag and drop support
- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard; - (id <NSPasteboardWriting>)tableView:(NSTableView *)tableView
- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op; pasteboardWriterForRow:(NSInteger)row;
- (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(int)row dropOperation:(NSTableViewDropOperation)op; - (void)tableView:(NSTableView *)tableView
draggingSession:(NSDraggingSession *)session
willBeginAtPoint:(NSPoint)screenPoint
forRowIndexes:(NSIndexSet *)rowIndexes;
- (NSDragOperation)tableView:(NSTableView *)tableView
validateDrop:(id <NSDraggingInfo>)info
proposedRow:(NSInteger)row
proposedDropOperation:(NSTableViewDropOperation)dropOperation;
- (BOOL)tableView:(NSTableView *)tableView
acceptDrop:(id <NSDraggingInfo>)info
row:(NSInteger)row
dropOperation:(NSTableViewDropOperation)dropOperation;
// utility methods // utility methods
-(void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet*)indexSet toIndex:(unsigned int)insertIndex; -(void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet
toIndex:(unsigned int)insertIndex;
@end @end

View File

@ -3,72 +3,76 @@
#import "Logging.h" #import "Logging.h"
NSString *CogDNDIndexType = @"org.cogx.cog.dnd-index";
NSString *CogUrlsPboardType = @"org.cogx.cog.url";
NSString *iTunesDropType = @"com.apple.tv.metadata";
@implementation DNDArrayController @implementation DNDArrayController
NSString *MovedRowsType = @"MOVED_ROWS_TYPE"; - (void)awakeFromNib {
NSString *CogUrlsPboardType = @"COG_URLS_TYPE"; [super awakeFromNib];
// @"CorePasteboardFlavorType 0x6974756E" is the "itun" type representing an iTunes plist
NSString *iTunesDropType = @"CorePasteboardFlavorType 0x6974756E";
- (void)awakeFromNib
{
// register for drag and drop // register for drag and drop
[tableView registerForDraggedTypes:[NSArray arrayWithObjects:MovedRowsType, CogUrlsPboardType, NSFilenamesPboardType, iTunesDropType, nil]]; [self.tableView registerForDraggedTypes:@[CogDNDIndexType,
CogUrlsPboardType,
NSPasteboardTypeFileURL,
iTunesDropType]];
} }
- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard - (id <NSPasteboardWriting>)tableView:(NSTableView *)tableView
{ pasteboardWriterForRow:(NSInteger)row {
DLog(@"INDEX SET ON DRAG: %@", rowIndexes); NSPasteboardItem *item = [[NSPasteboardItem alloc] init];
[item setString:[@(row) stringValue] forType:CogDNDIndexType];
NSData *data = [NSArchiver archivedDataWithRootObject:rowIndexes]; return item;
[pboard declareTypes: [NSArray arrayWithObjects:MovedRowsType, nil] owner:self];
[pboard setData:data forType: MovedRowsType];
return YES;
} }
- (NSDragOperation)tableView:(NSTableView*)tv - (void)tableView:(NSTableView *)tableView
draggingSession:(NSDraggingSession *)session
willBeginAtPoint:(NSPoint)screenPoint
forRowIndexes:(NSIndexSet *)rowIndexes {
DLog(@"Drag session started with indexes: %@", rowIndexes);
}
- (NSDragOperation)tableView:(NSTableView *)tableView
validateDrop:(id <NSDraggingInfo>)info validateDrop:(id <NSDraggingInfo>)info
proposedRow:(int)row proposedRow:(NSInteger)row
proposedDropOperation:(NSTableViewDropOperation)op proposedDropOperation:(NSTableViewDropOperation)dropOperation {
{
NSDragOperation dragOp = NSDragOperationCopy; NSDragOperation dragOp = NSDragOperationCopy;
if ([info draggingSource] == tv) if ([info draggingSource] == tableView)
dragOp = NSDragOperationMove; dragOp = NSDragOperationMove;
DLog(@"VALIDATING DROP!"); DLog(@"VALIDATING DROP!");
// we want to put the object at, not over, // we want to put the object at, not over,
// the current row (contrast NSTableViewDropOn) // the current row (contrast NSTableViewDropOn)
[tv setDropRow:row dropOperation:NSTableViewDropAbove]; [tableView setDropRow:row dropOperation:NSTableViewDropAbove];
return dragOp; return dragOp;
} }
- (BOOL)tableView:(NSTableView*)tv - (BOOL)tableView:(NSTableView *)tableView
acceptDrop:(id <NSDraggingInfo>)info acceptDrop:(id <NSDraggingInfo>)info
row:(int)row row:(NSInteger)row
dropOperation:(NSTableViewDropOperation)op dropOperation:(NSTableViewDropOperation)dropOperation {
{ if (row < 0) {
if (row < 0)
{
row = 0; row = 0;
} }
NSArray<NSPasteboardItem *> *items = info.draggingPasteboard.pasteboardItems;
// if drag source is self, it's a move // if drag source is self, it's a move
if ([info draggingSource] == tableView) if ([info draggingSource] == tableView || items == nil) {
{ NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet];
NSIndexSet *indexSet = [NSUnarchiver unarchiveObjectWithData:[[info draggingPasteboard] dataForType:MovedRowsType]]; for (NSPasteboardItem *item in items) {
if (indexSet) [indexSet addIndex:(NSUInteger) [[item stringForType:CogDNDIndexType] intValue]];
{ }
if ([indexSet count] > 0) {
DLog(@"INDEX SET ON DROP: %@", indexSet); DLog(@"INDEX SET ON DROP: %@", indexSet);
NSArray *selected = [[self arrangedObjects] objectsAtIndexes:indexSet]; NSArray *selected = [[self arrangedObjects] objectsAtIndexes:indexSet];
[self moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:row]; [self moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:(unsigned int) row];
[self setSelectedObjects:selected]; [self setSelectedObjects:selected];
@ -81,30 +85,25 @@ NSString *iTunesDropType = @"CorePasteboardFlavorType 0x6974756E";
} }
-(void) moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet*)indexSet - (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet
toIndex:(unsigned int)insertIndex toIndex:(unsigned int)insertIndex {
{
NSArray *objects = [self arrangedObjects]; NSArray *objects = [self arrangedObjects];
NSUInteger index = [indexSet lastIndex]; NSUInteger index = [indexSet lastIndex];
int aboveInsertIndexCount = 0; NSUInteger aboveInsertIndexCount = 0;
id object; id object;
int removeIndex; NSUInteger removeIndex;
while (NSNotFound != index) while (NSNotFound != index) {
{
if (index >= insertIndex) { if (index >= insertIndex) {
removeIndex = (int)(index + aboveInsertIndexCount); removeIndex = index + aboveInsertIndexCount;
aboveInsertIndexCount += 1; aboveInsertIndexCount += 1;
} } else {
else removeIndex = index;
{
removeIndex = (int)index;
insertIndex -= 1; insertIndex -= 1;
} }
object = [objects objectAtIndex:removeIndex]; object = objects[removeIndex];
[self removeObjectAtArrangedObjectIndex:removeIndex]; [self removeObjectAtArrangedObjectIndex:removeIndex];
[self insertObject:object atArrangedObjectIndex:insertIndex]; [self insertObject:object atArrangedObjectIndex:insertIndex];

View File

@ -15,31 +15,25 @@
@class SpotlightWindowController; @class SpotlightWindowController;
@class PlaybackController; @class PlaybackController;
typedef enum { typedef NS_ENUM(NSInteger, RepeatMode) {
RepeatNone = 0, RepeatModeNoRepeat = 0,
RepeatOne, RepeatModeRepeatOne,
RepeatAlbum, RepeatModeRepeatAlbum,
RepeatAll RepeatModeRepeatAll
} RepeatMode; };
static inline BOOL IsRepeatOneSet() static inline BOOL IsRepeatOneSet() {
{ return [[NSUserDefaults standardUserDefaults] integerForKey:@"repeat"] == RepeatModeRepeatOne;
return [[NSUserDefaults standardUserDefaults] integerForKey:@"repeat"] == RepeatOne;
} }
typedef enum { typedef enum { ShuffleOff = 0, ShuffleAlbums, ShuffleAll } ShuffleMode;
ShuffleOff = 0,
ShuffleAlbums,
ShuffleAll
} ShuffleMode;
typedef NS_ENUM(NSInteger, URLOrigin) {
typedef enum {
URLOriginInternal = 0, URLOriginInternal = 0,
URLOriginExternal, URLOriginExternal
} URLOrigin; };
@interface PlaylistController : DNDArrayController { @interface PlaylistController : DNDArrayController <NSTableViewDelegate> {
IBOutlet PlaylistLoader *playlistLoader; IBOutlet PlaylistLoader *playlistLoader;
IBOutlet SpotlightWindowController *spotlightWindowController; IBOutlet SpotlightWindowController *spotlightWindowController;
IBOutlet PlaybackController *playbackController; IBOutlet PlaybackController *playbackController;
@ -57,13 +51,12 @@ typedef enum {
@property(nonatomic, retain) PlaylistEntry *currentEntry; @property(nonatomic, retain) PlaylistEntry *currentEntry;
@property(retain) NSString *totalTime; @property(retain) NSString *totalTime;
//Private Methods // Private Methods
- (void)updateTotalTime; - (void)updateTotalTime;
- (void)updatePlaylistIndexes; - (void)updatePlaylistIndexes;
- (IBAction)stopAfterCurrent:(id)sender; - (IBAction)stopAfterCurrent:(id)sender;
// PUBLIC METHODS
//PUBLIC METHODS
- (void)setShuffle:(ShuffleMode)s; - (void)setShuffle:(ShuffleMode)s;
- (ShuffleMode)shuffle; - (ShuffleMode)shuffle;
- (void)setRepeat:(RepeatMode)r; - (void)setRepeat:(RepeatMode)r;
@ -95,7 +88,7 @@ typedef enum {
- (IBAction)searchByArtist:(id)sender; - (IBAction)searchByArtist:(id)sender;
- (IBAction)searchByAlbum:(id)sender; - (IBAction)searchByAlbum:(id)sender;
//FUN PLAYLIST MANAGEMENT STUFF! // FUN PLAYLIST MANAGEMENT STUFF!
- (BOOL)next; - (BOOL)next;
- (BOOL)prev; - (BOOL)prev;
@ -107,12 +100,15 @@ typedef enum {
- (PlaylistEntry *)entryAtIndex:(int)i; - (PlaylistEntry *)entryAtIndex:(int)i;
// Event inlets: // Event inlets:
- (void)willInsertURLs:(NSArray*)urls origin:(URLOrigin)origin; - (void)willInsertURLs:(NSArray *)urls origin:(URLOrigin)origin;
- (void)didInsertURLs:(NSArray*)urls origin:(URLOrigin)origin; - (void)didInsertURLs:(NSArray *)urls origin:(URLOrigin)origin;
// queue methods // queue methods
- (IBAction)toggleQueued:(id)sender; - (IBAction)toggleQueued:(id)sender;
- (IBAction)emptyQueueList:(id)sender; - (IBAction)emptyQueueList:(id)sender;
- (NSMutableArray *)queueList; - (NSMutableArray *)queueList;
- (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet
toIndex:(unsigned int)insertIndex;
@end @end

File diff suppressed because it is too large Load Diff

View File

@ -7,13 +7,11 @@
// //
#import "PlaylistView.h" #import "PlaylistView.h"
#import "PlaybackController.h"
#import "PlaylistController.h"
#import "IndexFormatter.h"
#import "SecondsFormatter.h"
#import "BlankZeroFormatter.h" #import "BlankZeroFormatter.h"
#import "IndexFormatter.h"
#import "PlaylistEntry.h" #import "PlaylistEntry.h"
#import "SecondsFormatter.h"
#import "CogAudio/Status.h" #import "CogAudio/Status.h"
@ -21,12 +19,11 @@
@implementation PlaylistView @implementation PlaylistView
- (void)awakeFromNib - (void)awakeFromNib {
{
[[self menu] setAutoenablesItems:NO]; [[self menu] setAutoenablesItems:NO];
// Configure bindings to scale font size and row height // Configure bindings to scale font size and row height
NSControlSize s = NSSmallControlSize; NSControlSize s = NSControlSizeSmall;
NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]]; NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]];
// NSFont *bf = [[NSFontManager sharedFontManager] convertFont:f toHaveTrait:NSBoldFontMask]; // NSFont *bf = [[NSFontManager sharedFontManager] convertFont:f toHaveTrait:NSBoldFontMask];
@ -35,7 +32,7 @@
[[col dataCell] setFont:f]; [[col dataCell] setFont:f];
} }
//Set up formatters // Set up formatters
NSFormatter *secondsFormatter = [[SecondsFormatter alloc] init]; NSFormatter *secondsFormatter = [[SecondsFormatter alloc] init];
[[[self tableColumnWithIdentifier:@"length"] dataCell] setFormatter:secondsFormatter]; [[[self tableColumnWithIdentifier:@"length"] dataCell] setFormatter:secondsFormatter];
@ -45,39 +42,38 @@
NSFormatter *blankZeroFormatter = [[BlankZeroFormatter alloc] init]; NSFormatter *blankZeroFormatter = [[BlankZeroFormatter alloc] init];
[[[self tableColumnWithIdentifier:@"track"] dataCell] setFormatter:blankZeroFormatter]; [[[self tableColumnWithIdentifier:@"track"] dataCell] setFormatter:blankZeroFormatter];
[[[self tableColumnWithIdentifier:@"year"] dataCell] setFormatter:blankZeroFormatter]; [[[self tableColumnWithIdentifier:@"year"] dataCell] setFormatter:blankZeroFormatter];
//end setting up formatters // end setting up formatters
[self setVerticalMotionCanBeginDrag:YES]; [self setVerticalMotionCanBeginDrag:YES];
//Set up header context menu // Set up header context menu
headerContextMenu = [[NSMenu alloc] initWithTitle:@"Playlist Header Context Menu"]; headerContextMenu = [[NSMenu alloc] initWithTitle:@"Playlist Header Context Menu"];
NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"identifier" ascending:YES]; NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"identifier"
NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor]; ascending:YES];
NSArray *sortDescriptors = @[sortDescriptor];
int visibleTableColumns = 0; int visibleTableColumns = 0;
int menuIndex = 0; int menuIndex = 0;
for (NSTableColumn *col in [[self tableColumns] sortedArrayUsingDescriptors: sortDescriptors]) for (NSTableColumn *col in [[self tableColumns] sortedArrayUsingDescriptors:sortDescriptors]) {
{
NSString *title; NSString *title;
if ([[col identifier] isEqualToString:@"status"]) if ([[col identifier] isEqualToString:@"status"]) {
{
title = @"Status"; title = @"Status";
} } else if ([[col identifier] isEqualToString:@"index"]) {
else if ([[col identifier] isEqualToString:@"index"])
{
title = @"Index"; title = @"Index";
} } else {
else
{
title = [[col headerCell] title]; title = [[col headerCell] title];
} }
NSMenuItem *contextMenuItem = [headerContextMenu insertItemWithTitle:title action:@selector(toggleColumn:) keyEquivalent:@"" atIndex:menuIndex]; NSMenuItem *contextMenuItem =
[headerContextMenu insertItemWithTitle:title
action:@selector(toggleColumn:)
keyEquivalent:@""
atIndex:menuIndex];
[contextMenuItem setTarget:self]; [contextMenuItem setTarget:self];
[contextMenuItem setRepresentedObject:col]; [contextMenuItem setRepresentedObject:col];
[contextMenuItem setState:([col isHidden] ? NSOffState : NSOnState)]; [contextMenuItem setState:([col isHidden] ? NSControlStateValueOff : NSControlStateValueOn)];
visibleTableColumns += ![col isHidden]; visibleTableColumns += ![col isHidden];
menuIndex++; menuIndex++;
@ -92,79 +88,65 @@
[[self headerView] setMenu:headerContextMenu]; [[self headerView] setMenu:headerContextMenu];
} }
- (IBAction)toggleColumn:(id)sender {
- (IBAction)toggleColumn:(id)sender
{
id tc = [sender representedObject]; id tc = [sender representedObject];
if ([sender state] == NSOffState) if ([sender state] == NSControlStateValueOff) {
{ [sender setState:NSControlStateValueOn];
[sender setState:NSOnState];
[tc setHidden: NO]; [tc setHidden:NO];
} } else {
else [sender setState:NSControlStateValueOff];
{
[sender setState:NSOffState];
[tc setHidden: YES]; [tc setHidden:YES];
} }
} }
- (BOOL)acceptsFirstResponder - (BOOL)acceptsFirstResponder {
{
return YES; return YES;
} }
- (BOOL)resignFirstResponder - (BOOL)resignFirstResponder {
{
return YES; return YES;
} }
- (BOOL)acceptsFirstMouse:(NSEvent *)mouseDownEvent - (BOOL)acceptsFirstMouse:(NSEvent *)mouseDownEvent {
{
return NO; return NO;
} }
- (void)mouseDown:(NSEvent *)e - (void)mouseDown:(NSEvent *)e {
{
[super mouseDown:e]; [super mouseDown:e];
if ([e type] == NSLeftMouseDown && [e clickCount] == 2 && [[self selectedRowIndexes] count] == 1) if ([e type] == NSEventTypeLeftMouseDown && [e clickCount] == 2 &&
{ [[self selectedRowIndexes] count] == 1) {
[playbackController play:self]; [playbackController play:self];
} }
} }
// enables right-click selection for "Show in Finder" contextual menu // enables right-click selection for "Show in Finder" contextual menu
-(NSMenu*)menuForEvent:(NSEvent*)event - (NSMenu *)menuForEvent:(NSEvent *)event {
{ // Find which row is under the cursor
//Find which row is under the cursor
[[self window] makeFirstResponder:self]; [[self window] makeFirstResponder:self];
NSPoint menuPoint = [self convertPoint:[event locationInWindow] fromView:nil]; NSPoint menuPoint = [self convertPoint:[event locationInWindow] fromView:nil];
NSInteger iRow = [self rowAtPoint:menuPoint]; NSInteger iRow = [self rowAtPoint:menuPoint];
NSMenu* tableViewMenu = [self menu]; NSMenu *tableViewMenu = [self menu];
/* Update the table selection before showing menu /* Update the table selection before showing menu
Preserves the selection if the row under the mouse is selected (to allow for Preserves the selection if the row under the mouse is selected (to allow for
multiple items to be selected), otherwise selects the row under the mouse */ multiple items to be selected), otherwise selects the row under the mouse */
BOOL currentRowIsSelected = [[self selectedRowIndexes] containsIndex:iRow]; BOOL currentRowIsSelected = [[self selectedRowIndexes] containsIndex:(NSUInteger) iRow];
if (!currentRowIsSelected) { if (!currentRowIsSelected) {
if (iRow == -1) if (iRow == -1) {
{
[self deselectAll:self]; [self deselectAll:self];
} } else {
else [self selectRowIndexes:[NSIndexSet indexSetWithIndex:(NSUInteger) iRow] byExtendingSelection:NO];
{
[self selectRowIndexes:[NSIndexSet indexSetWithIndex:iRow] byExtendingSelection:NO];
} }
} }
if ([self numberOfSelectedRows] <=0) if ([self numberOfSelectedRows] <= 0) {
{ // No rows are selected, so the table should be displayed with all items disabled
//No rows are selected, so the table should be displayed with all items disabled
int i; int i;
for (i=0;i<[tableViewMenu numberOfItems];i++) { for (i = 0; i < [tableViewMenu numberOfItems]; i++) {
[[tableViewMenu itemAtIndex:i] setEnabled:NO]; [[tableViewMenu itemAtIndex:i] setEnabled:NO];
} }
} }
@ -172,141 +154,152 @@
return tableViewMenu; return tableViewMenu;
} }
- (void)keyDown:(NSEvent *)e - (void)keyDown:(NSEvent *)e {
{ unsigned int modifiers =
unsigned int modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask); [e modifierFlags] & (NSEventModifierFlagCommand | NSEventModifierFlagShift |
NSEventModifierFlagControl | NSEventModifierFlagOption);
NSString *characters = [e characters]; NSString *characters = [e characters];
unichar c; unichar c;
if ([characters length] != 1) if ([characters length] != 1) {
{
[super keyDown:e]; [super keyDown:e];
return; return;
} }
c = [characters characterAtIndex:0]; c = [characters characterAtIndex:0];
if (modifiers == 0 && (c == NSDeleteCharacter || c == NSBackspaceCharacter || c == NSDeleteFunctionKey)) if (modifiers == 0 &&
{ (c == NSDeleteCharacter || c == NSBackspaceCharacter || c == NSDeleteFunctionKey)) {
[playlistController remove:self]; [playlistController remove:self];
} } else if (modifiers == 0 && c == ' ') {
else if (modifiers == 0 && c == ' ')
{
[playbackController playPauseResume:self]; [playbackController playPauseResume:self];
} } else if (modifiers == 0 && (c == NSEnterCharacter || c == NSCarriageReturnCharacter)) {
else if (modifiers == 0 && (c == NSEnterCharacter || c == NSCarriageReturnCharacter))
{
[playbackController play:self]; [playbackController play:self];
} } else if (modifiers == 0 && c == NSLeftArrowFunctionKey) {
else if (modifiers == 0 && c == NSLeftArrowFunctionKey)
{
[playbackController eventSeekBackward:self]; [playbackController eventSeekBackward:self];
} } else if (modifiers == 0 && c == NSRightArrowFunctionKey) {
else if (modifiers == 0 && c == NSRightArrowFunctionKey)
{
[playbackController eventSeekForward:self]; [playbackController eventSeekForward:self];
} }
// Escape // Escape
else if (modifiers == 0 && c == 0x1b) else if (modifiers == 0 && c == 0x1b) {
{
[playlistController clearFilterPredicate:self]; [playlistController clearFilterPredicate:self];
} } else {
else
{
[super keyDown:e]; [super keyDown:e];
} }
} }
- (IBAction)scrollToCurrentEntry:(id)sender - (IBAction)scrollToCurrentEntry:(id)sender {
{
[self scrollRowToVisible:[[playlistController currentEntry] index]]; [self scrollRowToVisible:[[playlistController currentEntry] index]];
[self selectRowIndexes:[NSIndexSet indexSetWithIndex:[[playlistController currentEntry] index]] byExtendingSelection:NO]; [self selectRowIndexes:[NSIndexSet indexSetWithIndex:(NSUInteger) [[playlistController currentEntry] index]]
byExtendingSelection:NO];
} }
- (IBAction)undo:(id)sender - (IBAction)undo:(id)sender {
{
[[playlistController undoManager] undo]; [[playlistController undoManager] undo];
} }
- (IBAction)redo:(id)sender - (IBAction)redo:(id)sender {
{
[[playlistController undoManager] redo]; [[playlistController undoManager] redo];
} }
- (IBAction)copy:(id)sender - (IBAction)copy:(id)sender {
{
NSPasteboard *pboard = [NSPasteboard generalPasteboard]; NSPasteboard *pboard = [NSPasteboard generalPasteboard];
[pboard clearContents]; [pboard clearContents];
NSMutableArray *selectedURLs = [[NSMutableArray alloc] init]; NSArray *entries =
[[playlistController content] objectsAtIndexes:[playlistController selectionIndexes]];
NSUInteger capacity = [entries count];
NSMutableArray *selectedURLs = [NSMutableArray arrayWithCapacity:capacity];
for (PlaylistEntry *pe in [[playlistController content] objectsAtIndexes:[playlistController selectionIndexes]]) for (PlaylistEntry *pe in entries) {
{
[selectedURLs addObject:[pe URL]]; [selectedURLs addObject:[pe URL]];
} }
[pboard setData:[NSArchiver archivedDataWithRootObject:selectedURLs] forType:CogUrlsPboardType]; NSError *error;
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:selectedURLs
requiringSecureCoding:YES
error:&error];
if (!data) {
DLog(@"Error: %@", error);
}
[pboard setData:data forType:CogUrlsPboardType];
NSMutableDictionary * tracks = [[NSMutableDictionary alloc] init]; NSMutableDictionary *tracks = [NSMutableDictionary dictionaryWithCapacity:capacity];
unsigned long i = 0; unsigned long i = 0;
for (NSURL *url in selectedURLs) for (NSURL *url in selectedURLs) {
{ tracks[[NSString stringWithFormat:@"%lu", i++]] = @{@"Location": [url absoluteString]};
NSMutableDictionary * track = [NSMutableDictionary dictionaryWithObjectsAndKeys:[url absoluteString], @"Location", nil];
[tracks setObject:track forKey:[NSString stringWithFormat:@"%lu", i]];
++i;
} }
NSMutableDictionary * itunesPlist = [NSMutableDictionary dictionaryWithObjectsAndKeys:tracks, @"Tracks", nil]; NSDictionary *itunesPlist = @{@"Tracks": tracks};
[pboard setPropertyList:itunesPlist forType:iTunesDropType]; [pboard setPropertyList:itunesPlist forType:iTunesDropType];
NSMutableArray *filePaths = [[NSMutableArray alloc] init]; NSMutableArray *filePaths = [NSMutableArray array];
for (NSURL *url in selectedURLs) for (NSURL *url in selectedURLs) {
{ if ([url isFileURL]) {
if ([url isFileURL]) [filePaths addObject:url];
[filePaths addObject:[url path]]; }
} }
if ([filePaths count]) if ([filePaths count]) {
[pboard setPropertyList:filePaths forType:NSFilenamesPboardType]; [pboard writeObjects:filePaths];
}
} }
- (IBAction)cut:(id)sender - (IBAction)cut:(id)sender {
{
[self copy:sender]; [self copy:sender];
[playlistController removeObjectsAtArrangedObjectIndexes:[playlistController selectionIndexes]]; [playlistController removeObjectsAtArrangedObjectIndexes:[playlistController selectionIndexes]];
if ([playlistController shuffle] != ShuffleOff) if ([playlistController shuffle] != ShuffleOff) [playlistController resetShuffleList];
[playlistController resetShuffleList];
} }
- (IBAction)paste:(id)sender - (IBAction)paste:(id)sender {
{
// Determine the type of object that was dropped // Determine the type of object that was dropped
NSArray *supportedTypes = [NSArray arrayWithObjects:CogUrlsPboardType, NSFilenamesPboardType, iTunesDropType, nil]; NSArray *supportedTypes = @[CogUrlsPboardType, NSPasteboardTypeFileURL, iTunesDropType];
NSPasteboard *pboard = [NSPasteboard generalPasteboard]; NSPasteboard *pboard = [NSPasteboard generalPasteboard];
NSString *bestType = [pboard availableTypeFromArray:supportedTypes]; NSPasteboardType bestType = [pboard availableTypeFromArray:supportedTypes];
DLog(@"All types:");
for (NSPasteboardType type in [pboard types]) {
DLog(@" Type: %@", type);
}
DLog(@"Supported types:");
for (NSPasteboardType type in supportedTypes) {
DLog(@" Type: %@", type);
}
DLog(@"Best type: %@", bestType);
NSMutableArray *acceptedURLs = [[NSMutableArray alloc] init]; NSMutableArray *acceptedURLs = [NSMutableArray array];
// Get files from an file drawer drop // Get files from an file drawer drop
if ([bestType isEqualToString:CogUrlsPboardType]) { if ([bestType isEqualToString:CogUrlsPboardType]) {
NSArray *urls = [NSUnarchiver unarchiveObjectWithData:[pboard dataForType:CogUrlsPboardType]]; NSError *error;
NSData *data = [pboard dataForType:CogUrlsPboardType];
NSArray *urls;
if (@available(macOS 11.0, *)) {
urls = [NSKeyedUnarchiver unarchivedArrayOfObjectsOfClass:[NSURL class]
fromData:data
error:&error];
} else {
NSSet *allowed = [NSSet setWithArray:@[[NSArray class], [NSURL class]]];
urls = [NSKeyedUnarchiver unarchivedObjectOfClasses:allowed fromData:data error:&error];
}
if (!urls) {
DLog(@"%@", error);
} else {
DLog(@"URLS: %@", urls); DLog(@"URLS: %@", urls);
}
//[playlistLoader insertURLs: urls atIndex:row sort:YES]; //[playlistLoader insertURLs: urls atIndex:row sort:YES];
[acceptedURLs addObjectsFromArray:urls]; [acceptedURLs addObjectsFromArray:urls];
} }
// Get files from a normal file drop (such as from Finder) // Get files from a normal file drop (such as from Finder)
if ([bestType isEqualToString:NSFilenamesPboardType]) { if ([bestType isEqualToString:NSPasteboardTypeFileURL]) {
NSMutableArray *urls = [[NSMutableArray alloc] init]; NSMutableArray *urls = [[NSMutableArray alloc] init];
for (NSString *file in [pboard propertyListForType:NSFilenamesPboardType]) for (NSString *file in [pboard propertyListForType:NSPasteboardTypeFileURL]) {
{
[urls addObject:[NSURL fileURLWithPath:file]]; [urls addObject:[NSURL fileURLWithPath:file]];
} }
@ -330,66 +323,47 @@
[acceptedURLs addObjectsFromArray:urls]; [acceptedURLs addObjectsFromArray:urls];
} }
if ([acceptedURLs count]) if ([acceptedURLs count]) {
{
NSUInteger row = [[playlistController content] count]; NSUInteger row = [[playlistController content] count];
[playlistController willInsertURLs:acceptedURLs origin:URLOriginInternal]; [playlistController willInsertURLs:acceptedURLs origin:URLOriginInternal];
NSArray* entries = [playlistLoader insertURLs:acceptedURLs atIndex:(int)row sort:NO]; NSArray *entries = [playlistLoader insertURLs:acceptedURLs atIndex:(int) row sort:NO];
[playlistLoader didInsertURLs:entries origin:URLOriginInternal]; [playlistLoader didInsertURLs:entries origin:URLOriginInternal];
if ([playlistController shuffle] != ShuffleOff) if ([playlistController shuffle] != ShuffleOff) [playlistController resetShuffleList];
[playlistController resetShuffleList];
} }
} }
- (IBAction)delete:(id)sender - (IBAction)delete:(id)sender {
{
[playlistController removeObjectsAtArrangedObjectIndexes:[playlistController selectionIndexes]]; [playlistController removeObjectsAtArrangedObjectIndexes:[playlistController selectionIndexes]];
} }
- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
-(BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
{
SEL action = [anItem action]; SEL action = [anItem action];
if (action == @selector(undo:)) if (action == @selector(undo:)) {
{ return [[playlistController undoManager] canUndo];
if ([[playlistController undoManager] canUndo])
return YES;
else
return NO;
} }
if (action == @selector(redo:)) if (action == @selector(redo:)) {
{ return [[playlistController undoManager] canRedo];
if ([[playlistController undoManager] canRedo])
return YES;
else
return NO;
} }
if (action == @selector(cut:) || action == @selector(copy:) || action == @selector(delete:)) if (action == @selector(cut:) || action == @selector(copy:) || action == @selector(delete:)) {
{ return [[playlistController selectionIndexes] count] != 0;
if ([[playlistController selectionIndexes] count] == 0)
return NO;
else
return YES;
} }
if (action == @selector(paste:)) if (action == @selector(paste:)) {
{
NSPasteboard *pboard = [NSPasteboard generalPasteboard]; NSPasteboard *pboard = [NSPasteboard generalPasteboard];
NSArray *supportedTypes = [NSArray arrayWithObjects:CogUrlsPboardType, NSFilenamesPboardType, iTunesDropType, nil]; NSArray *supportedTypes = @[CogUrlsPboardType, NSPasteboardTypeFileURL, iTunesDropType];
NSString *bestType = [pboard availableTypeFromArray:supportedTypes]; NSString *bestType = [pboard availableTypeFromArray:supportedTypes];
if (bestType != nil) return bestType != nil;
return YES;
else
return NO;
} }
if (action == @selector(scrollToCurrentEntry:) && (([playbackController playbackStatus] == kCogStatusStopped) || ([playbackController playbackStatus] == kCogStatusStopping))) if (action == @selector(scrollToCurrentEntry:) &&
(([playbackController playbackStatus] == kCogStatusStopped) ||
([playbackController playbackStatus] == kCogStatusStopping)))
return NO; return NO;
return [super validateUserInterfaceItem:anItem]; return [super validateUserInterfaceItem:anItem];
@ -405,5 +379,4 @@
} }
#endif #endif
@end @end

View File

@ -8,9 +8,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface XmlContainer : NSObject { @interface XmlContainer : NSObject
}
+ (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename; + (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename;

View File

@ -8,17 +8,13 @@
#import "XmlContainer.h" #import "XmlContainer.h"
#import "PlaylistEntry.h"
#import "Logging.h" #import "Logging.h"
@implementation XmlContainer @implementation XmlContainer
+ (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename + (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename {
{
NSRange protocolRange = [path rangeOfString:@"://"]; NSRange protocolRange = [path rangeOfString:@"://"];
if (protocolRange.location != NSNotFound) if (protocolRange.location != NSNotFound) {
{
return [NSURL URLWithString:path]; return [NSURL URLWithString:path];
} }
@ -32,8 +28,7 @@
NSString *possibleFragment; NSString *possibleFragment;
[scanner scanUpToString:@"#" intoString:nil]; [scanner scanUpToString:@"#" intoString:nil];
if ([scanner scanCharactersFromSet:characterSet intoString:&possibleFragment] && [scanner isAtEnd]) if ([scanner scanCharactersFromSet:characterSet intoString:&possibleFragment] && [scanner isAtEnd]) {
{
fragment = possibleFragment; fragment = possibleFragment;
[unixPath deleteCharactersInRange:NSMakeRange([scanner scanLocation] - [possibleFragment length], [possibleFragment length])]; [unixPath deleteCharactersInRange:NSMakeRange([scanner scanLocation] - [possibleFragment length], [possibleFragment length])];
break; break;
@ -51,29 +46,35 @@
} }
//Append the fragment //Append the fragment
NSURL *url = [NSURL URLWithString:[[[NSURL fileURLWithPath:unixPath] absoluteString] stringByAppendingString: fragment]]; NSURL *url = [NSURL URLWithString:[[[NSURL fileURLWithPath:unixPath] absoluteString] stringByAppendingString:fragment]];
return url; return url;
} }
+ (NSDictionary *)entriesForContainerURL:(NSURL *)url + (NSDictionary *)entriesForContainerURL:(NSURL *)url {
{
if (![url isFileURL]) if (![url isFileURL])
return [NSDictionary dictionary]; return nil;
NSError *nserr; NSError *error;
NSString *error;
NSString *filename = [url path]; NSString *filename = [url path];
NSString * contents = [NSString stringWithContentsOfFile:filename encoding:NSUTF8StringEncoding error:&nserr]; NSString *contents = [NSString stringWithContentsOfFile:filename
encoding:NSUTF8StringEncoding
error:&error];
if (!contents) {
ALog(@"Error: %@", error);
return nil;
}
NSData* plistData = [contents dataUsingEncoding:NSUTF8StringEncoding]; NSData *plistData = [contents dataUsingEncoding:NSUTF8StringEncoding];
NSPropertyListFormat format; NSPropertyListFormat format;
id plist = [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&error]; id plist = [NSPropertyListSerialization propertyListWithData:plistData
if(!plist){ options:NSPropertyListImmutable
ALog(@"Error: %@",error); format:&format
error:&error];
if (!plist) {
ALog(@"Error: %@", error);
return nil; return nil;
} }
@ -82,27 +83,34 @@
if (!isDict && !isArray) return nil; if (!isDict && !isArray) return nil;
NSArray * items = (isArray) ? (NSArray*)plist : [(NSDictionary *)plist objectForKey:@"items"]; NSArray *items;
NSDictionary *albumArt;
NSDictionary *albumArt = (isArray) ? nil : [(NSDictionary *)plist objectForKey:@"albumArt"]; NSArray *queueList;
if (isArray) {
NSArray *queueList = (isArray) ? [NSArray array] : [(NSDictionary *)plist objectForKey:@"queue"]; items = (NSArray *) plist;
albumArt = nil;
queueList = [NSArray array];
} else {
NSDictionary *dict = (NSDictionary *) plist;
items = dict[@"items"];
albumArt = dict[@"albumArt"];
queueList = dict[@"queue"];
}
NSMutableArray *entries = [NSMutableArray array]; NSMutableArray *entries = [NSMutableArray array];
for (NSDictionary *entry in items) for (NSDictionary *entry in items) {
{ NSMutableDictionary *preparedEntry = [NSMutableDictionary dictionaryWithDictionary:entry];
NSMutableDictionary * preparedEntry = [NSMutableDictionary dictionaryWithDictionary:entry];
[preparedEntry setObject:[self urlForPath:[preparedEntry objectForKey:@"URL"] relativeTo:filename] forKey:@"URL"]; preparedEntry[@"URL"] = [self urlForPath:preparedEntry[@"URL"] relativeTo:filename];
if (albumArt && [preparedEntry objectForKey:@"albumArt"]) if (albumArt && preparedEntry[@"albumArt"])
[preparedEntry setObject:[albumArt objectForKey:[preparedEntry objectForKey:@"albumArt"]] forKey:@"albumArt"]; preparedEntry[@"albumArt"] = albumArt[preparedEntry[@"albumArt"]];
[entries addObject:[NSDictionary dictionaryWithDictionary:preparedEntry]]; [entries addObject:[NSDictionary dictionaryWithDictionary:preparedEntry]];
} }
return [NSDictionary dictionaryWithObjectsAndKeys:entries, @"entries", queueList, @"queue", nil]; return @{@"entries": entries, @"queue": queueList};
} }
@end @end

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -51,7 +51,7 @@
Copl * p_emu = new CSilentopl; Copl * p_emu = new CSilentopl;
std::string path = [[[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; std::string path = [[[url absoluteString] stringByRemovingPercentEncoding] UTF8String];
CPlayer * p_player = CAdPlug::factory(path, p_emu, CAdPlug::players, CProvider_cog( path, source )); CPlayer * p_player = CAdPlug::factory(path, p_emu, CAdPlug::players, CProvider_cog( path, source ));
if ( !p_player ) if ( !p_player )

View File

@ -40,7 +40,7 @@
path = [path substringToIndex:fragmentRange.location]; path = [path substringToIndex:fragmentRange.location];
} }
std::string _path = [[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; std::string _path = [[path stringByRemovingPercentEncoding] UTF8String];
m_player = CAdPlug::factory(_path, m_emu, CAdPlug::players, CProvider_cog( _path, source )); m_player = CAdPlug::factory(_path, m_emu, CAdPlug::players, CProvider_cog( _path, source ));
if ( !m_player ) if ( !m_player )

View File

@ -52,7 +52,7 @@
path = [path substringToIndex:fragmentRange.location]; path = [path substringToIndex:fragmentRange.location];
} }
std::string _path = [[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; std::string _path = [[path stringByRemovingPercentEncoding] UTF8String];
CPlayer * p_player = CAdPlug::factory(_path, p_emu, CAdPlug::players, CProvider_cog( _path, source )); CPlayer * p_player = CAdPlug::factory(_path, p_emu, CAdPlug::players, CProvider_cog( _path, source ));
if ( !p_player ) if ( !p_player )

View File

@ -100,7 +100,7 @@ binistream * CProvider_cog::open(std::string filename) const
fragmentString = [urlString substringFromIndex:fragmentRange.location]; fragmentString = [urlString substringFromIndex:fragmentRange.location];
urlString = [urlString substringToIndex:fragmentRange.location]; urlString = [urlString substringToIndex:fragmentRange.location];
} }
NSURL * url = [NSURL URLWithString:[[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByAppendingString:fragmentString]]; NSURL * url = [NSURL URLWithString:[[urlString stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLFragmentAllowedCharacterSet] stringByAppendingString:fragmentString]];
id audioSourceClass = NSClassFromString(@"AudioSource"); id audioSourceClass = NSClassFromString(@"AudioSource");
p_file = [audioSourceClass audioSourceForURL:url]; p_file = [audioSourceClass audioSourceForURL:url];

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -62,7 +62,7 @@ static NSString * g_make_unpack_path(NSString * archive, NSString * file, NSStri
while ( !fex_done(fex) ) { while ( !fex_done(fex) ) {
NSString *name = [NSString stringWithUTF8String:fex_name(fex)]; NSString *name = [NSString stringWithUTF8String:fex_name(fex)];
if ([[NSClassFromString(@"AudioPlayer") fileTypes] containsObject:[[name pathExtension] lowercaseString]]) if ([[NSClassFromString(@"AudioPlayer") fileTypes] containsObject:[[name pathExtension] lowercaseString]])
[files addObject:[NSURL URLWithString:[g_make_unpack_path([url path], name, @"fex") stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]; [files addObject:[NSURL URLWithString:[g_make_unpack_path([url path], name, @"fex") stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet]]];
fex_next(fex); fex_next(fex);
} }

View File

@ -75,7 +75,7 @@ static BOOL g_parse_unpack_path(NSString * src, NSString ** archive, NSString **
{ {
[self setURL:url]; [self setURL:url];
NSString * urlDecoded = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString * urlDecoded = [[url absoluteString] stringByRemovingPercentEncoding];
NSString * type; NSString * type;
NSString * archive; NSString * archive;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -162,7 +162,7 @@
089C1669FE841209C02AAC07 /* Project object */ = { 089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1020; LastUpgradeCheck = 1230;
TargetAttributes = { TargetAttributes = {
8D5B49AC048680CD000E48DA = { 8D5B49AC048680CD000E48DA = {
DevelopmentTeam = ""; DevelopmentTeam = "";
@ -293,6 +293,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -334,6 +335,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -80,8 +80,6 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
{ {
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);
av_log_set_level(AV_LOG_ERROR); av_log_set_level(AV_LOG_ERROR);
av_register_all();
av_lockmgr_register(lockmgr_callback);
} }
} }
@ -191,8 +189,6 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
return NO; return NO;
} }
av_codec_set_pkt_timebase(codecCtx, stream->time_base);
AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id); AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id);
if (!codec) { if (!codec) {
ALog(@"codec not found"); ALog(@"codec not found");

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -48,7 +48,7 @@
if (!type) if (!type)
{ {
ALog(@"GME: No type!"); ALog(@"GME: No type!");
return NO; return nil;
} }
Music_Emu* emu; Music_Emu* emu;
@ -56,7 +56,7 @@
if (!emu) if (!emu)
{ {
ALog(@"GME: No new emu!"); ALog(@"GME: No new emu!");
return NO; return nil;
} }
[source seek:0 whence:SEEK_END]; [source seek:0 whence:SEEK_END];
@ -68,7 +68,7 @@
if (error) if (error)
{ {
ALog(@"GME: ERROR Loding file!"); ALog(@"GME: ERROR Loding file!");
return NO; return nil;
} }
NSURL *m3uurl = [url URLByDeletingPathExtension]; NSURL *m3uurl = [url URLByDeletingPathExtension];

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -112,7 +112,7 @@ void * source_fopen(const char * path)
if ( ![[psf_file_container instance] try_hint:[NSString stringWithUTF8String:path] source:&source] ) if ( ![[psf_file_container instance] try_hint:[NSString stringWithUTF8String:path] source:&source] )
{ {
NSString * urlString = [NSString stringWithUTF8String:path]; NSString * urlString = [NSString stringWithUTF8String:path];
NSURL * url = [NSURL URLWithString:[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; NSURL * url = [NSURL URLWithString:[urlString stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet]];
id audioSourceClass = NSClassFromString(@"AudioSource"); id audioSourceClass = NSClassFromString(@"AudioSource");
source = [audioSourceClass audioSourceForURL:url]; source = [audioSourceClass audioSourceForURL:url];
@ -1271,7 +1271,7 @@ static int usf_info(void * context, const char * name, const char * value)
info.trackPeak = 0; info.trackPeak = 0;
info.volume = 1; info.volume = 1;
currentUrl = [[[source url] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; currentUrl = [[[source url] absoluteString] stringByRemovingPercentEncoding];
[[psf_file_container instance] add_hint:currentUrl source:currentSource]; [[psf_file_container instance] add_hint:currentUrl source:currentSource];
hintAdded = YES; hintAdded = YES;
@ -1706,7 +1706,7 @@ static int usf_info(void * context, const char * name, const char * value)
info.tag_length_ms = 0; info.tag_length_ms = 0;
info.tag_fade_ms = 0; info.tag_fade_ms = 0;
NSString * decodedUrl = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString * decodedUrl = [[url absoluteString] stringByRemovingPercentEncoding];
psf_load( [decodedUrl UTF8String], &source_callbacks, 0, 0, 0, psf_info_meta, &info, 0 ); psf_load( [decodedUrl UTF8String], &source_callbacks, 0, 0, 0, psf_info_meta, &info, 0 );

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -508,6 +508,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
@ -554,6 +555,7 @@
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -30,7 +30,11 @@ AUPluginUI::AUPluginUI (AudioUnit & _au)
} }
if (au_view) { if (au_view) {
cocoa_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, req_width, req_height) styleMask:(NSTitledWindowMask | NSClosableWindowMask) backing:NSBackingStoreBuffered defer:NO]; cocoa_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, req_width, req_height)
styleMask:(NSWindowStyleMaskTitled |
NSWindowStyleMaskClosable)
backing:NSBackingStoreBuffered
defer:NO];
[cocoa_window setAutodisplay:YES]; [cocoa_window setAutodisplay:YES];
[cocoa_window setTitle:@"AU Plug-in"]; [cocoa_window setTitle:@"AU Plug-in"];

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -248,7 +248,7 @@
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
@ -305,7 +305,7 @@
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;

View File

@ -81,7 +81,7 @@ static void g_push_archive_extensions(std::vector<std::string> & list)
mod->set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, 100 ); mod->set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, 100 );
mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, interp ); mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, interp );
mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, -1 ); mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, -1 );
mod->ctl_set( "render.resampler.emulate_amiga", "1" ); mod->ctl_set_boolean("render.resampler.emulate_amiga", true);
left.resize( 1024 ); left.resize( 1024 );
right.resize( 1024 ); right.resize( 1024 );

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1150" LastUpgradeVersion = "1230"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

Some files were not shown because too many files have changed in this diff Show More