From be0b6adb78b42d099f6c4911faa474ea7917358d Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Thu, 28 Jun 2018 03:59:59 -0700 Subject: [PATCH] Updates for new build system. --- Application/AppController.m | 22 +- Application/MediaKeysApplication.m | 21 +- Application/PlaybackController.m | 2 +- Audio/CogAudio.xcodeproj/project.pbxproj | 6 +- AudioScrobbler/AudioScrobbler.m | 2 +- {English.lproj => Base.lproj}/Feedback.xib | 0 {English.lproj => Base.lproj}/FileTree.xib | 0 .../InfoInspector.xib | 58 +- {English.lproj => Base.lproj}/MainMenu.xib | 0 .../OpenURLPanel.xib | 0 .../SpotlightPanel.xib | 0 Cog.xcodeproj/project.pbxproj | 746 +++--- .../contents.xcworkspacedata | 2 +- .../xcshareddata/Cog.xcscmblueprint | 46 - FileTree/DirectoryNode.m | 2 + FileTree/PathNode.m | 19 +- .../project.pbxproj | 26 +- .../FLAC/flac.xcodeproj/project.pbxproj | 6 +- .../File_Extractor.xcodeproj/project.pbxproj | 4 +- Frameworks/GME/GME.xcodeproj/project.pbxproj | 6 +- Frameworks/GME/gme/Bml_Parser.cpp | 6 +- .../HighlyAdvanced.xcodeproj/project.pbxproj | 4 +- .../project.pbxproj | 4 +- .../HighlyQuixotic.xcodeproj/project.pbxproj | 4 +- .../project.pbxproj | 4 +- .../HivelyPlayer.xcodeproj/project.pbxproj | 4 +- .../MPCDec/MPCDec.xcodeproj/project.pbxproj | 6 +- .../NDHotKey.xcodeproj/project.pbxproj | 4 +- .../Ogg/macosx/Ogg.xcodeproj/project.pbxproj | 6 +- .../project.pbxproj | 28 +- .../Opus/Opus.xcodeproj/project.pbxproj | 4 +- .../SSEQPlayer.xcodeproj/project.pbxproj | 4 +- .../Shorten/Shorten.xcodeproj/project.pbxproj | 6 +- Frameworks/Syntrax-c/Syntrax-c/resampler.c | 6 +- Frameworks/Syntrax-c/Syntrax-c/resampler.h | 2 +- Frameworks/Syntrax-c/Syntrax-c/syntrax.c | 19 +- .../Syntrax_c.xcodeproj/project.pbxproj | 4 +- .../TagLib/TagLib.xcodeproj/project.pbxproj | 6 +- .../macosx/Vorbis.xcodeproj/project.pbxproj | 6 +- .../WavPack/WavPack.xcodeproj/project.pbxproj | 6 +- .../lazyusf/lazyusf.xcodeproj/project.pbxproj | 4 +- Frameworks/lazyusf/lazyusf/usf/usf.h | 2 +- Frameworks/libsidplay/sidplay-residfp-code | 2 +- .../sidplayfp.xcodeproj/project.pbxproj | 4 +- .../mGBA/mGBA.xcodeproj/project.pbxproj | 10 +- .../midi_processing.xcodeproj/project.pbxproj | 4 +- Frameworks/mpg123/mpg123/getbits.h | 2 +- Frameworks/mpg123/mpg123/layer2.c | 16 +- Frameworks/mpg123/mpg123/parse.c | 14 +- Frameworks/mpg123/mpg123/readers.c | 8 +- Frameworks/mpg123/mpg123/synth_mono.h | 2 +- Frameworks/mpg123/mpg123/synth_ntom.h | 4 +- .../psflib/psflib.xcodeproj/project.pbxproj | 4 +- .../project.pbxproj | 62 +- .../xcshareddata/xcschemes/vgmstream.xcscheme | 18 +- ...eam-Info.plist => libvgmstream-Info.plist} | 0 .../vio2sf/vio2sf.xcodeproj/project.pbxproj | 4 +- .../vio2sf/vio2sf/src/vio2sf/desmume/GPU.h | 4 +- .../vio2sf/vio2sf/src/vio2sf/desmume/MMU.c | 8 + .../vio2sf/vio2sf/src/vio2sf/desmume/cp15.c | 1 + Playlist/FilePlaylistEntry.h | 18 - Playlist/FilePlaylistEntry.m | 39 - Playlist/PlaylistController.m | 48 +- Playlist/PlaylistLoader.m | 15 +- Playlist/PlaylistView.m | 2 + Playlist/XmlContainer.m | 2 +- Plugins/APL/APL.xcodeproj/project.pbxproj | 6 +- .../AdPlug/AdPlug.xcodeproj/project.pbxproj | 64 +- Plugins/AdPlug/AdPlug/AdPlugContainer.mm | 4 +- Plugins/AdPlug/AdPlug/AdPlugDecoder.h | 4 +- Plugins/AdPlug/AdPlug/AdPlugDecoder.mm | 2 +- Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm | 4 +- Plugins/AdPlug/AdPlug/fileprovider.h | 2 +- Plugins/AdPlug/AdPlug/fileprovider.mm | 2 +- .../ArchiveSource.xcodeproj/project.pbxproj | 4 +- .../CoreAudio.xcodeproj/project.pbxproj | 6 +- .../CueSheet.xcodeproj/project.pbxproj | 6 +- .../FFMPEG/FFMPEG.xcodeproj/project.pbxproj | 6 +- Plugins/FileSource/FileSource.m | 9 +- .../FileSource.xcodeproj/project.pbxproj | 6 +- Plugins/Flac/Flac.xcodeproj/project.pbxproj | 6 +- Plugins/GME/GME.xcodeproj/project.pbxproj | 6 +- .../HTTPSource.xcodeproj/project.pbxproj | 6 +- .../HighlyComplete.xcodeproj/project.pbxproj | 4 +- .../HighlyComplete/HCDecoder.mm | 1 - .../Hively/Hively.xcodeproj/project.pbxproj | 4 +- Plugins/M3u/M3u.xcodeproj/project.pbxproj | 6 +- Plugins/MIDI/MIDI.xcodeproj/project.pbxproj | 4 +- .../Musepack.xcodeproj/project.pbxproj | 6 +- .../OpenMPT/OpenMPT.xcodeproj/project.pbxproj | 64 +- Plugins/OpenMPT/OpenMPT/OMPTContainer.mm | 2 +- Plugins/OpenMPT/OpenMPT/OMPTDecoder.h | 2 +- Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm | 2 +- ...{Opus-Info.plist => OpusPlugin-Info.plist} | 0 ...{Opus-Prefix.pch => OpusPlugin-Prefix.pch} | 0 .../project.pbxproj | 82 +- .../xcshareddata/xcschemes/Opus.xcscheme | 18 +- Plugins/Pls/Pls.xcodeproj/project.pbxproj | 6 +- .../Shorten/Shorten.xcodeproj/project.pbxproj | 6 +- .../SilenceDecoder.xcodeproj/project.pbxproj | 4 +- .../Syntrax/Syntrax.xcodeproj/project.pbxproj | 4 +- Plugins/Syntrax/Syntrax/jxsContainer.m | 6 +- Plugins/Syntrax/Syntrax/jxsMetadataReader.m | 6 +- .../TagLib/TagLib.xcodeproj/project.pbxproj | 6 +- .../project.pbxproj | 129 +- .../xcschemes/Vorbis Plugin.xcscheme | 18 +- ...bis_Prefix.pch => VorbisPlugin_Prefix.pch} | 0 .../WavPack/WavPack.xcodeproj/project.pbxproj | 6 +- Plugins/sidplay/SidContainer.mm | 2 +- .../sidplay/sidplay.xcodeproj/project.pbxproj | 4 +- .../vgmstream.xcodeproj/project.pbxproj | 56 +- .../xcshareddata/xcschemes/vgmstream.xcscheme | 18 +- Plugins/vgmstream/vgmstream/VGMDecoder.h | 4 +- Plugins/vgmstream/vgmstream/VGMInterface.h | 2 +- .../Preferences.xib | 0 .../General/General.xcodeproj/project.pbxproj | 11 +- ThirdParty/GCWindowMenu/GCWindowMenu.m | 2 +- ThirdParty/OpenURLPanel/OpenURLPanel.m | 4 +- Utils/SideViewController.m | 12 + Utils/TrackingCell.m | 2 +- Window/DualWindow.m | 2 +- Window/MainWindow.m | 2 +- Window/MiniWindow.m | 2 +- Window/RepeatTransformers.m | 2 +- en.lproj/Feedback.strings | 18 + en.lproj/FileTree.strings | 21 + en.lproj/InfoInspector.strings | 75 + en.lproj/MainMenu.strings | 624 +++++ en.lproj/OpenURLPanel.strings | 9 + en.lproj/SpotlightPanel.strings | 57 + es.lproj/Feedback.strings | 18 + es.lproj/Feedback.xib | 147 -- es.lproj/FileTree.strings | 21 + es.lproj/FileTree.xib | 157 -- es.lproj/InfoInspector.strings | 75 + es.lproj/InfoInspector.xib | 1526 ------------ es.lproj/MainMenu.strings | 624 +++++ es.lproj/MainMenu.xib | 1961 --------------- es.lproj/OpenURLPanel.strings | 9 + es.lproj/OpenURLPanel.xib | 70 - es.lproj/SpotlightPanel.strings | 57 + es.lproj/SpotlightPanel.xib | 2110 ----------------- 142 files changed, 2663 insertions(+), 6968 deletions(-) rename {English.lproj => Base.lproj}/Feedback.xib (100%) rename {English.lproj => Base.lproj}/FileTree.xib (100%) rename {English.lproj => Base.lproj}/InfoInspector.xib (87%) rename {English.lproj => Base.lproj}/MainMenu.xib (100%) rename {English.lproj => Base.lproj}/OpenURLPanel.xib (100%) rename {English.lproj => Base.lproj}/SpotlightPanel.xib (100%) delete mode 100644 Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint rename Frameworks/AdPlug/{AdPlug.xcodeproj => libAdPlug.xcodeproj}/project.pbxproj (98%) rename Frameworks/OpenMPT/{OpenMPT.xcodeproj => libOpenMPT.xcodeproj}/project.pbxproj (99%) rename Frameworks/vgmstream/{vgmstream.xcodeproj => libvgmstream.xcodeproj}/project.pbxproj (99%) rename Frameworks/vgmstream/{vgmstream.xcodeproj => libvgmstream.xcodeproj}/xcshareddata/xcschemes/vgmstream.xcscheme (82%) rename Frameworks/vgmstream/vgmstream/{vgmstream-Info.plist => libvgmstream-Info.plist} (100%) delete mode 100644 Playlist/FilePlaylistEntry.h delete mode 100644 Playlist/FilePlaylistEntry.m rename Plugins/Opus/Opus/{Opus-Info.plist => OpusPlugin-Info.plist} (100%) rename Plugins/Opus/Opus/{Opus-Prefix.pch => OpusPlugin-Prefix.pch} (100%) rename Plugins/Opus/{Opus.xcodeproj => OpusPlugin.xcodeproj}/project.pbxproj (85%) rename Plugins/Opus/{Opus.xcodeproj => OpusPlugin.xcodeproj}/xcshareddata/xcschemes/Opus.xcscheme (83%) rename Plugins/Vorbis/{Vorbis.xcodeproj => VorbisPlugin.xcodeproj}/project.pbxproj (81%) rename Plugins/Vorbis/{Vorbis.xcodeproj => VorbisPlugin.xcodeproj}/xcshareddata/xcschemes/Vorbis Plugin.xcscheme (82%) rename Plugins/Vorbis/{Vorbis_Prefix.pch => VorbisPlugin_Prefix.pch} (100%) rename Preferences/General/{English.lproj => Base.lproj}/Preferences.xib (100%) create mode 100644 en.lproj/Feedback.strings create mode 100644 en.lproj/FileTree.strings create mode 100644 en.lproj/InfoInspector.strings create mode 100644 en.lproj/MainMenu.strings create mode 100644 en.lproj/OpenURLPanel.strings create mode 100644 en.lproj/SpotlightPanel.strings create mode 100644 es.lproj/Feedback.strings delete mode 100644 es.lproj/Feedback.xib create mode 100644 es.lproj/FileTree.strings delete mode 100644 es.lproj/FileTree.xib create mode 100644 es.lproj/InfoInspector.strings delete mode 100644 es.lproj/InfoInspector.xib create mode 100644 es.lproj/MainMenu.strings delete mode 100644 es.lproj/MainMenu.xib create mode 100644 es.lproj/OpenURLPanel.strings delete mode 100644 es.lproj/OpenURLPanel.xib create mode 100644 es.lproj/SpotlightPanel.strings delete mode 100644 es.lproj/SpotlightPanel.xib diff --git a/Application/AppController.m b/Application/AppController.m index 798200245..ac5121ea4 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -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; }]; } } diff --git a/Application/MediaKeysApplication.m b/Application/MediaKeysApplication.m index e99fd994e..1dc3fafb6 100644 --- a/Application/MediaKeysApplication.m +++ b/Application/MediaKeysApplication.m @@ -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 diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m index f9c271efa..aed733205 100644 --- a/Application/PlaybackController.m +++ b/Application/PlaybackController.m @@ -6,7 +6,7 @@ #import "PlaylistController.h" #import "PlaylistEntry.h" -#import "playlistLoader.h" +#import "PlaylistLoader.h" #import "Logging.h" diff --git a/Audio/CogAudio.xcodeproj/project.pbxproj b/Audio/CogAudio.xcodeproj/project.pbxproj index e4fef3526..0bc447f85 100644 --- a/Audio/CogAudio.xcodeproj/project.pbxproj +++ b/Audio/CogAudio.xcodeproj/project.pbxproj @@ -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; diff --git a/AudioScrobbler/AudioScrobbler.m b/AudioScrobbler/AudioScrobbler.m index 599ab22b5..7d7d08829 100644 --- a/AudioScrobbler/AudioScrobbler.m +++ b/AudioScrobbler/AudioScrobbler.m @@ -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 diff --git a/English.lproj/Feedback.xib b/Base.lproj/Feedback.xib similarity index 100% rename from English.lproj/Feedback.xib rename to Base.lproj/Feedback.xib diff --git a/English.lproj/FileTree.xib b/Base.lproj/FileTree.xib similarity index 100% rename from English.lproj/FileTree.xib rename to Base.lproj/FileTree.xib diff --git a/English.lproj/InfoInspector.xib b/Base.lproj/InfoInspector.xib similarity index 87% rename from English.lproj/InfoInspector.xib rename to Base.lproj/InfoInspector.xib index 2f7bce66b..cc89e557a 100644 --- a/English.lproj/InfoInspector.xib +++ b/Base.lproj/InfoInspector.xib @@ -1,9 +1,9 @@ - - + + - - + + @@ -13,7 +13,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -274,7 +274,7 @@ - + diff --git a/English.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib similarity index 100% rename from English.lproj/MainMenu.xib rename to Base.lproj/MainMenu.xib diff --git a/English.lproj/OpenURLPanel.xib b/Base.lproj/OpenURLPanel.xib similarity index 100% rename from English.lproj/OpenURLPanel.xib rename to Base.lproj/OpenURLPanel.xib diff --git a/English.lproj/SpotlightPanel.xib b/Base.lproj/SpotlightPanel.xib similarity index 100% rename from English.lproj/SpotlightPanel.xib rename to Base.lproj/SpotlightPanel.xib diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 26e5419e7..9dad975f8 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -18,13 +18,10 @@ 171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DC0C091F2B00F6AFAF /* ogg.icns */; }; 171CB3DC0F63670D0047EF0A /* PreferencesWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 171CB3DB0F63670D0047EF0A /* PreferencesWindow.m */; }; 171EFE8C0F59FEAE000ADC42 /* DockIconController.m in Sources */ = {isa = PBXBuildFile; fileRef = 171EFE8B0F59FEAE000ADC42 /* DockIconController.m */; }; - 17211A7E0D68B7C500911CA9 /* FileTree.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17211A7C0D68B7C500911CA9 /* FileTree.xib */; }; 17249F0F0D82E17700F33392 /* ToggleQueueTitleTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17249F0E0D82E17700F33392 /* ToggleQueueTitleTransformer.m */; }; 172A12330F5911D20078EF0C /* RepeatTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A12320F5911D20078EF0C /* RepeatTransformers.m */; }; 172A123C0F5912AE0078EF0C /* ShuffleTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A123B0F5912AE0078EF0C /* ShuffleTransformers.m */; }; 172A12A90F59AF8A0078EF0C /* NSString+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A12A80F59AF8A0078EF0C /* NSString+CogSort.m */; }; - 17342A9A0D5FD20B00E8D854 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342A980D5FD20B00E8D854 /* MainMenu.xib */; }; - 17342ABF0D5FD36400E8D854 /* OpenURLPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342ABD0D5FD36400E8D854 /* OpenURLPanel.xib */; }; 173855FF0E0CC81F00488CD4 /* FileTreeOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 173855FE0E0CC81F00488CD4 /* FileTreeOutlineView.m */; }; 173A43A10F3FD26500676A7B /* ToolTipWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 173A43A00F3FD26500676A7B /* ToolTipWindow.m */; }; 1745CBA50F661DBB00E513F7 /* shuffle_albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 1745CBA40F661DBB00E513F7 /* shuffle_albums.png */; }; @@ -60,7 +57,6 @@ 17818A9B0C0B27AC001C4916 /* wv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17818A940C0B27AC001C4916 /* wv.icns */; }; 1784560F0F631E24007E8021 /* FileTreeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1784560E0F631E24007E8021 /* FileTreeViewController.m */; }; 178456120F631E31007E8021 /* SideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 178456110F631E31007E8021 /* SideViewController.m */; }; - 178456C30F6320B5007E8021 /* SpotlightPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 178456C00F6320B5007E8021 /* SpotlightPanel.xib */; }; 178BAB990CD4E1B700B33D47 /* GCOneShotEffectTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 178BAB940CD4E1B700B33D47 /* GCOneShotEffectTimer.m */; }; 178BAB9A0CD4E1B700B33D47 /* GCWindowMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 178BAB960CD4E1B700B33D47 /* GCWindowMenu.m */; }; 178BAB9B0CD4E1B700B33D47 /* PopupButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 178BAB980CD4E1B700B33D47 /* PopupButton.m */; }; @@ -78,7 +74,6 @@ 179D03260E0CB2500064A77A /* PathNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D03190E0CB2500064A77A /* PathNode.m */; }; 179D03270E0CB2500064A77A /* PathWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D031B0E0CB2500064A77A /* PathWatcher.m */; }; 179D03280E0CB2500064A77A /* SmartFolderNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D031D0E0CB2500064A77A /* SmartFolderNode.m */; }; - 17A140E90D88B954004852F9 /* FilePlaylistEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A140E80D88B954004852F9 /* FilePlaylistEntry.m */; }; 17A8F6850D6A7FCA0095DA13 /* repeat_all.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6820D6A7FCA0095DA13 /* repeat_all.png */; }; 17A8F6860D6A7FCA0095DA13 /* repeat_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6830D6A7FCA0095DA13 /* repeat_none.png */; }; 17A8F6870D6A7FCA0095DA13 /* repeat_one.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6840D6A7FCA0095DA13 /* repeat_one.png */; }; @@ -88,22 +83,15 @@ 17BB5CFA0B8A86350009ACB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */; }; 17BB5CFB0B8A86350009ACB1 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF80B8A86350009ACB1 /* CoreAudioKit.framework */; }; 17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5EA50B8A87850009ACB1 /* IOKit.framework */; }; - 17C809910C3BD201005707C4 /* WavPack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808C80C3BD1DD005707C4 /* WavPack.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17C809920C3BD206005707C4 /* Vorbis.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17C809930C3BD21D005707C4 /* TagLib.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808B60C3BD1C5005707C4 /* TagLib.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17C809940C3BD220005707C4 /* Shorten.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17C809950C3BD223005707C4 /* Musepack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808A60C3BD1AB005707C4 /* Musepack.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17C809980C3BD22E005707C4 /* HTTPSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8088B0C3BD181005707C4 /* HTTPSource.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17C809990C3BD231005707C4 /* Flac.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808820C3BD173005707C4 /* Flac.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17C8099A0C3BD233005707C4 /* FileSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808790C3BD167005707C4 /* FileSource.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17C809E60C3BD487005707C4 /* CoreAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17C8F3CF0CBED66C008D969D /* GME.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F3CD0CBED663008D969D /* GME.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17D1B0D20F6320EA00694C57 /* InfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B0D00F6320EA00694C57 /* InfoInspector.xib */; }; 17D1B1010F63255200694C57 /* InfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1000F63255200694C57 /* InfoWindowController.m */; }; 17D1B1680F632ABB00694C57 /* BlankZeroFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1630F632ABB00694C57 /* BlankZeroFormatter.m */; }; 17D1B1690F632ABB00694C57 /* IndexFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1650F632ABB00694C57 /* IndexFormatter.m */; }; 17D1B16A0F632ABB00694C57 /* SecondsFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1670F632ABB00694C57 /* SecondsFormatter.m */; }; - 17D1B1DC0F6330D400694C57 /* Feedback.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DA0F6330D400694C57 /* Feedback.xib */; }; 17D1B25D0F633A4F00694C57 /* PreferencePluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B25C0F633A4F00694C57 /* PreferencePluginController.m */; }; 17D1B27D0CF8B2830028F5B5 /* cue.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B2760CF8B2830028F5B5 /* cue.icns */; }; 17D1B27E0CF8B2830028F5B5 /* it.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B2770CF8B2830028F5B5 /* it.icns */; }; @@ -135,15 +123,21 @@ 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB08540D67185300453B6A /* NSArray+CogSort.m */; }; 8319A68D1F79E99300C168D6 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 8319A67E1F79E99300C168D6 /* dsa_pub.pem */; }; 832C1253180BD1E2005507C1 /* Cog.help in Resources */ = {isa = PBXBuildFile; fileRef = 832C1252180BD1E2005507C1 /* Cog.help */; }; + 834D793F20E4EFEA00C4A5CC /* OpusPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834D794020E4EFEF00C4A5CC /* VorbisPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8301F94520E4EEF70017B2DC /* VorbisPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4320E4E4ED00228DAB /* AdPlug.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8303A30920E4E3D000951EF8 /* AdPlug.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4420E4E4FA00228DAB /* OpenMPT.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83CA5B0020E4E395003E463A /* OpenMPT.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4520E4E51F00228DAB /* WavPack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 834068BD20E4E40200A01561 /* WavPack.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4720E4E54300228DAB /* TagLib.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8303A31C20E4E3D000951EF8 /* TagLib.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4820E4E55D00228DAB /* Shorten.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83CA5B0320E4E395003E463A /* Shorten.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 834F7F4A20E4E58900228DAB /* vgmstream.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83BB13C220E4E38E00723731 /* vgmstream.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8355D6B6180612F300D05687 /* NSData+MD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 8355D6B5180612F300D05687 /* NSData+MD5.m */; }; 8355D6B8180613FB00D05687 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8355D6B7180613FB00D05687 /* Security.framework */; }; 8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8360EF0517F92B24005208A4 /* HighlyComplete.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 836D28A818086386005B7299 /* MiniModeMenuTitleTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */; }; 836F5BF91A357A01002730CC /* sidplay.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8314D6411A354DFF00EEE8E6 /* sidplay.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 836F706218BDD1230095E648 /* vgmstream.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 836F6B2E18BDB80E0095E648 /* vgmstream.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 836FB5A718206F2500B3AD2D /* Hively.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 836FB5471820538800B3AD2D /* Hively.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8375B05717FFEA410092A79F /* Opus.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 83790D501809F4980073CF51 /* NSObject+SPInvocationGrabbing.m in Sources */ = {isa = PBXBuildFile; fileRef = 83790D4D1809F4980073CF51 /* NSObject+SPInvocationGrabbing.m */; }; 83790D511809F4980073CF51 /* SPMediaKeyTap.m in Sources */ = {isa = PBXBuildFile; fileRef = 83790D4F1809F4980073CF51 /* SPMediaKeyTap.m */; }; 838491211807F38A00E7332D /* NowPlayingBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384911D1807F38A00E7332D /* NowPlayingBarView.m */; }; @@ -181,12 +175,18 @@ 838491871808591F00E7332D /* NDHotKey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8384917E1808585D00E7332D /* NDHotKey.framework */; }; 838491881808593200E7332D /* NDHotKey.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8384917E1808585D00E7332D /* NDHotKey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8399D4E21805A55000B503B1 /* XmlContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8399D4E01805A55000B503B1 /* XmlContainer.m */; }; + 83A360B220E4E81D00192DAB /* Flac.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8303A30C20E4E3D000951EF8 /* Flac.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 83B06704180D579E008E3612 /* MIDI.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83B066A1180D5669008E3612 /* MIDI.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 83BC5AB220E4C87100631CD4 /* DualWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 83BC5AB020E4C87100631CD4 /* DualWindow.m */; }; + 83BC5ABF20E4CE7A00631CD4 /* InfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B0D00F6320EA00694C57 /* InfoInspector.xib */; }; + 83BC5AC020E4CE7D00631CD4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342A980D5FD20B00E8D854 /* MainMenu.xib */; }; + 83BC5AC120E4CE8700631CD4 /* OpenURLPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342ABD0D5FD36400E8D854 /* OpenURLPanel.xib */; }; + 83BC5AC220E4CE8A00631CD4 /* FileTree.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17211A7C0D68B7C500911CA9 /* FileTree.xib */; }; + 83BC5AC320E4CE8D00631CD4 /* SpotlightPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 178456C00F6320B5007E8021 /* SpotlightPanel.xib */; }; + 83BC5AC420E4CE9000631CD4 /* Feedback.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DA0F6330D400694C57 /* Feedback.xib */; }; 83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 83D3C6AD201D39E1005564CB /* AdPlug.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83D3C601201C674F005564CB /* AdPlug.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 83E5E54C18087CA5001F3284 /* miniModeOffTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */; }; 83E5E54D18087CA5001F3284 /* miniModeOnTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */; }; - 83E5FE771FFF0C9D00659F0F /* OpenMPT.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 83E6B7621816136F00D4576D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E6B759181612FD00D4576D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 83E6B7651816178200D4576D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E6B759181612FD00D4576D /* Sparkle.framework */; }; 83EEAB241C965C56002761C5 /* Syntrax.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83EEAAFA1C9651D8002761C5 /* Syntrax.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -228,13 +228,6 @@ remoteGlobalIDString = 8D5B49B6048680CD000E48DA; remoteInfo = FileSource; }; - 17C808810C3BD173005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = Flac; - }; 17C8088A0C3BD181005707C4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */; @@ -249,34 +242,6 @@ remoteGlobalIDString = 8D5B49B6048680CD000E48DA; remoteInfo = Musepack; }; - 17C808AE0C3BD1BA005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = Shorten; - }; - 17C808B50C3BD1C5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = TagLib; - }; - 17C808BE0C3BD1D2005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = Vorbis; - }; - 17C808C70C3BD1DD005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = WavPack; - }; 17C8097D0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */; @@ -284,20 +249,6 @@ remoteGlobalIDString = 8D5B49AC048680CD000E48DA; remoteInfo = Musepack; }; - 17C809810C3BD1F5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = WavPack; - }; - 17C809830C3BD1F5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = Shorten; - }; 17C809850C3BD1F5005707C4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17C808710C3BD167005707C4 /* FileSource.xcodeproj */; @@ -312,27 +263,6 @@ remoteGlobalIDString = 8D5B49AC048680CD000E48DA; remoteInfo = HTTPSource; }; - 17C809890C3BD1F5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = TagLib; - }; - 17C8098B0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = Flac; - }; - 17C8098F0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = Vorbis; - }; 17C809E20C3BD46D005707C4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */; @@ -410,6 +340,41 @@ remoteGlobalIDString = 99B989F40CC7E10400C256E9; remoteInfo = "APL Plugin"; }; + 8301F94420E4EEF70017B2DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = "VorbisPlugin Plugin"; + }; + 8303A30820E4E3D000951EF8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83D3C5F3201C674D005564CB; + remoteInfo = AdPlugPlugin; + }; + 8303A30B20E4E3D000951EF8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = "Flac Plugin"; + }; + 8303A31B20E4E3D000951EF8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = "TagLibPlugin Plugin"; + }; + 830B62B220E4EF89004A74B2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8375B03C17FFEA400092A79F; + remoteInfo = OpusPlugin; + }; 8314D6401A354DFF00EEE8E6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8314D63B1A354DFE00EEE8E6 /* sidplay.xcodeproj */; @@ -438,6 +403,76 @@ remoteGlobalIDString = 722954B41D04ADAF00ECF9CA; remoteInfo = fileop; }; + 834068BC20E4E40200A01561 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = "WavPackPlugin Plugin"; + }; + 834D792F20E4EFCC00C4A5CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = "VorbisPlugin Plugin"; + }; + 834D793D20E4EFD200C4A5CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8375B03B17FFEA400092A79F; + remoteInfo = OpusPlugin; + }; + 834F7F1E20E4E4AA00228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 83D3C5F2201C674D005564CB; + remoteInfo = AdPlugPlugin; + }; + 834F7F3320E4E4B000228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 83E5EFA21FFEF78100659F0F; + remoteInfo = OpenMPTPlugin; + }; + 834F7F3520E4E4B400228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = "WavPackPlugin Plugin"; + }; + 834F7F3920E4E4BD00228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = "TagLibPlugin Plugin"; + }; + 834F7F3B20E4E4C200228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = "Shorten Plugin"; + }; + 834F7F3D20E4E4C600228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = "Flac Plugin"; + }; + 834F7F4120E4E4CD00228DAB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 836F6B0F18BDB80D0095E648; + remoteInfo = "vgmstream Plugin"; + }; 8359FF3017FEF35D0060F3ED /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */; @@ -459,13 +494,6 @@ remoteGlobalIDString = 8314D6301A354DFE00EEE8E6; remoteInfo = sidplay; }; - 836F6B2D18BDB80E0095E648 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 836F6B1018BDB80D0095E648; - remoteInfo = vgmstream; - }; 836FB5461820538800B3AD2D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 836FB5421820538700B3AD2D /* Hively.xcodeproj */; @@ -480,13 +508,6 @@ remoteGlobalIDString = 836FB52C1820538700B3AD2D; remoteInfo = Hively; }; - 8375B05617FFEA410092A79F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8375B05117FFEA400092A79F /* Opus.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8375B03C17FFEA400092A79F; - remoteInfo = Opus; - }; 8375B36117FFEF010092A79F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */; @@ -494,13 +515,6 @@ remoteGlobalIDString = 8359FF1617FEF35C0060F3ED; remoteInfo = ArchiveSource; }; - 8375B36317FFEF010092A79F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8375B05117FFEA400092A79F /* Opus.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8375B03B17FFEA400092A79F; - remoteInfo = Opus; - }; 8384917D1808585D00E7332D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 838491791808585C00E7332D /* NDHotKey.xcodeproj */; @@ -529,6 +543,13 @@ remoteGlobalIDString = 83B06686180D5668008E3612; remoteInfo = MIDI; }; + 83BB13C120E4E38E00723731 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 836F6B1018BDB80D0095E648; + remoteInfo = "vgmstream Plugin"; + }; 83BCB8D817FC96F800760340 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */; @@ -543,40 +564,19 @@ remoteGlobalIDString = 8D5B49AC048680CD000E48DA; remoteInfo = "FFMPEG Plugin"; }; - 83D3C600201C674F005564CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83D3C5F3201C674D005564CB; - remoteInfo = AdPlug; - }; - 83D3C6A9201D39BC005564CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 83D3C5F2201C674D005564CB; - remoteInfo = AdPlug; - }; - 83D3C6AB201D39C3005564CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 836F6B0F18BDB80D0095E648; - remoteInfo = vgmstream; - }; - 83E5EFB01FFEF78300659F0F /* PBXContainerItemProxy */ = { + 83CA5AFF20E4E395003E463A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */; proxyType = 2; remoteGlobalIDString = 83E5EFA31FFEF78100659F0F; - remoteInfo = OpenMPT; + remoteInfo = OpenMPTPlugin; }; - 83E5FE781FFF0CAC00659F0F /* PBXContainerItemProxy */ = { + 83CA5B0220E4E395003E463A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 83E5EFA21FFEF78100659F0F; - remoteInfo = OpenMPT; + containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = "Shorten Plugin"; }; 83E6B758181612FD00D4576D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -701,15 +701,21 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 83D3C6AD201D39E1005564CB /* AdPlug.bundle in CopyFiles */, - 83E5FE771FFF0C9D00659F0F /* OpenMPT.bundle in CopyFiles */, + 834D794020E4EFEF00C4A5CC /* VorbisPlugin.bundle in CopyFiles */, + 834D793F20E4EFEA00C4A5CC /* OpusPlugin.bundle in CopyFiles */, + 83A360B220E4E81D00192DAB /* Flac.bundle in CopyFiles */, + 834F7F4A20E4E58900228DAB /* vgmstream.bundle in CopyFiles */, + 17C809950C3BD223005707C4 /* Musepack.bundle in CopyFiles */, + 834F7F4820E4E55D00228DAB /* Shorten.bundle in CopyFiles */, + 834F7F4720E4E54300228DAB /* TagLib.bundle in CopyFiles */, + 834F7F4520E4E51F00228DAB /* WavPack.bundle in CopyFiles */, + 834F7F4420E4E4FA00228DAB /* OpenMPT.bundle in CopyFiles */, + 834F7F4320E4E4ED00228DAB /* AdPlug.bundle in CopyFiles */, 83EEAB241C965C56002761C5 /* Syntrax.bundle in CopyFiles */, 83F9D8071A884C54007ABEC2 /* SilenceDecoder.bundle in CopyFiles */, 836F5BF91A357A01002730CC /* sidplay.bundle in CopyFiles */, - 836F706218BDD1230095E648 /* vgmstream.bundle in CopyFiles */, 836FB5A718206F2500B3AD2D /* Hively.bundle in CopyFiles */, 83B06704180D579E008E3612 /* MIDI.bundle in CopyFiles */, - 8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */, 8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */, 83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */, 8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */, @@ -720,13 +726,7 @@ 8E8D40880CBB038E00135C1B /* M3u.bundle in CopyFiles */, 17C809E60C3BD487005707C4 /* CoreAudio.bundle in CopyFiles */, 17C8099A0C3BD233005707C4 /* FileSource.bundle in CopyFiles */, - 17C809990C3BD231005707C4 /* Flac.bundle in CopyFiles */, 17C809980C3BD22E005707C4 /* HTTPSource.bundle in CopyFiles */, - 17C809950C3BD223005707C4 /* Musepack.bundle in CopyFiles */, - 17C809940C3BD220005707C4 /* Shorten.bundle in CopyFiles */, - 17C809930C3BD21D005707C4 /* TagLib.bundle in CopyFiles */, - 17C809920C3BD206005707C4 /* Vorbis.bundle in CopyFiles */, - 17C809910C3BD201005707C4 /* WavPack.bundle in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -763,7 +763,6 @@ 171CB3DB0F63670D0047EF0A /* PreferencesWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferencesWindow.m; path = Preferences/PreferencesWindow.m; sourceTree = ""; }; 171EFE8A0F59FEAE000ADC42 /* DockIconController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockIconController.h; sourceTree = ""; }; 171EFE8B0F59FEAE000ADC42 /* DockIconController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockIconController.m; sourceTree = ""; }; - 17211A7D0D68B7C500911CA9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/FileTree.xib; sourceTree = ""; }; 17249F0D0D82E17700F33392 /* ToggleQueueTitleTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToggleQueueTitleTransformer.h; sourceTree = ""; }; 17249F0E0D82E17700F33392 /* ToggleQueueTitleTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToggleQueueTitleTransformer.m; sourceTree = ""; }; 172A12310F5911D20078EF0C /* RepeatTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RepeatTransformers.h; path = Window/RepeatTransformers.h; sourceTree = ""; }; @@ -772,8 +771,6 @@ 172A123B0F5912AE0078EF0C /* ShuffleTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShuffleTransformers.m; path = Window/ShuffleTransformers.m; sourceTree = ""; }; 172A12A70F59AF8A0078EF0C /* NSString+CogSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+CogSort.h"; sourceTree = ""; }; 172A12A80F59AF8A0078EF0C /* NSString+CogSort.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+CogSort.m"; sourceTree = ""; }; - 17342A990D5FD20B00E8D854 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; - 17342ABE0D5FD36400E8D854 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/OpenURLPanel.xib; sourceTree = ""; }; 173855FD0E0CC81F00488CD4 /* FileTreeOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileTreeOutlineView.h; path = FileTree/FileTreeOutlineView.h; sourceTree = ""; }; 173855FE0E0CC81F00488CD4 /* FileTreeOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileTreeOutlineView.m; path = FileTree/FileTreeOutlineView.m; sourceTree = ""; }; 173A439F0F3FD26500676A7B /* ToolTipWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolTipWindow.h; path = ToolTip/ToolTipWindow.h; sourceTree = ""; }; @@ -824,7 +821,6 @@ 1784560E0F631E24007E8021 /* FileTreeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileTreeViewController.m; path = FileTree/FileTreeViewController.m; sourceTree = ""; }; 178456100F631E31007E8021 /* SideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SideViewController.h; sourceTree = ""; }; 178456110F631E31007E8021 /* SideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SideViewController.m; sourceTree = ""; }; - 178456C10F6320B5007E8021 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/SpotlightPanel.xib; sourceTree = ""; }; 178BAB930CD4E1B700B33D47 /* GCOneShotEffectTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCOneShotEffectTimer.h; sourceTree = ""; }; 178BAB940CD4E1B700B33D47 /* GCOneShotEffectTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCOneShotEffectTimer.m; sourceTree = ""; }; 178BAB950CD4E1B700B33D47 /* GCWindowMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCWindowMenu.h; sourceTree = ""; }; @@ -857,8 +853,6 @@ 179D031B0E0CB2500064A77A /* PathWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PathWatcher.m; path = FileTree/PathWatcher.m; sourceTree = ""; }; 179D031C0E0CB2500064A77A /* SmartFolderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmartFolderNode.h; path = FileTree/SmartFolderNode.h; sourceTree = ""; }; 179D031D0E0CB2500064A77A /* SmartFolderNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SmartFolderNode.m; path = FileTree/SmartFolderNode.m; sourceTree = ""; }; - 17A140E70D88B954004852F9 /* FilePlaylistEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePlaylistEntry.h; sourceTree = ""; }; - 17A140E80D88B954004852F9 /* FilePlaylistEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilePlaylistEntry.m; sourceTree = ""; }; 17A8F6820D6A7FCA0095DA13 /* repeat_all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_all.png; path = Images/repeat_all.png; sourceTree = ""; }; 17A8F6830D6A7FCA0095DA13 /* repeat_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_none.png; path = Images/repeat_none.png; sourceTree = ""; }; 17A8F6840D6A7FCA0095DA13 /* repeat_one.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_one.png; path = Images/repeat_one.png; sourceTree = ""; }; @@ -875,10 +869,9 @@ 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Musepack.xcodeproj; path = Plugins/Musepack/Musepack.xcodeproj; sourceTree = ""; }; 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Shorten.xcodeproj; path = Plugins/Shorten/Shorten.xcodeproj; sourceTree = ""; }; 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TagLib.xcodeproj; path = Plugins/TagLib/TagLib.xcodeproj; sourceTree = ""; }; - 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = Plugins/Vorbis/Vorbis.xcodeproj; sourceTree = ""; }; + 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VorbisPlugin.xcodeproj; path = Plugins/Vorbis/VorbisPlugin.xcodeproj; sourceTree = ""; }; 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WavPack.xcodeproj; path = Plugins/WavPack/WavPack.xcodeproj; sourceTree = ""; }; 17C8F3C80CBED663008D969D /* GME.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GME.xcodeproj; path = Plugins/GME/GME.xcodeproj; sourceTree = ""; }; - 17D1B0D10F6320EA00694C57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/InfoInspector.xib; sourceTree = ""; }; 17D1B0FF0F63255200694C57 /* InfoWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoWindowController.h; path = InfoInspector/InfoWindowController.h; sourceTree = ""; }; 17D1B1000F63255200694C57 /* InfoWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoWindowController.m; path = InfoInspector/InfoWindowController.m; sourceTree = ""; }; 17D1B1620F632ABB00694C57 /* BlankZeroFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlankZeroFormatter.h; path = Formatters/BlankZeroFormatter.h; sourceTree = ""; }; @@ -887,7 +880,6 @@ 17D1B1650F632ABB00694C57 /* IndexFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IndexFormatter.m; path = Formatters/IndexFormatter.m; sourceTree = ""; }; 17D1B1660F632ABB00694C57 /* SecondsFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecondsFormatter.h; path = Formatters/SecondsFormatter.h; sourceTree = ""; }; 17D1B1670F632ABB00694C57 /* SecondsFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecondsFormatter.m; path = Formatters/SecondsFormatter.m; sourceTree = ""; }; - 17D1B1DB0F6330D400694C57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Feedback.xib; sourceTree = ""; }; 17D1B25B0F633A4F00694C57 /* PreferencePluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencePluginController.h; path = Preferences/PreferencePluginController.h; sourceTree = ""; }; 17D1B25C0F633A4F00694C57 /* PreferencePluginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferencePluginController.m; path = Preferences/PreferencePluginController.m; sourceTree = ""; }; 17D1B2610F633D2C00694C57 /* PreferencePanePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencePanePlugin.h; path = Preferences/PreferencePanePlugin.h; sourceTree = ""; }; @@ -945,13 +937,7 @@ 832C1252180BD1E2005507C1 /* Cog.help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Cog.help; sourceTree = ""; }; 833F681E1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; 833F681F1CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; - 833F68201CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/InfoInspector.xib; sourceTree = ""; }; - 833F68211CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/MainMenu.xib; sourceTree = ""; }; - 833F68221CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/OpenURLPanel.xib; sourceTree = ""; }; - 833F68231CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/FileTree.xib; sourceTree = ""; }; - 833F68241CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/SpotlightPanel.xib; sourceTree = ""; }; 833F68251CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = es; path = es.lproj/Credits.html; sourceTree = ""; }; - 833F68261CDBCAA900AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/Feedback.xib; sourceTree = ""; }; 8355D6B4180612F300D05687 /* NSData+MD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+MD5.h"; sourceTree = ""; }; 8355D6B5180612F300D05687 /* NSData+MD5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+MD5.m"; sourceTree = ""; }; 8355D6B7180613FB00D05687 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; @@ -961,7 +947,7 @@ 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MiniModeMenuTitleTransformer.m; path = Window/MiniModeMenuTitleTransformer.m; sourceTree = ""; }; 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = vgmstream.xcodeproj; path = Plugins/vgmstream/vgmstream.xcodeproj; sourceTree = ""; }; 836FB5421820538700B3AD2D /* Hively.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Hively.xcodeproj; path = Plugins/Hively/Hively.xcodeproj; sourceTree = ""; }; - 8375B05117FFEA400092A79F /* Opus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Opus.xcodeproj; path = Plugins/Opus/Opus.xcodeproj; sourceTree = ""; }; + 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpusPlugin.xcodeproj; path = Plugins/Opus/OpusPlugin.xcodeproj; sourceTree = ""; }; 83790D4C1809F4980073CF51 /* NSObject+SPInvocationGrabbing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SPInvocationGrabbing.h"; sourceTree = ""; }; 83790D4D1809F4980073CF51 /* NSObject+SPInvocationGrabbing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SPInvocationGrabbing.m"; sourceTree = ""; }; 83790D4E1809F4980073CF51 /* SPMediaKeyTap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMediaKeyTap.h; sourceTree = ""; }; @@ -1005,6 +991,26 @@ 8399D4E01805A55000B503B1 /* XmlContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XmlContainer.m; sourceTree = ""; }; 8399D4E11805A55000B503B1 /* XmlContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlContainer.h; sourceTree = ""; }; 83B0669C180D5668008E3612 /* MIDI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MIDI.xcodeproj; path = Plugins/MIDI/MIDI.xcodeproj; sourceTree = ""; }; + 83BC5AB020E4C87100631CD4 /* DualWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DualWindow.m; path = Window/DualWindow.m; sourceTree = ""; }; + 83BC5AB120E4C87100631CD4 /* DualWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DualWindow.h; path = Window/DualWindow.h; sourceTree = ""; }; + 83BC5AB420E4C91100631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InfoInspector.xib; sourceTree = ""; }; + 83BC5AB520E4C91200631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 83BC5AB620E4C91300631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OpenURLPanel.xib; sourceTree = ""; }; + 83BC5AB720E4C91400631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FileTree.xib; sourceTree = ""; }; + 83BC5AB820E4C91400631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SpotlightPanel.xib; sourceTree = ""; }; + 83BC5AB920E4C91500631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Feedback.xib; sourceTree = ""; }; + 83BC5AC620E4D04600631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = ""; }; + 83BC5AC820E4D05A00631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainMenu.strings; sourceTree = ""; }; + 83BC5ACA20E4D07200631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoInspector.strings; sourceTree = ""; }; + 83BC5ACC20E4D07700631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoInspector.strings; sourceTree = ""; }; + 83BC5ACE20E4D09700631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/OpenURLPanel.strings; sourceTree = ""; }; + 83BC5AD020E4D09800631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/OpenURLPanel.strings; sourceTree = ""; }; + 83BC5AD220E4D0B400631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/FileTree.strings; sourceTree = ""; }; + 83BC5AD420E4D0B600631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FileTree.strings; sourceTree = ""; }; + 83BC5AD620E4D0D800631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SpotlightPanel.strings; sourceTree = ""; }; + 83BC5AD820E4D0D900631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SpotlightPanel.strings; sourceTree = ""; }; + 83BC5ADA20E4D0E900631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Feedback.strings; sourceTree = ""; }; + 83BC5ADC20E4D0EC00631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Feedback.strings; sourceTree = ""; }; 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdPlug.xcodeproj; path = Plugins/AdPlug/AdPlug.xcodeproj; sourceTree = ""; }; 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOffTemplate.pdf; path = Images/miniModeOffTemplate.pdf; sourceTree = ""; }; 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOnTemplate.pdf; path = Images/miniModeOnTemplate.pdf; sourceTree = ""; }; @@ -1297,7 +1303,7 @@ 8E8D41C20CBB0DA000135C1B /* Pls.xcodeproj */, 8E8D40820CBB036600135C1B /* M3u.xcodeproj */, 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */, - 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */, + 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */, 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */, 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */, 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */, @@ -1306,7 +1312,7 @@ 17C808710C3BD167005707C4 /* FileSource.xcodeproj */, 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */, 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */, - 8375B05117FFEA400092A79F /* Opus.xcodeproj */, + 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */, 83B0669C180D5668008E3612 /* MIDI.xcodeproj */, 836FB5421820538700B3AD2D /* Hively.xcodeproj */, 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */, @@ -1324,14 +1330,6 @@ name = Products; sourceTree = ""; }; - 17C8087B0C3BD173005707C4 /* Products */ = { - isa = PBXGroup; - children = ( - 17C808820C3BD173005707C4 /* Flac.bundle */, - ); - name = Products; - sourceTree = ""; - }; 17C808840C3BD181005707C4 /* Products */ = { isa = PBXGroup; children = ( @@ -1348,38 +1346,6 @@ name = Products; sourceTree = ""; }; - 17C808A80C3BD1BA005707C4 /* Products */ = { - isa = PBXGroup; - children = ( - 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */, - ); - name = Products; - sourceTree = ""; - }; - 17C808B10C3BD1C5005707C4 /* Products */ = { - isa = PBXGroup; - children = ( - 17C808B60C3BD1C5005707C4 /* TagLib.bundle */, - ); - name = Products; - sourceTree = ""; - }; - 17C808B80C3BD1D2005707C4 /* Products */ = { - isa = PBXGroup; - children = ( - 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */, - ); - name = Products; - sourceTree = ""; - }; - 17C808C10C3BD1DD005707C4 /* Products */ = { - isa = PBXGroup; - children = ( - 17C808C80C3BD1DD005707C4 /* WavPack.bundle */, - ); - name = Products; - sourceTree = ""; - }; 17C809DF0C3BD46D005707C4 /* Products */ = { isa = PBXGroup; children = ( @@ -1454,6 +1420,8 @@ 17E0D5D20F520E75005B6FED /* Window */ = { isa = PBXGroup; children = ( + 83BC5AB120E4C87100631CD4 /* DualWindow.h */, + 83BC5AB020E4C87100631CD4 /* DualWindow.m */, 836D28A618086386005B7299 /* MiniModeMenuTitleTransformer.h */, 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */, 8384911D1807F38A00E7332D /* NowPlayingBarView.m */, @@ -1619,6 +1587,46 @@ name = Categories; sourceTree = ""; }; + 8301F93720E4EEF70017B2DC /* Products */ = { + isa = PBXGroup; + children = ( + 8301F94520E4EEF70017B2DC /* VorbisPlugin.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 8303A30020E4E3D000951EF8 /* Products */ = { + isa = PBXGroup; + children = ( + 8303A30920E4E3D000951EF8 /* AdPlug.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 8303A30220E4E3D000951EF8 /* Products */ = { + isa = PBXGroup; + children = ( + 8303A30C20E4E3D000951EF8 /* Flac.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 8303A30520E4E3D000951EF8 /* Products */ = { + isa = PBXGroup; + children = ( + 8303A31C20E4E3D000951EF8 /* TagLib.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 830B62AF20E4EF89004A74B2 /* Products */ = { + isa = PBXGroup; + children = ( + 830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */, + ); + name = Products; + sourceTree = ""; + }; 8314D63C1A354DFE00EEE8E6 /* Products */ = { isa = PBXGroup; children = ( @@ -1627,6 +1635,14 @@ name = Products; sourceTree = ""; }; + 834068A720E4E40200A01561 /* Products */ = { + isa = PBXGroup; + children = ( + 834068BD20E4E40200A01561 /* WavPack.bundle */, + ); + name = Products; + sourceTree = ""; + }; 8359FF2D17FEF35C0060F3ED /* Products */ = { isa = PBXGroup; children = ( @@ -1643,14 +1659,6 @@ name = Products; sourceTree = ""; }; - 836F6B2618BDB80D0095E648 /* Products */ = { - isa = PBXGroup; - children = ( - 836F6B2E18BDB80E0095E648 /* vgmstream.bundle */, - ); - name = Products; - sourceTree = ""; - }; 836FB5431820538700B3AD2D /* Products */ = { isa = PBXGroup; children = ( @@ -1659,14 +1667,6 @@ name = Products; sourceTree = ""; }; - 8375B05217FFEA400092A79F /* Products */ = { - isa = PBXGroup; - children = ( - 8375B05717FFEA410092A79F /* Opus.bundle */, - ); - name = Products; - sourceTree = ""; - }; 83790D4A1809F4980073CF51 /* SPMediaKeyTap */ = { isa = PBXGroup; children = ( @@ -1702,18 +1702,26 @@ name = Products; sourceTree = ""; }; - 83D3C5FD201C674D005564CB /* Products */ = { + 83BB13AE20E4E38E00723731 /* Products */ = { isa = PBXGroup; children = ( - 83D3C601201C674F005564CB /* AdPlug.bundle */, + 83BB13C220E4E38E00723731 /* vgmstream.bundle */, ); name = Products; sourceTree = ""; }; - 83E5EFAD1FFEF78100659F0F /* Products */ = { + 83CA5AF820E4E394003E463A /* Products */ = { isa = PBXGroup; children = ( - 83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */, + 83CA5B0020E4E395003E463A /* OpenMPT.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 83CA5AFA20E4E394003E463A /* Products */ = { + isa = PBXGroup; + children = ( + 83CA5B0320E4E395003E463A /* Shorten.bundle */, ); name = Products; sourceTree = ""; @@ -1805,8 +1813,6 @@ 170B55930D6E5E7B006B9E92 /* StatusImageTransformer.m */, 17249F0D0D82E17700F33392 /* ToggleQueueTitleTransformer.h */, 17249F0E0D82E17700F33392 /* ToggleQueueTitleTransformer.m */, - 17A140E70D88B954004852F9 /* FilePlaylistEntry.h */, - 17A140E80D88B954004852F9 /* FilePlaylistEntry.m */, ); path = Playlist; sourceTree = ""; @@ -1881,9 +1887,15 @@ buildRules = ( ); dependencies = ( - 83D3C6AC201D39C3005564CB /* PBXTargetDependency */, - 83D3C6AA201D39BC005564CB /* PBXTargetDependency */, - 83E5FE791FFF0CAC00659F0F /* PBXTargetDependency */, + 834D793E20E4EFD200C4A5CC /* PBXTargetDependency */, + 834D793020E4EFCC00C4A5CC /* PBXTargetDependency */, + 834F7F4220E4E4CD00228DAB /* PBXTargetDependency */, + 834F7F3E20E4E4C600228DAB /* PBXTargetDependency */, + 834F7F3C20E4E4C200228DAB /* PBXTargetDependency */, + 834F7F3A20E4E4BD00228DAB /* PBXTargetDependency */, + 834F7F3620E4E4B400228DAB /* PBXTargetDependency */, + 834F7F3420E4E4B000228DAB /* PBXTargetDependency */, + 834F7F1F20E4E4AA00228DAB /* PBXTargetDependency */, 83EEAB261C965C61002761C5 /* PBXTargetDependency */, 83F9D8061A884C33007ABEC2 /* PBXTargetDependency */, 836F5BEE1A3579F5002730CC /* PBXTargetDependency */, @@ -1892,17 +1904,11 @@ 83B06703180D5776008E3612 /* PBXTargetDependency */, 838491861808591400E7332D /* PBXTargetDependency */, 8375B36217FFEF010092A79F /* PBXTargetDependency */, - 8375B36417FFEF010092A79F /* PBXTargetDependency */, 83BCB8DD17FC96FC00760340 /* PBXTargetDependency */, 83BCB8D917FC96F800760340 /* PBXTargetDependency */, 17C8097E0C3BD1F5005707C4 /* PBXTargetDependency */, - 17C809820C3BD1F5005707C4 /* PBXTargetDependency */, - 17C809840C3BD1F5005707C4 /* PBXTargetDependency */, 17C809860C3BD1F5005707C4 /* PBXTargetDependency */, 17C809880C3BD1F5005707C4 /* PBXTargetDependency */, - 17C8098A0C3BD1F5005707C4 /* PBXTargetDependency */, - 17C8098C0C3BD1F5005707C4 /* PBXTargetDependency */, - 17C809900C3BD1F5005707C4 /* PBXTargetDependency */, 17C809E50C3BD47C005707C4 /* PBXTargetDependency */, 17F5613F0C3BD4E90019975C /* PBXTargetDependency */, 17F5623B0C3BD9280019975C /* PBXTargetDependency */, @@ -1946,12 +1952,14 @@ Greek, zh_CN, es, + Base, + en, ); mainGroup = 29B97314FDCFA39411CA2CEA /* Cog */; projectDirPath = ""; projectReferences = ( { - ProductGroup = 83D3C5FD201C674D005564CB /* Products */; + ProductGroup = 8303A30020E4E3D000951EF8 /* Products */; ProjectRef = 83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */; }, { @@ -1983,7 +1991,7 @@ ProjectRef = 17C808710C3BD167005707C4 /* FileSource.xcodeproj */; }, { - ProductGroup = 17C8087B0C3BD173005707C4 /* Products */; + ProductGroup = 8303A30220E4E3D000951EF8 /* Products */; ProjectRef = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; }, { @@ -2023,19 +2031,19 @@ ProjectRef = 838491791808585C00E7332D /* NDHotKey.xcodeproj */; }, { - ProductGroup = 83E5EFAD1FFEF78100659F0F /* Products */; + ProductGroup = 83CA5AF820E4E394003E463A /* Products */; ProjectRef = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */; }, { - ProductGroup = 8375B05217FFEA400092A79F /* Products */; - ProjectRef = 8375B05117FFEA400092A79F /* Opus.xcodeproj */; + ProductGroup = 830B62AF20E4EF89004A74B2 /* Products */; + ProjectRef = 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */; }, { ProductGroup = 8E8D41C30CBB0DA000135C1B /* Products */; ProjectRef = 8E8D41C20CBB0DA000135C1B /* Pls.xcodeproj */; }, { - ProductGroup = 17C808A80C3BD1BA005707C4 /* Products */; + ProductGroup = 83CA5AFA20E4E394003E463A /* Products */; ProjectRef = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; }, { @@ -2055,19 +2063,19 @@ ProjectRef = 83EEAAF51C9651D8002761C5 /* Syntrax.xcodeproj */; }, { - ProductGroup = 17C808B10C3BD1C5005707C4 /* Products */; + ProductGroup = 8303A30520E4E3D000951EF8 /* Products */; ProjectRef = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; }, { - ProductGroup = 836F6B2618BDB80D0095E648 /* Products */; + ProductGroup = 83BB13AE20E4E38E00723731 /* Products */; ProjectRef = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */; }, { - ProductGroup = 17C808B80C3BD1D2005707C4 /* Products */; - ProjectRef = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; + ProductGroup = 8301F93720E4EEF70017B2DC /* Products */; + ProjectRef = 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */; }, { - ProductGroup = 17C808C10C3BD1DD005707C4 /* Products */; + ProductGroup = 834068A720E4E40200A01561 /* Products */; ProjectRef = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; }, ); @@ -2086,13 +2094,6 @@ remoteRef = 17C808780C3BD167005707C4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 17C808820C3BD173005707C4 /* Flac.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = Flac.bundle; - remoteRef = 17C808810C3BD173005707C4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 17C8088B0C3BD181005707C4 /* HTTPSource.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2107,34 +2108,6 @@ remoteRef = 17C808A50C3BD1AB005707C4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = Shorten.bundle; - remoteRef = 17C808AE0C3BD1BA005707C4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 17C808B60C3BD1C5005707C4 /* TagLib.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = TagLib.bundle; - remoteRef = 17C808B50C3BD1C5005707C4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = Vorbis.bundle; - remoteRef = 17C808BE0C3BD1D2005707C4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 17C808C80C3BD1DD005707C4 /* WavPack.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = WavPack.bundle; - remoteRef = 17C808C70C3BD1DD005707C4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2177,6 +2150,41 @@ remoteRef = 566D321A0D538550004466A5 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 8301F94520E4EEF70017B2DC /* VorbisPlugin.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = VorbisPlugin.bundle; + remoteRef = 8301F94420E4EEF70017B2DC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8303A30920E4E3D000951EF8 /* AdPlug.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = AdPlug.bundle; + remoteRef = 8303A30820E4E3D000951EF8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8303A30C20E4E3D000951EF8 /* Flac.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Flac.bundle; + remoteRef = 8303A30B20E4E3D000951EF8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8303A31C20E4E3D000951EF8 /* TagLib.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = TagLib.bundle; + remoteRef = 8303A31B20E4E3D000951EF8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = OpusPlugin.bundle; + remoteRef = 830B62B220E4EF89004A74B2 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 8314D6411A354DFF00EEE8E6 /* sidplay.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2205,6 +2213,13 @@ remoteRef = 8333B65A1DCC4290004C140D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 834068BD20E4E40200A01561 /* WavPack.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = WavPack.bundle; + remoteRef = 834068BC20E4E40200A01561 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2219,13 +2234,6 @@ remoteRef = 8360EF0417F92B24005208A4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 836F6B2E18BDB80E0095E648 /* vgmstream.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = vgmstream.bundle; - remoteRef = 836F6B2D18BDB80E0095E648 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 836FB5471820538800B3AD2D /* Hively.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2233,13 +2241,6 @@ remoteRef = 836FB5461820538800B3AD2D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8375B05717FFEA410092A79F /* Opus.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = Opus.bundle; - remoteRef = 8375B05617FFEA410092A79F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 8384917E1808585D00E7332D /* NDHotKey.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -2254,18 +2255,25 @@ remoteRef = 83B066A0180D5669008E3612 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 83D3C601201C674F005564CB /* AdPlug.bundle */ = { + 83BB13C220E4E38E00723731 /* vgmstream.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = AdPlug.bundle; - remoteRef = 83D3C600201C674F005564CB /* PBXContainerItemProxy */; + path = vgmstream.bundle; + remoteRef = 83BB13C120E4E38E00723731 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */ = { + 83CA5B0020E4E395003E463A /* OpenMPT.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = OpenMPT.bundle; - remoteRef = 83E5EFB01FFEF78300659F0F /* PBXContainerItemProxy */; + remoteRef = 83CA5AFF20E4E395003E463A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 83CA5B0320E4E395003E463A /* Shorten.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Shorten.bundle; + remoteRef = 83CA5B0220E4E395003E463A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 83E6B759181612FD00D4576D /* Sparkle.framework */ = { @@ -2345,6 +2353,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 838491221807F38A00E7332D /* NowPlayingBarController.xib in Resources */, + 83BC5AC420E4CE9000631CD4 /* Feedback.xib in Resources */, + 83BC5AC320E4CE8D00631CD4 /* SpotlightPanel.xib in Resources */, + 83BC5AC220E4CE8A00631CD4 /* FileTree.xib in Resources */, + 83BC5AC120E4CE8700631CD4 /* OpenURLPanel.xib in Resources */, + 83BC5AC020E4CE7D00631CD4 /* MainMenu.xib in Resources */, + 83BC5ABF20E4CE7A00631CD4 /* InfoInspector.xib in Resources */, 17F562390C3BD91B0019975C /* General.preferencePane in Resources */, 8384915B18083EAB00E7332D /* navigatorTemplate.pdf in Resources */, 832C1253180BD1E2005507C1 /* Cog.help in Resources */, @@ -2397,7 +2412,6 @@ 1791005F0CB44D6D0070BC5C /* Cog.scriptTerminology in Resources */, 8384916518083EAB00E7332D /* repeatModeOffTemplate.pdf in Resources */, 17D1B27D0CF8B2830028F5B5 /* cue.icns in Resources */, - 838491221807F38A00E7332D /* NowPlayingBarController.xib in Resources */, 8384913C1808217300E7332D /* randomize.png in Resources */, 8384915A18083EAB00E7332D /* missingArt@2x.png in Resources */, 17D1B27E0CF8B2830028F5B5 /* it.icns in Resources */, @@ -2409,9 +2423,6 @@ 17D1B2810CF8B2830028F5B5 /* song.icns in Resources */, 17D1B2820CF8B2830028F5B5 /* vg.icns in Resources */, 17D1B2830CF8B2830028F5B5 /* xm.icns in Resources */, - 17342A9A0D5FD20B00E8D854 /* MainMenu.xib in Resources */, - 17342ABF0D5FD36400E8D854 /* OpenURLPanel.xib in Resources */, - 17211A7E0D68B7C500911CA9 /* FileTree.xib in Resources */, 17A8F6850D6A7FCA0095DA13 /* repeat_all.png in Resources */, 83849172180843B200E7332D /* pauseDockBadgeColorful.png in Resources */, 17A8F6860D6A7FCA0095DA13 /* repeat_none.png in Resources */, @@ -2422,9 +2433,6 @@ 8384916B18083EAB00E7332D /* stopDockBadge.png in Resources */, 8384916118083EAB00E7332D /* previousTemplate.pdf in Resources */, 8384916A18083EAB00E7332D /* stop.png in Resources */, - 178456C30F6320B5007E8021 /* SpotlightPanel.xib in Resources */, - 17D1B0D20F6320EA00694C57 /* InfoInspector.xib in Resources */, - 17D1B1DC0F6330D400694C57 /* Feedback.xib in Resources */, 1778D3B00F645A190037E7A0 /* missingArt.png in Resources */, 1745CBA50F661DBB00E513F7 /* shuffle_albums.png in Resources */, 8384915918083EAB00E7332D /* infoTemplate.pdf in Resources */, @@ -2492,7 +2500,6 @@ 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */, 170B55940D6E5E7B006B9E92 /* StatusImageTransformer.m in Sources */, 17249F0F0D82E17700F33392 /* ToggleQueueTitleTransformer.m in Sources */, - 17A140E90D88B954004852F9 /* FilePlaylistEntry.m in Sources */, 179D031E0E0CB2500064A77A /* ContainedNode.m in Sources */, 179D031F0E0CB2500064A77A /* ContainerNode.m in Sources */, 179D03200E0CB2500064A77A /* DirectoryNode.m in Sources */, @@ -2522,6 +2529,7 @@ 1752C36C0F59E00100F85F28 /* PlaybackButtons.m in Sources */, 171EFE8C0F59FEAE000ADC42 /* DockIconController.m in Sources */, 17F6C8070F603701000D9DA9 /* PlaybackEventController.m in Sources */, + 83BC5AB220E4C87100631CD4 /* DualWindow.m in Sources */, 1784560F0F631E24007E8021 /* FileTreeViewController.m in Sources */, 178456120F631E31007E8021 /* SideViewController.m in Sources */, 17D1B1010F63255200694C57 /* InfoWindowController.m in Sources */, @@ -2550,16 +2558,6 @@ name = Musepack; targetProxy = 17C8097D0C3BD1F5005707C4 /* PBXContainerItemProxy */; }; - 17C809820C3BD1F5005707C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = WavPack; - targetProxy = 17C809810C3BD1F5005707C4 /* PBXContainerItemProxy */; - }; - 17C809840C3BD1F5005707C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Shorten; - targetProxy = 17C809830C3BD1F5005707C4 /* PBXContainerItemProxy */; - }; 17C809860C3BD1F5005707C4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = FileSource; @@ -2570,21 +2568,6 @@ name = HTTPSource; targetProxy = 17C809870C3BD1F5005707C4 /* PBXContainerItemProxy */; }; - 17C8098A0C3BD1F5005707C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = TagLib; - targetProxy = 17C809890C3BD1F5005707C4 /* PBXContainerItemProxy */; - }; - 17C8098C0C3BD1F5005707C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Flac; - targetProxy = 17C8098B0C3BD1F5005707C4 /* PBXContainerItemProxy */; - }; - 17C809900C3BD1F5005707C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Vorbis; - targetProxy = 17C8098F0C3BD1F5005707C4 /* PBXContainerItemProxy */; - }; 17C809E50C3BD47C005707C4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = CoreAudio; @@ -2610,6 +2593,51 @@ name = General; targetProxy = 17F5623A0C3BD9280019975C /* PBXContainerItemProxy */; }; + 834D793020E4EFCC00C4A5CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "VorbisPlugin Plugin"; + targetProxy = 834D792F20E4EFCC00C4A5CC /* PBXContainerItemProxy */; + }; + 834D793E20E4EFD200C4A5CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = OpusPlugin; + targetProxy = 834D793D20E4EFD200C4A5CC /* PBXContainerItemProxy */; + }; + 834F7F1F20E4E4AA00228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = AdPlugPlugin; + targetProxy = 834F7F1E20E4E4AA00228DAB /* PBXContainerItemProxy */; + }; + 834F7F3420E4E4B000228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = OpenMPTPlugin; + targetProxy = 834F7F3320E4E4B000228DAB /* PBXContainerItemProxy */; + }; + 834F7F3620E4E4B400228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "WavPackPlugin Plugin"; + targetProxy = 834F7F3520E4E4B400228DAB /* PBXContainerItemProxy */; + }; + 834F7F3A20E4E4BD00228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "TagLibPlugin Plugin"; + targetProxy = 834F7F3920E4E4BD00228DAB /* PBXContainerItemProxy */; + }; + 834F7F3C20E4E4C200228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Shorten Plugin"; + targetProxy = 834F7F3B20E4E4C200228DAB /* PBXContainerItemProxy */; + }; + 834F7F3E20E4E4C600228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Flac Plugin"; + targetProxy = 834F7F3D20E4E4C600228DAB /* PBXContainerItemProxy */; + }; + 834F7F4220E4E4CD00228DAB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "vgmstream Plugin"; + targetProxy = 834F7F4120E4E4CD00228DAB /* PBXContainerItemProxy */; + }; 836F5BEE1A3579F5002730CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = sidplay; @@ -2625,11 +2653,6 @@ name = ArchiveSource; targetProxy = 8375B36117FFEF010092A79F /* PBXContainerItemProxy */; }; - 8375B36417FFEF010092A79F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Opus; - targetProxy = 8375B36317FFEF010092A79F /* PBXContainerItemProxy */; - }; 838491861808591400E7332D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = NDHotKey; @@ -2650,21 +2673,6 @@ name = "FFMPEG Plugin"; targetProxy = 83BCB8DC17FC96FC00760340 /* PBXContainerItemProxy */; }; - 83D3C6AA201D39BC005564CB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = AdPlug; - targetProxy = 83D3C6A9201D39BC005564CB /* PBXContainerItemProxy */; - }; - 83D3C6AC201D39C3005564CB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = vgmstream; - targetProxy = 83D3C6AB201D39C3005564CB /* PBXContainerItemProxy */; - }; - 83E5FE791FFF0CAC00659F0F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = OpenMPT; - targetProxy = 83E5FE781FFF0CAC00659F0F /* PBXContainerItemProxy */; - }; 83E6B7641816138800D4576D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Sparkle; @@ -2705,8 +2713,9 @@ 17211A7C0D68B7C500911CA9 /* FileTree.xib */ = { isa = PBXVariantGroup; children = ( - 17211A7D0D68B7C500911CA9 /* English */, - 833F68231CDBCAA800AFB9F0 /* es */, + 83BC5AB720E4C91400631CD4 /* Base */, + 83BC5AD220E4D0B400631CD4 /* es */, + 83BC5AD420E4D0B600631CD4 /* en */, ); name = FileTree.xib; sourceTree = ""; @@ -2714,8 +2723,9 @@ 17342A980D5FD20B00E8D854 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 17342A990D5FD20B00E8D854 /* English */, - 833F68211CDBCAA800AFB9F0 /* es */, + 83BC5AB520E4C91200631CD4 /* Base */, + 83BC5AC620E4D04600631CD4 /* en */, + 83BC5AC820E4D05A00631CD4 /* es */, ); name = MainMenu.xib; sourceTree = ""; @@ -2723,8 +2733,9 @@ 17342ABD0D5FD36400E8D854 /* OpenURLPanel.xib */ = { isa = PBXVariantGroup; children = ( - 17342ABE0D5FD36400E8D854 /* English */, - 833F68221CDBCAA800AFB9F0 /* es */, + 83BC5AB620E4C91300631CD4 /* Base */, + 83BC5ACE20E4D09700631CD4 /* es */, + 83BC5AD020E4D09800631CD4 /* en */, ); name = OpenURLPanel.xib; sourceTree = ""; @@ -2732,8 +2743,9 @@ 178456C00F6320B5007E8021 /* SpotlightPanel.xib */ = { isa = PBXVariantGroup; children = ( - 178456C10F6320B5007E8021 /* English */, - 833F68241CDBCAA800AFB9F0 /* es */, + 83BC5AB820E4C91400631CD4 /* Base */, + 83BC5AD620E4D0D800631CD4 /* es */, + 83BC5AD820E4D0D900631CD4 /* en */, ); name = SpotlightPanel.xib; sourceTree = ""; @@ -2741,8 +2753,9 @@ 17D1B0D00F6320EA00694C57 /* InfoInspector.xib */ = { isa = PBXVariantGroup; children = ( - 17D1B0D10F6320EA00694C57 /* English */, - 833F68201CDBCAA800AFB9F0 /* es */, + 83BC5AB420E4C91100631CD4 /* Base */, + 83BC5ACA20E4D07200631CD4 /* es */, + 83BC5ACC20E4D07700631CD4 /* en */, ); name = InfoInspector.xib; sourceTree = ""; @@ -2750,8 +2763,9 @@ 17D1B1DA0F6330D400694C57 /* Feedback.xib */ = { isa = PBXVariantGroup; children = ( - 17D1B1DB0F6330D400694C57 /* English */, - 833F68261CDBCAA900AFB9F0 /* es */, + 83BC5AB920E4C91500631CD4 /* Base */, + 83BC5ADA20E4D0E900631CD4 /* en */, + 83BC5ADC20E4D0EC00631CD4 /* es */, ); name = Feedback.xib; sourceTree = ""; @@ -2792,6 +2806,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CFLAGS = ( "-D__MACOSX__", "-DHAVE_CONFIG_H", @@ -2821,6 +2836,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CFLAGS = ( "-D__MACOSX__", "-DHAVE_CONFIG_H", @@ -2842,6 +2858,7 @@ C01FCF4F08A954540054247B /* 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; @@ -2882,6 +2899,7 @@ C01FCF5008A954540054247B /* 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; diff --git a/Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata index e6945e873..919434a62 100644 --- a/Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Cog.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint b/Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint deleted file mode 100644 index a3bfc3587..000000000 --- a/Cog.xcodeproj/project.xcworkspace/xcshareddata/Cog.xcscmblueprint +++ /dev/null @@ -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" - } - ] -} \ No newline at end of file diff --git a/FileTree/DirectoryNode.m b/FileTree/DirectoryNode.m index 659d618f5..4ad1597c9 100644 --- a/FileTree/DirectoryNode.m +++ b/FileTree/DirectoryNode.m @@ -11,6 +11,8 @@ #import "FileNode.h" #import "SmartFolderNode.h" +#import "NSString+FinderCompare.h" + @implementation DirectoryNode - (BOOL)isLeaf diff --git a/FileTree/PathNode.m b/FileTree/PathNode.m index 4387eaf0b..cd60f1b25 100644 --- a/FileTree/PathNode.m +++ b/FileTree/PathNode.m @@ -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); } } diff --git a/Frameworks/AdPlug/AdPlug.xcodeproj/project.pbxproj b/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj similarity index 98% rename from Frameworks/AdPlug/AdPlug.xcodeproj/project.pbxproj rename to Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj index 9bc8d2663..5752d1fb5 100644 --- a/Frameworks/AdPlug/AdPlug.xcodeproj/project.pbxproj +++ b/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj @@ -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 = ""; }; 83D3C504201C66C1005564CB /* rad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rad.h; path = adplug/src/rad.h; sourceTree = ""; }; 83D3C505201C66C1005564CB /* adplug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adplug.cpp; path = adplug/src/adplug.cpp; sourceTree = ""; }; @@ -311,7 +311,7 @@ 83D3C4D5201C654F005564CB /* Products */ = { isa = PBXGroup; children = ( - 83D3C4D4201C654F005564CB /* AdPlug.framework */, + 83D3C4D4201C654F005564CB /* libAdPlug.framework */, ); name = Products; sourceTree = ""; @@ -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 */, diff --git a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj index 29b1beef3..c608fe33d 100644 --- a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj +++ b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj b/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj index 868eb736f..29da56e97 100644 --- a/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj +++ b/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/GME/GME.xcodeproj/project.pbxproj b/Frameworks/GME/GME.xcodeproj/project.pbxproj index 18474483d..1a7586111 100644 --- a/Frameworks/GME/GME.xcodeproj/project.pbxproj +++ b/Frameworks/GME/GME.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/GME/gme/Bml_Parser.cpp b/Frameworks/GME/gme/Bml_Parser.cpp index e63d4b9a0..1bde07be1 100644 --- a/Frameworks/GME/gme/Bml_Parser.cpp +++ b/Frameworks/GME/gme/Bml_Parser.cpp @@ -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() ) diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj index 28c9753e3..1ee38b15b 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj index 5a951524d..08b432b00 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj index 7400b8977..7835e076c 100644 --- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj index cd4dea0d4..d470fef4f 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj index d9052b25f..e48c91635 100644 --- a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj +++ b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj index 81f2583d0..333a09320 100644 --- a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj +++ b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj b/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj index f54d6dee6..d5975acdb 100644 --- a/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj +++ b/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj b/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj index 40492ad94..0c8e96731 100644 --- a/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj +++ b/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj similarity index 99% rename from Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj rename to Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj index 37629168d..da211f1ed 100644 --- a/Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj +++ b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj @@ -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 = ""; }; @@ -565,7 +565,7 @@ 83E5EFBE1FFEF7CC00659F0F /* Products */ = { isa = PBXGroup; children = ( - 83E5EFBD1FFEF7CC00659F0F /* OpenMPT.framework */, + 83E5EFBD1FFEF7CC00659F0F /* libOpenMPT.framework */, ); name = Products; sourceTree = ""; @@ -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 */, diff --git a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj index 5f9bae3d2..15b09179e 100644 --- a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj +++ b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj index 17a40750c..dcc437759 100644 --- a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj +++ b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj index 1c34792d3..3cbb352fa 100644 --- a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/Syntrax-c/Syntrax-c/resampler.c b/Frameworks/Syntrax-c/Syntrax-c/resampler.c index b058e00bf..2b228f310 100644 --- a/Frameworks/Syntrax-c/Syntrax-c/resampler.c +++ b/Frameworks/Syntrax-c/Syntrax-c/resampler.c @@ -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 ) diff --git a/Frameworks/Syntrax-c/Syntrax-c/resampler.h b/Frameworks/Syntrax-c/Syntrax-c/resampler.h index ebacf52e1..3384f1400 100644 --- a/Frameworks/Syntrax-c/Syntrax-c/resampler.h +++ b/Frameworks/Syntrax-c/Syntrax-c/resampler.h @@ -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 *); diff --git a/Frameworks/Syntrax-c/Syntrax-c/syntrax.c b/Frameworks/Syntrax-c/Syntrax-c/syntrax.c index f71c2c859..daec8b4b3 100644 --- a/Frameworks/Syntrax-c/Syntrax-c/syntrax.c +++ b/Frameworks/Syntrax-c/Syntrax-c/syntrax.c @@ -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); diff --git a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj index cadf8949e..88bb00fbe 100644 --- a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj +++ b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/project.pbxproj @@ -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"; diff --git a/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj b/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj index f3d922bad..9b63b094f 100644 --- a/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj index 7087875c4..6cdcde18e 100644 --- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj +++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj index db6b58697..ca4b0fe88 100644 --- a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj +++ b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj b/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj index bd33690ba..b13aab7e0 100644 --- a/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj +++ b/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/lazyusf/lazyusf/usf/usf.h b/Frameworks/lazyusf/lazyusf/usf/usf.h index e88faba6c..6e2379a9b 100644 --- a/Frameworks/lazyusf/lazyusf/usf/usf.h +++ b/Frameworks/lazyusf/lazyusf/usf/usf.h @@ -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 diff --git a/Frameworks/libsidplay/sidplay-residfp-code b/Frameworks/libsidplay/sidplay-residfp-code index b61bdd964..5beb0a91d 160000 --- a/Frameworks/libsidplay/sidplay-residfp-code +++ b/Frameworks/libsidplay/sidplay-residfp-code @@ -1 +1 @@ -Subproject commit b61bdd96408fa5850716c534c06906d189e65148 +Subproject commit 5beb0a91d0fa566ec1b4d125cbe53831833c6692 diff --git a/Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj b/Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj index 35e951762..19ee97594 100644 --- a/Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj +++ b/Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj @@ -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"; diff --git a/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj b/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj index f56cd9c52..1beb2447f 100644 --- a/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj +++ b/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj @@ -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 = ""; }; 83CA2E2E1D7BCB6700F2EA53 /* ini.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ini.c; sourceTree = ""; }; 83CA2E2F1D7BCB6700F2EA53 /* ini.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ini.h; sourceTree = ""; }; - 83CA2E311D7BCB6700F2EA53 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 83CA2E391D7BCBD300F2EA53 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = memory.c; path = platform/posix/memory.c; sourceTree = ""; }; 83CA2E421D7BD82100F2EA53 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = ""; }; 83D7282120A673A500076FC5 /* matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = matrix.h; sourceTree = ""; }; @@ -977,7 +975,6 @@ 837612F11DD6AD07001EED3D /* inih_LICENSE.txt */, 83CA2E2E1D7BCB6700F2EA53 /* ini.c */, 83CA2E2F1D7BCB6700F2EA53 /* ini.h */, - 83CA2E311D7BCB6700F2EA53 /* README.md */, ); path = inih; sourceTree = ""; @@ -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; diff --git a/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj b/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj index 1cdfa166b..6f4207876 100644 --- a/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj +++ b/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/mpg123/mpg123/getbits.h b/Frameworks/mpg123/mpg123/getbits.h index 8eff00ed6..79e97b34a 100644 --- a/Frameworks/mpg123/mpg123/getbits.h +++ b/Frameworks/mpg123/mpg123/getbits.h @@ -74,7 +74,7 @@ fprintf(stderr,"g%d",number_of_bits); fprintf(stderr,":%lx\n",rval); #endif - return rval; + return (unsigned int) rval; } diff --git a/Frameworks/mpg123/mpg123/layer2.c b/Frameworks/mpg123/mpg123/layer2.c index 056e8f4a4..208817002 100644 --- a/Frameworks/mpg123/mpg123/layer2.c +++ b/Frameworks/mpg123/mpg123/layer2.c @@ -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; } diff --git a/Frameworks/mpg123/mpg123/parse.c b/Frameworks/mpg123/mpg123/parse.c index 41ea75e49..7dc9df347 100644 --- a/Frameworks/mpg123/mpg123/parse.c +++ b/Frameworks/mpg123/mpg123/parse.c @@ -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 */ diff --git a/Frameworks/mpg123/mpg123/readers.c b/Frameworks/mpg123/mpg123/readers.c index 88c0fed26..43a92bd77 100644 --- a/Frameworks/mpg123/mpg123/readers.c +++ b/Frameworks/mpg123/mpg123/readers.c @@ -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) diff --git a/Frameworks/mpg123/mpg123/synth_mono.h b/Frameworks/mpg123/mpg123/synth_mono.h index 907aa254c..750b92dca 100644 --- a/Frameworks/mpg123/mpg123/synth_mono.h +++ b/Frameworks/mpg123/mpg123/synth_mono.h @@ -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 */ diff --git a/Frameworks/mpg123/mpg123/synth_ntom.h b/Frameworks/mpg123/mpg123/synth_ntom.h index 614277875..593448323 100644 --- a/Frameworks/mpg123/mpg123/synth_ntom.h +++ b/Frameworks/mpg123/mpg123/synth_ntom.h @@ -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) diff --git a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj index 501ce35b7..c58fe4118 100644 --- a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj +++ b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/vgmstream/vgmstream.xcodeproj/project.pbxproj b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj similarity index 99% rename from Frameworks/vgmstream/vgmstream.xcodeproj/project.pbxproj rename to Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj index c87344a54..77c24ec17 100644 --- a/Frameworks/vgmstream/vgmstream.xcodeproj/project.pbxproj +++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj @@ -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 = ""; }; 8350C0541E071881009E0A93 /* xma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xma.c; sourceTree = ""; }; 8350C0591E071990009E0A93 /* ps2_svag_snk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ps2_svag_snk.c; sourceTree = ""; }; - 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 = ""; }; + 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 = ""; }; 836F6B4618BDB8880095E648 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 836F6DE018BDC2180095E648 /* acm_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acm_decoder.c; sourceTree = ""; }; 836F6DE118BDC2180095E648 /* acm_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acm_decoder.h; sourceTree = ""; }; @@ -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 = ""; @@ -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 */, diff --git a/Frameworks/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme similarity index 82% rename from Frameworks/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme rename to Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme index 800ecdb1c..fd1f68bca 100644 --- a/Frameworks/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme +++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "libvgmstream.framework" + BlueprintName = "libvgmstream" + ReferencedContainer = "container:libvgmstream.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "libvgmstream.framework" + BlueprintName = "libvgmstream" + ReferencedContainer = "container:libvgmstream.xcodeproj"> @@ -64,9 +64,9 @@ + BuildableName = "libvgmstream.framework" + BlueprintName = "libvgmstream" + ReferencedContainer = "container:libvgmstream.xcodeproj"> diff --git a/Frameworks/vgmstream/vgmstream/vgmstream-Info.plist b/Frameworks/vgmstream/vgmstream/libvgmstream-Info.plist similarity index 100% rename from Frameworks/vgmstream/vgmstream/vgmstream-Info.plist rename to Frameworks/vgmstream/vgmstream/libvgmstream-Info.plist diff --git a/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj b/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj index 1aa015498..e33a9d1dc 100644 --- a/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj +++ b/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj @@ -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; diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h index 6967d7c94..1831b31fb 100755 --- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h +++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/GPU.h @@ -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; diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c index 742d85f27..620d08c5a 100755 --- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c +++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/MMU.c @@ -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) diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c index fdbac375e..f3ac295d2 100755 --- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c +++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/cp15.c @@ -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) diff --git a/Playlist/FilePlaylistEntry.h b/Playlist/FilePlaylistEntry.h deleted file mode 100644 index a5ce6b231..000000000 --- a/Playlist/FilePlaylistEntry.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// FilePlaylistEntry.h -// Cog -// -// Created by Vincent Spader on 3/12/08. -// Copyright 2008 __MyCompanyName__. All rights reserved. -// - -#import - -#import "PlaylistEntry.h" - - -@interface FilePlaylistEntry : PlaylistEntry { - FSRef fileRef; -} - -@end diff --git a/Playlist/FilePlaylistEntry.m b/Playlist/FilePlaylistEntry.m deleted file mode 100644 index 743c469e2..000000000 --- a/Playlist/FilePlaylistEntry.m +++ /dev/null @@ -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 diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 1d0e05c88..d51c062e5 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -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; diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index a838035e3..767b0352b 100755 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -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; diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index bc23ade96..1751d7017 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -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 diff --git a/Playlist/XmlContainer.m b/Playlist/XmlContainer.m index 92cb0f69c..4fcc2858d 100644 --- a/Playlist/XmlContainer.m +++ b/Playlist/XmlContainer.m @@ -8,7 +8,7 @@ #import "XmlContainer.h" -#import +#import "PlaylistEntry.h" #import "Logging.h" diff --git a/Plugins/APL/APL.xcodeproj/project.pbxproj b/Plugins/APL/APL.xcodeproj/project.pbxproj index 540c018ab..6be648fc4 100644 --- a/Plugins/APL/APL.xcodeproj/project.pbxproj +++ b/Plugins/APL/APL.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj index 727b821fa..5c7eec422 100644 --- a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj +++ b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj @@ -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 = ""; }; - 83D3C603201C6775005564CB /* AdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdPlug.xcodeproj; path = ../../Frameworks/AdPlug/AdPlug.xcodeproj; sourceTree = ""; }; + 83D3C603201C6775005564CB /* libAdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libAdPlug.xcodeproj; path = ../../Frameworks/AdPlug/libAdPlug.xcodeproj; sourceTree = ""; }; 83D3C650201C6DE9005564CB /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../../Utils/Logging.h; sourceTree = ""; }; 83D3C651201C6E00005564CB /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = ""; }; 83D3C652201C6E10005564CB /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = ""; }; @@ -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 = ""; + }; 83D3C5EA201C674D005564CB = { isa = PBXGroup; children = ( @@ -122,19 +130,11 @@ isa = PBXGroup; children = ( 83D3C6A7201D3951005564CB /* libbinio.framework */, - 83D3C603201C6775005564CB /* AdPlug.xcodeproj */, + 83D3C603201C6775005564CB /* libAdPlug.xcodeproj */, ); name = Frameworks; sourceTree = ""; }; - 83D3C604201C6775005564CB /* Products */ = { - isa = PBXGroup; - children = ( - 83D3C608201C6775005564CB /* AdPlug.framework */, - ); - name = Products; - sourceTree = ""; - }; /* 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; diff --git a/Plugins/AdPlug/AdPlug/AdPlugContainer.mm b/Plugins/AdPlug/AdPlug/AdPlugContainer.mm index 84418c307..b719a5943 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugContainer.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugContainer.mm @@ -6,8 +6,8 @@ // Copyright 2018 __LoSnoCo__. All rights reserved. // -#import -#import +#import +#import #import "AdPlugContainer.h" #import "AdPlugDecoder.h" diff --git a/Plugins/AdPlug/AdPlug/AdPlugDecoder.h b/Plugins/AdPlug/AdPlug/AdPlugDecoder.h index acb89a7bb..68928f214 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugDecoder.h +++ b/Plugins/AdPlug/AdPlug/AdPlugDecoder.h @@ -8,8 +8,8 @@ #import -#import -#import +#import +#import #import "Plugin.h" diff --git a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm index b50182306..8f3aef61f 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm @@ -8,7 +8,7 @@ #import "AdPlugDecoder.h" -#import +#import #import "fileprovider.h" diff --git a/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm b/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm index 8bbe1aea8..428ba6a16 100644 --- a/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm @@ -9,8 +9,8 @@ #import "AdPlugMetadataReader.h" #import "AdPlugDecoder.h" -#import -#import +#import +#import #import "fileprovider.h" diff --git a/Plugins/AdPlug/AdPlug/fileprovider.h b/Plugins/AdPlug/AdPlug/fileprovider.h index 273960aa8..642213854 100644 --- a/Plugins/AdPlug/AdPlug/fileprovider.h +++ b/Plugins/AdPlug/AdPlug/fileprovider.h @@ -15,7 +15,7 @@ #include #include -#include +#include class CProvider_cog : public CFileProvider { diff --git a/Plugins/AdPlug/AdPlug/fileprovider.mm b/Plugins/AdPlug/AdPlug/fileprovider.mm index 90283341f..eaf9a9865 100644 --- a/Plugins/AdPlug/AdPlug/fileprovider.mm +++ b/Plugins/AdPlug/AdPlug/fileprovider.mm @@ -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; diff --git a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj index f09fdf36c..6f4bf0196 100644 --- a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj +++ b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj index cc73205a5..602152d42 100644 --- a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj +++ b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj index 16000425d..903762c3f 100644 --- a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj +++ b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj b/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj index 67aea499e..d91d8728c 100644 --- a/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj +++ b/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/FileSource/FileSource.m b/Plugins/FileSource/FileSource.m index 58c6af1bd..5005c4474 100644 --- a/Plugins/FileSource/FileSource.m +++ b/Plugins/FileSource/FileSource.m @@ -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); } diff --git a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj index 9bee79a8d..34f330bc1 100644 --- a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj +++ b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/Flac/Flac.xcodeproj/project.pbxproj b/Plugins/Flac/Flac.xcodeproj/project.pbxproj index 5081ba5f2..95daa8957 100644 --- a/Plugins/Flac/Flac.xcodeproj/project.pbxproj +++ b/Plugins/Flac/Flac.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/GME/GME.xcodeproj/project.pbxproj b/Plugins/GME/GME.xcodeproj/project.pbxproj index 523ae2077..8d97ca462 100644 --- a/Plugins/GME/GME.xcodeproj/project.pbxproj +++ b/Plugins/GME/GME.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj index fa397092b..9503dfb58 100644 --- a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj +++ b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj index 9a41e04c0..f5a2c757e 100644 --- a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj +++ b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm index 25142b11b..455626f04 100644 --- a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm +++ b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm @@ -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) diff --git a/Plugins/Hively/Hively.xcodeproj/project.pbxproj b/Plugins/Hively/Hively.xcodeproj/project.pbxproj index 8f90ee3a0..4e5277a6f 100644 --- a/Plugins/Hively/Hively.xcodeproj/project.pbxproj +++ b/Plugins/Hively/Hively.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Plugins/M3u/M3u.xcodeproj/project.pbxproj b/Plugins/M3u/M3u.xcodeproj/project.pbxproj index cb4aa3983..b66511b66 100644 --- a/Plugins/M3u/M3u.xcodeproj/project.pbxproj +++ b/Plugins/M3u/M3u.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj index e859b8aef..9b30fee49 100644 --- a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj +++ b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj index 90219b6f0..32eb41afc 100644 --- a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj +++ b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj index 60d444e15..f96d13a3d 100644 --- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj +++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj @@ -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 = ""; }; - 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = ../../Frameworks/OpenMPT/OpenMPT.xcodeproj; sourceTree = ""; }; + 83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libOpenMPT.xcodeproj; path = ../../Frameworks/OpenMPT/libOpenMPT.xcodeproj; sourceTree = ""; }; 83E5FE6B1FFF004D00659F0F /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = ""; }; 83E5FE6C1FFF006400659F0F /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = ""; }; 83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OMPTDecoder.mm; path = OpenMPT/OMPTDecoder.mm; sourceTree = ""; }; @@ -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 = ""; + }; 83E5EF9A1FFEF78100659F0F = { isa = PBXGroup; children = ( @@ -93,19 +108,11 @@ 83E5EFB21FFEF79000659F0F /* Frameworks */ = { isa = PBXGroup; children = ( - 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */, + 83E5EFC81FFEF7CC00659F0F /* libOpenMPT.xcodeproj */, ); name = Frameworks; sourceTree = ""; }; - 83E5EFC91FFEF7CC00659F0F /* Products */ = { - isa = PBXGroup; - children = ( - 83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */, - ); - name = Products; - sourceTree = ""; - }; 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; }; diff --git a/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm b/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm index 57946bfb6..3e53b9b3d 100755 --- a/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm +++ b/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm @@ -6,7 +6,7 @@ // Copyright 2018 __LoSnoCo__. All rights reserved. // -#import +#import #import "OMPTContainer.h" #import "OMPTDecoder.h" diff --git a/Plugins/OpenMPT/OpenMPT/OMPTDecoder.h b/Plugins/OpenMPT/OpenMPT/OMPTDecoder.h index a1cc674ae..e2e783bd6 100755 --- a/Plugins/OpenMPT/OpenMPT/OMPTDecoder.h +++ b/Plugins/OpenMPT/OpenMPT/OMPTDecoder.h @@ -8,7 +8,7 @@ #import -#import +#import #include diff --git a/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm b/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm index 0a3aa4ca3..3bc47765f 100644 --- a/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm +++ b/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm @@ -9,7 +9,7 @@ #import "OMPTMetadataReader.h" #import "OMPTDecoder.h" -#import +#import #import "Logging.H" diff --git a/Plugins/Opus/Opus/Opus-Info.plist b/Plugins/Opus/Opus/OpusPlugin-Info.plist similarity index 100% rename from Plugins/Opus/Opus/Opus-Info.plist rename to Plugins/Opus/Opus/OpusPlugin-Info.plist diff --git a/Plugins/Opus/Opus/Opus-Prefix.pch b/Plugins/Opus/Opus/OpusPlugin-Prefix.pch similarity index 100% rename from Plugins/Opus/Opus/Opus-Prefix.pch rename to Plugins/Opus/Opus/OpusPlugin-Prefix.pch diff --git a/Plugins/Opus/Opus.xcodeproj/project.pbxproj b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj similarity index 85% rename from Plugins/Opus/Opus.xcodeproj/project.pbxproj rename to Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj index 2e2066cc4..332569104 100644 --- a/Plugins/Opus/Opus.xcodeproj/project.pbxproj +++ b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj @@ -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 = ""; }; - 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 = ""; }; + 8375B04717FFEA400092A79F /* OpusPlugin-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OpusPlugin-Info.plist"; sourceTree = ""; }; 8375B04917FFEA400092A79F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 8375B04B17FFEA400092A79F /* Opus-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Opus-Prefix.pch"; sourceTree = ""; }; + 8375B04B17FFEA400092A79F /* OpusPlugin-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpusPlugin-Prefix.pch"; sourceTree = ""; }; 8375B09017FFEABB0092A79F /* Opus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Opus.xcodeproj; path = ../../Frameworks/Opus/Opus.xcodeproj; sourceTree = ""; }; 8375B36A17FFF1CB0092A79F /* OpusDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpusDecoder.h; sourceTree = ""; }; 8375B36B17FFF1CB0092A79F /* OpusDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpusDecoder.m; sourceTree = ""; }; @@ -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 = ""; + }; 8375B03317FFEA400092A79F = { isa = PBXGroup; children = ( @@ -86,7 +94,7 @@ 8375B03D17FFEA400092A79F /* Products */ = { isa = PBXGroup; children = ( - 8375B03C17FFEA400092A79F /* Opus.bundle */, + 8375B03C17FFEA400092A79F /* OpusPlugin.bundle */, ); name = Products; sourceTree = ""; @@ -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 = ""; }; - 8375B09117FFEABB0092A79F /* Products */ = { - isa = PBXGroup; - children = ( - 8375B09617FFEABC0092A79F /* Opus.framework */, - ); - name = Products; - sourceTree = ""; - }; /* 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 */, diff --git a/Plugins/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme similarity index 83% rename from Plugins/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme rename to Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme index b3aab621a..4c83343a6 100644 --- a/Plugins/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme +++ b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "OpusPlugin.bundle" + BlueprintName = "OpusPlugin" + ReferencedContainer = "container:OpusPlugin.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "OpusPlugin.bundle" + BlueprintName = "OpusPlugin" + ReferencedContainer = "container:OpusPlugin.xcodeproj"> @@ -64,9 +64,9 @@ + BuildableName = "OpusPlugin.bundle" + BlueprintName = "OpusPlugin" + ReferencedContainer = "container:OpusPlugin.xcodeproj"> diff --git a/Plugins/Pls/Pls.xcodeproj/project.pbxproj b/Plugins/Pls/Pls.xcodeproj/project.pbxproj index 45481715a..827e1409a 100644 --- a/Plugins/Pls/Pls.xcodeproj/project.pbxproj +++ b/Plugins/Pls/Pls.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj index 8603a07ed..b6925b842 100644 --- a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj @@ -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; diff --git a/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj b/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj index c5b8328f2..6579d785a 100644 --- a/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj +++ b/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj @@ -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; }; diff --git a/Plugins/Syntrax/Syntrax.xcodeproj/project.pbxproj b/Plugins/Syntrax/Syntrax.xcodeproj/project.pbxproj index e8020d3ab..3880f8d69 100644 --- a/Plugins/Syntrax/Syntrax.xcodeproj/project.pbxproj +++ b/Plugins/Syntrax/Syntrax.xcodeproj/project.pbxproj @@ -268,7 +268,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; @@ -313,7 +313,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; }; diff --git a/Plugins/Syntrax/Syntrax/jxsContainer.m b/Plugins/Syntrax/Syntrax/jxsContainer.m index c128cf474..aaac18890 100755 --- a/Plugins/Syntrax/Syntrax/jxsContainer.m +++ b/Plugins/Syntrax/Syntrax/jxsContainer.m @@ -59,7 +59,7 @@ { ALog(@"Open failed for file: %@", [url absoluteString]); free(data); - return NO; + return nil; } free(data); @@ -69,7 +69,7 @@ { ALog(@"Failed to create Syntrax-c player for file: %@", [url absoluteString]); File_freeSong(synSong); - return NO; + return nil; } if (loadSong(synPlayer, synSong) < 0) @@ -77,7 +77,7 @@ ALog(@"Load failed for file: %@", [url absoluteString]); playerDestroy(synPlayer); File_freeSong(synSong); - return NO; + return nil; } NSMutableArray *tracks = [NSMutableArray array]; diff --git a/Plugins/Syntrax/Syntrax/jxsMetadataReader.m b/Plugins/Syntrax/Syntrax/jxsMetadataReader.m index 838b615b9..219487ef7 100644 --- a/Plugins/Syntrax/Syntrax/jxsMetadataReader.m +++ b/Plugins/Syntrax/Syntrax/jxsMetadataReader.m @@ -54,7 +54,7 @@ { ALog(@"Open failed for file: %@", [url absoluteString]); free(data); - return NO; + return nil; } free(data); @@ -64,7 +64,7 @@ { ALog(@"Failed to create player for file: %@", [url absoluteString]); File_freeSong(synSong); - return NO; + return nil; } if (loadSong(synPlayer, synSong) < 0) @@ -72,7 +72,7 @@ ALog(@"Load failed for file: %@", [url absoluteString]); playerDestroy(synPlayer); File_freeSong(synSong); - return NO; + return nil; } int track_num; diff --git a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj index 1376d442d..ccd482a17 100644 --- a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj @@ -328,6 +328,7 @@ 1DEB913F08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; @@ -358,7 +359,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; @@ -369,6 +370,7 @@ 1DEB914008733D840010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; @@ -397,7 +399,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; diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj similarity index 81% rename from Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj rename to Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj index 295877a68..4d589dd25 100644 --- a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj +++ b/Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj @@ -8,47 +8,47 @@ /* Begin PBXBuildFile section */ 17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */; }; - 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 83E301AD1E932D4B009E2655 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; }; + 833765A320E4EF1F007287F6 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83172ABB20E4EF0100751437 /* Vorbis.framework */; }; + 833765A420E4EF29007287F6 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83172ABB20E4EF0100751437 /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 17F562F60C3BDAAC0019975C /* PBXContainerItemProxy */ = { + 83172ABA20E4EF0100751437 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteGlobalIDString = 730F23F1091827B100AB638C; remoteInfo = Vorbis; }; - 17F562FA0C3BDAC10019975C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 730F23A1091827B100AB638C; - remoteInfo = Vorbis; - }; - 83EC071B1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */ = { + 83172ABC20E4EF0100751437 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; proxyType = 2; remoteGlobalIDString = 738835E40B18F870005C7A69; remoteInfo = "libvorbis (static)"; }; - 83EC071D1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */ = { + 83172ABE20E4EF0100751437 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; proxyType = 2; remoteGlobalIDString = 738836130B190488005C7A69; remoteInfo = "libvorbisenc (static)"; }; - 83EC071F1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */ = { + 83172AC020E4EF0100751437 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; proxyType = 2; remoteGlobalIDString = 738836220B1905E5005C7A69; remoteInfo = "libvorbisfile (static)"; }; + 8337659C20E4EF14007287F6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 730F23A1091827B100AB638C; + remoteInfo = Vorbis; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -58,7 +58,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */, + 833765A420E4EF29007287F6 /* Vorbis.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,9 +72,9 @@ 17C93D330B8FDA66008627D6 /* VorbisDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisDecoder.h; sourceTree = ""; }; 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisDecoder.m; sourceTree = ""; }; 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = ../../Frameworks/Vorbis/macosx/Vorbis.xcodeproj; sourceTree = SOURCE_ROOT; }; - 32DBCF630370AF2F00C91783 /* Vorbis_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vorbis_Prefix.pch; sourceTree = ""; }; + 32DBCF630370AF2F00C91783 /* VorbisPlugin_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VorbisPlugin_Prefix.pch; sourceTree = ""; }; 8384913418081A3900E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = ""; }; - 8D5B49B6048680CD000E48DA /* Vorbis.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Vorbis.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D5B49B6048680CD000E48DA /* VorbisPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VorbisPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -84,7 +84,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 83E301AD1E932D4B009E2655 /* Vorbis.framework in Frameworks */, + 833765A320E4EF1F007287F6 /* Vorbis.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -100,6 +100,7 @@ 089C167CFE841241C02AAC07 /* Resources */, 089C1671FE841209C02AAC07 /* Frameworks and Libraries */, 19C28FB8FE9D52D311CA2CBB /* Products */, + 833765A220E4EF1F007287F6 /* Frameworks */, ); name = Vorbis; sourceTree = ""; @@ -151,21 +152,10 @@ name = "Other Frameworks"; sourceTree = ""; }; - 17F562F00C3BDAAC0019975C /* Products */ = { - isa = PBXGroup; - children = ( - 17F562F70C3BDAAC0019975C /* Vorbis.framework */, - 83EC071C1ABA7FCD00F0DEF7 /* libvorbis.a */, - 83EC071E1ABA7FCD00F0DEF7 /* libvorbisenc.a */, - 83EC07201ABA7FCD00F0DEF7 /* libvorbisfile.a */, - ); - name = Products; - sourceTree = ""; - }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D5B49B6048680CD000E48DA /* Vorbis.bundle */, + 8D5B49B6048680CD000E48DA /* VorbisPlugin.bundle */, ); name = Products; sourceTree = ""; @@ -173,17 +163,35 @@ 32C88E010371C26100C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - 32DBCF630370AF2F00C91783 /* Vorbis_Prefix.pch */, + 32DBCF630370AF2F00C91783 /* VorbisPlugin_Prefix.pch */, ); name = "Other Sources"; sourceTree = ""; }; + 83172AB420E4EF0100751437 /* Products */ = { + isa = PBXGroup; + children = ( + 83172ABB20E4EF0100751437 /* Vorbis.framework */, + 83172ABD20E4EF0100751437 /* libvorbis.a */, + 83172ABF20E4EF0100751437 /* libvorbisenc.a */, + 83172AC120E4EF0100751437 /* libvorbisfile.a */, + ); + name = Products; + sourceTree = ""; + }; + 833765A220E4EF1F007287F6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* Vorbis Plugin */ = { + 8D5B49AC048680CD000E48DA /* VorbisPlugin Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Plugin" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "VorbisPlugin Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -194,12 +202,12 @@ buildRules = ( ); dependencies = ( - 17F562FB0C3BDAC10019975C /* PBXTargetDependency */, + 8337659D20E4EF14007287F6 /* PBXTargetDependency */, ); - name = "Vorbis Plugin"; + name = "VorbisPlugin Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = Vorbis; - productReference = 8D5B49B6048680CD000E48DA /* Vorbis.bundle */; + productReference = 8D5B49B6048680CD000E48DA /* VorbisPlugin.bundle */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -216,7 +224,7 @@ }; }; }; - buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Vorbis" */; + buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "VorbisPlugin" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -227,44 +235,44 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 17F562F00C3BDAAC0019975C /* Products */; + ProductGroup = 83172AB420E4EF0100751437 /* Products */; ProjectRef = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; }, ); projectRoot = ""; targets = ( - 8D5B49AC048680CD000E48DA /* Vorbis Plugin */, + 8D5B49AC048680CD000E48DA /* VorbisPlugin Plugin */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 17F562F70C3BDAAC0019975C /* Vorbis.framework */ = { + 83172ABB20E4EF0100751437 /* Vorbis.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Vorbis.framework; - remoteRef = 17F562F60C3BDAAC0019975C /* PBXContainerItemProxy */; + remoteRef = 83172ABA20E4EF0100751437 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 83EC071C1ABA7FCD00F0DEF7 /* libvorbis.a */ = { + 83172ABD20E4EF0100751437 /* libvorbis.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libvorbis.a; - remoteRef = 83EC071B1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */; + remoteRef = 83172ABC20E4EF0100751437 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 83EC071E1ABA7FCD00F0DEF7 /* libvorbisenc.a */ = { + 83172ABF20E4EF0100751437 /* libvorbisenc.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libvorbisenc.a; - remoteRef = 83EC071D1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */; + remoteRef = 83172ABE20E4EF0100751437 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 83EC07201ABA7FCD00F0DEF7 /* libvorbisfile.a */ = { + 83172AC120E4EF0100751437 /* libvorbisfile.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libvorbisfile.a; - remoteRef = 83EC071F1ABA7FCD00F0DEF7 /* PBXContainerItemProxy */; + remoteRef = 83172AC020E4EF0100751437 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -285,14 +293,15 @@ buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( ); outputPaths = ( - "$(CONFIGURATION_BUILD_DIR)/Vorbis.bundle/Contents/MacOS/Vorbis", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "install_name_tool -change @loader_path/Frameworks/Vorbis.framework/Versions/A/Vorbis @loader_path/../Frameworks/Vorbis.framework/Versions/A/Vorbis \"${CONFIGURATION_BUILD_DIR}/Vorbis.bundle/Contents/MacOS/Vorbis\""; + shellScript = "install_name_tool -change @loader_path/Frameworks/Vorbis.framework/Versions/A/Vorbis @loader_path/../Frameworks/Vorbis.framework/Versions/A/Vorbis \"${CONFIGURATION_BUILD_DIR}/VorbisPlugin.bundle/Contents/MacOS/VorbisPlugin\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -308,10 +317,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 17F562FB0C3BDAC10019975C /* PBXTargetDependency */ = { + 8337659D20E4EF14007287F6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Vorbis; - targetProxy = 17F562FA0C3BDAC10019975C /* PBXContainerItemProxy */; + targetProxy = 8337659C20E4EF14007287F6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -331,12 +340,12 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Vorbis_Prefix.pch; + GCC_PREFIX_HEADER = VorbisPlugin_Prefix.pch; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; PRODUCT_BUNDLE_IDENTIFIER = org.cogx.vorbis; - PRODUCT_NAME = Vorbis; + PRODUCT_NAME = VorbisPlugin; SDKROOT = macosx; SKIP_INSTALL = YES; WRAPPER_EXTENSION = bundle; @@ -354,12 +363,12 @@ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Vorbis_Prefix.pch; + GCC_PREFIX_HEADER = VorbisPlugin_Prefix.pch; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; PRODUCT_BUNDLE_IDENTIFIER = org.cogx.vorbis; - PRODUCT_NAME = Vorbis; + PRODUCT_NAME = VorbisPlugin; SDKROOT = macosx; SKIP_INSTALL = YES; WRAPPER_EXTENSION = bundle; @@ -369,6 +378,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; @@ -398,7 +408,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; @@ -409,6 +419,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; @@ -436,7 +447,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; @@ -446,7 +457,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Plugin" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "VorbisPlugin Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, @@ -455,7 +466,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Vorbis" */ = { + 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "VorbisPlugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913F08733D840010E9CD /* Debug */, diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme similarity index 82% rename from Plugins/Vorbis/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme rename to Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme index 3826a8fad..dc0bb16c7 100644 --- a/Plugins/Vorbis/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme +++ b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "VorbisPlugin.bundle" + BlueprintName = "VorbisPlugin Plugin" + ReferencedContainer = "container:VorbisPlugin.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "VorbisPlugin.bundle" + BlueprintName = "VorbisPlugin Plugin" + ReferencedContainer = "container:VorbisPlugin.xcodeproj"> @@ -64,9 +64,9 @@ + BuildableName = "VorbisPlugin.bundle" + BlueprintName = "VorbisPlugin Plugin" + ReferencedContainer = "container:VorbisPlugin.xcodeproj"> diff --git a/Plugins/Vorbis/Vorbis_Prefix.pch b/Plugins/Vorbis/VorbisPlugin_Prefix.pch similarity index 100% rename from Plugins/Vorbis/Vorbis_Prefix.pch rename to Plugins/Vorbis/VorbisPlugin_Prefix.pch diff --git a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj index dc5e9e42c..fa40e2999 100644 --- a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj +++ b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj @@ -309,6 +309,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; @@ -338,7 +339,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; @@ -349,6 +350,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; @@ -376,7 +378,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; diff --git a/Plugins/sidplay/SidContainer.mm b/Plugins/sidplay/SidContainer.mm index 0c08e6edf..432dd5c31 100755 --- a/Plugins/sidplay/SidContainer.mm +++ b/Plugins/sidplay/SidContainer.mm @@ -51,7 +51,7 @@ void * data = malloc(size); [source read:data amount:size]; - SidTune * tune = new SidTune( (const uint_least8_t*)data, size ); + SidTune * tune = new SidTune( (const uint_least8_t*)data, (uint_least32_t) size ); if (!tune->getStatus()) return 0; diff --git a/Plugins/sidplay/sidplay.xcodeproj/project.pbxproj b/Plugins/sidplay/sidplay.xcodeproj/project.pbxproj index 1617fa05b..604845c96 100644 --- a/Plugins/sidplay/sidplay.xcodeproj/project.pbxproj +++ b/Plugins/sidplay/sidplay.xcodeproj/project.pbxproj @@ -283,7 +283,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; @@ -329,7 +329,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; }; diff --git a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj index 12b9f5b15..f866abf21 100644 --- a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj +++ b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj @@ -11,19 +11,26 @@ 836F6B1418BDB80D0095E648 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836F6B1318BDB80D0095E648 /* Cocoa.framework */; }; 836F6B1E18BDB80D0095E648 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 836F6B1C18BDB80D0095E648 /* InfoPlist.strings */; }; 836F705C18BDC40E0095E648 /* VGMDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 836F705B18BDC40E0095E648 /* VGMDecoder.m */; }; - 836F705D18BDC4580095E648 /* vgmstream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836F6B6D18BDB8890095E648 /* vgmstream.framework */; }; - 836F705F18BDC47F0095E648 /* vgmstream.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 836F6B6D18BDB8890095E648 /* vgmstream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 83AA5D2D1F6E30080020821C /* VGMInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 83AA5D281F6E30080020821C /* VGMInterface.m */; }; 83AA5D2E1F6E30080020821C /* VGMContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 83AA5D2A1F6E30080020821C /* VGMContainer.m */; }; + 83C2806720E4ED3500823BF9 /* libvgmstream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8394628720E4EC8300B45CEA /* libvgmstream.framework */; }; + 83C2806820E4ED3D00823BF9 /* libvgmstream.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8394628720E4EC8300B45CEA /* libvgmstream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 836F6B6C18BDB8890095E648 /* PBXContainerItemProxy */ = { + 8394628620E4EC8300B45CEA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 836F6B6718BDB8880095E648 /* vgmstream.xcodeproj */; + containerPortal = 836F6B6718BDB8880095E648 /* libvgmstream.xcodeproj */; proxyType = 2; remoteGlobalIDString = 836F6B3918BDB8880095E648; - remoteInfo = vgmstream; + remoteInfo = libvgmstream; + }; + 83C2806420E4ED2B00823BF9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 836F6B6718BDB8880095E648 /* libvgmstream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 836F6B3818BDB8880095E648; + remoteInfo = libvgmstream; }; /* End PBXContainerItemProxy section */ @@ -34,7 +41,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 836F705F18BDC47F0095E648 /* vgmstream.framework in CopyFiles */, + 83C2806820E4ED3D00823BF9 /* libvgmstream.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -52,7 +59,7 @@ 836F6B1B18BDB80D0095E648 /* vgmstream-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "vgmstream-Info.plist"; sourceTree = ""; }; 836F6B1D18BDB80D0095E648 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 836F6B1F18BDB80D0095E648 /* vgmstream-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "vgmstream-Prefix.pch"; sourceTree = ""; }; - 836F6B6718BDB8880095E648 /* vgmstream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = vgmstream.xcodeproj; path = ../../Frameworks/vgmstream/vgmstream.xcodeproj; sourceTree = ""; }; + 836F6B6718BDB8880095E648 /* libvgmstream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libvgmstream.xcodeproj; path = ../../Frameworks/vgmstream/libvgmstream.xcodeproj; sourceTree = ""; }; 836F705A18BDC40E0095E648 /* VGMDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VGMDecoder.h; sourceTree = ""; }; 836F705B18BDC40E0095E648 /* VGMDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VGMDecoder.m; sourceTree = ""; }; 836F706018BDC84D0095E648 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = ""; }; @@ -69,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 836F705D18BDC4580095E648 /* vgmstream.framework in Frameworks */, + 83C2806720E4ED3500823BF9 /* libvgmstream.framework in Frameworks */, 836F6B1418BDB80D0095E648 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -99,7 +106,7 @@ children = ( 836F6B1318BDB80D0095E648 /* Cocoa.framework */, 836F6B1518BDB80D0095E648 /* Other Frameworks */, - 836F6B6718BDB8880095E648 /* vgmstream.xcodeproj */, + 836F6B6718BDB8880095E648 /* libvgmstream.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -143,10 +150,10 @@ name = "Supporting Files"; sourceTree = ""; }; - 836F6B6818BDB8880095E648 /* Products */ = { + 8394628320E4EC8300B45CEA /* Products */ = { isa = PBXGroup; children = ( - 836F6B6D18BDB8890095E648 /* vgmstream.framework */, + 8394628720E4EC8300B45CEA /* libvgmstream.framework */, ); name = Products; sourceTree = ""; @@ -166,6 +173,7 @@ buildRules = ( ); dependencies = ( + 83C2806520E4ED2B00823BF9 /* PBXTargetDependency */, ); name = vgmstream; productName = vgmstream; @@ -199,8 +207,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 836F6B6818BDB8880095E648 /* Products */; - ProjectRef = 836F6B6718BDB8880095E648 /* vgmstream.xcodeproj */; + ProductGroup = 8394628320E4EC8300B45CEA /* Products */; + ProjectRef = 836F6B6718BDB8880095E648 /* libvgmstream.xcodeproj */; }, ); projectRoot = ""; @@ -211,11 +219,11 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 836F6B6D18BDB8890095E648 /* vgmstream.framework */ = { + 8394628720E4EC8300B45CEA /* libvgmstream.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = vgmstream.framework; - remoteRef = 836F6B6C18BDB8890095E648 /* PBXContainerItemProxy */; + path = libvgmstream.framework; + remoteRef = 8394628620E4EC8300B45CEA /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -245,6 +253,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 83C2806520E4ED2B00823BF9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libvgmstream; + targetProxy = 83C2806420E4ED2B00823BF9 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 836F6B1C18BDB80D0095E648 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -310,7 +326,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, ../Vorbis/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -362,7 +378,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, ../Vorbis/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.8; SDKROOT = macosx; }; name = Release; @@ -382,7 +398,7 @@ ); INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.vgmstream"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -405,7 +421,7 @@ ); INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = "NoWork-Inc.vgmstream"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; diff --git a/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme b/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme index e9bcbd770..fb5af074b 100644 --- a/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme +++ b/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "vgmstreamPlugin.bundle" + BlueprintName = "vgmstreamPlugin" + ReferencedContainer = "container:vgmstreamPlugin.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "vgmstreamPlugin.bundle" + BlueprintName = "vgmstreamPlugin" + ReferencedContainer = "container:vgmstreamPlugin.xcodeproj"> @@ -64,9 +64,9 @@ + BuildableName = "vgmstreamPlugin.bundle" + BlueprintName = "vgmstreamPlugin" + ReferencedContainer = "container:vgmstreamPlugin.xcodeproj"> diff --git a/Plugins/vgmstream/vgmstream/VGMDecoder.h b/Plugins/vgmstream/vgmstream/VGMDecoder.h index 4658e9d19..c7c206e1e 100644 --- a/Plugins/vgmstream/vgmstream/VGMDecoder.h +++ b/Plugins/vgmstream/vgmstream/VGMDecoder.h @@ -8,8 +8,8 @@ #import -#import -#import +#import +#import #import "Plugin.h" diff --git a/Plugins/vgmstream/vgmstream/VGMInterface.h b/Plugins/vgmstream/vgmstream/VGMInterface.h index 909dd1448..3be257bf8 100644 --- a/Plugins/vgmstream/vgmstream/VGMInterface.h +++ b/Plugins/vgmstream/vgmstream/VGMInterface.h @@ -6,7 +6,7 @@ // Copyright 2017 __LoSnoCo__. All rights reserved. // -#import +#import typedef struct _COGSTREAMFILE { STREAMFILE sf; diff --git a/Preferences/General/English.lproj/Preferences.xib b/Preferences/General/Base.lproj/Preferences.xib similarity index 100% rename from Preferences/General/English.lproj/Preferences.xib rename to Preferences/General/Base.lproj/Preferences.xib diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj index f0fedb7d9..d3b4cf3be 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/General/General.xcodeproj/project.pbxproj @@ -96,7 +96,6 @@ 17D1B3F60F6349CE00694C57 /* PreferencePanePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencePanePlugin.h; path = ../PreferencePanePlugin.h; sourceTree = SOURCE_ROOT; }; 17E41DB50C130A9D00AC744D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; 17E78A7D0D68BE3C005C5A59 /* file_tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_tree.png; path = Icons/file_tree.png; sourceTree = ""; }; - 17E78B690D68C1E3005C5A59 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = ""; }; 32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = ""; }; 833F681A1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/Preferences.xib; sourceTree = ""; }; 833F681B1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -112,6 +111,7 @@ 83B06727180D85B8008E3612 /* MIDIPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MIDIPane.h; sourceTree = ""; }; 83B06728180D85B8008E3612 /* MIDIPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MIDIPane.m; sourceTree = ""; }; 83B0672A180D8B39008E3612 /* midi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = midi.png; path = Icons/midi.png; sourceTree = ""; }; + 83BC5AB320E4C90F00631CD4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Preferences.xib; sourceTree = ""; }; 83DFEA091CBC94DE00BCC565 /* MIDIFlavorBehaviorArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MIDIFlavorBehaviorArrayController.h; sourceTree = ""; }; 83DFEA0A1CBC94DE00BCC565 /* MIDIFlavorBehaviorArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MIDIFlavorBehaviorArrayController.m; sourceTree = ""; }; 83EF495D17FBC96A00642E3C /* VolumeBehaviorArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VolumeBehaviorArrayController.h; sourceTree = ""; }; @@ -371,6 +371,7 @@ Greek, zh_CN, es, + Base, ); mainGroup = 089C166AFE841209C02AAC07 /* General */; projectDirPath = ""; @@ -481,8 +482,8 @@ 17E78B680D68C1E3005C5A59 /* Preferences.xib */ = { isa = PBXVariantGroup; children = ( - 17E78B690D68C1E3005C5A59 /* English */, 833F681A1CDBCAA700AFB9F0 /* es */, + 83BC5AB320E4C90F00631CD4 /* Base */, ); name = Preferences.xib; sourceTree = ""; @@ -530,6 +531,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; @@ -560,7 +562,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_LDFLAGS = ( "-undefined", @@ -575,6 +577,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; @@ -603,7 +606,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_LDFLAGS = ( "-undefined", dynamic_lookup, diff --git a/ThirdParty/GCWindowMenu/GCWindowMenu.m b/ThirdParty/GCWindowMenu/GCWindowMenu.m index 2bb84f15b..0aac88f44 100644 --- a/ThirdParty/GCWindowMenu/GCWindowMenu.m +++ b/ThirdParty/GCWindowMenu/GCWindowMenu.m @@ -213,7 +213,7 @@ ///******************************************************************************************************************** - (id) initWithContentRect:(NSRect) contentRect - styleMask:(NSUInteger) styleMask + styleMask:(NSWindowStyleMask) styleMask backing:(NSBackingStoreType) bufferingType defer:(BOOL) deferCreation { diff --git a/ThirdParty/OpenURLPanel/OpenURLPanel.m b/ThirdParty/OpenURLPanel/OpenURLPanel.m index cb6593f3e..2f4921afe 100755 --- a/ThirdParty/OpenURLPanel/OpenURLPanel.m +++ b/ThirdParty/OpenURLPanel/OpenURLPanel.m @@ -232,10 +232,12 @@ typedef id (*myIMP)(id, SEL, ...); mDelegate = delegate; mDidEndSelector = (didEndSelector); mContextInfo = contextInfo; + + NSArray *objects; // load the bundle (if necessary) if (mPanel == nil) - [NSBundle loadNibNamed:@"OpenURLPanel" owner:self]; + [[NSBundle mainBundle] loadNibNamed:@"OpenURLPanel" owner:self topLevelObjects:&objects]; // start the sheet (or window) [NSApp beginSheet:mPanel modalForWindow:window modalDelegate:nil didEndSelector:nil contextInfo:nil]; diff --git a/Utils/SideViewController.m b/Utils/SideViewController.m index 6ec64799a..061abd53c 100644 --- a/Utils/SideViewController.m +++ b/Utils/SideViewController.m @@ -206,5 +206,17 @@ [[NSUserDefaults standardUserDefaults] setFloat:position forKey:[self sideViewDividerPositionDefaultsKey]]; } +// placeholders, implemented by subclass +- (void)doAddToPlaylist:(NSArray *)urls origin:(URLOrigin)origin +{ +} + +- (void)clear:(id)sender +{ +} + +- (void)playPauseResume:(id)sender +{ +} @end diff --git a/Utils/TrackingCell.m b/Utils/TrackingCell.m index 7fc51b74b..7e8878c6b 100644 --- a/Utils/TrackingCell.m +++ b/Utils/TrackingCell.m @@ -12,7 +12,7 @@ - (BOOL)continueTracking:(NSPoint)lastPoint at:(NSPoint)currentPoint inView:(NSView *)controlView { - NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDragged location:currentPoint modifierFlags:NSLeftMouseDown timestamp:0 windowNumber:[[controlView window] windowNumber] context:nil eventNumber:0 clickCount:0 pressure:0]; + NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged location:currentPoint modifierFlags:0 timestamp:0 windowNumber:[[controlView window] windowNumber] context:nil eventNumber:0 clickCount:0 pressure:0]; [controlView mouseDragged:event]; diff --git a/Window/DualWindow.m b/Window/DualWindow.m index 23ca3aad9..71879d007 100644 --- a/Window/DualWindow.m +++ b/Window/DualWindow.m @@ -11,7 +11,7 @@ @implementation DualWindow -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation]; if (self) diff --git a/Window/MainWindow.m b/Window/MainWindow.m index 404741442..15b274836 100644 --- a/Window/MainWindow.m +++ b/Window/MainWindow.m @@ -11,7 +11,7 @@ @implementation MainWindow -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation]; if (self) diff --git a/Window/MiniWindow.m b/Window/MiniWindow.m index 999df0822..439be85ff 100644 --- a/Window/MiniWindow.m +++ b/Window/MiniWindow.m @@ -11,7 +11,7 @@ @implementation MiniWindow -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation]; if (self) diff --git a/Window/RepeatTransformers.m b/Window/RepeatTransformers.m index 680faa457..d5ac8a8ac 100644 --- a/Window/RepeatTransformers.m +++ b/Window/RepeatTransformers.m @@ -71,7 +71,7 @@ if (value == nil) return nil; - RepeatMode mode = [value integerValue]; + RepeatMode mode = (RepeatMode) [value integerValue]; if (mode == RepeatNone) { return [NSImage imageNamed:@"repeatModeOffTemplate"]; diff --git a/en.lproj/Feedback.strings b/en.lproj/Feedback.strings new file mode 100644 index 000000000..7849c8d7e --- /dev/null +++ b/en.lproj/Feedback.strings @@ -0,0 +1,18 @@ + +/* Class = "NSWindow"; title = "Send Feedback"; ObjectID = "1"; */ +"1.title" = "Send Feedback"; + +/* Class = "NSButtonCell"; title = "Send"; ObjectID = "17"; */ +"17.title" = "Send"; + +/* Class = "NSTextFieldCell"; title = "Subject:"; ObjectID = "18"; */ +"18.title" = "Subject:"; + +/* Class = "NSTextFieldCell"; title = "Message:"; ObjectID = "19"; */ +"19.title" = "Message:"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "20"; */ +"20.title" = "Cancel"; + +/* Class = "NSTextFieldCell"; title = "Email:"; ObjectID = "22"; */ +"22.title" = "Email:"; diff --git a/en.lproj/FileTree.strings b/en.lproj/FileTree.strings new file mode 100644 index 000000000..5e90ea13b --- /dev/null +++ b/en.lproj/FileTree.strings @@ -0,0 +1,21 @@ + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "71"; */ +"71.title" = "Text Cell"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "110"; */ +"110.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "112"; */ +"112.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Add to Playlist"; ObjectID = "119"; */ +"119.title" = "Add to Playlist"; + +/* Class = "NSMenuItem"; title = "Set as Root"; ObjectID = "124"; */ +"124.title" = "Set as Root"; + +/* Class = "NSMenuItem"; title = "Set as Playlist"; ObjectID = "129"; */ +"129.title" = "Set as Playlist"; + +/* Class = "NSBox"; title = "Box"; ObjectID = "147"; */ +"147.title" = "Box"; diff --git a/en.lproj/InfoInspector.strings b/en.lproj/InfoInspector.strings new file mode 100644 index 000000000..b801f1316 --- /dev/null +++ b/en.lproj/InfoInspector.strings @@ -0,0 +1,75 @@ + +/* Class = "NSWindow"; title = "Info Inspector"; ObjectID = "1"; */ +"1.title" = "Info Inspector"; + +/* Class = "NSTextFieldCell"; title = "Artist:"; ObjectID = "10"; */ +"10.title" = "Artist:"; + +/* Class = "NSTextFieldCell"; title = "Album:"; ObjectID = "12"; */ +"12.title" = "Album:"; + +/* Class = "NSTextFieldCell"; title = "Track:"; ObjectID = "14"; */ +"14.title" = "Track:"; + +/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "16"; */ +"16.title" = "Length:"; + +/* Class = "NSTextFieldCell"; title = "Year:"; ObjectID = "18"; */ +"18.title" = "Year:"; + +/* Class = "NSTextFieldCell"; title = "Genre:"; ObjectID = "20"; */ +"20.title" = "Genre:"; + +/* Class = "NSTextFieldCell"; title = "Sample Rate:"; ObjectID = "22"; */ +"22.title" = "Sample Rate:"; + +/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "24"; */ +"24.title" = "Title:"; + +/* Class = "NSTextFieldCell"; title = "Channels:"; ObjectID = "28"; */ +"28.title" = "Channels:"; + +/* Class = "NSTextFieldCell"; title = "Bits Per Sample:"; ObjectID = "31"; */ +"31.title" = "Bits Per Sample:"; + +/* Class = "NSTextFieldCell"; title = "Bitrate:"; ObjectID = "32"; */ +"32.title" = "Bitrate:"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "34"; */ +"34.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "36"; */ +"36.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "38"; */ +"38.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "40"; */ +"40.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "42"; */ +"42.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "44"; */ +"44.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "46"; */ +"46.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "50"; */ +"50.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "52"; */ +"52.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "54"; */ +"54.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "56"; */ +"56.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "Filename:"; ObjectID = "85"; */ +"85.title" = "Filename:"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "87"; */ +"87.title" = "N/A"; diff --git a/en.lproj/MainMenu.strings b/en.lproj/MainMenu.strings new file mode 100644 index 000000000..6b7eee521 --- /dev/null +++ b/en.lproj/MainMenu.strings @@ -0,0 +1,624 @@ + +/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */ +"5.title" = "Bring All to Front"; + +/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */ +"19.title" = "Window"; + +/* Class = "NSWindow"; title = "Cog"; ObjectID = "21"; */ +"21.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */ +"23.title" = "Minimize"; + +/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */ +"24.title" = "Window"; + +/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */ +"29.title" = "MainMenu"; + +/* Class = "NSMenuItem"; title = "Cog"; ObjectID = "56"; */ +"56.title" = "Cog"; + +/* Class = "NSMenu"; title = "Cog"; ObjectID = "57"; */ +"57.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "About Cog"; ObjectID = "58"; */ +"58.title" = "About Cog"; + +/* Class = "NSMenuItem"; title = "Add File..."; ObjectID = "72"; */ +"72.title" = "Add File..."; + +/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "73"; */ +"73.title" = "Close Window"; + +/* Class = "NSMenuItem"; title = "Save As..."; ObjectID = "75"; */ +"75.title" = "Save As..."; + +/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */ +"81.title" = "File"; + +/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */ +"83.title" = "File"; + +/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */ +"103.title" = "Help"; + +/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */ +"106.title" = "Help"; + +/* Class = "NSMenuItem"; title = "Cog Help"; ObjectID = "111"; */ +"111.title" = "Cog Help"; + +/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */ +"129.title" = "Preferences…"; + +/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */ +"130.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */ +"131.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Hide Cog"; ObjectID = "134"; */ +"134.title" = "Hide Cog"; + +/* Class = "NSMenuItem"; title = "Quit Cog"; ObjectID = "136"; */ +"136.title" = "Quit Cog"; + +/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */ +"145.title" = "Hide Others"; + +/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */ +"150.title" = "Show All"; + +/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "157"; */ +"157.title" = "Copy"; + +/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "158"; */ +"158.title" = "Undo"; + +/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "160"; */ +"160.title" = "Cut"; + +/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "163"; */ +"163.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "164"; */ +"164.title" = "Delete"; + +/* Class = "NSMenu"; title = "Edit"; ObjectID = "169"; */ +"169.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "171"; */ +"171.title" = "Paste"; + +/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "172"; */ +"172.title" = "Select All"; + +/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "173"; */ +"173.title" = "Redo"; + +/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */ +"197.title" = "Zoom"; + +/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "208"; */ +"208.headerCell.title" = "Title"; + +/* Class = "NSTableColumn"; headerCell.title = "#"; ObjectID = "209"; */ +"209.headerCell.title" = "#"; + +/* Class = "NSMenuItem"; title = "Check for Updates..."; ObjectID = "302"; */ +"302.title" = "Check for Updates..."; + +/* Class = "NSMenuItem"; title = "Send Feedback..."; ObjectID = "303"; */ +"303.title" = "Send Feedback..."; + +/* Class = "NSTableColumn"; headerCell.title = "Artist"; ObjectID = "391"; */ +"391.headerCell.title" = "Artist"; + +/* Class = "NSMenuItem"; title = "Control"; ObjectID = "418"; */ +"418.title" = "Control"; + +/* Class = "NSMenu"; title = "Control"; ObjectID = "419"; */ +"419.title" = "Control"; + +/* Class = "NSMenuItem"; title = "Play/Pause"; ObjectID = "420"; */ +"420.title" = "Play/Pause"; + +/* Class = "NSMenuItem"; title = "Next Song"; ObjectID = "422"; */ +"422.title" = "Next Song"; + +/* Class = "NSMenuItem"; title = "Previous Song"; ObjectID = "423"; */ +"423.title" = "Previous Song"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "513"; */ +"513.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Stop"; ObjectID = "517"; */ +"517.title" = "Stop"; + +/* Class = "NSMenuItem"; title = "Next Track"; ObjectID = "518"; */ +"518.title" = "Next Track"; + +/* Class = "NSMenuItem"; title = "Previous Track"; ObjectID = "519"; */ +"519.title" = "Previous Track"; + +/* Class = "NSMenuItem"; title = "Play/Pause"; ObjectID = "520"; */ +"520.title" = "Play/Pause"; + +/* Class = "NSMenuItem"; title = "Cog"; ObjectID = "702"; */ +"702.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "Support Cog..."; ObjectID = "751"; */ +"751.title" = "Support Cog..."; + +/* Class = "NSMenuItem"; title = "Current Song"; ObjectID = "791"; */ +"791.title" = "Current Song"; + +/* Class = "NSTableColumn"; headerCell.title = "Album"; ObjectID = "806"; */ +"806.headerCell.title" = "Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Length"; ObjectID = "807"; */ +"807.headerCell.title" = "Length"; + +/* Class = "NSTableColumn"; headerCell.title = "Year"; ObjectID = "848"; */ +"848.headerCell.title" = "Year"; + +/* Class = "NSTableColumn"; headerCell.title = "Genre"; ObjectID = "849"; */ +"849.headerCell.title" = "Genre"; + +/* Class = "NSTableColumn"; headerCell.title = "№"; ObjectID = "850"; */ +"850.headerCell.title" = "№"; + +/* Class = "NSMenuItem"; title = "Playlist"; ObjectID = "881"; */ +"881.title" = "Playlist"; + +/* Class = "NSMenu"; title = "Playlist"; ObjectID = "882"; */ +"882.title" = "Playlist"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "1063"; */ +"1063.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "1064"; */ +"1064.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Show All Songs"; ObjectID = "1132"; */ +"1132.title" = "Show All Songs"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "1135"; */ +"1135.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Volume Up"; ObjectID = "1136"; */ +"1136.title" = "Volume Up"; + +/* Class = "NSMenuItem"; title = "Volume Down"; ObjectID = "1137"; */ +"1137.title" = "Volume Down"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "1324"; */ +"1324.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Index"; ObjectID = "1337"; */ +"1337.title" = "Index"; + +/* Class = "NSMenuItem"; title = "Title"; ObjectID = "1338"; */ +"1338.title" = "Title"; + +/* Class = "NSMenuItem"; title = "Artist"; ObjectID = "1339"; */ +"1339.title" = "Artist"; + +/* Class = "NSMenuItem"; title = "Album"; ObjectID = "1340"; */ +"1340.title" = "Album"; + +/* Class = "NSMenuItem"; title = "Genre"; ObjectID = "1341"; */ +"1341.title" = "Genre"; + +/* Class = "NSMenuItem"; title = "Length"; ObjectID = "1342"; */ +"1342.title" = "Length"; + +/* Class = "NSMenuItem"; title = "Track"; ObjectID = "1343"; */ +"1343.title" = "Track"; + +/* Class = "NSMenuItem"; title = "Year"; ObjectID = "1344"; */ +"1344.title" = "Year"; + +/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "1360"; */ +"1360.title" = "Remove"; + +/* Class = "NSMenuItem"; title = "Stop"; ObjectID = "1362"; */ +"1362.title" = "Stop"; + +/* Class = "NSMenuItem"; title = "Remove All"; ObjectID = "1402"; */ +"1402.title" = "Remove All"; + +/* Class = "NSMenuItem"; title = "Add URL..."; ObjectID = "1403"; */ +"1403.title" = "Add URL..."; + +/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "1408"; */ +"1408.title" = "Remove"; + +/* Class = "NSMenuItem"; title = "Current Artist"; ObjectID = "1454"; */ +"1454.title" = "Current Artist"; + +/* Class = "NSTextFieldCell"; title = "Total Duration: 00 hours 00 minutes 00 seconds"; ObjectID = "1473"; */ +"1473.title" = "Total Duration: 00 hours 00 minutes 00 seconds"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1506"; */ +"1506.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1507"; */ +"1507.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1508"; */ +"1508.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1509"; */ +"1509.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1510"; */ +"1510.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1511"; */ +"1511.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1512"; */ +"1512.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1513"; */ +"1513.title" = "Text Cell"; + +/* Class = "NSSearchFieldCell"; placeholderString = "All"; ObjectID = "1532"; */ +"1532.placeholderString" = "All"; + +/* Class = "NSToolbarItem"; label = "Search"; ObjectID = "1533"; */ +"1533.label" = "Search"; + +/* Class = "NSToolbarItem"; paletteLabel = "Search"; ObjectID = "1533"; */ +"1533.paletteLabel" = "Search"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[0] = "Previous"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[0]" = "Previous"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[1] = "Play"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[1]" = "Play"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[2] = "Next"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[2]" = "Next"; + +/* Class = "NSToolbarItem"; label = "Playback Control"; ObjectID = "1539"; */ +"1539.label" = "Playback Control"; + +/* Class = "NSToolbarItem"; paletteLabel = "Playback Control"; ObjectID = "1539"; */ +"1539.paletteLabel" = "Playback Control"; + +/* Class = "NSToolbarItem"; label = "Position"; ObjectID = "1551"; */ +"1551.label" = "Position"; + +/* Class = "NSToolbarItem"; paletteLabel = "Position"; ObjectID = "1551"; */ +"1551.paletteLabel" = "Position"; + +/* Class = "NSTextFieldCell"; title = "0:00"; ObjectID = "1567"; */ +"1567.title" = "0:00"; + +/* Class = "NSToolbarItem"; label = "Current Time"; ObjectID = "1568"; */ +"1568.label" = "Current Time"; + +/* Class = "NSToolbarItem"; paletteLabel = "Current Time"; ObjectID = "1568"; */ +"1568.paletteLabel" = "Current Time"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "All"; ObjectID = "1576"; */ +"1576.ibShadowedDisplayName" = "All"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Title"; ObjectID = "1578"; */ +"1578.ibShadowedDisplayName" = "Title"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Artist"; ObjectID = "1580"; */ +"1580.ibShadowedDisplayName" = "Artist"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Album"; ObjectID = "1582"; */ +"1582.ibShadowedDisplayName" = "Album"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Genre"; ObjectID = "1583"; */ +"1583.ibShadowedDisplayName" = "Genre"; + +/* Class = "NSToolbarItem"; label = "Volume"; ObjectID = "1610"; */ +"1610.label" = "Volume"; + +/* Class = "NSToolbarItem"; paletteLabel = "Volume"; ObjectID = "1610"; */ +"1610.paletteLabel" = "Volume"; + +/* Class = "NSToolbarItem"; label = "Info Inspector"; ObjectID = "1629"; */ +"1629.label" = "Info Inspector"; + +/* Class = "NSToolbarItem"; paletteLabel = "Info Inspector"; ObjectID = "1629"; */ +"1629.paletteLabel" = "Info Inspector"; + +/* Class = "NSToolbarItem"; label = "File Tree"; ObjectID = "1630"; */ +"1630.label" = "File Tree"; + +/* Class = "NSToolbarItem"; paletteLabel = "File Tree"; ObjectID = "1630"; */ +"1630.paletteLabel" = "File Tree"; + +/* Class = "NSToolbarItem"; label = "Shuffle"; ObjectID = "1636"; */ +"1636.label" = "Shuffle"; + +/* Class = "NSToolbarItem"; paletteLabel = "Shuffle"; ObjectID = "1636"; */ +"1636.paletteLabel" = "Shuffle"; + +/* Class = "NSToolbarItem"; label = "Repeat"; ObjectID = "1639"; */ +"1639.label" = "Repeat"; + +/* Class = "NSToolbarItem"; paletteLabel = "Repeat"; ObjectID = "1639"; */ +"1639.paletteLabel" = "Repeat"; + +/* Class = "NSMenuItem"; title = "Seek Backward"; ObjectID = "1683"; */ +"1683.title" = "Seek Backward"; + +/* Class = "NSMenuItem"; title = "Seek Forward"; ObjectID = "1685"; */ +"1685.title" = "Seek Forward"; + +/* Class = "NSMenuItem"; title = "Previous Album"; ObjectID = "1699"; */ +"1699.title" = "Previous Album"; + +/* Class = "NSMenuItem"; title = "Next Album"; ObjectID = "1701"; */ +"1701.title" = "Next Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Path"; ObjectID = "1712"; */ +"1712.headerCell.title" = "Path"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1713"; */ +"1713.title" = "Text Cell"; + +/* Class = "NSTableColumn"; headerCell.title = "Filename"; ObjectID = "1736"; */ +"1736.headerCell.title" = "Filename"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1737"; */ +"1737.title" = "Text Cell"; + +/* Class = "NSMenuItem"; title = "Repeat"; ObjectID = "1740"; */ +"1740.title" = "Repeat"; + +/* Class = "NSMenu"; title = "Repeat"; ObjectID = "1741"; */ +"1741.title" = "Repeat"; + +/* Class = "NSMenuItem"; title = "All"; ObjectID = "1742"; */ +"1742.title" = "All"; + +/* Class = "NSMenuItem"; title = "One"; ObjectID = "1746"; */ +"1746.title" = "One"; + +/* Class = "NSMenuItem"; title = "None"; ObjectID = "1749"; */ +"1749.title" = "None"; + +/* Class = "NSMenuItem"; title = "Remove All from Queue"; ObjectID = "1791"; */ +"1791.title" = "Remove All from Queue"; + +/* Class = "NSMenuItem"; title = "Select Currently Playing"; ObjectID = "1823"; */ +"1823.title" = "Select Currently Playing"; + +/* Class = "NSMenuItem"; title = "Filter Playlist"; ObjectID = "1824"; */ +"1824.title" = "Filter Playlist"; + +/* Class = "NSMenuItem"; title = "View"; ObjectID = "1848"; */ +"1848.title" = "View"; + +/* Class = "NSMenu"; title = "View"; ObjectID = "1849"; */ +"1849.title" = "View"; + +/* Class = "NSMenuItem"; title = "Show Spotlight Panel"; ObjectID = "1853"; */ +"1853.title" = "Show Spotlight Panel"; + +/* Class = "NSMenuItem"; title = "Customize Toolbar..."; ObjectID = "1856"; */ +"1856.title" = "Customize Toolbar..."; + +/* Class = "NSMenuItem"; title = "Increase Font Size"; ObjectID = "1858"; */ +"1858.title" = "Increase Font Size"; + +/* Class = "NSMenuItem"; title = "Decrease Font Size"; ObjectID = "1859"; */ +"1859.title" = "Decrease Font Size"; + +/* Class = "NSMenuItem"; title = "Add to Queue"; ObjectID = "1864"; */ +"1864.title" = "Add to Queue"; + +/* Class = "NSMenuItem"; title = "Remove from Queue"; ObjectID = "1865"; */ +"1865.title" = "Remove from Queue"; + +/* Class = "NSMenuItem"; title = "Search for Songs by Artist"; ObjectID = "1867"; */ +"1867.title" = "Search for Songs by Artist"; + +/* Class = "NSMenuItem"; title = "Search for Songs from Album"; ObjectID = "1868"; */ +"1868.title" = "Search for Songs from Album"; + +/* Class = "NSMenuItem"; title = "Fade In/Out"; ObjectID = "1885"; */ +"1885.title" = "Fade In/Out"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayPattern = "Total Duration: %{value1}@"; ObjectID = "1891"; */ +"1891.ibShadowedDisplayPattern" = "Total Duration: %{value1}@"; + +/* Class = "NSMenuItem"; title = "Album"; ObjectID = "1892"; */ +"1892.title" = "Album"; + +/* Class = "NSMenuItem"; title = "Add to Queue"; ObjectID = "1893"; */ +"1893.title" = "Add to Queue"; + +/* Class = "NSMenuItem"; title = "Stop After Current"; ObjectID = "1895"; */ +"1895.title" = "Stop After Current"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedIsNilPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedNoSelectionPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedNotApplicablePlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedIsNilPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedMultipleValuesPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedNoSelectionPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedNotApplicablePlaceholder" = "Toggle Queued"; + +/* Class = "NSMenuItem"; title = "Search for Artist"; ObjectID = "2045"; */ +"2045.title" = "Search for Artist"; + +/* Class = "NSMenuItem"; title = "Search for Album"; ObjectID = "2046"; */ +"2046.title" = "Search for Album"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Not Playing"; ObjectID = "2083"; */ +"2083.ibShadowedIsNilPlaceholder" = "Not Playing"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Not Playing"; ObjectID = "2085"; */ +"2085.ibShadowedIsNilPlaceholder" = "Not Playing"; + +/* Class = "NSMenuItem"; title = "Toggle File Tree Orientation"; ObjectID = "2160"; */ +"2160.title" = "Toggle File Tree Orientation"; + +/* Class = "NSMenuItem"; title = "Information"; ObjectID = "2212"; */ +"2212.title" = "Information"; + +/* Class = "NSWindow"; title = "Cog"; ObjectID = "2234"; */ +"2234.title" = "Cog"; + +/* Class = "NSToolbarItem"; label = "Playback Buttons"; ObjectID = "2272"; */ +"2272.label" = "Playback Buttons"; + +/* Class = "NSToolbarItem"; paletteLabel = "Playback Buttons"; ObjectID = "2272"; */ +"2272.paletteLabel" = "Playback Buttons"; + +/* Class = "NSToolbarItem"; label = "Position"; ObjectID = "2273"; */ +"2273.label" = "Position"; + +/* Class = "NSToolbarItem"; paletteLabel = "Position"; ObjectID = "2273"; */ +"2273.paletteLabel" = "Position"; + +/* Class = "NSToolbarItem"; label = "Current Time"; ObjectID = "2274"; */ +"2274.label" = "Current Time"; + +/* Class = "NSToolbarItem"; paletteLabel = "Current Time"; ObjectID = "2274"; */ +"2274.paletteLabel" = "Current Time"; + +/* Class = "NSToolbarItem"; label = "Volume"; ObjectID = "2275"; */ +"2275.label" = "Volume"; + +/* Class = "NSToolbarItem"; paletteLabel = "Volume"; ObjectID = "2275"; */ +"2275.paletteLabel" = "Volume"; + +/* Class = "NSToolbarItem"; label = "Shuffle"; ObjectID = "2278"; */ +"2278.label" = "Shuffle"; + +/* Class = "NSToolbarItem"; paletteLabel = "Shuffle"; ObjectID = "2278"; */ +"2278.paletteLabel" = "Shuffle"; + +/* Class = "NSToolbarItem"; label = "Repeat"; ObjectID = "2279"; */ +"2279.label" = "Repeat"; + +/* Class = "NSToolbarItem"; paletteLabel = "Repeat"; ObjectID = "2279"; */ +"2279.paletteLabel" = "Repeat"; + +/* Class = "NSTextFieldCell"; title = "0:00"; ObjectID = "2292"; */ +"2292.title" = "0:00"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[0] = "Previous"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[0]" = "Previous"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[1] = "Play"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[1]" = "Play"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[2] = "Stop"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[2]" = "Stop"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[3] = "Next"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[3]" = "Next"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedIsNilPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedNoSelectionPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedNotApplicablePlaceholder" = "Cog"; + +/* Class = "NSMenuItem"; title = "Show File Tree"; ObjectID = "2417"; */ +"2417.title" = "Show File Tree"; + +/* Class = "NSToolbarItem"; label = "Info Inspector"; ObjectID = "2429"; */ +"2429.label" = "Info Inspector"; + +/* Class = "NSToolbarItem"; paletteLabel = "Info Inspector"; ObjectID = "2429"; */ +"2429.paletteLabel" = "Info Inspector"; + +/* Class = "NSMenuItem"; title = "Shuffle"; ObjectID = "2438"; */ +"2438.title" = "Shuffle"; + +/* Class = "NSMenu"; title = "Shuffle"; ObjectID = "2439"; */ +"2439.title" = "Shuffle"; + +/* Class = "NSMenuItem"; title = "Off"; ObjectID = "2440"; */ +"2440.title" = "Off"; + +/* Class = "NSMenuItem"; title = "Albums"; ObjectID = "2442"; */ +"2442.title" = "Albums"; + +/* Class = "NSMenuItem"; title = "All"; ObjectID = "2443"; */ +"2443.title" = "All"; + +/* Class = "NSMenuItem"; title = "Show Info Inspector"; ObjectID = "2453"; */ +"2453.title" = "Show Info Inspector"; + +/* Class = "NSMenuItem"; title = "Enter Full Screen"; ObjectID = "2456"; */ +"2456.title" = "Enter Full Screen"; + +/* Class = "NSToolbarItem"; label = "Randomize"; ObjectID = "2466"; */ +"2466.label" = "Randomize"; + +/* Class = "NSToolbarItem"; paletteLabel = "Randomize"; ObjectID = "2466"; */ +"2466.paletteLabel" = "Randomize"; + +/* Class = "NSMenuItem"; title = "Toggle"; ObjectID = "2472"; */ +"2472.title" = "Toggle"; + +/* Class = "NSMenuItem"; title = "Toggle"; ObjectID = "2476"; */ +"2476.title" = "Toggle"; + +/* Class = "NSMenuItem"; title = "Stop After Current"; ObjectID = "2483"; */ +"2483.title" = "Stop After Current"; + +/* Class = "NSMenuItem"; title = "Next Album"; ObjectID = "2485"; */ +"2485.title" = "Next Album"; + +/* Class = "NSMenuItem"; title = "Previous Album"; ObjectID = "2487"; */ +"2487.title" = "Previous Album"; + +/* Class = "NSMenuItem"; title = "Toggle Mini Mode"; ObjectID = "2493"; */ +"2493.title" = "Toggle Mini Mode"; + +/* Class = "NSToolbarItem"; label = "Normal Mode"; ObjectID = "2526"; */ +"2526.label" = "Normal Mode"; + +/* Class = "NSToolbarItem"; paletteLabel = "Normal Mode"; ObjectID = "2526"; */ +"2526.paletteLabel" = "Normal Mode"; + +/* Class = "NSToolbarItem"; label = "Mini Mode"; ObjectID = "2532"; */ +"2532.label" = "Mini Mode"; + +/* Class = "NSToolbarItem"; paletteLabel = "Mini Mode"; ObjectID = "2532"; */ +"2532.paletteLabel" = "Mini Mode"; + +/* Class = "NSMenuItem"; title = "Randomize"; ObjectID = "2545"; */ +"2545.title" = "Randomize"; + +/* Class = "NSMenuItem"; title = "Remove Duplicate Items"; ObjectID = "2qB-Bq-t2u"; */ +"2qB-Bq-t2u.title" = "Remove Duplicate Items"; + +/* Class = "NSMenuItem"; title = "Remove Dead Items"; ObjectID = "Ajn-k4-afd"; */ +"Ajn-k4-afd.title" = "Remove Dead Items"; + +/* Class = "NSMenuItem"; title = "Properties"; ObjectID = "Eds-my-DQr"; */ +"Eds-my-DQr.title" = "Properties"; diff --git a/en.lproj/OpenURLPanel.strings b/en.lproj/OpenURLPanel.strings new file mode 100644 index 000000000..8518883ad --- /dev/null +++ b/en.lproj/OpenURLPanel.strings @@ -0,0 +1,9 @@ + +/* Class = "NSWindow"; title = "Open URL"; ObjectID = "5"; */ +"5.title" = "Open URL"; + +/* Class = "NSButtonCell"; title = "OK"; ObjectID = "23"; */ +"23.title" = "OK"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "24"; */ +"24.title" = "Cancel"; diff --git a/en.lproj/SpotlightPanel.strings b/en.lproj/SpotlightPanel.strings new file mode 100644 index 000000000..406628c19 --- /dev/null +++ b/en.lproj/SpotlightPanel.strings @@ -0,0 +1,57 @@ + +/* Class = "NSWindow"; title = "Spotlight"; ObjectID = "1"; */ +"1.title" = "Spotlight"; + +/* Class = "NSButtonCell"; title = "Add to Playlist"; ObjectID = "6"; */ +"6.title" = "Add to Playlist"; + +/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "29"; */ +"29.headerCell.title" = "Track"; + +/* Class = "NSTableColumn"; headerCell.title = "Genre"; ObjectID = "30"; */ +"30.headerCell.title" = "Genre"; + +/* Class = "NSTableColumn"; headerCell.title = "Year"; ObjectID = "31"; */ +"31.headerCell.title" = "Year"; + +/* Class = "NSTableColumn"; headerCell.title = "Length"; ObjectID = "32"; */ +"32.headerCell.title" = "Length"; + +/* Class = "NSTableColumn"; headerCell.title = "Album"; ObjectID = "33"; */ +"33.headerCell.title" = "Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Artist"; ObjectID = "34"; */ +"34.headerCell.title" = "Artist"; + +/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "36"; */ +"36.headerCell.title" = "Title"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "37"; */ +"37.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "39"; */ +"39.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "40"; */ +"40.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "41"; */ +"41.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "42"; */ +"42.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "44"; */ +"44.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Search Location:"; ObjectID = "80"; */ +"80.title" = "Search Location:"; + +/* Class = "NSMenu"; title = "ContextualMenu"; ObjectID = "171"; */ +"171.title" = "ContextualMenu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "172"; */ +"172.title" = "Show in Finder"; diff --git a/es.lproj/Feedback.strings b/es.lproj/Feedback.strings new file mode 100644 index 000000000..7849c8d7e --- /dev/null +++ b/es.lproj/Feedback.strings @@ -0,0 +1,18 @@ + +/* Class = "NSWindow"; title = "Send Feedback"; ObjectID = "1"; */ +"1.title" = "Send Feedback"; + +/* Class = "NSButtonCell"; title = "Send"; ObjectID = "17"; */ +"17.title" = "Send"; + +/* Class = "NSTextFieldCell"; title = "Subject:"; ObjectID = "18"; */ +"18.title" = "Subject:"; + +/* Class = "NSTextFieldCell"; title = "Message:"; ObjectID = "19"; */ +"19.title" = "Message:"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "20"; */ +"20.title" = "Cancel"; + +/* Class = "NSTextFieldCell"; title = "Email:"; ObjectID = "22"; */ +"22.title" = "Email:"; diff --git a/es.lproj/Feedback.xib b/es.lproj/Feedback.xib deleted file mode 100644 index 8eff24958..000000000 --- a/es.lproj/Feedback.xib +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/es.lproj/FileTree.strings b/es.lproj/FileTree.strings new file mode 100644 index 000000000..5e90ea13b --- /dev/null +++ b/es.lproj/FileTree.strings @@ -0,0 +1,21 @@ + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "71"; */ +"71.title" = "Text Cell"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "110"; */ +"110.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "112"; */ +"112.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Add to Playlist"; ObjectID = "119"; */ +"119.title" = "Add to Playlist"; + +/* Class = "NSMenuItem"; title = "Set as Root"; ObjectID = "124"; */ +"124.title" = "Set as Root"; + +/* Class = "NSMenuItem"; title = "Set as Playlist"; ObjectID = "129"; */ +"129.title" = "Set as Playlist"; + +/* Class = "NSBox"; title = "Box"; ObjectID = "147"; */ +"147.title" = "Box"; diff --git a/es.lproj/FileTree.xib b/es.lproj/FileTree.xib deleted file mode 100644 index b251ad02f..000000000 --- a/es.lproj/FileTree.xib +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - StringToURLTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FontSizetoLineHeightTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/es.lproj/InfoInspector.strings b/es.lproj/InfoInspector.strings new file mode 100644 index 000000000..b801f1316 --- /dev/null +++ b/es.lproj/InfoInspector.strings @@ -0,0 +1,75 @@ + +/* Class = "NSWindow"; title = "Info Inspector"; ObjectID = "1"; */ +"1.title" = "Info Inspector"; + +/* Class = "NSTextFieldCell"; title = "Artist:"; ObjectID = "10"; */ +"10.title" = "Artist:"; + +/* Class = "NSTextFieldCell"; title = "Album:"; ObjectID = "12"; */ +"12.title" = "Album:"; + +/* Class = "NSTextFieldCell"; title = "Track:"; ObjectID = "14"; */ +"14.title" = "Track:"; + +/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "16"; */ +"16.title" = "Length:"; + +/* Class = "NSTextFieldCell"; title = "Year:"; ObjectID = "18"; */ +"18.title" = "Year:"; + +/* Class = "NSTextFieldCell"; title = "Genre:"; ObjectID = "20"; */ +"20.title" = "Genre:"; + +/* Class = "NSTextFieldCell"; title = "Sample Rate:"; ObjectID = "22"; */ +"22.title" = "Sample Rate:"; + +/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "24"; */ +"24.title" = "Title:"; + +/* Class = "NSTextFieldCell"; title = "Channels:"; ObjectID = "28"; */ +"28.title" = "Channels:"; + +/* Class = "NSTextFieldCell"; title = "Bits Per Sample:"; ObjectID = "31"; */ +"31.title" = "Bits Per Sample:"; + +/* Class = "NSTextFieldCell"; title = "Bitrate:"; ObjectID = "32"; */ +"32.title" = "Bitrate:"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "34"; */ +"34.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "36"; */ +"36.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "38"; */ +"38.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "40"; */ +"40.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "42"; */ +"42.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "44"; */ +"44.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "46"; */ +"46.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "50"; */ +"50.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "52"; */ +"52.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "54"; */ +"54.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "56"; */ +"56.title" = "N/A"; + +/* Class = "NSTextFieldCell"; title = "Filename:"; ObjectID = "85"; */ +"85.title" = "Filename:"; + +/* Class = "NSTextFieldCell"; title = "N/A"; ObjectID = "87"; */ +"87.title" = "N/A"; diff --git a/es.lproj/InfoInspector.xib b/es.lproj/InfoInspector.xib deleted file mode 100644 index a05be4117..000000000 --- a/es.lproj/InfoInspector.xib +++ /dev/null @@ -1,1526 +0,0 @@ - - - - 1050 - 11G63b - 2549 - 1138.51 - 569.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2549 - - - YES - NSCustomObject - NSImageCell - NSImageView - NSTextField - NSTextFieldCell - NSUserDefaultsController - NSView - NSWindowTemplate - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - InfoWindowController - - - FirstResponder - - - NSApplication - - - 8219 - 2 - {{700, 80}, {300, 450}} - -1538259968 - Info Inspector - NSPanel - - - {400, 600} - {240, 420} - - - 256 - - YES - - - 268 - {{69, 416}, {37, 14}} - - - - YES - - 68288064 - 272761856 - Artist: - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 1 - MSAxIDEAA - - - - - - 268 - {{63, 394}, {43, 14}} - - - - YES - - 68288064 - 272761856 - Album: - - - - - - - - - 268 - {{68, 350}, {38, 14}} - - - - YES - - 68288064 - 272761856 - Track: - - - - - - - - - 268 - {{61, 328}, {45, 14}} - - - - YES - - 68288064 - 272761856 - Length: - - - - - - - - - 268 - {{74, 306}, {32, 14}} - - - - YES - - 68288064 - 272761856 - Year: - - - - - - - - - 268 - {{66, 284}, {40, 14}} - - - - YES - - 68288064 - 272761856 - Genre: - - - - - - - - - 268 - {{33, 240}, {73, 14}} - - - - YES - - 68288064 - 272761856 - Sample Rate: - - - - - - - - - 268 - {{49, 218}, {57, 14}} - - - - YES - - 68288064 - 272761856 - Channels: - - - - - - - - - 268 - {{64, 196}, {42, 14}} - - - - YES - - 68288064 - 272761856 - Bitrate: - - - - - - - - - 268 - {{17, 174}, {89, 14}} - - - - YES - - 68288064 - 272761856 - Bits Per Sample: - - - - - - - - - 268 - {{74, 372}, {32, 14}} - - - - YES - - 68288064 - 272761856 - Title: - - - - - - - - - 266 - {{113, 416}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 394}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 372}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 350}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 328}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 306}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 284}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 240}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 218}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 196}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 266 - {{113, 174}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 268 - {{50, 262}, {56, 14}} - - - - YES - - 68288064 - 272761856 - Filename: - - - - - - - - - 266 - {{113, 262}, {170, 14}} - - - - YES - - 67239488 - 272763392 - N/A - - - - - - - - - 274 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{17, 17}, {266, 138}} - - - - YES - - 671219200 - 33554432 - 0 - 0 - 0 - NO - - YES - - - {300, 450} - - - - - {{0, 0}, {1280, 1002}} - {240, 439} - {400, 619} - InfoInspector - YES - - - YES - - - BlankZeroFormatter - - - SecondsFormatter - - - - - YES - - - window - - - - 83 - - - - value: valueToDisplay.artist - - - - - - value: valueToDisplay.artist - value - valueToDisplay.artist - 2 - - - 108 - - - - value: valueToDisplay.album - - - - - - value: valueToDisplay.album - value - valueToDisplay.album - 2 - - - 109 - - - - value: valueToDisplay.title - - - - - - value: valueToDisplay.title - value - valueToDisplay.title - 2 - - - 110 - - - - formatter - - - - 82 - - - - value: valueToDisplay.track - - - - - - value: valueToDisplay.track - value - valueToDisplay.track - 2 - - - 111 - - - - formatter - - - - 81 - - - - value: valueToDisplay.length - - - - - - value: valueToDisplay.length - value - valueToDisplay.length - 2 - - - 112 - - - - value: valueToDisplay.year - - - - - - value: valueToDisplay.year - value - valueToDisplay.year - 2 - - - 113 - - - - formatter - - - - 107 - - - - value: valueToDisplay.genre - - - - - - value: valueToDisplay.genre - value - valueToDisplay.genre - 2 - - - 114 - - - - value: valueToDisplay.sampleRate - - - - - - value: valueToDisplay.sampleRate - value - valueToDisplay.sampleRate - 2 - - - 116 - - - - value: valueToDisplay.channels - - - - - - value: valueToDisplay.channels - value - valueToDisplay.channels - 2 - - - 117 - - - - value: valueToDisplay.bitrate - - - - - - value: valueToDisplay.bitrate - value - valueToDisplay.bitrate - 2 - - - 118 - - - - value: valueToDisplay.bitsPerSample - - - - - - value: valueToDisplay.bitsPerSample - value - valueToDisplay.bitsPerSample - 2 - - - 122 - - - - value: valueToDisplay.filename - - - - - - value: valueToDisplay.filename - value - valueToDisplay.filename - 2 - - - 115 - - - - value: valueToDisplay.albumArt - - - - - - value: valueToDisplay.albumArt - value - valueToDisplay.albumArt - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSConditionallySetsEnabled - NSValueTransformerName - - - YES - - - MissingAlbumArtTransformer - - - 2 - - - 121 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - YES - - - - - - 2 - - - YES - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9 - - - YES - - - - - - 10 - - - - - 11 - - - YES - - - - - - 12 - - - - - 13 - - - YES - - - - - - 14 - - - - - 15 - - - YES - - - - - - 16 - - - - - 17 - - - YES - - - - - - 18 - - - - - 19 - - - YES - - - - - - 20 - - - - - 21 - - - YES - - - - - - 22 - - - - - 23 - - - YES - - - - - - 24 - - - - - 27 - - - YES - - - - - - 28 - - - - - 29 - - - YES - - - - - - 30 - - - YES - - - - - - 31 - - - - - 32 - - - - - 58 - - - - - 79 - - - - - 80 - - - - - 84 - - - YES - - - - - - 85 - - - - - 45 - - - YES - - - - - - 46 - - - - - 39 - - - YES - - - - - - 40 - - - - - 55 - - - YES - - - - - - 56 - - - - - 41 - - - YES - - - - - - 42 - - - - - 35 - - - YES - - - - - - 36 - - - - - 53 - - - YES - - - - - - 54 - - - - - 43 - - - YES - - - - - - 44 - - - - - 86 - - - YES - - - - - - 87 - - - - - 51 - - - YES - - - - - - 52 - - - - - 49 - - - YES - - - - - - 50 - - - - - 33 - - - YES - - - - - - 34 - - - - - 37 - - - YES - - - - - - 38 - - - - - 95 - - - YES - - - - - - 96 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 1.IBNSWindowAutoPositionCentersHorizontal - 1.IBNSWindowAutoPositionCentersVertical - 1.IBPluginDependency - 1.IBWindowTemplateEditedContentRect - 1.NSWindowTemplate.visibleAtLaunch - 10.IBPluginDependency - 11.IBPluginDependency - 12.IBPluginDependency - 13.IBPluginDependency - 14.IBPluginDependency - 15.IBPluginDependency - 16.IBPluginDependency - 17.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 2.IBPluginDependency - 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 27.IBPluginDependency - 28.IBPluginDependency - 29.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency - 32.IBPluginDependency - 33.CustomClassName - 33.IBPluginDependency - 34.IBPluginDependency - 35.CustomClassName - 35.IBPluginDependency - 36.IBPluginDependency - 37.CustomClassName - 37.IBPluginDependency - 38.IBPluginDependency - 39.CustomClassName - 39.IBPluginDependency - 40.IBPluginDependency - 41.CustomClassName - 41.IBPluginDependency - 42.IBPluginDependency - 43.CustomClassName - 43.IBPluginDependency - 44.IBPluginDependency - 45.CustomClassName - 45.IBPluginDependency - 46.IBPluginDependency - 49.CustomClassName - 49.IBPluginDependency - 50.IBPluginDependency - 51.CustomClassName - 51.IBPluginDependency - 52.IBPluginDependency - 53.CustomClassName - 53.IBPluginDependency - 54.IBPluginDependency - 55.CustomClassName - 55.IBPluginDependency - 56.IBPluginDependency - 58.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency - 84.IBPluginDependency - 85.IBPluginDependency - 86.CustomClassName - 86.IBPluginDependency - 87.IBPluginDependency - 9.IBPluginDependency - 95.IBPluginDependency - 96.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{548, 275}, {351, 498}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTipTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 122 - - - - YES - - BlankZeroFormatter - NSFormatter - - IBProjectSource - ./Classes/BlankZeroFormatter.h - - - - InfoWindowController - NSWindowController - - toggleWindow: - id - - - toggleWindow: - - toggleWindow: - id - - - - YES - - YES - appController - currentEntryController - playlistSelectionController - - - YES - id - id - id - - - - YES - - YES - appController - currentEntryController - playlistSelectionController - - - YES - - appController - id - - - currentEntryController - id - - - playlistSelectionController - id - - - - - IBProjectSource - ./Classes/InfoWindowController.h - - - - SecondsFormatter - NSFormatter - - IBProjectSource - ./Classes/SecondsFormatter.h - - - - ToolTipTextField - NSTextField - - IBProjectSource - ./Classes/ToolTipTextField.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - diff --git a/es.lproj/MainMenu.strings b/es.lproj/MainMenu.strings new file mode 100644 index 000000000..6b7eee521 --- /dev/null +++ b/es.lproj/MainMenu.strings @@ -0,0 +1,624 @@ + +/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */ +"5.title" = "Bring All to Front"; + +/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */ +"19.title" = "Window"; + +/* Class = "NSWindow"; title = "Cog"; ObjectID = "21"; */ +"21.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */ +"23.title" = "Minimize"; + +/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */ +"24.title" = "Window"; + +/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */ +"29.title" = "MainMenu"; + +/* Class = "NSMenuItem"; title = "Cog"; ObjectID = "56"; */ +"56.title" = "Cog"; + +/* Class = "NSMenu"; title = "Cog"; ObjectID = "57"; */ +"57.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "About Cog"; ObjectID = "58"; */ +"58.title" = "About Cog"; + +/* Class = "NSMenuItem"; title = "Add File..."; ObjectID = "72"; */ +"72.title" = "Add File..."; + +/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "73"; */ +"73.title" = "Close Window"; + +/* Class = "NSMenuItem"; title = "Save As..."; ObjectID = "75"; */ +"75.title" = "Save As..."; + +/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */ +"81.title" = "File"; + +/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */ +"83.title" = "File"; + +/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */ +"103.title" = "Help"; + +/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */ +"106.title" = "Help"; + +/* Class = "NSMenuItem"; title = "Cog Help"; ObjectID = "111"; */ +"111.title" = "Cog Help"; + +/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */ +"129.title" = "Preferences…"; + +/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */ +"130.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */ +"131.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Hide Cog"; ObjectID = "134"; */ +"134.title" = "Hide Cog"; + +/* Class = "NSMenuItem"; title = "Quit Cog"; ObjectID = "136"; */ +"136.title" = "Quit Cog"; + +/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */ +"145.title" = "Hide Others"; + +/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */ +"150.title" = "Show All"; + +/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "157"; */ +"157.title" = "Copy"; + +/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "158"; */ +"158.title" = "Undo"; + +/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "160"; */ +"160.title" = "Cut"; + +/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "163"; */ +"163.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "164"; */ +"164.title" = "Delete"; + +/* Class = "NSMenu"; title = "Edit"; ObjectID = "169"; */ +"169.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "171"; */ +"171.title" = "Paste"; + +/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "172"; */ +"172.title" = "Select All"; + +/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "173"; */ +"173.title" = "Redo"; + +/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */ +"197.title" = "Zoom"; + +/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "208"; */ +"208.headerCell.title" = "Title"; + +/* Class = "NSTableColumn"; headerCell.title = "#"; ObjectID = "209"; */ +"209.headerCell.title" = "#"; + +/* Class = "NSMenuItem"; title = "Check for Updates..."; ObjectID = "302"; */ +"302.title" = "Check for Updates..."; + +/* Class = "NSMenuItem"; title = "Send Feedback..."; ObjectID = "303"; */ +"303.title" = "Send Feedback..."; + +/* Class = "NSTableColumn"; headerCell.title = "Artist"; ObjectID = "391"; */ +"391.headerCell.title" = "Artist"; + +/* Class = "NSMenuItem"; title = "Control"; ObjectID = "418"; */ +"418.title" = "Control"; + +/* Class = "NSMenu"; title = "Control"; ObjectID = "419"; */ +"419.title" = "Control"; + +/* Class = "NSMenuItem"; title = "Play/Pause"; ObjectID = "420"; */ +"420.title" = "Play/Pause"; + +/* Class = "NSMenuItem"; title = "Next Song"; ObjectID = "422"; */ +"422.title" = "Next Song"; + +/* Class = "NSMenuItem"; title = "Previous Song"; ObjectID = "423"; */ +"423.title" = "Previous Song"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "513"; */ +"513.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Stop"; ObjectID = "517"; */ +"517.title" = "Stop"; + +/* Class = "NSMenuItem"; title = "Next Track"; ObjectID = "518"; */ +"518.title" = "Next Track"; + +/* Class = "NSMenuItem"; title = "Previous Track"; ObjectID = "519"; */ +"519.title" = "Previous Track"; + +/* Class = "NSMenuItem"; title = "Play/Pause"; ObjectID = "520"; */ +"520.title" = "Play/Pause"; + +/* Class = "NSMenuItem"; title = "Cog"; ObjectID = "702"; */ +"702.title" = "Cog"; + +/* Class = "NSMenuItem"; title = "Support Cog..."; ObjectID = "751"; */ +"751.title" = "Support Cog..."; + +/* Class = "NSMenuItem"; title = "Current Song"; ObjectID = "791"; */ +"791.title" = "Current Song"; + +/* Class = "NSTableColumn"; headerCell.title = "Album"; ObjectID = "806"; */ +"806.headerCell.title" = "Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Length"; ObjectID = "807"; */ +"807.headerCell.title" = "Length"; + +/* Class = "NSTableColumn"; headerCell.title = "Year"; ObjectID = "848"; */ +"848.headerCell.title" = "Year"; + +/* Class = "NSTableColumn"; headerCell.title = "Genre"; ObjectID = "849"; */ +"849.headerCell.title" = "Genre"; + +/* Class = "NSTableColumn"; headerCell.title = "№"; ObjectID = "850"; */ +"850.headerCell.title" = "№"; + +/* Class = "NSMenuItem"; title = "Playlist"; ObjectID = "881"; */ +"881.title" = "Playlist"; + +/* Class = "NSMenu"; title = "Playlist"; ObjectID = "882"; */ +"882.title" = "Playlist"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "1063"; */ +"1063.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "1064"; */ +"1064.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Show All Songs"; ObjectID = "1132"; */ +"1132.title" = "Show All Songs"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "1135"; */ +"1135.title" = "Show in Finder"; + +/* Class = "NSMenuItem"; title = "Volume Up"; ObjectID = "1136"; */ +"1136.title" = "Volume Up"; + +/* Class = "NSMenuItem"; title = "Volume Down"; ObjectID = "1137"; */ +"1137.title" = "Volume Down"; + +/* Class = "NSMenu"; title = "Menu"; ObjectID = "1324"; */ +"1324.title" = "Menu"; + +/* Class = "NSMenuItem"; title = "Index"; ObjectID = "1337"; */ +"1337.title" = "Index"; + +/* Class = "NSMenuItem"; title = "Title"; ObjectID = "1338"; */ +"1338.title" = "Title"; + +/* Class = "NSMenuItem"; title = "Artist"; ObjectID = "1339"; */ +"1339.title" = "Artist"; + +/* Class = "NSMenuItem"; title = "Album"; ObjectID = "1340"; */ +"1340.title" = "Album"; + +/* Class = "NSMenuItem"; title = "Genre"; ObjectID = "1341"; */ +"1341.title" = "Genre"; + +/* Class = "NSMenuItem"; title = "Length"; ObjectID = "1342"; */ +"1342.title" = "Length"; + +/* Class = "NSMenuItem"; title = "Track"; ObjectID = "1343"; */ +"1343.title" = "Track"; + +/* Class = "NSMenuItem"; title = "Year"; ObjectID = "1344"; */ +"1344.title" = "Year"; + +/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "1360"; */ +"1360.title" = "Remove"; + +/* Class = "NSMenuItem"; title = "Stop"; ObjectID = "1362"; */ +"1362.title" = "Stop"; + +/* Class = "NSMenuItem"; title = "Remove All"; ObjectID = "1402"; */ +"1402.title" = "Remove All"; + +/* Class = "NSMenuItem"; title = "Add URL..."; ObjectID = "1403"; */ +"1403.title" = "Add URL..."; + +/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "1408"; */ +"1408.title" = "Remove"; + +/* Class = "NSMenuItem"; title = "Current Artist"; ObjectID = "1454"; */ +"1454.title" = "Current Artist"; + +/* Class = "NSTextFieldCell"; title = "Total Duration: 00 hours 00 minutes 00 seconds"; ObjectID = "1473"; */ +"1473.title" = "Total Duration: 00 hours 00 minutes 00 seconds"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1506"; */ +"1506.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1507"; */ +"1507.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1508"; */ +"1508.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1509"; */ +"1509.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1510"; */ +"1510.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1511"; */ +"1511.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1512"; */ +"1512.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1513"; */ +"1513.title" = "Text Cell"; + +/* Class = "NSSearchFieldCell"; placeholderString = "All"; ObjectID = "1532"; */ +"1532.placeholderString" = "All"; + +/* Class = "NSToolbarItem"; label = "Search"; ObjectID = "1533"; */ +"1533.label" = "Search"; + +/* Class = "NSToolbarItem"; paletteLabel = "Search"; ObjectID = "1533"; */ +"1533.paletteLabel" = "Search"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[0] = "Previous"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[0]" = "Previous"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[1] = "Play"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[1]" = "Play"; + +/* Class = "NSSegmentedCell"; 1538.ibShadowedToolTips[2] = "Next"; ObjectID = "1538"; */ +"1538.ibShadowedToolTips[2]" = "Next"; + +/* Class = "NSToolbarItem"; label = "Playback Control"; ObjectID = "1539"; */ +"1539.label" = "Playback Control"; + +/* Class = "NSToolbarItem"; paletteLabel = "Playback Control"; ObjectID = "1539"; */ +"1539.paletteLabel" = "Playback Control"; + +/* Class = "NSToolbarItem"; label = "Position"; ObjectID = "1551"; */ +"1551.label" = "Position"; + +/* Class = "NSToolbarItem"; paletteLabel = "Position"; ObjectID = "1551"; */ +"1551.paletteLabel" = "Position"; + +/* Class = "NSTextFieldCell"; title = "0:00"; ObjectID = "1567"; */ +"1567.title" = "0:00"; + +/* Class = "NSToolbarItem"; label = "Current Time"; ObjectID = "1568"; */ +"1568.label" = "Current Time"; + +/* Class = "NSToolbarItem"; paletteLabel = "Current Time"; ObjectID = "1568"; */ +"1568.paletteLabel" = "Current Time"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "All"; ObjectID = "1576"; */ +"1576.ibShadowedDisplayName" = "All"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Title"; ObjectID = "1578"; */ +"1578.ibShadowedDisplayName" = "Title"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Artist"; ObjectID = "1580"; */ +"1580.ibShadowedDisplayName" = "Artist"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Album"; ObjectID = "1582"; */ +"1582.ibShadowedDisplayName" = "Album"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayName = "Genre"; ObjectID = "1583"; */ +"1583.ibShadowedDisplayName" = "Genre"; + +/* Class = "NSToolbarItem"; label = "Volume"; ObjectID = "1610"; */ +"1610.label" = "Volume"; + +/* Class = "NSToolbarItem"; paletteLabel = "Volume"; ObjectID = "1610"; */ +"1610.paletteLabel" = "Volume"; + +/* Class = "NSToolbarItem"; label = "Info Inspector"; ObjectID = "1629"; */ +"1629.label" = "Info Inspector"; + +/* Class = "NSToolbarItem"; paletteLabel = "Info Inspector"; ObjectID = "1629"; */ +"1629.paletteLabel" = "Info Inspector"; + +/* Class = "NSToolbarItem"; label = "File Tree"; ObjectID = "1630"; */ +"1630.label" = "File Tree"; + +/* Class = "NSToolbarItem"; paletteLabel = "File Tree"; ObjectID = "1630"; */ +"1630.paletteLabel" = "File Tree"; + +/* Class = "NSToolbarItem"; label = "Shuffle"; ObjectID = "1636"; */ +"1636.label" = "Shuffle"; + +/* Class = "NSToolbarItem"; paletteLabel = "Shuffle"; ObjectID = "1636"; */ +"1636.paletteLabel" = "Shuffle"; + +/* Class = "NSToolbarItem"; label = "Repeat"; ObjectID = "1639"; */ +"1639.label" = "Repeat"; + +/* Class = "NSToolbarItem"; paletteLabel = "Repeat"; ObjectID = "1639"; */ +"1639.paletteLabel" = "Repeat"; + +/* Class = "NSMenuItem"; title = "Seek Backward"; ObjectID = "1683"; */ +"1683.title" = "Seek Backward"; + +/* Class = "NSMenuItem"; title = "Seek Forward"; ObjectID = "1685"; */ +"1685.title" = "Seek Forward"; + +/* Class = "NSMenuItem"; title = "Previous Album"; ObjectID = "1699"; */ +"1699.title" = "Previous Album"; + +/* Class = "NSMenuItem"; title = "Next Album"; ObjectID = "1701"; */ +"1701.title" = "Next Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Path"; ObjectID = "1712"; */ +"1712.headerCell.title" = "Path"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1713"; */ +"1713.title" = "Text Cell"; + +/* Class = "NSTableColumn"; headerCell.title = "Filename"; ObjectID = "1736"; */ +"1736.headerCell.title" = "Filename"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1737"; */ +"1737.title" = "Text Cell"; + +/* Class = "NSMenuItem"; title = "Repeat"; ObjectID = "1740"; */ +"1740.title" = "Repeat"; + +/* Class = "NSMenu"; title = "Repeat"; ObjectID = "1741"; */ +"1741.title" = "Repeat"; + +/* Class = "NSMenuItem"; title = "All"; ObjectID = "1742"; */ +"1742.title" = "All"; + +/* Class = "NSMenuItem"; title = "One"; ObjectID = "1746"; */ +"1746.title" = "One"; + +/* Class = "NSMenuItem"; title = "None"; ObjectID = "1749"; */ +"1749.title" = "None"; + +/* Class = "NSMenuItem"; title = "Remove All from Queue"; ObjectID = "1791"; */ +"1791.title" = "Remove All from Queue"; + +/* Class = "NSMenuItem"; title = "Select Currently Playing"; ObjectID = "1823"; */ +"1823.title" = "Select Currently Playing"; + +/* Class = "NSMenuItem"; title = "Filter Playlist"; ObjectID = "1824"; */ +"1824.title" = "Filter Playlist"; + +/* Class = "NSMenuItem"; title = "View"; ObjectID = "1848"; */ +"1848.title" = "View"; + +/* Class = "NSMenu"; title = "View"; ObjectID = "1849"; */ +"1849.title" = "View"; + +/* Class = "NSMenuItem"; title = "Show Spotlight Panel"; ObjectID = "1853"; */ +"1853.title" = "Show Spotlight Panel"; + +/* Class = "NSMenuItem"; title = "Customize Toolbar..."; ObjectID = "1856"; */ +"1856.title" = "Customize Toolbar..."; + +/* Class = "NSMenuItem"; title = "Increase Font Size"; ObjectID = "1858"; */ +"1858.title" = "Increase Font Size"; + +/* Class = "NSMenuItem"; title = "Decrease Font Size"; ObjectID = "1859"; */ +"1859.title" = "Decrease Font Size"; + +/* Class = "NSMenuItem"; title = "Add to Queue"; ObjectID = "1864"; */ +"1864.title" = "Add to Queue"; + +/* Class = "NSMenuItem"; title = "Remove from Queue"; ObjectID = "1865"; */ +"1865.title" = "Remove from Queue"; + +/* Class = "NSMenuItem"; title = "Search for Songs by Artist"; ObjectID = "1867"; */ +"1867.title" = "Search for Songs by Artist"; + +/* Class = "NSMenuItem"; title = "Search for Songs from Album"; ObjectID = "1868"; */ +"1868.title" = "Search for Songs from Album"; + +/* Class = "NSMenuItem"; title = "Fade In/Out"; ObjectID = "1885"; */ +"1885.title" = "Fade In/Out"; + +/* Class = "CocoaBindingsConnection"; ibShadowedDisplayPattern = "Total Duration: %{value1}@"; ObjectID = "1891"; */ +"1891.ibShadowedDisplayPattern" = "Total Duration: %{value1}@"; + +/* Class = "NSMenuItem"; title = "Album"; ObjectID = "1892"; */ +"1892.title" = "Album"; + +/* Class = "NSMenuItem"; title = "Add to Queue"; ObjectID = "1893"; */ +"1893.title" = "Add to Queue"; + +/* Class = "NSMenuItem"; title = "Stop After Current"; ObjectID = "1895"; */ +"1895.title" = "Stop After Current"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedIsNilPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedNoSelectionPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Cog"; ObjectID = "1903"; */ +"1903.ibShadowedNotApplicablePlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedIsNilPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedMultipleValuesPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedNoSelectionPlaceholder" = "Toggle Queued"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Toggle Queued"; ObjectID = "2042"; */ +"2042.ibShadowedNotApplicablePlaceholder" = "Toggle Queued"; + +/* Class = "NSMenuItem"; title = "Search for Artist"; ObjectID = "2045"; */ +"2045.title" = "Search for Artist"; + +/* Class = "NSMenuItem"; title = "Search for Album"; ObjectID = "2046"; */ +"2046.title" = "Search for Album"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Not Playing"; ObjectID = "2083"; */ +"2083.ibShadowedIsNilPlaceholder" = "Not Playing"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Not Playing"; ObjectID = "2085"; */ +"2085.ibShadowedIsNilPlaceholder" = "Not Playing"; + +/* Class = "NSMenuItem"; title = "Toggle File Tree Orientation"; ObjectID = "2160"; */ +"2160.title" = "Toggle File Tree Orientation"; + +/* Class = "NSMenuItem"; title = "Information"; ObjectID = "2212"; */ +"2212.title" = "Information"; + +/* Class = "NSWindow"; title = "Cog"; ObjectID = "2234"; */ +"2234.title" = "Cog"; + +/* Class = "NSToolbarItem"; label = "Playback Buttons"; ObjectID = "2272"; */ +"2272.label" = "Playback Buttons"; + +/* Class = "NSToolbarItem"; paletteLabel = "Playback Buttons"; ObjectID = "2272"; */ +"2272.paletteLabel" = "Playback Buttons"; + +/* Class = "NSToolbarItem"; label = "Position"; ObjectID = "2273"; */ +"2273.label" = "Position"; + +/* Class = "NSToolbarItem"; paletteLabel = "Position"; ObjectID = "2273"; */ +"2273.paletteLabel" = "Position"; + +/* Class = "NSToolbarItem"; label = "Current Time"; ObjectID = "2274"; */ +"2274.label" = "Current Time"; + +/* Class = "NSToolbarItem"; paletteLabel = "Current Time"; ObjectID = "2274"; */ +"2274.paletteLabel" = "Current Time"; + +/* Class = "NSToolbarItem"; label = "Volume"; ObjectID = "2275"; */ +"2275.label" = "Volume"; + +/* Class = "NSToolbarItem"; paletteLabel = "Volume"; ObjectID = "2275"; */ +"2275.paletteLabel" = "Volume"; + +/* Class = "NSToolbarItem"; label = "Shuffle"; ObjectID = "2278"; */ +"2278.label" = "Shuffle"; + +/* Class = "NSToolbarItem"; paletteLabel = "Shuffle"; ObjectID = "2278"; */ +"2278.paletteLabel" = "Shuffle"; + +/* Class = "NSToolbarItem"; label = "Repeat"; ObjectID = "2279"; */ +"2279.label" = "Repeat"; + +/* Class = "NSToolbarItem"; paletteLabel = "Repeat"; ObjectID = "2279"; */ +"2279.paletteLabel" = "Repeat"; + +/* Class = "NSTextFieldCell"; title = "0:00"; ObjectID = "2292"; */ +"2292.title" = "0:00"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[0] = "Previous"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[0]" = "Previous"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[1] = "Play"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[1]" = "Play"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[2] = "Stop"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[2]" = "Stop"; + +/* Class = "NSSegmentedCell"; 2296.ibShadowedToolTips[3] = "Next"; ObjectID = "2296"; */ +"2296.ibShadowedToolTips[3]" = "Next"; + +/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedIsNilPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedNoSelectionPlaceholder" = "Cog"; + +/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Cog"; ObjectID = "2374"; */ +"2374.ibShadowedNotApplicablePlaceholder" = "Cog"; + +/* Class = "NSMenuItem"; title = "Show File Tree"; ObjectID = "2417"; */ +"2417.title" = "Show File Tree"; + +/* Class = "NSToolbarItem"; label = "Info Inspector"; ObjectID = "2429"; */ +"2429.label" = "Info Inspector"; + +/* Class = "NSToolbarItem"; paletteLabel = "Info Inspector"; ObjectID = "2429"; */ +"2429.paletteLabel" = "Info Inspector"; + +/* Class = "NSMenuItem"; title = "Shuffle"; ObjectID = "2438"; */ +"2438.title" = "Shuffle"; + +/* Class = "NSMenu"; title = "Shuffle"; ObjectID = "2439"; */ +"2439.title" = "Shuffle"; + +/* Class = "NSMenuItem"; title = "Off"; ObjectID = "2440"; */ +"2440.title" = "Off"; + +/* Class = "NSMenuItem"; title = "Albums"; ObjectID = "2442"; */ +"2442.title" = "Albums"; + +/* Class = "NSMenuItem"; title = "All"; ObjectID = "2443"; */ +"2443.title" = "All"; + +/* Class = "NSMenuItem"; title = "Show Info Inspector"; ObjectID = "2453"; */ +"2453.title" = "Show Info Inspector"; + +/* Class = "NSMenuItem"; title = "Enter Full Screen"; ObjectID = "2456"; */ +"2456.title" = "Enter Full Screen"; + +/* Class = "NSToolbarItem"; label = "Randomize"; ObjectID = "2466"; */ +"2466.label" = "Randomize"; + +/* Class = "NSToolbarItem"; paletteLabel = "Randomize"; ObjectID = "2466"; */ +"2466.paletteLabel" = "Randomize"; + +/* Class = "NSMenuItem"; title = "Toggle"; ObjectID = "2472"; */ +"2472.title" = "Toggle"; + +/* Class = "NSMenuItem"; title = "Toggle"; ObjectID = "2476"; */ +"2476.title" = "Toggle"; + +/* Class = "NSMenuItem"; title = "Stop After Current"; ObjectID = "2483"; */ +"2483.title" = "Stop After Current"; + +/* Class = "NSMenuItem"; title = "Next Album"; ObjectID = "2485"; */ +"2485.title" = "Next Album"; + +/* Class = "NSMenuItem"; title = "Previous Album"; ObjectID = "2487"; */ +"2487.title" = "Previous Album"; + +/* Class = "NSMenuItem"; title = "Toggle Mini Mode"; ObjectID = "2493"; */ +"2493.title" = "Toggle Mini Mode"; + +/* Class = "NSToolbarItem"; label = "Normal Mode"; ObjectID = "2526"; */ +"2526.label" = "Normal Mode"; + +/* Class = "NSToolbarItem"; paletteLabel = "Normal Mode"; ObjectID = "2526"; */ +"2526.paletteLabel" = "Normal Mode"; + +/* Class = "NSToolbarItem"; label = "Mini Mode"; ObjectID = "2532"; */ +"2532.label" = "Mini Mode"; + +/* Class = "NSToolbarItem"; paletteLabel = "Mini Mode"; ObjectID = "2532"; */ +"2532.paletteLabel" = "Mini Mode"; + +/* Class = "NSMenuItem"; title = "Randomize"; ObjectID = "2545"; */ +"2545.title" = "Randomize"; + +/* Class = "NSMenuItem"; title = "Remove Duplicate Items"; ObjectID = "2qB-Bq-t2u"; */ +"2qB-Bq-t2u.title" = "Remove Duplicate Items"; + +/* Class = "NSMenuItem"; title = "Remove Dead Items"; ObjectID = "Ajn-k4-afd"; */ +"Ajn-k4-afd.title" = "Remove Dead Items"; + +/* Class = "NSMenuItem"; title = "Properties"; ObjectID = "Eds-my-DQr"; */ +"Eds-my-DQr.title" = "Properties"; diff --git a/es.lproj/MainMenu.xib b/es.lproj/MainMenu.xib deleted file mode 100644 index facf1d9ea..000000000 --- a/es.lproj/MainMenu.xib +++ /dev/null @@ -1,1961 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Total Duration: %{value1}@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - StatusImageTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FontSizetoLineHeightTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All - (title contains[cd] $value) OR (artist contains[cd] $value) OR (album contains[cd] $value) OR (genre contains[cd] $value) - - - - - Title - title contains[cd] $value - - - - - Artist - artist contains[cd] $value - - - - - - Album - artist contains[cd] $value - - - - - - - - Genre - genre contains[cd] $value - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cog - Cog - Cog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cog - Cog - Cog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - -CA - - - - - - - - - - - - - - - -CA - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RepeatAllTransformer - - - - - - - - - - - RepeatAlbumTransformer - - - - - - - - - - - - - - - RepeatOneTransformer - - - - - - - - - - - - - - - RepeatNoneTransformer - - - - - - - - - - - - - - - - - - - - - - - - - ShuffleAllTransformer - - - - - - - - - - ShuffleAlbumsTransformer - - - - - - - - - - ShuffleOffTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Gw - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MiniModeMenuTitleTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - current - index - artist - album - title - genre - track - year - length - channels - bitsPerSample - bitrate - url - sampleRate - seekable - artists - display - self - relativePath - base - URL.lastPathComponent - URL.path.lastPathComponent - filename - path - status - queued - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Not Playing - - - - - - - - - - - - - - Not Playing - - - - - - - - - - - - - - - - NSIsNil - - - - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSIsNotNil - - - - - Toggle Queued - Toggle Queued - Toggle Queued - Toggle Queued - - ToggleQueueTitleTransformer - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - NSIsNotNil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - display - length - seekable - queued - title - artist - - - - - - - - queued - title - artist - album - - - - - - - - - - - - - - - - - - - - - - - - - - -YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU -GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw -c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MTcsIDE3fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb -HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPER/eTU0AKgAAEhjo6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo -/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/ABIB -AAADAAAAAQAiAAABAQADAAAAAQAiAAABAgADAAAABAAAEwYBAwADAAAAAQABAAABBgADAAAAAQACAAAB -CgADAAAAAQABAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQAiAAAB -FwAEAAAAAQAAEhABGgAFAAAAAQAAEvYBGwAFAAAAAQAAEv4BHAADAAAAAQABAAABKAADAAAAAQACAAAB -UgADAAAAAQABAAABUwADAAAABAAAEw6HcwAHAAAMyAAAExYAAAAAAAAAkAAAAAEAAACQAAAAAQAIAAgA -CAAIAAEAAQABAAEAAAzIYXBwbAIQAABtbnRyUkdCIFhZWiAH4AABAA0AFwADAB1hY3NwQVBQTAAAAABB -UFBMAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAABFkZXNjAAABUAAAAGJkc2NtAAABtAAAAbBjcHJ0AAADZAAAACN3 -dHB0AAADiAAAABRyWFlaAAADnAAAABRnWFlaAAADsAAAABRiWFlaAAADxAAAABRyVFJDAAAD2AAACAxh -YXJnAAAL5AAAACB2Y2d0AAAMBAAAADBuZGluAAAMNAAAAD5jaGFkAAAMdAAAACxtbW9kAAAMoAAAAChi -VFJDAAAD2AAACAxnVFJDAAAD2AAACAxhYWJnAAAL5AAAACBhYWdnAAAL5AAAACBkZXNjAAAAAAAAAAhE -aXNwbGF5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAAiAAAADGhySFIAAAAIAAABqGtvS1IA -AAAIAAABqG5iTk8AAAAIAAABqGlkAAAAAAAIAAABqGh1SFUAAAAIAAABqGNzQ1oAAAAIAAABqGRhREsA -AAAIAAABqHVrVUEAAAAIAAABqGFyAAAAAAAIAAABqGl0SVQAAAAIAAABqHJvUk8AAAAIAAABqG5sTkwA -AAAIAAABqGhlSUwAAAAIAAABqGVzRVMAAAAIAAABqGZpRkkAAAAIAAABqHpoVFcAAAAIAAABqHZpVk4A -AAAIAAABqHNrU0sAAAAIAAABqHpoQ04AAAAIAAABqHJ1UlUAAAAIAAABqGZyRlIAAAAIAAABqG1zAAAA -AAAIAAABqGNhRVMAAAAIAAABqHRoVEgAAAAIAAABqGVzWEwAAAAIAAABqGRlREUAAAAIAAABqGVuVVMA -AAAIAAABqHB0QlIAAAAIAAABqHBsUEwAAAAIAAABqGVsR1IAAAAIAAABqHN2U0UAAAAIAAABqHRyVFIA -AAAIAAABqGphSlAAAAAIAAABqHB0UFQAAAAIAAABqABpAE0AYQBjdGV4dAAAAABDb3B5cmlnaHQgQXBw -bGUgSW5jLiwgMjAxNgAAWFlaIAAAAAAAAPPYAAEAAAABFghYWVogAAAAAAAAc9QAADomAAABblhZWiAA -AAAAAABehgAAujcAABPtWFlaIAAAAAAAACR8AAALowAAvdJjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkA -HgAjACgALQAyADYAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8AowCoAK0A -sgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkB -YAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksC -VAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oD -lgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwF -KwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcH -GQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8J -ZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kM -EgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkP -JQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQS -oxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwW -jxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa -7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qf -vx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNol -CSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsq -zysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsx -EjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w3 -1zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/ -IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG -8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBP -SU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BY -L1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9h -omH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09r -p2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2 -Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqB -a4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqN -MY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZ -kJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqm -i6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660 -JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePC -X8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrR -PNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4Dbg -veFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw -5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//3BhcmEA -AAAAAAMAAAACZmYAAPKnAAANWQAAE9AAAAoOdmNndAAAAAAAAAABAAEAAAAAAAAAAQAAAAEAAAAAAAAA -AQAAAAEAAAAAAAAAAQAAbmRpbgAAAAAAAAA2AACnwAAAVQAAAEuAAACgAAAAJgAAAAwAAABQQAAAVEAA -AjMzAAIzMwACMzMAAAAAAAAAAHNmMzIAAAAAAAELtwAABZb///NXAAAHKQAA/df///u3///9pgAAA9oA -AMD2bW1vZAAAAAAAAAYQAACuA5v0iCnPTo6AAAAAAAAAAAAAAAAAAAAAANIlJicoWiRjbGFzc25hbWVY -JGNsYXNzZXNfEBBOU0JpdG1hcEltYWdlUmVwoycpKlpOU0ltYWdlUmVwWE5TT2JqZWN00iUmLC1XTlNB -cnJheaIsKtIlJi8wXk5TTXV0YWJsZUFycmF5oy8sKtMyMwo0NTZXTlNXaGl0ZVxOU0NvbG9yU3BhY2VE -MCAwABADgAzSJSY4OVdOU0NvbG9yojgq0iUmOzxXTlNJbWFnZaI7Kl8QD05TS2V5ZWRBcmNoaXZlctE/ -QFRyb290gAEACAARABoAIwAtADIANwBGAEwAVwBeAGUAcgB5AIEAgwCFAIoAjACOAJcAnACnAKkAqwCt -ALIAtQC3ALkAuwC9AMIA2QDbAN0gvyDEIM8g2CDrIO8g+iEDIQghECETIRghJyErITIhOiFHIUwhTiFQ -IVUhXSFgIWUhbSFwIYIhhSGKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAAIYw - - - - - - - - - - - - - - - - diff --git a/es.lproj/OpenURLPanel.strings b/es.lproj/OpenURLPanel.strings new file mode 100644 index 000000000..8518883ad --- /dev/null +++ b/es.lproj/OpenURLPanel.strings @@ -0,0 +1,9 @@ + +/* Class = "NSWindow"; title = "Open URL"; ObjectID = "5"; */ +"5.title" = "Open URL"; + +/* Class = "NSButtonCell"; title = "OK"; ObjectID = "23"; */ +"23.title" = "OK"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "24"; */ +"24.title" = "Cancel"; diff --git a/es.lproj/OpenURLPanel.xib b/es.lproj/OpenURLPanel.xib deleted file mode 100644 index dee80ff5a..000000000 --- a/es.lproj/OpenURLPanel.xib +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/es.lproj/SpotlightPanel.strings b/es.lproj/SpotlightPanel.strings new file mode 100644 index 000000000..406628c19 --- /dev/null +++ b/es.lproj/SpotlightPanel.strings @@ -0,0 +1,57 @@ + +/* Class = "NSWindow"; title = "Spotlight"; ObjectID = "1"; */ +"1.title" = "Spotlight"; + +/* Class = "NSButtonCell"; title = "Add to Playlist"; ObjectID = "6"; */ +"6.title" = "Add to Playlist"; + +/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "29"; */ +"29.headerCell.title" = "Track"; + +/* Class = "NSTableColumn"; headerCell.title = "Genre"; ObjectID = "30"; */ +"30.headerCell.title" = "Genre"; + +/* Class = "NSTableColumn"; headerCell.title = "Year"; ObjectID = "31"; */ +"31.headerCell.title" = "Year"; + +/* Class = "NSTableColumn"; headerCell.title = "Length"; ObjectID = "32"; */ +"32.headerCell.title" = "Length"; + +/* Class = "NSTableColumn"; headerCell.title = "Album"; ObjectID = "33"; */ +"33.headerCell.title" = "Album"; + +/* Class = "NSTableColumn"; headerCell.title = "Artist"; ObjectID = "34"; */ +"34.headerCell.title" = "Artist"; + +/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "36"; */ +"36.headerCell.title" = "Title"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "37"; */ +"37.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "39"; */ +"39.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "40"; */ +"40.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "41"; */ +"41.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "42"; */ +"42.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "44"; */ +"44.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Search Location:"; ObjectID = "80"; */ +"80.title" = "Search Location:"; + +/* Class = "NSMenu"; title = "ContextualMenu"; ObjectID = "171"; */ +"171.title" = "ContextualMenu"; + +/* Class = "NSMenuItem"; title = "Show in Finder"; ObjectID = "172"; */ +"172.title" = "Show in Finder"; diff --git a/es.lproj/SpotlightPanel.xib b/es.lproj/SpotlightPanel.xib deleted file mode 100644 index a59ad9e5a..000000000 --- a/es.lproj/SpotlightPanel.xib +++ /dev/null @@ -1,2110 +0,0 @@ - - - - 1050 - 11E53 - 1938 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSMenu - NSButton - NSCustomObject - NSArrayController - NSTableView - NSSearchField - NSTextField - NSSearchFieldCell - NSWindowTemplate - NSTextFieldCell - NSButtonCell - NSTableColumn - NSView - NSScrollView - NSUserDefaultsController - NSPathControl - NSScroller - NSTableHeaderView - NSPathCell - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - SpotlightWindowController - - - FirstResponder - - - NSApplication - - - 31 - 2 - {{196, 192}, {480, 320}} - -1610611712 - Spotlight - NSPanel - - - {400, 260} - - - 256 - - YES - - - 265 - {{335, 275}, {131, 32}} - - - - YES - - 67239424 - 134217728 - Add to Playlist - - LucidaGrande - 13 - 1044 - - - -2038284033 - 129 - - DQ - 200 - 25 - - - - - 274 - - YES - - - 2304 - - YES - - - 4370 - {438, 210} - - - - YES - - - 256 - {438, 17} - - - - - - - - 256 - {{425, 0}, {16, 17}} - - - YES - - title - 129 - 41 - 1000 - - 75628096 - 2048 - Title - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - - - title - YES - caseInsensitiveCompare: - - - - artist - 124 - 36 - 1000 - - 75628096 - 2048 - Artist - - - 6 - System - headerColor - - 3 - MQA - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - artist - YES - caseInsensitiveCompare: - - - - album - 127 - 39 - 1000 - - 75628096 - 2048 - Album - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - album - YES - caseInsensitiveCompare: - - - - length - 50 - 40.62012 - 1000 - - 75628096 - 67110912 - Length - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - YES - - - year - 47 - 10 - 1000 - - 75628096 - 67110912 - Year - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - YES - - - genre - 46 - 10 - 1000 - - 75628096 - 2048 - Genre - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - genre - YES - caseInsensitiveCompare: - - YES - - - track - 46 - 8 - 46 - - 75628096 - 67110912 - Track - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - - spotlightTrack - YES - compareTrackNumbers: - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -608141312 - - - CogSpotlightPlaylist - 1 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {438, 210}} - - - - - - 2 - - - - 256 - {{424, 17}, {15, 210}} - - - - - _doScroller: - 0.81927709999999998 - - - - -2147483392 - {{-100, -100}, {440, 15}} - - - - 1 - - _doScroller: - 0.92631580000000002 - - - - 2304 - - YES - - - {{1, 0}, {438, 17}} - - - - - - 4 - - - {{20, 44}, {440, 228}} - - - - 133138 - - - - - AAAAAAAAAABBmAAAQZgAAA - - - - 266 - {{20, 282}, {313, 22}} - - - - YES - - 343014976 - 268436480 - - - - YES - 1 - - 6 - System - textBackgroundColor - - - - - 130560 - 0 - search - - _searchFieldSearch: - - 138690815 - 0 - - 400 - 75 - - - 130560 - 0 - clear - - YES - - YES - - YES - AXDescription - NSAccessibilityEncodedAttributesValueType - - - YES - cancel - - - - - - _searchFieldCancel: - - 138690815 - 0 - - 400 - 75 - - 255 - - - - - 289 - {{174, 13}, {108, 17}} - - - - YES - - 67239488 - 272630784 - Search Location: - - - - 6 - System - controlColor - - - - - - - - 289 - - YES - - YES - Apple URL pasteboard type - NSFilenamesPboardType - - - {{284, 9}, {176, 26}} - - - - YES - - 337772033 - 32768 - - - - YES - - 2 - - - - - {480, 320} - - - - - {{0, 0}, {1280, 1002}} - {400, 276} - {10000000000000, 10000000000000} - Spotlight - YES - - - - YES - title - year - artist - album - genre - length - track - spotlightTrack - - SpotlightPlaylistEntry - YES - - YES - - - ContextualMenu - - YES - - - Show in Finder - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - - YES - - - - - YES - - - window - - - - 72 - - - - pathControl - - - - 159 - - - - playlistController - - - - 161 - - - - addToPlaylist: - - - - 163 - - - - searchField - - - - 179 - - - - pathComponentClicked: - - - - 216 - - - - initialFirstResponder - - - - 61 - - - - nextKeyView - - - - 205 - - - - tableView - - - - 149 - - - - spotlightWindowController - - - - 160 - - - - showEntryInFinder: - - - - 175 - - - - contentArray: query.results - - - - - - contentArray: query.results - contentArray - query.results - 2 - - - 213 - - - - nextKeyView - - - - 206 - - - - dataSource - - - - 151 - - - - menu - - - - 176 - - - - playlistController - - - - 184 - - - - rowHeight: values.fontSize - - - - - - rowHeight: values.fontSize - rowHeight - values.fontSize - - NSValueTransformerName - FontSizetoLineHeightTransformer - - 2 - - - 197 - - - - value: arrangedObjects.spotlightTrack - - - - - - value: arrangedObjects.spotlightTrack - value - arrangedObjects.spotlightTrack - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSAlwaysPresentsApplicationModalAlerts - NSConditionallySetsEditable - NSConditionallySetsEnabled - NSContinuouslyUpdatesValue - NSCreatesSortDescriptor - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValidatesImmediately - - - YES - - - - - - - - - - - - - - - 2 - - - 195 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 203 - - - - value: arrangedObjects.genre - - - - - - value: arrangedObjects.genre - value - arrangedObjects.genre - - NSConditionallySetsEditable - - - 2 - - - 102 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 212 - - - - value: arrangedObjects.year - - - - - - value: arrangedObjects.year - value - arrangedObjects.year - - NSConditionallySetsEditable - - - 2 - - - 94 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 211 - - - - value: arrangedObjects.length - - - - - - value: arrangedObjects.length - value - arrangedObjects.length - - NSConditionallySetsEditable - - - 2 - - - 105 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 208 - - - - value: arrangedObjects.album - - - - - - value: arrangedObjects.album - value - arrangedObjects.album - - NSConditionallySetsEditable - - - 2 - - - 101 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 201 - - - - value: arrangedObjects.artist - - - - - - value: arrangedObjects.artist - value - arrangedObjects.artist - - NSConditionallySetsEditable - - - 2 - - - 104 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 199 - - - - value: arrangedObjects.title - - - - - - value: arrangedObjects.title - value - arrangedObjects.title - - NSConditionallySetsEditable - - - 2 - - - 93 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 198 - - - - value: searchString - - - - - - value: searchString - value - searchString - 2 - - - 154 - - - - nextKeyView - - - - 204 - - - - value: values.spotlightSearchPath - - - - - - value: values.spotlightSearchPath - value - values.spotlightSearchPath - - NSValueTransformerName - StringToURLTransformer - - 2 - - - 193 - - - - nextKeyView - - - - 207 - - - - delegate - - - - 214 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - YES - - - - - - 2 - - - YES - - - - - - - - - - 5 - - - YES - - - - - - 6 - - - - - 16 - - - - - 79 - - - YES - - - - - - 80 - - - - - 88 - - - YES - - - - - - 89 - - - - - 55 - - - YES - - - - - - 56 - - - - - 24 - - - YES - - - - - - - - - 28 - - - YES - - - - - - - - - - - - 36 - - - YES - - - - - - 37 - - - - - 34 - - - YES - - - - - - 39 - - - - - 33 - - - YES - - - - - - 40 - - - - - 32 - - - YES - - - - - - 41 - - - - - 31 - - - YES - - - - - - 42 - - - - - 30 - - - YES - - - - - - 43 - - - - - 29 - - - YES - - - - - - 44 - - - YES - - - - - 27 - - - - - 26 - - - - - 25 - - - - - 171 - - - YES - - - - - - 172 - - - - - 186 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 1.IBPluginDependency - 1.IBWindowTemplateEditedContentRect - 1.NSWindowTemplate.visibleAtLaunch - 16.CustomClassName - 16.IBPluginDependency - 171.IBPluginDependency - 172.IBPluginDependency - 186.IBPluginDependency - 2.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 27.IBPluginDependency - 28.CustomClassName - 28.IBPluginDependency - 29.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency - 32.IBPluginDependency - 33.IBPluginDependency - 34.IBPluginDependency - 36.IBPluginDependency - 37.IBPluginDependency - 39.IBPluginDependency - 40.IBPluginDependency - 41.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 44.IBPluginDependency - 5.IBPluginDependency - 55.IBPluginDependency - 56.IBPluginDependency - 6.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency - 88.IBPluginDependency - 89.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{30, 13}, {480, 320}} - - SpotlightPlaylistController - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - PlaylistView - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 216 - - - - YES - - DNDArrayController - NSArrayController - - tableView - NSTableView - - - tableView - - tableView - NSTableView - - - - IBProjectSource - ./Classes/DNDArrayController.h - - - - EntriesController - NSObject - - IBProjectSource - ./Classes/EntriesController.h - - - - PlaybackController - NSObject - - YES - - YES - changeVolume: - eventSeekBackward: - eventSeekForward: - fade: - next: - pause: - pauseResume: - play: - playPauseResume: - prev: - resume: - seek: - skipToNextAlbum: - skipToPreviousAlbum: - stop: - volumeDown: - volumeUp: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - changeVolume: - eventSeekBackward: - eventSeekForward: - fade: - next: - pause: - pauseResume: - play: - playPauseResume: - prev: - resume: - seek: - skipToNextAlbum: - skipToPreviousAlbum: - stop: - volumeDown: - volumeUp: - - - YES - - changeVolume: - id - - - eventSeekBackward: - id - - - eventSeekForward: - id - - - fade: - id - - - next: - id - - - pause: - id - - - pauseResume: - id - - - play: - id - - - playPauseResume: - id - - - prev: - id - - - resume: - id - - - seek: - id - - - skipToNextAlbum: - id - - - skipToPreviousAlbum: - id - - - stop: - id - - - volumeDown: - id - - - volumeUp: - id - - - - - YES - - YES - outputDevices - playlistController - playlistView - volumeSlider - - - YES - NSArrayController - PlaylistController - PlaylistView - NSSlider - - - - YES - - YES - outputDevices - playlistController - playlistView - volumeSlider - - - YES - - outputDevices - NSArrayController - - - playlistController - PlaylistController - - - playlistView - PlaylistView - - - volumeSlider - NSSlider - - - - - IBProjectSource - ./Classes/PlaybackController.h - - - - PlaylistController - DNDArrayController - - YES - - YES - clear: - clearFilterPredicate: - emptyQueueList: - searchByAlbum: - searchByArtist: - showEntryInFinder: - stopAfterCurrent: - toggleQueued: - toggleRepeat: - toggleShuffle: - - - YES - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - clear: - clearFilterPredicate: - emptyQueueList: - searchByAlbum: - searchByArtist: - showEntryInFinder: - stopAfterCurrent: - toggleQueued: - toggleRepeat: - toggleShuffle: - - - YES - - clear: - id - - - clearFilterPredicate: - id - - - emptyQueueList: - id - - - searchByAlbum: - id - - - searchByArtist: - id - - - showEntryInFinder: - id - - - stopAfterCurrent: - id - - - toggleQueued: - id - - - toggleRepeat: - id - - - toggleShuffle: - id - - - - - YES - - YES - entriesController - playbackController - playlistLoader - spotlightWindowController - - - YES - EntriesController - PlaybackController - PlaylistLoader - SpotlightWindowController - - - - YES - - YES - entriesController - playbackController - playlistLoader - spotlightWindowController - - - YES - - entriesController - EntriesController - - - playbackController - PlaybackController - - - playlistLoader - PlaylistLoader - - - spotlightWindowController - SpotlightWindowController - - - - - IBProjectSource - ./Classes/PlaylistController.h - - - - PlaylistLoader - NSObject - - playlistController - PlaylistController - - - playlistController - - playlistController - PlaylistController - - - - IBProjectSource - ./Classes/PlaylistLoader.h - - - - PlaylistView - NSTableView - - YES - - YES - scrollToCurrentEntry: - shufflePlaylist: - sortByPath: - toggleColumn: - - - YES - id - id - id - id - - - - YES - - YES - scrollToCurrentEntry: - shufflePlaylist: - sortByPath: - toggleColumn: - - - YES - - scrollToCurrentEntry: - id - - - shufflePlaylist: - id - - - sortByPath: - id - - - toggleColumn: - id - - - - - YES - - YES - playbackController - playlistController - - - YES - PlaybackController - PlaylistController - - - - YES - - YES - playbackController - playlistController - - - YES - - playbackController - PlaybackController - - - playlistController - PlaylistController - - - - - IBProjectSource - ./Classes/PlaylistView.h - - - - SpotlightPlaylistController - PlaylistController - - IBProjectSource - ./Classes/SpotlightPlaylistController.h - - - - SpotlightWindowController - NSWindowController - - YES - - YES - addToPlaylist: - pathComponentClicked: - toggleWindow: - - - YES - id - id - id - - - - YES - - YES - addToPlaylist: - pathComponentClicked: - toggleWindow: - - - YES - - addToPlaylist: - id - - - pathComponentClicked: - id - - - toggleWindow: - id - - - - - YES - - YES - pathControl - playlistController - playlistLoader - searchField - - - YES - NSPathControl - NSArrayController - PlaylistLoader - NSSearchField - - - - YES - - YES - pathControl - playlistController - playlistLoader - searchField - - - YES - - pathControl - NSPathControl - - - playlistController - NSArrayController - - - playlistLoader - PlaylistLoader - - - searchField - NSSearchField - - - - - IBProjectSource - ./Classes/SpotlightWindowController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {11, 11} - {10, 3} - - - -