diff --git a/Application/AppController.m b/Application/AppController.m index 6c382ae57..6980249df 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -325,7 +325,7 @@ void* kAppControllerContext = &kAppControllerContext; - (void)applicationWillTerminate:(NSNotification *)aNotification { CogStatus currentStatus = [playbackController playbackStatus]; - int lastTrackPlaying = -1; + NSInteger lastTrackPlaying = -1; double lastTrackPosition = 0; if (currentStatus == CogStatusStopping) diff --git a/Application/PlaybackController.h b/Application/PlaybackController.h index 54351479c..fb5dd61c6 100644 --- a/Application/PlaybackController.h +++ b/Application/PlaybackController.h @@ -75,8 +75,8 @@ extern NSDictionary * makeRGInfo(PlaylistEntry *pe); - (void)audioFadeDown:(NSTimer *)audioTimer; - (void)audioFadeUp:(NSTimer *)audioTimer; -- (void)playEntryAtIndex:(int)i; -- (void)playEntryAtIndex:(int)i startPaused:(BOOL)paused; +- (void)playEntryAtIndex:(NSInteger)i; +- (void)playEntryAtIndex:(NSInteger)i startPaused:(BOOL)paused; - (void)playEntry:(PlaylistEntry *)pe; - (void)playEntry:(PlaylistEntry *)pe startPaused:(BOOL)paused; diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m index 270859ac0..54083e67a 100644 --- a/Application/PlaybackController.m +++ b/Application/PlaybackController.m @@ -115,12 +115,12 @@ NSString *CogPlaybackDidStopNotficiation = @"CogPlaybackDidStopNotficiation"; } //called by double-clicking on table -- (void)playEntryAtIndex:(int)i +- (void)playEntryAtIndex:(NSInteger)i { [self playEntryAtIndex:i startPaused:NO]; } -- (void)playEntryAtIndex:(int)i startPaused:(BOOL)paused +- (void)playEntryAtIndex:(NSInteger)i startPaused:(BOOL)paused { PlaylistEntry *pe = [playlistController entryAtIndex:i]; @@ -413,10 +413,10 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe) { BOOL found = NO; - int index = [[playlistController currentEntry] index]; + NSInteger index = [[playlistController currentEntry] index]; NSString *origAlbum = [[playlistController currentEntry] album]; - int i; + NSInteger i; NSString *curAlbum; PlaylistEntry *pe; @@ -455,11 +455,11 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe) BOOL found = NO; BOOL foundAlbum = NO; - int index = [[playlistController currentEntry] index]; + NSInteger index = [[playlistController currentEntry] index]; NSString *origAlbum = [[playlistController currentEntry] album]; NSString *curAlbum; - int i; + NSInteger i; PlaylistEntry *pe; diff --git a/Audio/AudioContainer.h b/Audio/AudioContainer.h index 36a0ece7a..7b48702fa 100644 --- a/Audio/AudioContainer.h +++ b/Audio/AudioContainer.h @@ -7,7 +7,7 @@ // #import -#import "Plugin.h" +#import @interface AudioContainer : NSObject { diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m index 9dbcf7f67..4567427cd 100644 --- a/Audio/AudioPlayer.m +++ b/Audio/AudioPlayer.m @@ -362,8 +362,8 @@ NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:selector]]; [invocation setTarget:delegate]; [invocation setSelector:selector]; - [invocation setArgument:&self atIndex:2]; - [invocation setArgument:&obj atIndex:3]; + [invocation setArgument:(void*)&self atIndex:2]; + [invocation setArgument:&obj atIndex:3]; [invocation retainArguments]; [invocation performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:wait]; @@ -374,9 +374,9 @@ NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:selector]]; [invocation setTarget:delegate]; [invocation setSelector:selector]; - [invocation setArgument:&self atIndex:2]; - [invocation setArgument:&obj atIndex:3]; - [invocation setArgument:&obj2 atIndex:4]; + [invocation setArgument:(void*)&self atIndex:2]; + [invocation setArgument:&obj atIndex:3]; + [invocation setArgument:&obj2 atIndex:4]; [invocation retainArguments]; [invocation performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:wait]; diff --git a/Audio/CogAudio.xcodeproj/project.pbxproj b/Audio/CogAudio.xcodeproj/project.pbxproj index 0dde09b5b..cc7729493 100644 --- a/Audio/CogAudio.xcodeproj/project.pbxproj +++ b/Audio/CogAudio.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -506,6 +506,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -547,6 +548,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme index df25b15b9..cf4fae5ee 100644 --- a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme +++ b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme @@ -1,6 +1,6 @@ -BOOL hostIsBigEndian() +static BOOL hostIsBigEndian(void) { #ifdef __BIG_ENDIAN__ return YES; diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index eae89ea02..7008ceb77 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -1732,10 +1732,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1250; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = ""; + DevelopmentTeam = 4S876G9VCD; LastSwiftMigration = 1220; ProvisioningStyle = Automatic; }; @@ -2620,6 +2620,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2661,6 +2662,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2677,6 +2679,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.13; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; }; name = Release; }; diff --git a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme index bda36aac4..9ef83bc72 100644 --- a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme +++ b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme @@ -1,6 +1,6 @@ -#include "FLAC_assert.h" -#include "callback.h" -#include "format.h" -#include "metadata.h" -#include "ordinals.h" -#include "stream_decoder.h" -#include "stream_encoder.h" +#include +#include +#include +#include +#include +#include +#include /** \mainpage * diff --git a/Frameworks/FLAC/flac-1.3.3/include/FLAC/callback.h b/Frameworks/FLAC/flac-1.3.3/include/FLAC/callback.h index 38e23002b..cfb6ee15e 100644 --- a/Frameworks/FLAC/flac-1.3.3/include/FLAC/callback.h +++ b/Frameworks/FLAC/flac-1.3.3/include/FLAC/callback.h @@ -33,7 +33,7 @@ #ifndef FLAC__CALLBACK_H #define FLAC__CALLBACK_H -#include "ordinals.h" +#include #include /* for size_t */ /** \file include/FLAC/callback.h diff --git a/Frameworks/FLAC/flac-1.3.3/include/FLAC/format.h b/Frameworks/FLAC/flac-1.3.3/include/FLAC/format.h index 769ab8afc..f73bbd203 100644 --- a/Frameworks/FLAC/flac-1.3.3/include/FLAC/format.h +++ b/Frameworks/FLAC/flac-1.3.3/include/FLAC/format.h @@ -33,8 +33,8 @@ #ifndef FLAC__FORMAT_H #define FLAC__FORMAT_H -#include "export.h" -#include "ordinals.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/FLAC/flac-1.3.3/include/FLAC/metadata.h b/Frameworks/FLAC/flac-1.3.3/include/FLAC/metadata.h index 4c67b87f6..310540be8 100644 --- a/Frameworks/FLAC/flac-1.3.3/include/FLAC/metadata.h +++ b/Frameworks/FLAC/flac-1.3.3/include/FLAC/metadata.h @@ -34,9 +34,9 @@ #define FLAC__METADATA_H #include /* for off_t */ -#include "export.h" -#include "callback.h" -#include "format.h" +#include +#include +#include /* -------------------------------------------------------------------- (For an example of how all these routines are used, see the source diff --git a/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_decoder.h b/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_decoder.h index 57215c5ed..3e7093543 100644 --- a/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_decoder.h +++ b/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_decoder.h @@ -34,8 +34,8 @@ #define FLAC__STREAM_DECODER_H #include /* for FILE */ -#include "export.h" -#include "format.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_encoder.h b/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_encoder.h index d154ac437..4a68dbdc5 100644 --- a/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_encoder.h +++ b/Frameworks/FLAC/flac-1.3.3/include/FLAC/stream_encoder.h @@ -34,9 +34,9 @@ #define FLAC__STREAM_ENCODER_H #include /* for FILE */ -#include "export.h" -#include "format.h" -#include "stream_decoder.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj index 7606f500f..ed842e8b5 100644 --- a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj +++ b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj @@ -421,7 +421,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -594,6 +594,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -636,6 +637,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme b/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme index 0ac0699d9..a708c36b0 100644 --- a/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme +++ b/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme @@ -1,6 +1,6 @@ ver >> 4) & 0xF00F) #define x86cpuid_GetStepping(p) ((p)->ver & 0xF) -Bool CPU_Is_InOrder(); -Bool CPU_Is_Aes_Supported(); +Bool CPU_Is_InOrder(void); +Bool CPU_Is_Aes_Supported(void); #endif diff --git a/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.c b/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.c index 9b0c68984..3840d1643 100644 --- a/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.c +++ b/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.c @@ -61,38 +61,25 @@ WRes AutoResetEvent_Create(CAutoResetEvent *p, int signaled) { return Event_Crea WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p) { return ManualResetEvent_Create(p, 0); } WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p) { return AutoResetEvent_Create(p, 0); } +WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount) +{ #ifdef __APPLE__ -WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount) -{ - p->sem = dispatch_semaphore_create( initCount ); - p->count = initCount; - p->maxCount = maxCount; - return 0; -} - -static WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount) -{ - if (previousCount) - { - *previousCount = p->count; - } - while (releaseCount--) - { - dispatch_semaphore_signal(p->sem); - IncrementAtomic(&p->count); - } - return 0; -} + dispatch_semaphore_t *sem = &p->sem; + + *sem = dispatch_semaphore_create(initCount); #else -WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount) -{ sem_init( &p->sem, 0, initCount ); +#endif p->maxCount = maxCount; return 0; } static WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount) { +#ifdef __APPLE__ + while (releaseCount--) + dispatch_semaphore_signal(p->sem); +#else if (previousCount) { int sval = 0; @@ -101,9 +88,9 @@ static WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCo } while (releaseCount--) sem_post( &p->sem ); +#endif return 0; } -#endif WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num) { return Semaphore_Release(p, (LONG)num, NULL); } diff --git a/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.h b/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.h index addf9fe12..5574791b7 100644 --- a/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.h +++ b/Frameworks/File_Extractor/File_Extractor/7z_C/posix/Threads.h @@ -10,7 +10,6 @@ #ifdef __APPLE__ #include -#include #else #include #endif @@ -63,7 +62,6 @@ typedef struct { #ifdef __APPLE__ dispatch_semaphore_t sem; - SInt32 count; #else sem_t sem; #endif @@ -74,7 +72,7 @@ CSemaphore; #define Semaphore_Construct(p) #define Semaphore_Close(p) #ifdef __APPLE__ -#define Semaphore_Wait(p) { DecrementAtomic(&((p)->count)); dispatch_semaphore_wait((p)->sem, DISPATCH_TIME_FOREVER); } +#define Semaphore_Wait(p) { dispatch_semaphore_wait((p)->sem, DISPATCH_TIME_FOREVER); } #else #define Semaphore_Wait(p) { sem_wait(&((p)->sem)); } #endif diff --git a/Frameworks/GME/GME.xcodeproj/project.pbxproj b/Frameworks/GME/GME.xcodeproj/project.pbxproj index 861aa5268..4db997f42 100644 --- a/Frameworks/GME/GME.xcodeproj/project.pbxproj +++ b/Frameworks/GME/GME.xcodeproj/project.pbxproj @@ -1281,7 +1281,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -1577,6 +1577,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1620,6 +1621,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme b/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme index 9f4b384bd..489ecba93 100644 --- a/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme +++ b/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme @@ -1,6 +1,6 @@ #ifdef __cplusplus extern "C" { diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.h b/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.h index 6b15508a5..a24884c96 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.h +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.h @@ -7,7 +7,7 @@ #ifndef __PSX_IOP_H__ #define __PSX_IOP_H__ -#include "emuconfig.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.h b/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.h index 1331dcdf0..935f82de9 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.h +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.h @@ -9,7 +9,7 @@ ///////////////////////////////////////////////////////////////////////////// -#include "emuconfig.h" +#include ///////////////////////////////////////////////////////////////////////////// diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/r3000.h b/Frameworks/HighlyExperimental/HighlyExperimental/Core/r3000.h index ee9efff63..e38a18a85 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/r3000.h +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/r3000.h @@ -7,7 +7,7 @@ #ifndef __PSX_R3000_H__ #define __PSX_R3000_H__ -#include "emuconfig.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj index 820ae287f..3353f9b93 100644 --- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj @@ -146,7 +146,7 @@ 834378D517F96E2600584396 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 834378DD17F96E2600584396 = { @@ -234,6 +234,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -290,6 +291,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme index 187a529de..d96050082 100644 --- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme +++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme @@ -1,6 +1,6 @@ #ifdef __cplusplus extern "C" { diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj index 4953697be..e9d4413c0 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj @@ -188,7 +188,7 @@ 8343786517F9658E00584396 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 8343786D17F9658E00584396 = { @@ -279,6 +279,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -337,6 +338,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme index 097debd5c..ae8171a42 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// diff --git a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj index 5a994a419..64c522e50 100644 --- a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj +++ b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj @@ -128,7 +128,7 @@ 836FB54D182053D700B3AD2D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 836FB555182053D700B3AD2D = { @@ -214,6 +214,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -267,6 +268,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme index ac9f059f8..dd663d648 100644 --- a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme +++ b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme @@ -1,6 +1,6 @@ #include diff --git a/Frameworks/MPCDec/Files/include/mpcdec/mpcdec.h b/Frameworks/MPCDec/Files/include/mpcdec/mpcdec.h index c72359516..c0d5bd063 100644 --- a/Frameworks/MPCDec/Files/include/mpcdec/mpcdec.h +++ b/Frameworks/MPCDec/Files/include/mpcdec/mpcdec.h @@ -39,8 +39,8 @@ #pragma once #endif -#include "reader.h" -#include "streaminfo.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj index 0308efe03..bf2d0a93a 100644 --- a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj +++ b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj @@ -229,7 +229,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -375,6 +375,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -416,6 +417,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme b/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme index 1701d64ac..fbf522a8b 100644 --- a/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme +++ b/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme @@ -1,6 +1,6 @@ #include #include diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_config.h b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_config.h index 01104732b..8a0241ec3 100644 --- a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_config.h +++ b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_config.h @@ -178,6 +178,6 @@ LIBOPENMPT_DEPRECATED static const int LIBOPENMPT_DEPRECATED_STRING_CONSTANT = 0 #endif -#include "libopenmpt_version.h" +#include #endif /* LIBOPENMPT_CONFIG_H */ diff --git a/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj index bc5038064..bbd41deea 100644 --- a/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj +++ b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj @@ -1156,7 +1156,7 @@ 83E5EFB41FFEF7CC00659F0F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 83E5EFBC1FFEF7CC00659F0F = { @@ -1366,6 +1366,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1435,6 +1436,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj index ccdaf1f62..be97d992d 100644 --- a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj +++ b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj @@ -1051,7 +1051,7 @@ 8375B05917FFEABB0092A79F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 8375B06117FFEABB0092A79F = { @@ -1289,6 +1289,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1342,6 +1343,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1370,7 +1372,7 @@ 8375B08B17FFEABB0092A79F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = ""; @@ -1409,7 +1411,7 @@ 8375B08C17FFEABB0092A79F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = ""; diff --git a/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme b/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme index 85a689848..0b42d84f7 100644 --- a/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme +++ b/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme @@ -1,6 +1,6 @@ +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/Opus/Opus/opus/include/opus_defines.h b/Frameworks/Opus/Opus/opus/include/opus_defines.h index 70bad4109..acad76b5c 100644 --- a/Frameworks/Opus/Opus/opus/include/opus_defines.h +++ b/Frameworks/Opus/Opus/opus/include/opus_defines.h @@ -33,7 +33,7 @@ #ifndef OPUS_DEFINES_H #define OPUS_DEFINES_H -#include "opus_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/Opus/Opus/opus/include/opus_multistream.h b/Frameworks/Opus/Opus/opus/include/opus_multistream.h index 47e03900b..2d861c0b9 100644 --- a/Frameworks/Opus/Opus/opus/include/opus_multistream.h +++ b/Frameworks/Opus/Opus/opus/include/opus_multistream.h @@ -33,7 +33,7 @@ #ifndef OPUS_MULTISTREAM_H #define OPUS_MULTISTREAM_H -#include "opus.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Frameworks/Opus/Opus/opusfile/include/opusfile.h b/Frameworks/Opus/Opus/opusfile/include/opusfile.h index 6e0c49de9..a245d8a4f 100644 --- a/Frameworks/Opus/Opus/opusfile/include/opusfile.h +++ b/Frameworks/Opus/Opus/opusfile/include/opusfile.h @@ -107,7 +107,7 @@ extern "C" { # include # include # include -# include "opus_multistream.h" +# include /**@cond PRIVATE*/ diff --git a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj index fd8b29c00..dcbdbeb30 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj +++ b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj @@ -237,7 +237,7 @@ 83848FAF1807623F00E7332D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 83848FB71807623F00E7332D = { @@ -334,6 +334,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -386,6 +387,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme index 3430c44c7..c23645514 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme +++ b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme @@ -1,6 +1,6 @@ #include #include -#include "SWAV.h" -#include "Track.h" +#include +#include /* * This structure is meant to be similar to what is stored in the actual diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/INFOEntry.h b/Frameworks/SSEQPlayer/SSEQPlayer/INFOEntry.h index c06a7d82f..6b04b10c0 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/INFOEntry.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/INFOEntry.h @@ -9,7 +9,7 @@ #pragma once -#include "common.h" +#include struct INFOEntry { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/Player.h b/Frameworks/SSEQPlayer/SSEQPlayer/Player.h index afa948bae..0020982f7 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/Player.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/Player.h @@ -12,10 +12,10 @@ #include #include -#include "SSEQ.h" -#include "Track.h" -#include "Channel.h" -#include "consts.h" +#include +#include +#include +#include struct Player { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/SBNK.h b/Frameworks/SSEQPlayer/SSEQPlayer/SBNK.h index e35f28067..a0f6a9b7d 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/SBNK.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/SBNK.h @@ -9,9 +9,9 @@ #pragma once -#include "SWAR.h" -#include "INFOEntry.h" -#include "common.h" +#include +#include +#include struct SBNKInstrumentRange { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/SDAT.h b/Frameworks/SSEQPlayer/SSEQPlayer/SDAT.h index a850b0afc..cbc4dabde 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/SDAT.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/SDAT.h @@ -10,10 +10,10 @@ #pragma once #include -#include "SSEQ.h" -#include "SBNK.h" -#include "SWAR.h" -#include "common.h" +#include +#include +#include +#include struct SDAT { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/SSEQ.h b/Frameworks/SSEQPlayer/SSEQPlayer/SSEQ.h index d036f7e58..92de0ae6a 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/SSEQ.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/SSEQ.h @@ -9,9 +9,9 @@ #pragma once -#include "SBNK.h" -#include "INFOEntry.h" -#include "common.h" +#include +#include +#include struct SSEQ { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/SWAR.h b/Frameworks/SSEQPlayer/SSEQPlayer/SWAR.h index 90d36a04f..a67afce93 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/SWAR.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/SWAR.h @@ -10,9 +10,9 @@ #pragma once #include -#include "SWAV.h" -#include "INFOEntry.h" -#include "common.h" +#include +#include +#include /* * The size has been left out of this structure as it is unused by this player. diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/SWAV.h b/Frameworks/SSEQPlayer/SSEQPlayer/SWAV.h index 85ddf1828..290252902 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/SWAV.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/SWAV.h @@ -9,7 +9,7 @@ #pragma once -#include "common.h" +#include struct SWAV { diff --git a/Frameworks/SSEQPlayer/SSEQPlayer/Track.h b/Frameworks/SSEQPlayer/SSEQPlayer/Track.h index 41ab47cd6..ed92c8636 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer/Track.h +++ b/Frameworks/SSEQPlayer/SSEQPlayer/Track.h @@ -12,7 +12,7 @@ #include #include -#include "consts.h" +#include struct Player; diff --git a/Frameworks/Shorten/Files/shorten/include/shn_reader.h b/Frameworks/Shorten/Files/shorten/include/shn_reader.h index 9192a1927..06e382a9a 100644 --- a/Frameworks/Shorten/Files/shorten/include/shn_reader.h +++ b/Frameworks/Shorten/Files/shorten/include/shn_reader.h @@ -34,8 +34,8 @@ #include #include -#include "shorten.h" -#include "ringbuffer.h" +#include +#include /* Derek */ diff --git a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj index 2fb7bc2c2..da9454c31 100644 --- a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj @@ -173,7 +173,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -319,6 +319,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -367,6 +368,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme b/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme index 47f8cfe19..64bd18d49 100644 --- a/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme +++ b/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme @@ -1,6 +1,6 @@ #ifdef __cplusplus extern "C" { diff --git a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj index 7450d9b17..5c82f1833 100644 --- a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj +++ b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj @@ -107,7 +107,7 @@ 832FF3121C96511E0076D662 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 832FF31A1C96511E0076D662 = { @@ -182,6 +182,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -237,6 +238,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme index 2d50c2672..83de7fcf8 100644 --- a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme +++ b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme @@ -1,6 +1,6 @@ +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h index b6def57a7..270480d3e 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_FLACPICTURE_H #define TAGLIB_FLACPICTURE_H -#include "tlist.h" -#include "tstring.h" -#include "tbytevector.h" -#include "taglib_export.h" -#include "flacmetadatablock.h" +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.h b/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.h index 9a902dc9e..725fbea89 100644 --- a/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.h +++ b/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_MPCPROPERTIES_H #define TAGLIB_MPCPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h index 7d889c2f2..5076dcbfe 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "taglib_export.h" -#include "tfile.h" -#include "tbytevectorlist.h" +#include +#include +#include #ifndef TAGLIB_OGGFILE_H #define TAGLIB_OGGFILE_H diff --git a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h index 04c0c04ea..2615df5a5 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_VORBISFILE_H #define TAGLIB_VORBISFILE_H -#include "taglib_export.h" -#include "oggfile.h" -#include "xiphcomment.h" +#include +#include +#include -#include "vorbisproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.h b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.h index 472e0390a..bbb7cf796 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_VORBISPROPERTIES_H #define TAGLIB_VORBISPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h index 74b927b38..2829c0d2a 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h @@ -26,14 +26,14 @@ #ifndef TAGLIB_VORBISCOMMENT_H #define TAGLIB_VORBISCOMMENT_H -#include "tag.h" -#include "tlist.h" -#include "tmap.h" -#include "tstring.h" -#include "tstringlist.h" -#include "tbytevector.h" -#include "flacpicture.h" -#include "taglib_export.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h index db97c5385..e547340fe 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h @@ -30,8 +30,7 @@ #include "taglib.h" #ifdef __APPLE__ -# define OSATOMIC_DEPRECATED 0 -# include +# include # define TAGLIB_ATOMIC_MAC #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) # ifndef NOMINMAX @@ -81,11 +80,11 @@ namespace TagLib RefCounterOld() : refCount(1) {} #ifdef TAGLIB_ATOMIC_MAC - void ref() { OSAtomicIncrement32Barrier(const_cast(&refCount)); } - bool deref() { return ! OSAtomicDecrement32Barrier(const_cast(&refCount)); } - int32_t count() { return refCount; } + void ref() { atomic_fetch_add(&refCount, 1); } + bool deref() { return atomic_fetch_sub(&refCount, 1) == 1; } + int32_t count() { return atomic_load(&refCount); } private: - volatile int32_t refCount; + std::atomic refCount; #elif defined(TAGLIB_ATOMIC_WIN) void ref() { InterlockedIncrement(&refCount); } bool deref() { return ! InterlockedDecrement(&refCount); } diff --git a/Frameworks/Vorbis/include/vorbis/vorbisfile.h b/Frameworks/Vorbis/include/vorbis/vorbisfile.h index 9271331e7..09840e513 100644 --- a/Frameworks/Vorbis/include/vorbis/vorbisfile.h +++ b/Frameworks/Vorbis/include/vorbis/vorbisfile.h @@ -24,7 +24,7 @@ extern "C" #endif /* __cplusplus */ #include -#include "codec.h" +#include /* The function prototypes for the callbacks are basically the same as for * the stdio functions fread, fseek, fclose, ftell. diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj index 8a26cb8c1..076f5ffcc 100644 --- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj +++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj @@ -575,7 +575,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1250; TargetAttributes = { 730F23A1091827B100AB638C = { DevelopmentTeam = ""; @@ -840,6 +840,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -882,6 +883,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme index 62c93304d..d185a28e5 100644 --- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme +++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme @@ -1,6 +1,6 @@ #ifdef __cplusplus extern "C" { diff --git a/Frameworks/shpakovski/MASShortcut b/Frameworks/shpakovski/MASShortcut index f082e8a16..03187327f 160000 --- a/Frameworks/shpakovski/MASShortcut +++ b/Frameworks/shpakovski/MASShortcut @@ -1 +1 @@ -Subproject commit f082e8a16186e74d83156f9496a459e0bb12f509 +Subproject commit 03187327f0fac7b553109ec09e483bc5ad43c575 diff --git a/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme index 00cf812ff..89d6f77c1 100644 --- a/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme +++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme @@ -1,6 +1,6 @@ typedef struct NDS_state NDS_state; diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h index 3b19de766..4ac98d790 100644 --- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h +++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h @@ -9,8 +9,8 @@ #ifndef vio2sf_state_h #define vio2sf_state_h -#include "types.h" -#include "spu_exports.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Playlist/DNDArrayController.h b/Playlist/DNDArrayController.h index 0194fae52..a10b0d4a3 100755 --- a/Playlist/DNDArrayController.h +++ b/Playlist/DNDArrayController.h @@ -27,6 +27,6 @@ extern NSString *iTunesDropType; // utility methods -(void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet - toIndex:(unsigned int)insertIndex; + toIndex:(NSUInteger)insertIndex; @end diff --git a/Playlist/DNDArrayController.m b/Playlist/DNDArrayController.m index bda5ac7e1..f78070ea8 100755 --- a/Playlist/DNDArrayController.m +++ b/Playlist/DNDArrayController.m @@ -86,7 +86,7 @@ NSString *iTunesDropType = @"com.apple.tv.metadata"; - (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet - toIndex:(unsigned int)insertIndex { + toIndex:(NSUInteger)insertIndex { NSArray *objects = [self arrangedObjects]; NSUInteger index = [indexSet lastIndex]; diff --git a/Playlist/PlaylistController.h b/Playlist/PlaylistController.h index 9852342a9..b7f145c42 100644 --- a/Playlist/PlaylistController.h +++ b/Playlist/PlaylistController.h @@ -96,8 +96,8 @@ typedef NS_ENUM(NSInteger, URLOrigin) { - (void)addShuffledListToFront; - (void)resetShuffleList; -- (PlaylistEntry *)shuffledEntryAtIndex:(int)i; -- (PlaylistEntry *)entryAtIndex:(int)i; +- (PlaylistEntry *)shuffledEntryAtIndex:(NSInteger)i; +- (PlaylistEntry *)entryAtIndex:(NSInteger)i; // Event inlets: - (void)willInsertURLs:(NSArray *)urls origin:(URLOrigin)origin; @@ -109,6 +109,6 @@ typedef NS_ENUM(NSInteger, URLOrigin) { - (NSMutableArray *)queueList; - (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet - toIndex:(unsigned int)insertIndex; + toIndex:(NSUInteger)insertIndex; @end diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 9283f304b..0816fac84 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -160,13 +160,13 @@ tableColumn:(NSTableColumn *)tc row:(NSInteger)row mouseLocation:(NSPoint)mouseLocation { - DLog(@"GETTING STATUS FOR ROW: %i: %@!", row, + DLog(@"GETTING STATUS FOR ROW: %li: %@!", row, [[[self arrangedObjects] objectAtIndex:row] statusMessage]); return [[[self arrangedObjects] objectAtIndex:row] statusMessage]; } - (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet - toIndex:(unsigned int)insertIndex { + toIndex:(NSUInteger)insertIndex { [super moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:insertIndex]; [playbackController playlistDidChange:self]; @@ -345,7 +345,7 @@ [[self undoManager] setActionName:actionName]; DLog(@"Removing indexes: %@", indexes); - DLog(@"Current index: %i", currentEntry.index); + DLog(@"Current index: %li", currentEntry.index); NSMutableIndexSet *unarrangedIndexes = [[NSMutableIndexSet alloc] init]; for (PlaylistEntry *pe in objects) { @@ -354,14 +354,14 @@ if (currentEntry.index >= 0 && [unarrangedIndexes containsIndex:currentEntry.index]) { currentEntry.index = -currentEntry.index - 1; - DLog(@"Current removed: %i", currentEntry.index); + DLog(@"Current removed: %li", currentEntry.index); } if (currentEntry.index < 0) // Need to update the negative index { - int i = -currentEntry.index - 1; - DLog(@"I is %i", i); - int j; + NSInteger i = -currentEntry.index - 1; + DLog(@"I is %li", i); + NSInteger j; for (j = i - 1; j >= 0; j--) { if ([unarrangedIndexes containsIndex:j]) { DLog(@"Removing 1"); @@ -441,7 +441,7 @@ } } -- (PlaylistEntry *)entryAtIndex:(int)i { +- (PlaylistEntry *)entryAtIndex:(NSInteger)i { RepeatMode repeat = [self repeat]; if (i < 0 || i >= [[self arrangedObjects] count]) { @@ -509,7 +509,7 @@ } } -- (PlaylistEntry *)shuffledEntryAtIndex:(int)i { +- (PlaylistEntry *)shuffledEntryAtIndex:(NSInteger)i { RepeatMode repeat = [self repeat]; while (i < 0) { @@ -559,7 +559,7 @@ if ([self shuffle] != ShuffleOff) { return [self shuffledEntryAtIndex:(pe.shuffleIndex + 1)]; } else { - int i; + NSInteger i; if (pe.index < 0) // Was a current entry, now removed. { i = -pe.index - 1; @@ -605,7 +605,7 @@ if ([self shuffle] != ShuffleOff) { return [self shuffledEntryAtIndex:(pe.shuffleIndex - 1)]; } else { - int i; + NSInteger i; if (pe.index < 0) // Was a current entry, now removed. { i = -pe.index - 2; diff --git a/Playlist/PlaylistEntry.h b/Playlist/PlaylistEntry.h index 143a9cb7c..42550fa92 100644 --- a/Playlist/PlaylistEntry.h +++ b/Playlist/PlaylistEntry.h @@ -9,8 +9,8 @@ #import @interface PlaylistEntry : NSObject { - int index; - int shuffleIndex; + NSInteger index; + NSInteger shuffleIndex; BOOL current; BOOL removed; @@ -18,7 +18,7 @@ BOOL stopAfter; BOOL queued; - int queuePosition; + NSInteger queuePosition; BOOL error; NSString *errorMessage; @@ -77,8 +77,8 @@ @property(readonly) NSString *lengthText; -@property int index; -@property int shuffleIndex; +@property NSInteger index; +@property NSInteger shuffleIndex; @property(readonly) NSString *status; @property(readonly) NSString *statusMessage; @@ -89,7 +89,7 @@ @property BOOL stopAfter; @property BOOL queued; -@property int queuePosition; +@property NSInteger queuePosition; @property BOOL error; @property(retain) NSString *errorMessage; diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m index e736f1844..eef22db41 100644 --- a/Playlist/PlaylistEntry.m +++ b/Playlist/PlaylistEntry.m @@ -109,7 +109,7 @@ - (NSString *)description { - return [NSString stringWithFormat:@"PlaylistEntry %i:(%@)", self.index, self.URL]; + return [NSString stringWithFormat:@"PlaylistEntry %li:(%@)", self.index, self.URL]; } - (id)init @@ -338,7 +338,7 @@ } else if (self.queued) { - return [NSString stringWithFormat:@"Queued: %i", self.queuePosition + 1]; + return [NSString stringWithFormat:@"Queued: %li", self.queuePosition + 1]; } else if (self.error) { diff --git a/Playlist/PlaylistLoader.h b/Playlist/PlaylistLoader.h index 2da72ad15..b75ca88ee 100755 --- a/Playlist/PlaylistLoader.h +++ b/Playlist/PlaylistLoader.h @@ -35,7 +35,7 @@ typedef enum { // Load arrays of urls... - (NSArray*)addURLs:(NSArray *)urls sort:(BOOL)sort; - (NSArray*)addURL:(NSURL *)url; -- (NSArray*)insertURLs:(NSArray *)urls atIndex:(int)index sort:(BOOL)sort; +- (NSArray*)insertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort; // Save playlist, auto-determines type based on extension. Uses m3u if it cannot be determined. - (BOOL)save:(NSString *)filename; diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index 3788c5082..817274ae5 100755 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -234,7 +234,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL for (PlaylistEntry *pe in [playlistController queueList]) { - [queueList addObject:[NSNumber numberWithInt:pe.index]]; + [queueList addObject:[NSNumber numberWithInteger:pe.index]]; } NSDictionary * dictionary = [NSDictionary dictionaryWithObjectsAndKeys:albumArtSet, @"albumArt", queueList, @"queue", topLevel, @"items", nil]; @@ -279,7 +279,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL return urls; } -- (NSArray*)insertURLs:(NSArray *)urls atIndex:(int)index sort:(BOOL)sort +- (NSArray*)insertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort { NSMutableSet *uniqueURLs = [NSMutableSet set]; @@ -405,7 +405,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL if (!count) return [NSArray array]; - int i = 0; + NSInteger i = 0; NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count]; for (NSURL *url in validURLs) { @@ -421,7 +421,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL ++i; } - int j = index + i; + NSInteger j = index + i; if (xmlData) { @@ -450,7 +450,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL i = 0; for (NSNumber *index in [xmlData objectForKey:@"queue"]) { - int indexVal = [index intValue] + j; + NSInteger indexVal = [index intValue] + j; PlaylistEntry *pe = [entries objectAtIndex:indexVal]; pe.queuePosition = i; pe.queued = YES; @@ -468,6 +468,11 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL return entries; } +- (void)loadInfoForEntries:(NSArray *)entries +{ + [self performSelectorOnMainThread:@selector(syncLoadInfoForEntries:) withObject:entries waitUntilDone:YES]; +} + // To be called on main thread only - (void)syncLoadInfoForEntries:(NSArray *)entries { diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index fb88c5412..949a53882 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -270,6 +270,7 @@ NSArray *supportedTypes = @[CogUrlsPboardType, NSPasteboardTypeFileURL, iTunesDropType]; NSPasteboard *pboard = [NSPasteboard generalPasteboard]; NSPasteboardType bestType = [pboard availableTypeFromArray:supportedTypes]; +#ifdef _DEBUG DLog(@"All types:"); for (NSPasteboardType type in [pboard types]) { DLog(@" Type: %@", type); @@ -279,6 +280,7 @@ DLog(@" Type: %@", type); } DLog(@"Best type: %@", bestType); +#endif NSMutableArray *acceptedURLs = [NSMutableArray array]; diff --git a/Plugins/APL/APL.xcodeproj/project.pbxproj b/Plugins/APL/APL.xcodeproj/project.pbxproj index 62a570254..cc87d3d24 100644 --- a/Plugins/APL/APL.xcodeproj/project.pbxproj +++ b/Plugins/APL/APL.xcodeproj/project.pbxproj @@ -142,7 +142,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 99B989F30CC7E10400C256E9 = { DevelopmentTeam = ""; @@ -208,6 +208,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -249,6 +250,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme b/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme index 551b73606..85c25e988 100644 --- a/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme +++ b/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme @@ -1,6 +1,6 @@ trackEnd) - frames = trackEnd - framePosition; + frames = (UInt32)(trackEnd - framePosition); if (!frames) { DLog(@"APL readAudio Returning 0"); diff --git a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj index 22c2470a0..74321ed7e 100644 --- a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj +++ b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj @@ -163,7 +163,7 @@ 83D3C5EB201C674D005564CB /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 83D3C5F2201C674D005564CB = { @@ -265,6 +265,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -322,6 +323,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj index 44a44bc5e..0057d3887 100644 --- a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj +++ b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj @@ -174,7 +174,7 @@ 8359FF0F17FEF35C0060F3ED /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 8359FF1617FEF35C0060F3ED = { @@ -283,6 +283,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -335,6 +336,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme index b07a95d5e..e3f6378c2 100644 --- a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme +++ b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme @@ -1,6 +1,6 @@ data; - return [[decoder source] read:ptr amount:size]; + return (mpc_int32_t)[[decoder source] read:ptr amount:size]; } mpc_bool_t SeekProc(mpc_reader *p_reader, mpc_int32_t offset) @@ -30,7 +30,7 @@ mpc_int32_t TellProc(mpc_reader *p_reader) { MusepackDecoder *decoder = (__bridge MusepackDecoder *) p_reader->data; - return [[decoder source] tell]; + return (mpc_int32_t)[[decoder source] tell]; } mpc_int32_t GetSizeProc(mpc_reader *p_reader) @@ -44,8 +44,11 @@ mpc_int32_t GetSizeProc(mpc_reader *p_reader) long size = [[decoder source] tell]; [[decoder source] seek:currentPos whence:SEEK_SET]; + + if (size > INT32_MAX) + size = INT32_MAX; - return size; + return (mpc_int32_t)size; } else { return 0; diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj index b59bcd8a8..c858187df 100644 --- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj +++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj @@ -157,7 +157,7 @@ 83E5EF9B1FFEF78100659F0F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 83E5EFA21FFEF78100659F0F = { @@ -257,6 +257,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -314,6 +315,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj index 654855987..a49ebbae8 100644 --- a/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj +++ b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj @@ -169,7 +169,7 @@ 8375B03417FFEA400092A79F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Christopher Snowhill"; TargetAttributes = { 8375B03B17FFEA400092A79F = { @@ -278,6 +278,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -331,6 +332,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme index 398982698..05001ca4a 100644 --- a/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme +++ b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme @@ -1,6 +1,6 @@ 0) { for (int i = 0; i < channels; i++) { for (int j = 0; j < numread; j++) { diff --git a/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj b/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj index e25f7e362..b89bcbf6d 100644 --- a/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj +++ b/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj @@ -216,7 +216,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1250; TargetAttributes = { 8D5B49AC048680CD000E48DA = { DevelopmentTeam = ""; @@ -401,6 +401,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -442,6 +443,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme index 651c614cb..915c69c3a 100644 --- a/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme +++ b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme @@ -1,6 +1,6 @@ )info - proposedRow:(int)row + proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)op { return NSDragOperationNone; } -@end \ No newline at end of file +@end