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

Updates for new build system.

CQTexperiment
Christopher Snowhill 2018-06-28 03:59:59 -07:00
parent 6e6648624d
commit 67495009ff
142 changed files with 2663 additions and 6968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Application/AppController.m
View File

@ -65,8 +65,8 @@
[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
if ( result == NSFileHandlingPanelOKButton ) {
[playlistLoader willInsertURLs:[p URLs] origin:URLOriginInternal];
[playlistLoader didInsertURLs:[playlistLoader addURLs:[p URLs] sort:YES] origin:URLOriginInternal];
[self->playlistLoader willInsertURLs:[p URLs] origin:URLOriginInternal];
[self->playlistLoader didInsertURLs:[self->playlistLoader addURLs:[p URLs] sort:YES] origin:URLOriginInternal];
} else {
[p close];
}
@ -81,7 +81,7 @@
[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
if ( result == NSFileHandlingPanelOKButton ) {
[playlistLoader save:[[p URL] path]];
[self->playlistLoader save:[[p URL] path]];
} else {
[p close];
}
@ -475,14 +475,14 @@
[contentView addSubview: [nowPlaying view]];
[NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
[context setDuration:0.25];
NSRect nowPlayingFrame = [[nowPlaying view] frame];
NSRect nowPlayingFrame = [[self->nowPlaying view] frame];
nowPlayingFrame.size.width = windowSize.width;
[[nowPlaying view] setFrame: nowPlayingFrame];
[[nowPlaying view] setFrameOrigin: NSMakePoint(0.0, NSMaxY(contentRect) - nowPlayingFrame.size.height)];
[[self->nowPlaying view] setFrame: nowPlayingFrame];
[[self->nowPlaying view] setFrameOrigin: NSMakePoint(0.0, NSMaxY(contentRect) - nowPlayingFrame.size.height)];
NSRect mainViewFrame = [mainView frame];
NSRect mainViewFrame = [self->mainView frame];
mainViewFrame.size.height -= nowPlayingFrame.size.height;
[[mainView animator] setFrame:mainViewFrame];
[[self->mainView animator] setFrame:mainViewFrame];
} completionHandler:^{
@ -507,11 +507,11 @@
[NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
[context setDuration:0.25];
[[mainView animator] setFrame:mainViewFrame];
[[self->mainView animator] setFrame:mainViewFrame];
} completionHandler:^{
[[nowPlaying view] removeFromSuperview];
nowPlaying = nil;
[[self->nowPlaying view] removeFromSuperview];
self->nowPlaying = nil;
}];
}
}

21
Application/MediaKeysApplication.m
View File

@ -33,15 +33,18 @@
keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self];
if([SPMediaKeyTap usesGlobalMediaKeyTap]) {
NSAlert *alert = [[NSAlert alloc] init];
[alert addButtonWithTitle:@"Retry"];
[alert addButtonWithTitle:@"Cancel"];
[alert setMessageText:@"Enable Media Key access?"];
[alert setInformativeText:@"Media Key support requires the \"Accessibility\" permission."];
[alert setAlertStyle:NSInformationalAlertStyle];
while (![keyTap startWatchingMediaKeys]) {
if ([alert runModal] == NSAlertFirstButtonReturn) continue;
else break;
if (![keyTap startWatchingMediaKeys]) {
NSAlert *alert = [[NSAlert alloc] init];
[alert addButtonWithTitle:@"Retry"];
[alert addButtonWithTitle:@"Cancel"];
[alert setMessageText:@"Enable Media Key access?"];
[alert setInformativeText:@"Media Key support requires the \"Accessibility\" permission."];
[alert setAlertStyle:NSInformationalAlertStyle];
if ([alert runModal] == NSAlertFirstButtonReturn) {
NSString *path = [[NSBundle mainBundle] executablePath];
NSString *processID = [NSString stringWithFormat:@"%d",[[NSProcessInfo processInfo] processIdentifier]];
[NSTask launchedTaskWithLaunchPath:path arguments:[NSArray arrayWithObjects:path,processID,nil]];
}
}
}
else

2
Application/PlaybackController.m
View File

@ -6,7 +6,7 @@
#import "PlaylistController.h"
#import "PlaylistEntry.h"
#import "playlistLoader.h"
#import "PlaylistLoader.h"
#import "Logging.h"

6
Audio/CogAudio.xcodeproj/project.pbxproj
View File

@ -483,6 +483,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -512,7 +513,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -523,6 +524,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -550,7 +552,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../build;

2
AudioScrobbler/AudioScrobbler.m
View File

@ -117,7 +117,7 @@ escapeForLastFM(NSString *string)
_queue = nil;
semaphore_destroy(mach_task_self(), _semaphore), _semaphore = 0;
semaphore_destroy(mach_task_self(), _semaphore); _semaphore = 0;
}
- (void) start:(PlaylistEntry *)pe

0
English.lproj/Feedback.xib → Base.lproj/Feedback.xib
View File

0
English.lproj/FileTree.xib → Base.lproj/FileTree.xib
View File

58
English.lproj/InfoInspector.xib → Base.lproj/InfoInspector.xib
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="InfoWindowController">
@ -13,7 +13,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Info Inspector" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="InfoInspector" animationBehavior="default" id="1" customClass="NSPanel">
<window title="Info Inspector" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" visibleAtLaunch="NO" frameAutosaveName="InfoInspector" animationBehavior="default" id="1" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" utility="YES" HUD="YES"/>
<windowPositionMask key="initialPositionMask" rightStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="700" y="80" width="300" height="450"/>
@ -29,7 +29,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Artist:" id="10">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -38,7 +38,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Album:" id="12">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -47,7 +47,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Track:" id="14">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -56,7 +56,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Length:" id="16">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -65,7 +65,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Year:" id="18">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -74,7 +74,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Genre:" id="20">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -83,7 +83,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Sample Rate:" id="22">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -92,7 +92,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Channels:" id="28">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -101,7 +101,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bitrate:" id="32">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -110,7 +110,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bits Per Sample:" id="31">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -119,7 +119,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Title:" id="24">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -128,7 +128,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="34">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -140,7 +140,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="36">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -152,7 +152,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="38">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -164,7 +164,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="40">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -177,7 +177,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="42">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -190,7 +190,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="44">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<connections>
<outlet property="formatter" destination="79" id="107"/>
@ -205,7 +205,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="46">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -217,7 +217,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="50">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -229,7 +229,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="52">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -241,7 +241,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="54">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -253,7 +253,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="56">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@ -265,7 +265,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Filename:" id="85">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@ -274,7 +274,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="N/A" id="87">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>

0
English.lproj/MainMenu.xib → Base.lproj/MainMenu.xib
View File

0
English.lproj/OpenURLPanel.xib → Base.lproj/OpenURLPanel.xib
View File

0
English.lproj/SpotlightPanel.xib → Base.lproj/SpotlightPanel.xib
View File

746
Cog.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

2
Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View File

@ -2,6 +2,6 @@
<Workspace
version = "1.0">
<FileRef
location = "self:Cog.xcodeproj">
location = "self:">
</FileRef>
</Workspace>

46
Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint
View File

@ -1,46 +0,0 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "0AD7EB3838D751618692B26EDD4BFAEE2A368D70",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
"75748be7-0387-4326-94c7-f41ce0883d2c++505" : {
}
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"75748be7-0387-4326-94c7-f41ce0883d2c++505" : 0,
"E8A8BC68B807061741C520ADCEFE0BE66B80D001" : 9223372036854775807,
"EF1CF5E1F342919DE309B5C9DAEDDCF1D12D0402" : 0,
"0AD7EB3838D751618692B26EDD4BFAEE2A368D70" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "811E8515-6C50-44FF-ACDB-088BB9917E26",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"75748be7-0387-4326-94c7-f41ce0883d2c++505" : "cog\/Frameworks\/libsidplay\/sidplay-residfp-code\/",
"E8A8BC68B807061741C520ADCEFE0BE66B80D001" : "cog\/Frameworks\/mGBA\/mGBA\/mgba\/",
"EF1CF5E1F342919DE309B5C9DAEDDCF1D12D0402" : "cog\/Frameworks\/Sparkle\/",
"0AD7EB3838D751618692B26EDD4BFAEE2A368D70" : "cog\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Cog",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Cog.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/kode54.net:2264\/kode54\/Cog.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0AD7EB3838D751618692B26EDD4BFAEE2A368D70"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "svn:\/\/svn.code.sf.net\/p\/sidplay-residfp\/code",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Subversion",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "75748be7-0387-4326-94c7-f41ce0883d2c++505"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mgba-emu\/mgba.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E8A8BC68B807061741C520ADCEFE0BE66B80D001"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/kode54.net:2264\/kode54\/Sparkle.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "EF1CF5E1F342919DE309B5C9DAEDDCF1D12D0402"
}
]
}

2
FileTree/DirectoryNode.m
View File

@ -11,6 +11,8 @@
#import "FileNode.h"
#import "SmartFolderNode.h"
#import "NSString+FinderCompare.h"
@implementation DirectoryNode
- (BOOL)isLeaf

19
FileTree/PathNode.m
View File

@ -22,22 +22,19 @@
@implementation PathNode
//From http://developer.apple.com/documentation/Cocoa/Conceptual/LowLevelFileMgmt/Tasks/ResolvingAliases.html
//Updated 2018-06-28
NSURL *resolveAliases(NSURL *url)
{
FSRef fsRef;
if (CFURLGetFSRef((CFURLRef)url, &fsRef))
CFErrorRef error;
CFDataRef bookmarkRef = CFURLCreateBookmarkDataFromFile(kCFAllocatorDefault, (__bridge CFURLRef)url, &error);
if (bookmarkRef)
{
Boolean targetIsFolder, wasAliased;
Boolean isStale;
CFURLRef urlRef = CFURLCreateByResolvingBookmarkData(kCFAllocatorDefault, bookmarkRef, kCFURLBookmarkResolutionWithSecurityScope, NULL, NULL, &isStale, &error);
if (FSResolveAliasFile (&fsRef, true /*resolveAliasChains*/, &targetIsFolder, &wasAliased) == noErr && wasAliased)
if (urlRef && !isStale)
{
CFURLRef resolvedUrl = CFURLCreateFromFSRef(NULL, &fsRef);
if (resolvedUrl != NULL)
{
//DLog(@"Resolved...");
return (NSURL *)CFBridgingRelease(resolvedUrl);
}
return (NSURL *)CFBridgingRelease(urlRef);
}
}

26
Frameworks/AdPlug/AdPlug.xcodeproj/project.pbxproj → Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj
View File

@ -162,7 +162,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
83D3C4D4201C654F005564CB /* AdPlug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AdPlug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83D3C4D4201C654F005564CB /* libAdPlug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libAdPlug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83D3C4D8201C6550005564CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
83D3C504201C66C1005564CB /* rad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rad.h; path = adplug/src/rad.h; sourceTree = "<group>"; };
83D3C505201C66C1005564CB /* adplug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adplug.cpp; path = adplug/src/adplug.cpp; sourceTree = "<group>"; };
@ -311,7 +311,7 @@
83D3C4D5201C654F005564CB /* Products */ = {
isa = PBXGroup;
children = (
83D3C4D4201C654F005564CB /* AdPlug.framework */,
83D3C4D4201C654F005564CB /* libAdPlug.framework */,
);
name = Products;
sourceTree = "<group>";
@ -535,9 +535,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
83D3C4D3201C654F005564CB /* AdPlug */ = {
83D3C4D3201C654F005564CB /* libAdPlug */ = {
isa = PBXNativeTarget;
buildConfigurationList = 83D3C4DC201C6550005564CB /* Build configuration list for PBXNativeTarget "AdPlug" */;
buildConfigurationList = 83D3C4DC201C6550005564CB /* Build configuration list for PBXNativeTarget "libAdPlug" */;
buildPhases = (
83D3C4CF201C654F005564CB /* Sources */,
83D3C4D0201C654F005564CB /* Frameworks */,
@ -550,9 +550,9 @@
dependencies = (
83D3C6A4201D38FE005564CB /* PBXTargetDependency */,
);
name = AdPlug;
name = libAdPlug;
productName = AdPlug;
productReference = 83D3C4D4201C654F005564CB /* AdPlug.framework */;
productReference = 83D3C4D4201C654F005564CB /* libAdPlug.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@ -570,7 +570,7 @@
};
};
};
buildConfigurationList = 83D3C4CE201C654F005564CB /* Build configuration list for PBXProject "AdPlug" */;
buildConfigurationList = 83D3C4CE201C654F005564CB /* Build configuration list for PBXProject "libAdPlug" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = en;
hasScannedForEncodings = 0;
@ -588,7 +588,7 @@
);
projectRoot = "";
targets = (
83D3C4D3201C654F005564CB /* AdPlug */,
83D3C4D3201C654F005564CB /* libAdPlug */,
);
};
/* End PBXProject section */
@ -741,7 +741,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -795,7 +795,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
@ -825,7 +825,6 @@
INFOPLIST_FILE = AdPlug/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.AdPlug;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
@ -850,7 +849,6 @@
INFOPLIST_FILE = AdPlug/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.AdPlug;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
@ -860,7 +858,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
83D3C4CE201C654F005564CB /* Build configuration list for PBXProject "AdPlug" */ = {
83D3C4CE201C654F005564CB /* Build configuration list for PBXProject "libAdPlug" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83D3C4DA201C6550005564CB /* Debug */,
@ -869,7 +867,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
83D3C4DC201C6550005564CB /* Build configuration list for PBXNativeTarget "AdPlug" */ = {
83D3C4DC201C6550005564CB /* Build configuration list for PBXNativeTarget "libAdPlug" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83D3C4DD201C6550005564CB /* Debug */,

6
Frameworks/FLAC/flac.xcodeproj/project.pbxproj
View File

@ -568,6 +568,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@ -596,7 +597,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -608,6 +609,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@ -634,7 +636,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

4
Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
View File

@ -790,7 +790,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -836,7 +836,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

6
Frameworks/GME/GME.xcodeproj/project.pbxproj
View File

@ -1554,6 +1554,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -1584,7 +1585,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ../../build;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
@ -1596,6 +1597,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -1624,7 +1626,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ../../build;
PREBINDING = NO;
SDKROOT = macosx;

6
Frameworks/GME/gme/Bml_Parser.cpp
View File

@ -23,7 +23,7 @@ Bml_Node::Bml_Node(char const* name, size_t max_length)
{
size_t length = 0;
char const* ptr = name;
while (*ptr && length < max_length) ++ptr, ++length;
while (*ptr && length < max_length) { ++ptr; ++length; }
this->name = new char[ length + 1 ];
memcpy( this->name, name, length );
this->name[ length ] = '\0';
@ -264,7 +264,7 @@ void Bml_Parser::parseDocument( const char * source, size_t max_length )
size_t length = 0;
const char * end = source;
while ( *end && length < max_length ) ++end, ++length;
while ( *end && length < max_length ) { ++end; ++length; }
while ( source < end )
{
@ -346,7 +346,7 @@ void Bml_Parser::serialize(std::ostringstream & out, Bml_Node const* node, unsig
out << std::endl;
}
for (unsigned i = 0, j = node->getChildCount(); i < j; ++i)
for (size_t i = 0, j = node->getChildCount(); i < j; ++i)
{
Bml_Node const& child = node->getChild(i);
if ( (!child.getValue() || !strlen(child.getValue())) && !child.getChildCount() )

4
Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
View File

@ -352,7 +352,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -397,7 +397,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

4
Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
View File

@ -289,7 +289,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
@ -333,7 +333,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
};
name = Release;
};

4
Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj
View File

@ -259,7 +259,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -310,7 +310,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};

4
Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
View File

@ -307,7 +307,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -360,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

4
Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
View File

@ -237,7 +237,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -284,7 +284,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};

6
Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj
View File

@ -353,6 +353,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -382,7 +383,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -393,6 +394,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -420,7 +422,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

4
Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
View File

@ -259,7 +259,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SYMROOT = ../../build;
@ -302,7 +302,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
SYMROOT = ../../build;
};

6
Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj
View File

@ -270,7 +270,7 @@
GCC_PREFIX_HEADER = Ogg_Prefix.pch;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.ogg;
PRODUCT_NAME = Ogg;
SDKROOT = macosx;
@ -293,7 +293,7 @@
GCC_PREFIX_HEADER = Ogg_Prefix.pch;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.ogg;
PRODUCT_NAME = Ogg;
SDKROOT = macosx;
@ -305,6 +305,7 @@
730F235909181A3A00AB638C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -344,6 +345,7 @@
730F235A09181A3A00AB638C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

28
Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj → Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj
View File

@ -272,7 +272,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
83E5EFBD1FFEF7CC00659F0F /* OpenMPT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenMPT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83E5EFBD1FFEF7CC00659F0F /* libOpenMPT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libOpenMPT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83E5EFCE1FFEF9D200659F0F /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
83E5EFCF1FFEF9D200659F0F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
83E5F2461FFEF9E100659F0F /* minimp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minimp3.c; sourceTree = "<group>"; };
@ -565,7 +565,7 @@
83E5EFBE1FFEF7CC00659F0F /* Products */ = {
isa = PBXGroup;
children = (
83E5EFBD1FFEF7CC00659F0F /* OpenMPT.framework */,
83E5EFBD1FFEF7CC00659F0F /* libOpenMPT.framework */,
);
name = Products;
sourceTree = "<group>";
@ -1078,9 +1078,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
83E5EFBC1FFEF7CC00659F0F /* OpenMPT */ = {
83E5EFBC1FFEF7CC00659F0F /* libOpenMPT */ = {
isa = PBXNativeTarget;
buildConfigurationList = 83E5EFC51FFEF7CC00659F0F /* Build configuration list for PBXNativeTarget "OpenMPT" */;
buildConfigurationList = 83E5EFC51FFEF7CC00659F0F /* Build configuration list for PBXNativeTarget "libOpenMPT" */;
buildPhases = (
83E5EFB81FFEF7CC00659F0F /* Sources */,
83E5EFB91FFEF7CC00659F0F /* Frameworks */,
@ -1091,9 +1091,9 @@
);
dependencies = (
);
name = OpenMPT;
name = libOpenMPT;
productName = OpenMPT;
productReference = 83E5EFBD1FFEF7CC00659F0F /* OpenMPT.framework */;
productReference = 83E5EFBD1FFEF7CC00659F0F /* libOpenMPT.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@ -1111,7 +1111,7 @@
};
};
};
buildConfigurationList = 83E5EFB71FFEF7CC00659F0F /* Build configuration list for PBXProject "OpenMPT" */;
buildConfigurationList = 83E5EFB71FFEF7CC00659F0F /* Build configuration list for PBXProject "libOpenMPT" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = en;
hasScannedForEncodings = 0;
@ -1123,7 +1123,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
83E5EFBC1FFEF7CC00659F0F /* OpenMPT */,
83E5EFBC1FFEF7CC00659F0F /* libOpenMPT */,
);
};
/* End PBXProject section */
@ -1342,7 +1342,7 @@
OpenMPT/include/modplug/include,
OpenMPT/include,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -1406,7 +1406,7 @@
OpenMPT/include/modplug/include,
OpenMPT/include,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
USE_HEADERMAP = YES;
@ -1432,7 +1432,7 @@
"$(inherited)",
"$(PROJECT_DIR)/OpenMPT/include/foobar2000sdk/foobar2000/shared",
);
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.OpenMPT;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};
@ -1455,7 +1455,7 @@
"$(inherited)",
"$(PROJECT_DIR)/OpenMPT/include/foobar2000sdk/foobar2000/shared",
);
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.OpenMPT;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.libOpenMPT;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};
@ -1464,7 +1464,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
83E5EFB71FFEF7CC00659F0F /* Build configuration list for PBXProject "OpenMPT" */ = {
83E5EFB71FFEF7CC00659F0F /* Build configuration list for PBXProject "libOpenMPT" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83E5EFC31FFEF7CC00659F0F /* Debug */,
@ -1473,7 +1473,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
83E5EFC51FFEF7CC00659F0F /* Build configuration list for PBXNativeTarget "OpenMPT" */ = {
83E5EFC51FFEF7CC00659F0F /* Build configuration list for PBXNativeTarget "libOpenMPT" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83E5EFC61FFEF7CC00659F0F /* Debug */,

4
Frameworks/Opus/Opus.xcodeproj/project.pbxproj
View File

@ -1277,7 +1277,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -1324,7 +1324,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

4
Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
View File

@ -357,7 +357,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -402,7 +402,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

6
Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj
View File

@ -296,6 +296,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -332,7 +333,7 @@
../../include,
include,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -343,6 +344,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -377,7 +379,7 @@
../../include,
include,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

6
Frameworks/Syntrax-c/Syntrax-c/resampler.c
View File

@ -305,10 +305,10 @@ static int resampler_wrapper( resampler *r, sample_t out [], int* out_size,
sample_t const in [], int in_size )
{
sample_t* out_ = out;
int result = resampler_inner_loop( r, &out_, out + *out_size, in, in_size ) - in;
long result = resampler_inner_loop( r, &out_, out + *out_size, in, in_size ) - in;
*out_size = out_ - out;
return result;
*out_size = (int)(out_ - out);
return (int) result;
}
static void resampler_fill( resampler *r )

2
Frameworks/Syntrax-c/Syntrax-c/resampler.h
View File

@ -49,7 +49,7 @@ typedef int32_t sample_t;
extern "C" {
#endif
void * resampler_create();
void * resampler_create(void);
void * resampler_dup(const void *);
void resampler_dup_inplace(void *, const void *);
void resampler_destroy(void *);

19
Frameworks/Syntrax-c/Syntrax-c/syntrax.c
View File

@ -134,11 +134,11 @@ void playerDestroy(Player *p)
Player * playerCreate(int SAMPLEFREQUENCY)
{
int i, j;
int i;
Player* p;
srand(time(NULL));
srand((unsigned int) time(NULL));
p = (Player *) calloc(1, sizeof(Player));
if (!p) return NULL;
@ -241,7 +241,6 @@ static void instrEffect(Player *p, int chanNum)
int _local38;
int _local39;
int _local40;
int _local43;
int butt, ron, pat, buf2, buf1;
TuneChannel *tc = &p->tuneChannels[chanNum];
@ -1666,7 +1665,7 @@ static void ABH(Player *p)
_local4 = 0;
}
_local2 = _local3[_local4].patLen;
if ((((tc->LJHG == _local2)) || ((tc->EQMIWERPIF == -1)))){
if ((((tc->LJHG == _local2)) || ((tc->EQMIWERPIF == 0xFF)))){
tc->LJHG = 0;
tc->EQMIWERPIF++;
p->curSubsong.mutedChans[i] = p->mutedChans[i];
@ -1744,7 +1743,7 @@ void mixChunk(Player *p, int16_t *outBuff, uint playbackBufferSize)
{
int i, j;
uint sampleNum;
int amp, smp, pos;
int amp, smp;
int32_t audioMainR, audioMainL;
int32_t audioDelayR, audioDelayL;
uint otherDelayTime;
@ -1753,7 +1752,7 @@ void mixChunk(Player *p, int16_t *outBuff, uint playbackBufferSize)
int insNum;
//We just don't know!
uint dword_6632774C = 0;
//uint dword_6632774C = 0;
if ( p->channelNumber > 0 )
{
@ -1833,11 +1832,11 @@ void mixChunk(Player *p, int16_t *outBuff, uint playbackBufferSize)
v->gainRight = 0x100;
v->gainLeft = 0x100;
}
if ( dword_6632774C )
/*if ( dword_6632774C )
{
//v->gainDelay = word_6632B9F4[i];
}
else
else*/
{
v->gainDelay = p->curSubsong.chanDelayAmt[i];
}
@ -1846,12 +1845,12 @@ void mixChunk(Player *p, int16_t *outBuff, uint playbackBufferSize)
v->gainDelayRight = (v->gainDelay * v->gainRight) >> 8;
v->gainDelayLeft = (v->gainDelay * v->gainLeft) >> 8;
}
if ( dword_6632774C )
/*if ( dword_6632774C )
{
//amp = word_6632B964;
//otherDelayTime = word_6632BB24;
}
else
else*/
{
amp = p->curSubsong.amplification;
otherDelayTime = p->curSubsong.delayTime / (44100 / p->SAMPLEFREQUENCY);

4
Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj
View File

@ -203,7 +203,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -251,7 +251,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";

6
Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj
View File

@ -1093,6 +1093,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@ -1124,7 +1125,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
SDKROOT = macosx;
@ -1135,6 +1136,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@ -1164,7 +1166,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
SDKROOT = macosx;
SYMROOT = ../../build;

6
Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
View File

@ -769,7 +769,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.vorbis;
PRODUCT_NAME = Vorbis;
@ -799,7 +799,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.vorbis;
PRODUCT_NAME = Vorbis;
@ -818,6 +818,7 @@
730F23F4091827B200AB638C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -857,6 +858,7 @@
730F23F5091827B200AB638C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

6
Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
View File

@ -409,6 +409,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -439,7 +440,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -450,6 +451,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -478,7 +480,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

4
Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
View File

@ -1124,7 +1124,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -1168,7 +1168,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

2
Frameworks/lazyusf/lazyusf/usf/usf.h
View File

@ -17,7 +17,7 @@ extern "C" {
#endif
/* Returns the size of the base emulator state. */
size_t usf_get_state_size();
size_t usf_get_state_size(void);
/* Clears and prepares an allocated state.
Do not call this on a state which has already been rendering

2
Frameworks/libsidplay/sidplay-residfp-code

@ -1 +1 @@
Subproject commit b61bdd96408fa5850716c534c06906d189e65148
Subproject commit 5beb0a91d0fa566ec1b4d125cbe53831833c6692

4
Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj
View File

@ -1032,7 +1032,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"sidplay-residfp-code/libsidplayfp/src",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -1087,7 +1087,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"sidplay-residfp-code/libsidplayfp/src",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";

10
Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj
View File

@ -197,7 +197,6 @@
83CA2E2C1D7BCB5200F2EA53 /* vfs-fd.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2E2B1D7BCB5200F2EA53 /* vfs-fd.c */; };
83CA2E321D7BCB6700F2EA53 /* ini.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2E2E1D7BCB6700F2EA53 /* ini.c */; };
83CA2E331D7BCB6700F2EA53 /* ini.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CA2E2F1D7BCB6700F2EA53 /* ini.h */; };
83CA2E351D7BCB6700F2EA53 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2E311D7BCB6700F2EA53 /* README.md */; };
83CA2E3B1D7BCBD300F2EA53 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2E391D7BCBD300F2EA53 /* memory.c */; };
83CA2E431D7BD82100F2EA53 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2E421D7BD82100F2EA53 /* core.c */; };
83D7282220A673A600076FC5 /* matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D7282120A673A500076FC5 /* matrix.h */; };
@ -402,7 +401,6 @@
83CA2E2B1D7BCB5200F2EA53 /* vfs-fd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vfs-fd.c"; sourceTree = "<group>"; };
83CA2E2E1D7BCB6700F2EA53 /* ini.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ini.c; sourceTree = "<group>"; };
83CA2E2F1D7BCB6700F2EA53 /* ini.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ini.h; sourceTree = "<group>"; };
83CA2E311D7BCB6700F2EA53 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
83CA2E391D7BCBD300F2EA53 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = memory.c; path = platform/posix/memory.c; sourceTree = "<group>"; };
83CA2E421D7BD82100F2EA53 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = "<group>"; };
83D7282120A673A500076FC5 /* matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = matrix.h; sourceTree = "<group>"; };
@ -977,7 +975,6 @@
837612F11DD6AD07001EED3D /* inih_LICENSE.txt */,
83CA2E2E1D7BCB6700F2EA53 /* ini.c */,
83CA2E2F1D7BCB6700F2EA53 /* ini.h */,
83CA2E311D7BCB6700F2EA53 /* README.md */,
);
path = inih;
sourceTree = "<group>";
@ -1258,7 +1255,6 @@
8333B6671DCC4451004C140D /* tile-cache.c in Sources */,
83CA299B1D7BC4EE00F2EA53 /* gameshark.c in Sources */,
83CA2D9C1D7BC83E00F2EA53 /* directories.c in Sources */,
83CA2E351D7BCB6700F2EA53 /* README.md in Sources */,
83CA29B81D7BC4EE00F2EA53 /* overrides.c in Sources */,
83299FBE1E7657B2003A3242 /* dma.c in Sources */,
83CA2D361D7BC4F000F2EA53 /* crc32.c in Sources */,
@ -1327,7 +1323,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -1379,7 +1375,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
@ -1408,7 +1404,6 @@
INFOPLIST_FILE = mGBA/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.mGBA;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@ -1435,7 +1430,6 @@
INFOPLIST_FILE = mGBA/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.mGBA;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;

4
Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
View File

@ -277,7 +277,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -323,7 +323,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

2
Frameworks/mpg123/mpg123/getbits.h
View File

@ -74,7 +74,7 @@ fprintf(stderr,"g%d",number_of_bits);
fprintf(stderr,":%lx\n",rval);
#endif
return rval;
return (unsigned int) rval;
}

16
Frameworks/mpg123/mpg123/layer2.c
View File

@ -168,23 +168,23 @@ static void II_step_one(unsigned int *bit_alloc,int *scale,mpg123_handle *fr)
switch(*scfsi++)
{
case 0:
*scale++ = getbits_fast(fr, 6);
*scale++ = getbits_fast(fr, 6);
*scale++ = getbits_fast(fr, 6);
*scale++ = (int) getbits_fast(fr, 6);
*scale++ = (int) getbits_fast(fr, 6);
*scale++ = (int) getbits_fast(fr, 6);
break;
case 1 :
*scale++ = sc = getbits_fast(fr, 6);
*scale++ = sc = (int) getbits_fast(fr, 6);
*scale++ = sc;
*scale++ = getbits_fast(fr, 6);
*scale++ = (int) getbits_fast(fr, 6);
break;
case 2:
*scale++ = sc = getbits_fast(fr, 6);
*scale++ = sc = (int) getbits_fast(fr, 6);
*scale++ = sc;
*scale++ = sc;
break;
default: /* case 3 */
*scale++ = getbits_fast(fr, 6);
*scale++ = sc = getbits_fast(fr, 6);
*scale++ = (int) getbits_fast(fr, 6);
*scale++ = sc = (int) getbits_fast(fr, 6);
*scale++ = sc;
break;
}

14
Frameworks/mpg123/mpg123/parse.c
View File

@ -423,7 +423,7 @@ static int halfspeed_do(mpg123_handle *fr)
}
else
{
fr->halfphase = fr->p.halfspeed - 1;
fr->halfphase = (int)(fr->p.halfspeed - 1);
}
}
return 0;
@ -650,7 +650,7 @@ static int guess_freeformat_framesize(mpg123_handle *fr)
if((head & HDR_SAMEMASK) == (fr->oldhead & HDR_SAMEMASK))
{
fr->rd->back_bytes(fr,i+1);
fr->framesize = i-3;
fr->framesize = (int)(i-3);
return PARSE_GOOD; /* Success! */
}
}
@ -751,7 +751,7 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma
/* freeformat should be CBR, so the same framesize can be used at the 2nd reading or later */
else
{
fr->framesize = fr->freeformat_framesize + fr->padding;
fr->framesize = (int)(fr->freeformat_framesize + fr->padding);
}
}
@ -762,7 +762,7 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma
fr->do_layer = do_layer1;
if(!fr->freeformat)
{
fr->framesize = (long) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
fr->framesize = (int) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
fr->framesize /= freqs[fr->sampling_frequency];
fr->framesize = ((fr->framesize+fr->padding)<<2)-4;
}
@ -774,7 +774,7 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma
if(!fr->freeformat)
{
debug2("bitrate index: %i (%i)", fr->bitrate_index, tabsel_123[fr->lsf][1][fr->bitrate_index] );
fr->framesize = (long) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
fr->framesize = (int) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
fr->framesize /= freqs[fr->sampling_frequency];
fr->framesize += fr->padding - 4;
}
@ -793,7 +793,7 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma
if(!fr->freeformat)
{
fr->framesize = (long) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
fr->framesize = (int) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
fr->framesize /= freqs[fr->sampling_frequency]<<(fr->lsf);
fr->framesize = fr->framesize + fr->padding - 4;
}
@ -1103,7 +1103,7 @@ static int wetwork(mpg123_handle *fr, unsigned long *newheadp)
fr->id3buf[2] = (unsigned char) ((newhead >> 8) & 0xff);
fr->id3buf[3] = (unsigned char) ( newhead & 0xff);
if((ret=fr->rd->fullread(fr,fr->id3buf+4,124)) < 0) return ret;
if((ret=(int)fr->rd->fullread(fr,fr->id3buf+4,124)) < 0) return ret;
fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3;
fr->rdat.flags |= READER_ID3TAG; /* that marks id3v1 */

8
Frameworks/mpg123/mpg123/readers.c
View File

@ -30,7 +30,9 @@ static int default_init(mpg123_handle *fr);
static off_t get_fileinfo(mpg123_handle *);
static ssize_t posix_read(int fd, void *buf, size_t count){ return read(fd, buf, count); }
static off_t posix_lseek(int fd, off_t offset, int whence){ return lseek(fd, offset, whence); }
#ifndef NO_ICY
static off_t nix_lseek(int fd, off_t offset, int whence){ return -1; }
#endif
static ssize_t plain_fullread(mpg123_handle *fr,unsigned char *buf, ssize_t count);
@ -302,7 +304,7 @@ static int stream_seek_frame(mpg123_handle *fr, off_t newframe)
static int generic_head_read(mpg123_handle *fr,unsigned long *newhead)
{
unsigned char hbuf[4];
int ret = fr->rd->fullread(fr,hbuf,4);
int ret = (int) fr->rd->fullread(fr,hbuf,4);
if(ret == READER_MORE) return ret;
if(ret != 4) return FALSE;
@ -318,7 +320,7 @@ static int generic_head_read(mpg123_handle *fr,unsigned long *newhead)
static int generic_head_shift(mpg123_handle *fr,unsigned long *head)
{
unsigned char hbuf;
int ret = fr->rd->fullread(fr,&hbuf,1);
int ret = (int) fr->rd->fullread(fr,&hbuf,1);
if(ret == READER_MORE) return ret;
if(ret != 1) return FALSE;
@ -394,7 +396,7 @@ static int generic_read_frame_body(mpg123_handle *fr,unsigned char *buf, int siz
if(ll <= 0) ll = 0;
return READER_MORE;
}
return l;
return (int) l;
}
static off_t generic_tell(mpg123_handle *fr)

2
Frameworks/mpg123/mpg123/synth_mono.h
View File

@ -26,7 +26,7 @@ int MONO_NAME(real *bandPtr, mpg123_handle *fr)
/* save buffer stuff, trick samples_tmp into there, decode, restore */
unsigned char *samples = fr->buffer.data;
int pnt = fr->buffer.fill;
int pnt = (int) fr->buffer.fill;
fr->buffer.data = (unsigned char*) samples_tmp;
fr->buffer.fill = 0;
ret = SYNTH_NAME(bandPtr, 0, fr, 0); /* decode into samples_tmp */

4
Frameworks/mpg123/mpg123/synth_ntom.h
View File

@ -80,13 +80,13 @@ int SYNTH_NAME(real *bandPtr,int channel, mpg123_handle *fr, int final)
fr->bo--;
fr->bo &= 0xf;
buf = fr->real_buffs[0];
ntom = fr->ntom_val[1] = fr->ntom_val[0];
ntom = (int)(fr->ntom_val[1] = fr->ntom_val[0]);
}
else
{
samples++;
buf = fr->real_buffs[1];
ntom = fr->ntom_val[1];
ntom = (int) fr->ntom_val[1];
}
if(fr->bo & 0x1)

4
Frameworks/psflib/psflib.xcodeproj/project.pbxproj
View File

@ -241,7 +241,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -286,7 +286,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

62
Frameworks/vgmstream/vgmstream.xcodeproj/project.pbxproj → Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
View File

@ -132,6 +132,7 @@
8349A91E1FE6258200E26435 /* bar.c in Sources */ = {isa = PBXBuildFile; fileRef = 8349A9051FE6258100E26435 /* bar.c */; };
8349A91F1FE6258200E26435 /* naac.c in Sources */ = {isa = PBXBuildFile; fileRef = 8349A9061FE6258100E26435 /* naac.c */; };
834D3A6E19F47C98001C54F6 /* g1l.c in Sources */ = {isa = PBXBuildFile; fileRef = 834D3A6D19F47C98001C54F6 /* g1l.c */; };
834D795520E4F0D400C4A5CC /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F4128F1E932F9A002E37D0 /* Vorbis.framework */; };
8350270D1ED119D200C25929 /* ps3_mta2.c in Sources */ = {isa = PBXBuildFile; fileRef = 8350270C1ED119D200C25929 /* ps3_mta2.c */; };
835027131ED119E000C25929 /* mta2_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 835027121ED119E000C25929 /* mta2_decoder.c */; };
8350C0551E071881009E0A93 /* xma.c in Sources */ = {isa = PBXBuildFile; fileRef = 8350C0541E071881009E0A93 /* xma.c */; };
@ -462,7 +463,6 @@
83EED5D3203A8BC7008BEB45 /* ea_swvr.c in Sources */ = {isa = PBXBuildFile; fileRef = 83EED5D1203A8BC7008BEB45 /* ea_swvr.c */; };
83EED5D4203A8BC7008BEB45 /* aus.c in Sources */ = {isa = PBXBuildFile; fileRef = 83EED5D2203A8BC7008BEB45 /* aus.c */; };
83EED5D6203A8BD7008BEB45 /* blocked_ea_swvr.c in Sources */ = {isa = PBXBuildFile; fileRef = 83EED5D5203A8BD7008BEB45 /* blocked_ea_swvr.c */; };
83F4129C1E93313C002E37D0 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F4128F1E932F9A002E37D0 /* Vorbis.framework */; };
83F5F8831908D0A400C8E65F /* fsb5.c in Sources */ = {isa = PBXBuildFile; fileRef = 83F5F8821908D0A400C8E65F /* fsb5.c */; };
83FF0EBC1E93282100C58054 /* wwise.c in Sources */ = {isa = PBXBuildFile; fileRef = 83FF0EBB1E93282100C58054 /* wwise.c */; };
/* End PBXBuildFile section */
@ -494,13 +494,6 @@
remoteGlobalIDString = 830EBD8620045F190023AA10;
remoteInfo = libatrac9;
};
830EBE17200465A30023AA10 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83F412871E932F9A002E37D0 /* Vorbis.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 730F23A1091827B100AB638C;
remoteInfo = Vorbis;
};
8313E3421901FBDD00B4B6F1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8313E33D1901FBDC00B4B6F1 /* mpg123.xcodeproj */;
@ -515,6 +508,13 @@
remoteGlobalIDString = 8313E30E1901FBDC00B4B6F1;
remoteInfo = mpg123;
};
834D795320E4F0B900C4A5CC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83F412871E932F9A002E37D0 /* Vorbis.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 730F23A1091827B100AB638C;
remoteInfo = Vorbis;
};
83D730EA1A738EB300CA1366 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83D730E51A738EB200CA1366 /* g7221.xcodeproj */;
@ -718,8 +718,8 @@
835027121ED119E000C25929 /* mta2_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mta2_decoder.c; sourceTree = "<group>"; };
8350C0541E071881009E0A93 /* xma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xma.c; sourceTree = "<group>"; };
8350C0591E071990009E0A93 /* ps2_svag_snk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ps2_svag_snk.c; sourceTree = "<group>"; };
836F6B3918BDB8880095E648 /* vgmstream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = vgmstream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
836F6B4418BDB8880095E648 /* vgmstream-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "vgmstream-Info.plist"; sourceTree = "<group>"; };
836F6B3918BDB8880095E648 /* libvgmstream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libvgmstream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
836F6B4418BDB8880095E648 /* libvgmstream-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "libvgmstream-Info.plist"; sourceTree = "<group>"; };
836F6B4618BDB8880095E648 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
836F6DE018BDC2180095E648 /* acm_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acm_decoder.c; sourceTree = "<group>"; };
836F6DE118BDC2180095E648 /* acm_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acm_decoder.h; sourceTree = "<group>"; };
@ -1071,7 +1071,7 @@
838BDB651D3AF08C0022CA6F /* libavformat.a in Frameworks */,
838BDB661D3AF08C0022CA6F /* libavutil.a in Frameworks */,
8313E3E61902020400B4B6F1 /* mpg123.framework in Frameworks */,
83F4129C1E93313C002E37D0 /* Vorbis.framework in Frameworks */,
834D795520E4F0D400C4A5CC /* Vorbis.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1116,7 +1116,7 @@
836F6B3A18BDB8880095E648 /* Products */ = {
isa = PBXGroup;
children = (
836F6B3918BDB8880095E648 /* vgmstream.framework */,
836F6B3918BDB8880095E648 /* libvgmstream.framework */,
);
name = Products;
sourceTree = "<group>";
@ -1168,7 +1168,7 @@
836F6B4318BDB8880095E648 /* Supporting Files */ = {
isa = PBXGroup;
children = (
836F6B4418BDB8880095E648 /* vgmstream-Info.plist */,
836F6B4418BDB8880095E648 /* libvgmstream-Info.plist */,
836F6B4518BDB8880095E648 /* InfoPlist.strings */,
);
name = "Supporting Files";
@ -1705,9 +1705,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
836F6B3818BDB8880095E648 /* vgmstream */ = {
836F6B3818BDB8880095E648 /* libvgmstream */ = {
isa = PBXNativeTarget;
buildConfigurationList = 836F6B6118BDB8880095E648 /* Build configuration list for PBXNativeTarget "vgmstream" */;
buildConfigurationList = 836F6B6118BDB8880095E648 /* Build configuration list for PBXNativeTarget "libvgmstream" */;
buildPhases = (
836F6B3418BDB8880095E648 /* Sources */,
836F6B3518BDB8880095E648 /* Frameworks */,
@ -1719,15 +1719,15 @@
48C265101A5D424500A0A3D6 /* PBXBuildRule */,
);
dependencies = (
830EBE18200465A30023AA10 /* PBXTargetDependency */,
834D795420E4F0B900C4A5CC /* PBXTargetDependency */,
830EBE162004659B0023AA10 /* PBXTargetDependency */,
83D731881A749D0D00CA1366 /* PBXTargetDependency */,
83D7310F1A7394B500CA1366 /* PBXTargetDependency */,
8313E3E91902021F00B4B6F1 /* PBXTargetDependency */,
);
name = vgmstream;
name = libvgmstream;
productName = vgmstream;
productReference = 836F6B3918BDB8880095E648 /* vgmstream.framework */;
productReference = 836F6B3918BDB8880095E648 /* libvgmstream.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@ -1744,7 +1744,7 @@
};
};
};
buildConfigurationList = 836F6B3318BDB8880095E648 /* Build configuration list for PBXProject "vgmstream" */;
buildConfigurationList = 836F6B3318BDB8880095E648 /* Build configuration list for PBXProject "libvgmstream" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@ -1779,7 +1779,7 @@
);
projectRoot = "";
targets = (
836F6B3818BDB8880095E648 /* vgmstream */,
836F6B3818BDB8880095E648 /* libvgmstream */,
);
};
/* End PBXProject section */
@ -2273,16 +2273,16 @@
name = libatrac9;
targetProxy = 830EBE152004659B0023AA10 /* PBXContainerItemProxy */;
};
830EBE18200465A30023AA10 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Vorbis;
targetProxy = 830EBE17200465A30023AA10 /* PBXContainerItemProxy */;
};
8313E3E91902021F00B4B6F1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = mpg123;
targetProxy = 8313E3E81902021F00B4B6F1 /* PBXContainerItemProxy */;
};
834D795420E4F0B900C4A5CC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Vorbis;
targetProxy = 834D795320E4F0B900C4A5CC /* PBXContainerItemProxy */;
};
83D7310F1A7394B500CA1366 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = g7221;
@ -2361,7 +2361,7 @@
);
INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = ../../ThirdParty/ffmpeg/lib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -2419,7 +2419,7 @@
);
INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = ../../ThirdParty/ffmpeg/lib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
@ -2443,7 +2443,7 @@
../Vorbis/include,
../Ogg/include,
);
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
INFOPLIST_FILE = "vgmstream/libvgmstream-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@ -2469,7 +2469,7 @@
../Vorbis/include,
../Ogg/include,
);
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
INFOPLIST_FILE = "vgmstream/libvgmstream-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@ -2480,7 +2480,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
836F6B3318BDB8880095E648 /* Build configuration list for PBXProject "vgmstream" */ = {
836F6B3318BDB8880095E648 /* Build configuration list for PBXProject "libvgmstream" */ = {
isa = XCConfigurationList;
buildConfigurations = (
836F6B5F18BDB8880095E648 /* Debug */,
@ -2489,7 +2489,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
836F6B6118BDB8880095E648 /* Build configuration list for PBXNativeTarget "vgmstream" */ = {
836F6B6118BDB8880095E648 /* Build configuration list for PBXNativeTarget "libvgmstream" */ = {
isa = XCConfigurationList;
buildConfigurations = (
836F6B6218BDB8880095E648 /* Debug */,

18
Frameworks/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme → Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
View File

@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "836F6B3818BDB8880095E648"
BuildableName = "vgmstream.framework"
BlueprintName = "vgmstream"
ReferencedContainer = "container:vgmstream.xcodeproj">
BuildableName = "libvgmstream.framework"
BlueprintName = "libvgmstream"
ReferencedContainer = "container:libvgmstream.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -46,9 +46,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "836F6B3818BDB8880095E648"
BuildableName = "vgmstream.framework"
BlueprintName = "vgmstream"
ReferencedContainer = "container:vgmstream.xcodeproj">
BuildableName = "libvgmstream.framework"
BlueprintName = "libvgmstream"
ReferencedContainer = "container:libvgmstream.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
@ -64,9 +64,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "836F6B3818BDB8880095E648"
BuildableName = "vgmstream.framework"
BlueprintName = "vgmstream"
ReferencedContainer = "container:vgmstream.xcodeproj">
BuildableName = "libvgmstream.framework"
BlueprintName = "libvgmstream"
ReferencedContainer = "container:libvgmstream.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>

0
Frameworks/vgmstream/vgmstream/vgmstream-Info.plist → Frameworks/vgmstream/vgmstream/libvgmstream-Info.plist
View File

4
Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
View File

@ -406,7 +406,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -451,7 +451,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

4
Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h
View File

@ -740,8 +740,8 @@ typedef struct
int id; // ID number for core(see above defines)
const char *Name; // Name of core
int flags; // What features the core supports(full screen, etc.)
int (*Init)(); // Initializes stuff related to core
void (*DeInit)(); // Deinitializes stuff related to core
int (*Init)(void); // Initializes stuff related to core
void (*DeInit)(void); // Deinitializes stuff related to core
void (*Resize)(int width, int height, BOOL fullscreen); // Resizes window or fullscreen
void (*OnScreenText)(char *string, ...); // For handling save state messages, etc.
} GraphicsInterface_struct;

8
Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c
View File

@ -265,13 +265,16 @@ void MMU_clearMem(NDS_state *state)
/* FIXME: VRAM Bank E,F,G,H,I missing */
void MMU_VRAMWriteBackToLCD(NDS_state *state, u8 block)
{
#if 0
u8 *destination;
u8 *source;
u32 size ;
u8 VRAMBankCnt;
#endif
#if 1
return ;
#endif
#if 0
destination = 0 ;
source = 0;
VRAMBankCnt = MMU_read8(state, ARMCPU_ARM9,REG_VRAMCNTA+block) ;
@ -376,16 +379,20 @@ void MMU_VRAMWriteBackToLCD(NDS_state *state, u8 block)
if (!destination) return ;
if (!source) return ;
memcpy(destination,source,size) ;
#endif
}
void MMU_VRAMReloadFromLCD(NDS_state *state, u8 block,u8 VRAMBankCnt)
{
#if 0
u8 *destination;
u8 *source;
u32 size;
#endif
#if 1
return ;
#endif
#if 0
destination = 0;
source = 0;
size = 0;
@ -490,6 +497,7 @@ void MMU_VRAMReloadFromLCD(NDS_state *state, u8 block,u8 VRAMBankCnt)
if (!destination) return ;
if (!source) return ;
memcpy(destination,source,size) ;
#endif
}
void MMU_setRom(NDS_state *state, u8 * rom, u32 mask)

1
Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c
View File

@ -480,6 +480,7 @@ BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1,
return TRUE;
}
return FALSE;
case 5 :
if((opcode1==0) && (CRm==0))
{
switch(opcode2)

18
Playlist/FilePlaylistEntry.h
View File

@ -1,18 +0,0 @@
//
// FilePlaylistEntry.h
// Cog
//
// Created by Vincent Spader on 3/12/08.
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
#import "PlaylistEntry.h"
@interface FilePlaylistEntry : PlaylistEntry {
FSRef fileRef;
}
@end

39
Playlist/FilePlaylistEntry.m
View File

@ -1,39 +0,0 @@
//
// FilePlaylistEntry.m
// Cog
//
// Created by Vincent Spader on 3/12/08.
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
#import "FilePlaylistEntry.h"
@implementation FilePlaylistEntry
- (void)setURL:(NSURL *)url
{
FSPathMakeRef((UInt8 *)[[url path] fileSystemRepresentation], &fileRef, NULL);
[super setURL:url];
}
- (NSURL *)URL
{
UInt8 path[PATH_MAX];
OSStatus status = FSRefMakePath(&fileRef, (UInt8*)path, sizeof(path));
if (status == noErr)
{
NSString *after = @"";
if ([URL fragment] != nil) {
after = [@"#" stringByAppendingString:[URL fragment]];
}
[super setURL:[NSURL URLWithString:[[[NSURL fileURLWithPath: [NSString stringWithUTF8String:(const char *)path]] absoluteString] stringByAppendingString:after]]];
}
return URL;
}
@end

48
Playlist/PlaylistController.m
View File

@ -414,7 +414,7 @@
if (([sortDescriptors count] != 0) && [[[sortDescriptors objectAtIndex:0] key] caseInsensitiveCompare:@"index"] == NSOrderedSame)
{
//Remove the sort descriptors
[super setSortDescriptors:nil];
[super setSortDescriptors:[NSArray array]];
[self rearrangeObjects];
return;
@ -428,7 +428,7 @@
- (IBAction)randomizeList:(id)sender
{
[self setSortDescriptors:nil];
[self setSortDescriptors:[NSArray array]];
NSArray *unrandomized = [self content];
[[[self undoManager] prepareWithInvocationTarget:self] unrandomizeList:unrandomized];
@ -743,10 +743,10 @@
[shuffleList insertObjects:newList atIndexes:indexSet];
int i;
unsigned long i;
for (i = ([shuffleList count] - [newList count]); i < [shuffleList count]; i++)
{
[[shuffleList objectAtIndex:i] setShuffleIndex:i];
[[shuffleList objectAtIndex:i] setShuffleIndex:(int)i];
}
}
@ -801,7 +801,7 @@
}
- (ShuffleMode)shuffle
{
return [[NSUserDefaults standardUserDefaults] integerForKey:@"shuffle"];
return (ShuffleMode) [[NSUserDefaults standardUserDefaults] integerForKey:@"shuffle"];
}
- (void)setRepeat:(RepeatMode)r
{
@ -810,7 +810,7 @@
}
- (RepeatMode)repeat
{
return [[NSUserDefaults standardUserDefaults] integerForKey:@"repeat"];
return (RepeatMode) [[NSUserDefaults standardUserDefaults] integerForKey:@"repeat"];
}
- (IBAction)clear:(id)sender
@ -893,7 +893,7 @@
else
{
queueItem.queued = YES;
queueItem.queuePosition = [queueList count];
queueItem.queuePosition = (int) [queueList count];
[queueList addObject:queueItem];
}
@ -908,6 +908,40 @@
}
}
- (IBAction)removeFromQueue:(id)sender
{
for (PlaylistEntry *queueItem in [self selectedObjects])
{
queueItem.queued = NO;
queueItem.queuePosition = -1;
[queueList removeObject:queueItem];
}
int i = 0;
for (PlaylistEntry *cur in queueList)
{
cur.queuePosition = i++;
}
}
- (IBAction)addToQueue:(id)sender
{
for (PlaylistEntry *queueItem in [self selectedObjects])
{
queueItem.queued = YES;
queueItem.queuePosition = (int) [queueList count];
[queueList addObject:queueItem];
}
int i = 0;
for (PlaylistEntry *cur in queueList)
{
cur.queuePosition = i++;
}
}
- (IBAction)stopAfterCurrent:(id)sender
{
currentEntry.stopAfter = !currentEntry.stopAfter;

15
Playlist/PlaylistLoader.m
View File

@ -13,7 +13,6 @@
#import "PlaylistLoader.h"
#import "PlaylistController.h"
#import "PlaylistEntry.h"
#import "FilePlaylistEntry.h"
#import "AppController.h"
#import "NSFileHandle+CreateFile.h"
@ -23,10 +22,12 @@
#import "CogAudio/AudioPropertiesReader.h"
#import "CogAudio/AudioMetadataReader.h"
#import "XMlContainer.h"
#import "XmlContainer.h"
#import "NSData+MD5.h"
#import "NSString+FinderCompare.h"
#import "Logging.h"
@implementation PlaylistLoader
@ -397,10 +398,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
for (NSURL *url in validURLs)
{
PlaylistEntry *pe;
if ([url isFileURL])
pe = [[FilePlaylistEntry alloc] init];
else
pe = [[PlaylistEntry alloc] init];
pe = [[PlaylistEntry alloc] init];
pe.URL = url;
pe.index = index+i;
@ -418,10 +416,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
for (NSDictionary *entry in [xmlData objectForKey:@"entries"])
{
PlaylistEntry *pe;
if ([[entry objectForKey:@"URL"] isFileURL])
pe = [[FilePlaylistEntry alloc] init];
else
pe = [[PlaylistEntry alloc] init];
pe = [[PlaylistEntry alloc] init];
[pe setValuesForKeysWithDictionary:entry];
pe.index = index+i;

2
Playlist/PlaylistView.m
View File

@ -387,6 +387,7 @@
return [super validateUserInterfaceItem:anItem];
}
#if 0
- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
{
if (isLocal)
@ -394,6 +395,7 @@
else
return NSDragOperationCopy;
}
#endif
@end

2
Playlist/XmlContainer.m
View File

@ -8,7 +8,7 @@
#import "XmlContainer.h"
#import <PlaylistEntry.h>
#import "PlaylistEntry.h"
#import "Logging.h"

6
Plugins/APL/APL.xcodeproj/project.pbxproj
View File

@ -192,6 +192,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -221,7 +222,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -232,6 +233,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -259,7 +261,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

64
Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj
View File

@ -7,31 +7,31 @@
objects = {
/* Begin PBXBuildFile section */
833AFD3620E4ED9D00F0C21E /* libAdPlug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83AA434020E4EC8C00E861B2 /* libAdPlug.framework */; };
83C2806320E4ECAD00823BF9 /* libAdPlug.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83AA434020E4EC8C00E861B2 /* libAdPlug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83D3C659201C6E24005564CB /* AdPlugContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83D3C654201C6E24005564CB /* AdPlugContainer.mm */; };
83D3C65A201C6E24005564CB /* AdPlugMetadataReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83D3C656201C6E24005564CB /* AdPlugMetadataReader.mm */; };
83D3C65B201C6E24005564CB /* AdPlugDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83D3C658201C6E24005564CB /* AdPlugDecoder.mm */; };
83D3C65E201C6E4D005564CB /* AdPlug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D3C608201C6775005564CB /* AdPlug.framework */; };
83D3C668201C7020005564CB /* adplug.db in Resources */ = {isa = PBXBuildFile; fileRef = 83D3C667201C7020005564CB /* adplug.db */; };
83D3C66C201C70F7005564CB /* fileprovider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83D3C66A201C70F7005564CB /* fileprovider.mm */; };
83D3C66E201C72ED005564CB /* AdPlug.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83D3C608201C6775005564CB /* AdPlug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83D3C6A6201D3951005564CB /* libbinio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D3C6A7201D3951005564CB /* libbinio.framework */; };
83D3C6A8201D3961005564CB /* libbinio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83D3C6A7201D3951005564CB /* libbinio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
83D3C607201C6775005564CB /* PBXContainerItemProxy */ = {
83AA433F20E4EC8C00E861B2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83D3C603201C6775005564CB /* AdPlug.xcodeproj */;
containerPortal = 83D3C603201C6775005564CB /* libAdPlug.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83D3C4D4201C654F005564CB;
remoteInfo = AdPlug;
remoteInfo = libAdPlug;
};
83D3C65C201C6E48005564CB /* PBXContainerItemProxy */ = {
83C2806020E4EC9F00823BF9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83D3C603201C6775005564CB /* AdPlug.xcodeproj */;
containerPortal = 83D3C603201C6775005564CB /* libAdPlug.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83D3C4D3201C654F005564CB;
remoteInfo = AdPlug;
remoteInfo = libAdPlug;
};
/* End PBXContainerItemProxy section */
@ -42,8 +42,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
83C2806320E4ECAD00823BF9 /* libAdPlug.framework in CopyFiles */,
83D3C6A8201D3961005564CB /* libbinio.framework in CopyFiles */,
83D3C66E201C72ED005564CB /* AdPlug.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -52,7 +52,7 @@
/* Begin PBXFileReference section */
83D3C5F3201C674D005564CB /* AdPlug.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AdPlug.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
83D3C5F6201C674D005564CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
83D3C603201C6775005564CB /* AdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdPlug.xcodeproj; path = ../../Frameworks/AdPlug/AdPlug.xcodeproj; sourceTree = "<group>"; };
83D3C603201C6775005564CB /* libAdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libAdPlug.xcodeproj; path = ../../Frameworks/AdPlug/libAdPlug.xcodeproj; sourceTree = "<group>"; };
83D3C650201C6DE9005564CB /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../../Utils/Logging.h; sourceTree = "<group>"; };
83D3C651201C6E00005564CB /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
83D3C652201C6E10005564CB /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = "<group>"; };
@ -74,13 +74,21 @@
buildActionMask = 2147483647;
files = (
83D3C6A6201D3951005564CB /* libbinio.framework in Frameworks */,
83D3C65E201C6E4D005564CB /* AdPlug.framework in Frameworks */,
833AFD3620E4ED9D00F0C21E /* libAdPlug.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
83AA433C20E4EC8C00E861B2 /* Products */ = {
isa = PBXGroup;
children = (
83AA434020E4EC8C00E861B2 /* libAdPlug.framework */,
);
name = Products;
sourceTree = "<group>";
};
83D3C5EA201C674D005564CB = {
isa = PBXGroup;
children = (
@ -122,19 +130,11 @@
isa = PBXGroup;
children = (
83D3C6A7201D3951005564CB /* libbinio.framework */,
83D3C603201C6775005564CB /* AdPlug.xcodeproj */,
83D3C603201C6775005564CB /* libAdPlug.xcodeproj */,
);
name = Frameworks;
sourceTree = "<group>";
};
83D3C604201C6775005564CB /* Products */ = {
isa = PBXGroup;
children = (
83D3C608201C6775005564CB /* AdPlug.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -150,7 +150,7 @@
buildRules = (
);
dependencies = (
83D3C65D201C6E48005564CB /* PBXTargetDependency */,
83C2806120E4EC9F00823BF9 /* PBXTargetDependency */,
);
name = AdPlug;
productName = AdPlug;
@ -184,8 +184,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 83D3C604201C6775005564CB /* Products */;
ProjectRef = 83D3C603201C6775005564CB /* AdPlug.xcodeproj */;
ProductGroup = 83AA433C20E4EC8C00E861B2 /* Products */;
ProjectRef = 83D3C603201C6775005564CB /* libAdPlug.xcodeproj */;
},
);
projectRoot = "";
@ -196,11 +196,11 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
83D3C608201C6775005564CB /* AdPlug.framework */ = {
83AA434020E4EC8C00E861B2 /* libAdPlug.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = AdPlug.framework;
remoteRef = 83D3C607201C6775005564CB /* PBXContainerItemProxy */;
path = libAdPlug.framework;
remoteRef = 83AA433F20E4EC8C00E861B2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@ -231,10 +231,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
83D3C65D201C6E48005564CB /* PBXTargetDependency */ = {
83C2806120E4EC9F00823BF9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = AdPlug;
targetProxy = 83D3C65C201C6E48005564CB /* PBXContainerItemProxy */;
name = libAdPlug;
targetProxy = 83C2806020E4EC9F00823BF9 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -289,7 +289,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -340,7 +340,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
@ -360,7 +360,6 @@
INFOPLIST_FILE = AdPlug/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.AdPlug;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@ -382,7 +381,6 @@
INFOPLIST_FILE = AdPlug/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.AdPlug;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;

4
Plugins/AdPlug/AdPlug/AdPlugContainer.mm
View File

@ -6,8 +6,8 @@
// Copyright 2018 __LoSnoCo__. All rights reserved.
//
#import <AdPlug/adplug.h>
#import <AdPlug/silentopl.h>
#import <libAdPlug/adplug.h>
#import <libAdPlug/silentopl.h>
#import "AdPlugContainer.h"
#import "AdPlugDecoder.h"

4
Plugins/AdPlug/AdPlug/AdPlugDecoder.h
View File

@ -8,8 +8,8 @@
#import <Cocoa/Cocoa.h>
#import <AdPlug/adplug.h>
#import <AdPlug/opl.h>
#import <libAdPlug/adplug.h>
#import <libAdPlug/opl.h>
#import "Plugin.h"

2
Plugins/AdPlug/AdPlug/AdPlugDecoder.mm
View File

@ -8,7 +8,7 @@
#import "AdPlugDecoder.h"
#import <AdPlug/nemuopl.h>
#import <libAdPlug/nemuopl.h>
#import "fileprovider.h"

4
Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm
View File

@ -9,8 +9,8 @@
#import "AdPlugMetadataReader.h"
#import "AdPlugDecoder.h"
#import <AdPlug/adplug.h>
#import <AdPlug/silentopl.h>
#import <libAdPlug/adplug.h>
#import <libAdPlug/silentopl.h>
#import "fileprovider.h"

2
Plugins/AdPlug/AdPlug/fileprovider.h
View File

@ -15,7 +15,7 @@
#include <string>
#include <binio.h>
#include <AdPlug/fprovide.h>
#include <libAdPlug/fprovide.h>
class CProvider_cog : public CFileProvider
{

2
Plugins/AdPlug/AdPlug/fileprovider.mm
View File

@ -65,7 +65,7 @@ public:
if ( ! m_buffer_filled )
{
m_buffer_filled = [m_file read:m_buffer amount:4096];
m_buffer_filled = (int) [m_file read:m_buffer amount:4096];
if ( ! m_buffer_filled )
{
err |= Eof;

4
Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
View File

@ -305,7 +305,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -351,7 +351,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

6
Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj
View File

@ -234,6 +234,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -263,7 +264,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -274,6 +275,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -301,7 +303,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

6
Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj
View File

@ -270,6 +270,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -300,7 +301,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -311,6 +312,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -339,7 +341,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

6
Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj
View File

@ -284,6 +284,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -315,7 +316,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../ThirdParty/ffmpeg/include;
LIBRARY_SEARCH_PATHS = ../../ThirdParty/ffmpeg/lib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -325,6 +326,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -354,7 +356,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../ThirdParty/ffmpeg/include;
LIBRARY_SEARCH_PATHS = ../../ThirdParty/ffmpeg/lib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

9
Plugins/FileSource/FileSource.m
View File

@ -32,6 +32,13 @@
NSString * path = [url path];
NSRange fragmentRange = [path rangeOfString:@"#" options:NSBackwardsSearch];
if (fragmentRange.location != NSNotFound) {
// Chop the fragment.
NSString* newURLString = [path substringToIndex:fragmentRange.location];
path = newURLString;
}
fex_type_t type;
fex_err_t error = fex_identify_file( &type, [path UTF8String] );
@ -63,7 +70,7 @@
else return NO;
}
_fd = fopen([[url path] UTF8String], "r");
_fd = fopen([path UTF8String], "r");
return (_fd != NULL);
}

6
Plugins/FileSource/FileSource.xcodeproj/project.pbxproj
View File

@ -291,6 +291,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -321,7 +322,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -332,6 +333,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -359,7 +361,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

6
Plugins/Flac/Flac.xcodeproj/project.pbxproj
View File

@ -305,6 +305,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -334,7 +335,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -345,6 +346,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -372,7 +374,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

6
Plugins/GME/GME.xcodeproj/project.pbxproj
View File

@ -329,6 +329,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -359,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ../../build;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
@ -371,6 +372,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -399,7 +401,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ../../build;
PREBINDING = NO;
SDKROOT = macosx;

6
Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj
View File

@ -263,6 +263,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -292,7 +293,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -303,6 +304,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -330,7 +332,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

4
Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
View File

@ -658,7 +658,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -703,7 +703,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

1
Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
View File

@ -834,7 +834,6 @@ static int load_twosf_mapz(struct twosf_loader_state *state, int issave, const u
return -1;
}
if (0)
{
uLong ccrc = crc32(crc32(0L, Z_NULL, 0), rdata, (uInt) usize);
if (ccrc != zcrc)

4
Plugins/Hively/Hively.xcodeproj/project.pbxproj
View File

@ -313,7 +313,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -360,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};

6
Plugins/M3u/M3u.xcodeproj/project.pbxproj
View File

@ -249,6 +249,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -279,7 +280,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -289,6 +290,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -317,7 +319,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
};

4
Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
View File

@ -511,7 +511,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -557,7 +557,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;

6
Plugins/Musepack/Musepack.xcodeproj/project.pbxproj
View File

@ -307,6 +307,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -336,7 +337,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -347,6 +348,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -374,7 +376,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

64
Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
View File

@ -7,20 +7,27 @@
objects = {
/* Begin PBXBuildFile section */
83E5FE671FFF001100659F0F /* OpenMPT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */; };
83E5FE691FFF002000659F0F /* OpenMPT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83187C7120E4EAB700DED293 /* libOpenMPT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8308151E20E4EA96003ACEDA /* libOpenMPT.framework */; };
83187C7220E4EAC400DED293 /* libOpenMPT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8308151E20E4EA96003ACEDA /* libOpenMPT.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83E5FE731FFF010C00659F0F /* OMPTDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */; };
83E5FE741FFF010C00659F0F /* OMPTContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE6F1FFF010B00659F0F /* OMPTContainer.mm */; };
83E5FE751FFF010C00659F0F /* OMPTMetadataReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE701FFF010C00659F0F /* OMPTMetadataReader.mm */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
83E5EFCC1FFEF7CE00659F0F /* PBXContainerItemProxy */ = {
8308151D20E4EA96003ACEDA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */;
containerPortal = 83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83E5EFBD1FFEF7CC00659F0F;
remoteInfo = OpenMPT;
remoteInfo = libOpenMPT;
};
83187C6E20E4EAA900DED293 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83E5EFBC1FFEF7CC00659F0F;
remoteInfo = libOpenMPT;
};
/* End PBXContainerItemProxy section */
@ -31,7 +38,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
83E5FE691FFF002000659F0F /* OpenMPT.framework in CopyFiles */,
83187C7220E4EAC400DED293 /* libOpenMPT.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -40,7 +47,7 @@
/* Begin PBXFileReference section */
83E5EFA31FFEF78100659F0F /* OpenMPT.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenMPT.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
83E5EFA61FFEF78100659F0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = ../../Frameworks/OpenMPT/OpenMPT.xcodeproj; sourceTree = "<group>"; };
83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libOpenMPT.xcodeproj; path = ../../Frameworks/OpenMPT/libOpenMPT.xcodeproj; sourceTree = "<group>"; };
83E5FE6B1FFF004D00659F0F /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
83E5FE6C1FFF006400659F0F /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = "<group>"; };
83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OMPTDecoder.mm; path = OpenMPT/OMPTDecoder.mm; sourceTree = "<group>"; };
@ -57,13 +64,21 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
83E5FE671FFF001100659F0F /* OpenMPT.framework in Frameworks */,
83187C7120E4EAB700DED293 /* libOpenMPT.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
8308151A20E4EA96003ACEDA /* Products */ = {
isa = PBXGroup;
children = (
8308151E20E4EA96003ACEDA /* libOpenMPT.framework */,
);
name = Products;
sourceTree = "<group>";
};
83E5EF9A1FFEF78100659F0F = {
isa = PBXGroup;
children = (
@ -93,19 +108,11 @@
83E5EFB21FFEF79000659F0F /* Frameworks */ = {
isa = PBXGroup;
children = (
83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */,
83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */,
);
name = Frameworks;
sourceTree = "<group>";
};
83E5EFC91FFEF7CC00659F0F /* Products */ = {
isa = PBXGroup;
children = (
83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */,
);
name = Products;
sourceTree = "<group>";
};
83E5FE6A1FFF003900659F0F /* Classes */ = {
isa = PBXGroup;
children = (
@ -137,6 +144,7 @@
buildRules = (
);
dependencies = (
83187C6F20E4EAA900DED293 /* PBXTargetDependency */,
);
name = OpenMPT;
productName = OpenMPT;
@ -170,8 +178,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 83E5EFC91FFEF7CC00659F0F /* Products */;
ProjectRef = 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */;
ProductGroup = 8308151A20E4EA96003ACEDA /* Products */;
ProjectRef = 83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */;
},
);
projectRoot = "";
@ -182,11 +190,11 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */ = {
8308151E20E4EA96003ACEDA /* libOpenMPT.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = OpenMPT.framework;
remoteRef = 83E5EFCC1FFEF7CE00659F0F /* PBXContainerItemProxy */;
path = libOpenMPT.framework;
remoteRef = 8308151D20E4EA96003ACEDA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@ -214,6 +222,14 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
83187C6F20E4EAA900DED293 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = libOpenMPT;
targetProxy = 83187C6E20E4EAA900DED293 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
83E5EFA71FFEF78100659F0F /* Debug */ = {
isa = XCBuildConfiguration;
@ -265,7 +281,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -316,7 +332,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};

2
Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
View File

@ -6,7 +6,7 @@
// Copyright 2018 __LoSnoCo__. All rights reserved.
//
#import <OpenMPT/libopenmpt.hpp>
#import <libOpenMPT/libopenmpt.hpp>
#import "OMPTContainer.h"
#import "OMPTDecoder.h"

2
Plugins/OpenMPT/OpenMPT/OMPTDecoder.h
View File

@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#import <OpenMPT/libopenmpt.hpp>
#import <libOpenMPT/libopenmpt.hpp>
#include <vector>

2
Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm
View File

@ -9,7 +9,7 @@
#import "OMPTMetadataReader.h"
#import "OMPTDecoder.h"
#import <OpenMPT/libopenmpt.hpp>
#import <libOpenMPT/libopenmpt.hpp>
#import "Logging.H"

0
Plugins/Opus/Opus/Opus-Info.plist → Plugins/Opus/Opus/OpusPlugin-Info.plist
View File

0
Plugins/Opus/Opus/Opus-Prefix.pch → Plugins/Opus/Opus/OpusPlugin-Prefix.pch
View File

82
Plugins/Opus/Opus.xcodeproj/project.pbxproj → Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj
View File

@ -7,22 +7,22 @@
objects = {
/* Begin PBXBuildFile section */
834D792D20E4EFB200C4A5CC /* Opus.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83208A3920E4EF9200F16441 /* Opus.framework */; };
834D792E20E4EFB900C4A5CC /* Opus.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83208A3920E4EF9200F16441 /* Opus.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8375B04017FFEA400092A79F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8375B03F17FFEA400092A79F /* Cocoa.framework */; };
8375B04A17FFEA400092A79F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8375B04817FFEA400092A79F /* InfoPlist.strings */; };
8375B36C17FFF1CB0092A79F /* OpusDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8375B36B17FFF1CB0092A79F /* OpusDecoder.m */; };
8375B37217FFF7770092A79F /* Opus.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8375B09617FFEABC0092A79F /* Opus.framework */; };
8375B37417FFF7950092A79F /* Opus.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8375B09617FFEABC0092A79F /* Opus.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
8375B09517FFEABC0092A79F /* PBXContainerItemProxy */ = {
83208A3820E4EF9200F16441 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8375B09017FFEABB0092A79F /* Opus.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8375B06217FFEABB0092A79F;
remoteInfo = Opus;
};
8375B37017FFF7650092A79F /* PBXContainerItemProxy */ = {
834D792A20E4EFAD00C4A5CC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8375B09017FFEABB0092A79F /* Opus.xcodeproj */;
proxyType = 1;
@ -38,7 +38,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
8375B37417FFF7950092A79F /* Opus.framework in CopyFiles */,
834D792E20E4EFB900C4A5CC /* Opus.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -46,14 +46,14 @@
/* Begin PBXFileReference section */
833F68411CDBCABC00AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
8375B03C17FFEA400092A79F /* Opus.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Opus.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
8375B03C17FFEA400092A79F /* OpusPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpusPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
8375B03F17FFEA400092A79F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
8375B04217FFEA400092A79F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8375B04317FFEA400092A79F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
8375B04417FFEA400092A79F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
8375B04717FFEA400092A79F /* Opus-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Opus-Info.plist"; sourceTree = "<group>"; };
8375B04717FFEA400092A79F /* OpusPlugin-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OpusPlugin-Info.plist"; sourceTree = "<group>"; };
8375B04917FFEA400092A79F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
8375B04B17FFEA400092A79F /* Opus-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Opus-Prefix.pch"; sourceTree = "<group>"; };
8375B04B17FFEA400092A79F /* OpusPlugin-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpusPlugin-Prefix.pch"; sourceTree = "<group>"; };
8375B09017FFEABB0092A79F /* Opus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Opus.xcodeproj; path = ../../Frameworks/Opus/Opus.xcodeproj; sourceTree = "<group>"; };
8375B36A17FFF1CB0092A79F /* OpusDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpusDecoder.h; sourceTree = "<group>"; };
8375B36B17FFF1CB0092A79F /* OpusDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpusDecoder.m; sourceTree = "<group>"; };
@ -66,7 +66,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8375B37217FFF7770092A79F /* Opus.framework in Frameworks */,
834D792D20E4EFB200C4A5CC /* Opus.framework in Frameworks */,
8375B04017FFEA400092A79F /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -74,6 +74,14 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
83208A3520E4EF9200F16441 /* Products */ = {
isa = PBXGroup;
children = (
83208A3920E4EF9200F16441 /* Opus.framework */,
);
name = Products;
sourceTree = "<group>";
};
8375B03317FFEA400092A79F = {
isa = PBXGroup;
children = (
@ -86,7 +94,7 @@
8375B03D17FFEA400092A79F /* Products */ = {
isa = PBXGroup;
children = (
8375B03C17FFEA400092A79F /* Opus.bundle */,
8375B03C17FFEA400092A79F /* OpusPlugin.bundle */,
);
name = Products;
sourceTree = "<group>";
@ -126,27 +134,19 @@
8375B04617FFEA400092A79F /* Supporting Files */ = {
isa = PBXGroup;
children = (
8375B04717FFEA400092A79F /* Opus-Info.plist */,
8375B04717FFEA400092A79F /* OpusPlugin-Info.plist */,
8375B04817FFEA400092A79F /* InfoPlist.strings */,
8375B04B17FFEA400092A79F /* Opus-Prefix.pch */,
8375B04B17FFEA400092A79F /* OpusPlugin-Prefix.pch */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
8375B09117FFEABB0092A79F /* Products */ = {
isa = PBXGroup;
children = (
8375B09617FFEABC0092A79F /* Opus.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
8375B03B17FFEA400092A79F /* Opus */ = {
8375B03B17FFEA400092A79F /* OpusPlugin */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8375B04E17FFEA400092A79F /* Build configuration list for PBXNativeTarget "Opus" */;
buildConfigurationList = 8375B04E17FFEA400092A79F /* Build configuration list for PBXNativeTarget "OpusPlugin" */;
buildPhases = (
8375B03817FFEA400092A79F /* Sources */,
8375B03917FFEA400092A79F /* Frameworks */,
@ -156,11 +156,11 @@
buildRules = (
);
dependencies = (
8375B37117FFF7650092A79F /* PBXTargetDependency */,
834D792B20E4EFAD00C4A5CC /* PBXTargetDependency */,
);
name = Opus;
name = OpusPlugin;
productName = Opus;
productReference = 8375B03C17FFEA400092A79F /* Opus.bundle */;
productReference = 8375B03C17FFEA400092A79F /* OpusPlugin.bundle */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
@ -178,7 +178,7 @@
};
};
};
buildConfigurationList = 8375B03717FFEA400092A79F /* Build configuration list for PBXProject "Opus" */;
buildConfigurationList = 8375B03717FFEA400092A79F /* Build configuration list for PBXProject "OpusPlugin" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@ -191,23 +191,23 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 8375B09117FFEABB0092A79F /* Products */;
ProductGroup = 83208A3520E4EF9200F16441 /* Products */;
ProjectRef = 8375B09017FFEABB0092A79F /* Opus.xcodeproj */;
},
);
projectRoot = "";
targets = (
8375B03B17FFEA400092A79F /* Opus */,
8375B03B17FFEA400092A79F /* OpusPlugin */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
8375B09617FFEABC0092A79F /* Opus.framework */ = {
83208A3920E4EF9200F16441 /* Opus.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Opus.framework;
remoteRef = 8375B09517FFEABC0092A79F /* PBXContainerItemProxy */;
remoteRef = 83208A3820E4EF9200F16441 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@ -235,10 +235,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
8375B37117FFF7650092A79F /* PBXTargetDependency */ = {
834D792B20E4EFAD00C4A5CC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Opus;
targetProxy = 8375B37017FFF7650092A79F /* PBXContainerItemProxy */;
targetProxy = 834D792A20E4EFAD00C4A5CC /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -302,7 +302,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@ -349,7 +349,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;
@ -357,16 +357,15 @@
8375B04F17FFEA400092A79F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Opus/Opus-Prefix.pch";
GCC_PREFIX_HEADER = "Opus/OpusPlugin-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
../../Frameworks/Ogg/include,
);
INFOPLIST_FILE = "Opus/Opus-Info.plist";
INFOPLIST_FILE = "Opus/OpusPlugin-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.opus;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -379,16 +378,15 @@
8375B05017FFEA400092A79F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Opus/Opus-Prefix.pch";
GCC_PREFIX_HEADER = "Opus/OpusPlugin-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
../../Frameworks/Ogg/include,
);
INFOPLIST_FILE = "Opus/Opus-Info.plist";
INFOPLIST_FILE = "Opus/OpusPlugin-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.opus;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -401,7 +399,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
8375B03717FFEA400092A79F /* Build configuration list for PBXProject "Opus" */ = {
8375B03717FFEA400092A79F /* Build configuration list for PBXProject "OpusPlugin" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8375B04C17FFEA400092A79F /* Debug */,
@ -410,7 +408,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8375B04E17FFEA400092A79F /* Build configuration list for PBXNativeTarget "Opus" */ = {
8375B04E17FFEA400092A79F /* Build configuration list for PBXNativeTarget "OpusPlugin" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8375B04F17FFEA400092A79F /* Debug */,

18
Plugins/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme → Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
View File

@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8375B03B17FFEA400092A79F"
BuildableName = "Opus.bundle"
BlueprintName = "Opus"
ReferencedContainer = "container:Opus.xcodeproj">
BuildableName = "OpusPlugin.bundle"
BlueprintName = "OpusPlugin"
ReferencedContainer = "container:OpusPlugin.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -46,9 +46,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8375B03B17FFEA400092A79F"
BuildableName = "Opus.bundle"
BlueprintName = "Opus"
ReferencedContainer = "container:Opus.xcodeproj">
BuildableName = "OpusPlugin.bundle"
BlueprintName = "OpusPlugin"
ReferencedContainer = "container:OpusPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
@ -64,9 +64,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8375B03B17FFEA400092A79F"
BuildableName = "Opus.bundle"
BlueprintName = "Opus"
ReferencedContainer = "container:Opus.xcodeproj">
BuildableName = "OpusPlugin.bundle"
BlueprintName = "OpusPlugin"
ReferencedContainer = "container:OpusPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>

6
Plugins/Pls/Pls.xcodeproj/project.pbxproj
View File

@ -246,6 +246,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -276,7 +277,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -286,6 +287,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@ -314,7 +316,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
};

6
Plugins/Shorten/Shorten.xcodeproj/project.pbxproj
View File

@ -305,6 +305,7 @@
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -334,7 +335,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx;
@ -345,6 +346,7 @@
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
@ -372,7 +374,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = macosx;
SYMROOT = ../../build;

4
Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj
View File

@ -194,7 +194,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@ -240,7 +240,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};

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