Browse Source

Updates for new build system.

master
Christopher Snowhill 2 years ago
parent
commit
be0b6adb78
100 changed files with 877 additions and 867 deletions
  1. +11
    -11
      Application/AppController.m
  2. +12
    -9
      Application/MediaKeysApplication.m
  3. +1
    -1
      Application/PlaybackController.m
  4. +4
    -2
      Audio/CogAudio.xcodeproj/project.pbxproj
  5. +1
    -1
      AudioScrobbler/AudioScrobbler.m
  6. +0
    -0
      Base.lproj/Feedback.xib
  7. +0
    -0
      Base.lproj/FileTree.xib
  8. +29
    -29
      Base.lproj/InfoInspector.xib
  9. +0
    -0
      Base.lproj/MainMenu.xib
  10. +0
    -0
      Base.lproj/OpenURLPanel.xib
  11. +0
    -0
      Base.lproj/SpotlightPanel.xib
  12. +378
    -360
      Cog.xcodeproj/project.pbxproj
  13. +1
    -1
      Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  14. +0
    -46
      Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint
  15. +2
    -0
      FileTree/DirectoryNode.m
  16. +8
    -11
      FileTree/PathNode.m
  17. +12
    -14
      Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj
  18. +4
    -2
      Frameworks/FLAC/flac.xcodeproj/project.pbxproj
  19. +2
    -2
      Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
  20. +4
    -2
      Frameworks/GME/GME.xcodeproj/project.pbxproj
  21. +3
    -3
      Frameworks/GME/gme/Bml_Parser.cpp
  22. +2
    -2
      Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
  23. +2
    -2
      Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
  24. +2
    -2
      Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj
  25. +2
    -2
      Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
  26. +2
    -2
      Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
  27. +4
    -2
      Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj
  28. +2
    -2
      Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
  29. +4
    -2
      Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj
  30. +14
    -14
      Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj
  31. +2
    -2
      Frameworks/Opus/Opus.xcodeproj/project.pbxproj
  32. +2
    -2
      Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
  33. +4
    -2
      Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj
  34. +3
    -3
      Frameworks/Syntrax-c/Syntrax-c/resampler.c
  35. +1
    -1
      Frameworks/Syntrax-c/Syntrax-c/resampler.h
  36. +9
    -10
      Frameworks/Syntrax-c/Syntrax-c/syntrax.c
  37. +2
    -2
      Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj
  38. +4
    -2
      Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj
  39. +4
    -2
      Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
  40. +4
    -2
      Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
  41. +2
    -2
      Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
  42. +1
    -1
      Frameworks/lazyusf/lazyusf/usf/usf.h
  43. +1
    -1
      Frameworks/libsidplay/sidplay-residfp-code
  44. +2
    -2
      Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj
  45. +2
    -8
      Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj
  46. +2
    -2
      Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
  47. +1
    -1
      Frameworks/mpg123/mpg123/getbits.h
  48. +8
    -8
      Frameworks/mpg123/mpg123/layer2.c
  49. +7
    -7
      Frameworks/mpg123/mpg123/parse.c
  50. +5
    -3
      Frameworks/mpg123/mpg123/readers.c
  51. +1
    -1
      Frameworks/mpg123/mpg123/synth_mono.h
  52. +2
    -2
      Frameworks/mpg123/mpg123/synth_ntom.h
  53. +2
    -2
      Frameworks/psflib/psflib.xcodeproj/project.pbxproj
  54. +31
    -31
      Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
  55. +9
    -9
      Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
  56. +0
    -0
      Frameworks/vgmstream/vgmstream/libvgmstream-Info.plist
  57. +2
    -2
      Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
  58. +2
    -2
      Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h
  59. +8
    -0
      Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c
  60. +1
    -0
      Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c
  61. +0
    -18
      Playlist/FilePlaylistEntry.h
  62. +0
    -39
      Playlist/FilePlaylistEntry.m
  63. +41
    -7
      Playlist/PlaylistController.m
  64. +5
    -10
      Playlist/PlaylistLoader.m
  65. +2
    -0
      Playlist/PlaylistView.m
  66. +1
    -1
      Playlist/XmlContainer.m
  67. +4
    -2
      Plugins/APL/APL.xcodeproj/project.pbxproj
  68. +31
    -33
      Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj
  69. +2
    -2
      Plugins/AdPlug/AdPlug/AdPlugContainer.mm
  70. +2
    -2
      Plugins/AdPlug/AdPlug/AdPlugDecoder.h
  71. +1
    -1
      Plugins/AdPlug/AdPlug/AdPlugDecoder.mm
  72. +2
    -2
      Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm
  73. +1
    -1
      Plugins/AdPlug/AdPlug/fileprovider.h
  74. +1
    -1
      Plugins/AdPlug/AdPlug/fileprovider.mm
  75. +2
    -2
      Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
  76. +4
    -2
      Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj
  77. +4
    -2
      Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj
  78. +4
    -2
      Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj
  79. +8
    -1
      Plugins/FileSource/FileSource.m
  80. +4
    -2
      Plugins/FileSource/FileSource.xcodeproj/project.pbxproj
  81. +4
    -2
      Plugins/Flac/Flac.xcodeproj/project.pbxproj
  82. +4
    -2
      Plugins/GME/GME.xcodeproj/project.pbxproj
  83. +4
    -2
      Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj
  84. +2
    -2
      Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
  85. +0
    -1
      Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
  86. +2
    -2
      Plugins/Hively/Hively.xcodeproj/project.pbxproj
  87. +4
    -2
      Plugins/M3u/M3u.xcodeproj/project.pbxproj
  88. +2
    -2
      Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
  89. +4
    -2
      Plugins/Musepack/Musepack.xcodeproj/project.pbxproj
  90. +40
    -24
      Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
  91. +1
    -1
      Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
  92. +1
    -1
      Plugins/OpenMPT/OpenMPT/OMPTDecoder.h
  93. +1
    -1
      Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm
  94. +0
    -0
      Plugins/Opus/Opus/OpusPlugin-Info.plist
  95. +0
    -0
      Plugins/Opus/Opus/OpusPlugin-Prefix.pch
  96. +40
    -42
      Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj
  97. +9
    -9
      Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
  98. +4
    -2
      Plugins/Pls/Pls.xcodeproj/project.pbxproj
  99. +4
    -2
      Plugins/Shorten/Shorten.xcodeproj/project.pbxproj
  100. +2
    -2
      Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj

+ 11
- 11
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;
}];
}
}


+ 12
- 9
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


+ 1
- 1
Application/PlaybackController.m View File

@@ -6,7 +6,7 @@

#import "PlaylistController.h"
#import "PlaylistEntry.h"
#import "playlistLoader.h"
#import "PlaylistLoader.h"

#import "Logging.h"



+ 4
- 2
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;


+ 1
- 1
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


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


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


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>

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


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


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


+ 378
- 360
Cog.xcodeproj/project.pbxproj
File diff suppressed because it is too large
View File


+ 1
- 1
Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

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

+ 0
- 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
- 0
FileTree/DirectoryNode.m View File

@@ -11,6 +11,8 @@
#import "FileNode.h"
#import "SmartFolderNode.h"

#import "NSString+FinderCompare.h"

@implementation DirectoryNode

- (BOOL)isLeaf


+ 8
- 11
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);
}
}



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 */,

+ 4
- 2
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;


+ 2
- 2
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;


+ 4
- 2
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;


+ 3
- 3
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() )


+ 2
- 2
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;


+ 2
- 2
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;
};


+ 2
- 2
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;
};


+ 2
- 2
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;


+ 2
- 2
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;
};


+ 4
- 2
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;


+ 2
- 2
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;
};


+ 4
- 2
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;


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 */,

+ 2
- 2
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;


+ 2
- 2
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;


+ 4
- 2
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;


+ 3
- 3
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 )


+ 1
- 1
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 *);


+ 9
- 10
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);


+ 2
- 2
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";


+ 4
- 2
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;


+ 4
- 2
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;


+ 4
- 2
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;


+ 2
- 2
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;


+ 1
- 1
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


+ 1
- 1
Frameworks/libsidplay/sidplay-residfp-code

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

+ 2
- 2
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";


+ 2
- 8
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;


+ 2
- 2
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;


+ 1
- 1
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;
}




+ 8
- 8
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;
}


+ 7
- 7
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 */


+ 5
- 3
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)


+ 1
- 1
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 */


+ 2
- 2
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)


+ 2
- 2
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;