From ec0e45381ef9baf13b3c87f2518d97738c2f0789 Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Thu, 3 Oct 2013 01:00:58 -0700 Subject: [PATCH] Cleaned up most of the warnings, eliminated use of deprecated APIs, and fixed the hotkeys crashing. --- Application/AppController.m | 39 +- Application/MediaKeysApplication.m | 6 +- Application/PlaybackController.m | 2 +- Audio/AudioPlayer.h | 2 - Audio/Chain/ConverterNode.m | 12 +- Audio/Output/OutputCoreAudio.m | 11 +- Audio/Plugin.h | 4 +- Audio/PluginController.m | 7 +- AudioScrobbler/AudioScrobblerClient.m | 2 + English.lproj/MainMenu.xib | 11147 +++------------- FileTree/DirectoryNode.m | 9 +- FileTree/FileTreeController.h | 1 + FileTree/FileTreeController.m | 6 +- FileTree/FileTreeDataSource.m | 2 +- FileTree/FileTreeOutlineView.m | 7 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/md5.c | 2 +- .../flac-1.2.1/src/libFLAC/metadata_object.c | 2 +- Frameworks/GME/gme/Ay_Apu.cpp | 6 +- Frameworks/GME/gme/Dual_Resampler.cpp | 2 - Frameworks/GME/gme/Vgm_Core.cpp | 2 +- Frameworks/GME/gme/c140.c | 1 + Frameworks/GME/gme/fm.c | 4 +- Frameworks/GME/gme/fmopl.cpp | 22 +- Frameworks/GME/gme/k053260.c | 10 +- Frameworks/GME/gme/k054539.c | 5 +- Frameworks/GME/gme/okim6258.c | 3 +- Frameworks/GME/gme/okim6295.c | 2 +- Frameworks/GME/gme/rf5c68.c | 1 + Frameworks/GME/gme/ym2151.c | 62 +- Frameworks/GME/gme/ym2413.c | 278 +- Frameworks/GME/gme/ymdeltat.cpp | 30 +- Frameworks/GME/gme/ymz280b.c | 2 +- .../HighlyAdvanced/vbam/apu/Blip_Buffer.cpp | 4 +- .../HighlyAdvanced/vbam/apu/Blip_Buffer.h | 14 +- .../vbam/apu/Effects_Buffer.cpp | 8 +- .../HighlyAdvanced/vbam/apu/Effects_Buffer.h | 2 +- .../HighlyAdvanced/vbam/apu/Gb_Oscs.cpp | 12 +- .../HighlyAdvanced/vbam/apu/Gb_Oscs.h | 2 +- .../HighlyAdvanced/vbam/apu/Multi_Buffer.cpp | 4 +- .../HighlyAdvanced/vbam/apu/Multi_Buffer.h | 18 +- .../HighlyAdvanced/vbam/apu/blargg_common.h | 2 +- .../HighlyAdvanced/vbam/gba/GBA-arm.cpp | 13 +- .../HighlyAdvanced/vbam/gba/GBA.h | 2 +- .../HighlyAdvanced/vbam/gba/Sound.cpp | 10 +- .../project.pbxproj | 8 - .../HighlyExperimental/Core/bios.c | 10 +- .../HighlyExperimental/Core/iop.c | 4 +- .../HighlyExperimental/Core/psx.c | 4 +- .../HighlyExperimental/Core/spucore.c | 1 - .../HighlyQuixotic/Core/qsound.c | 2 +- .../HighlyTheoretical/Core/m68k/m68kcpu.c | 2 + .../HighlyTheoretical/Core/m68k/m68kcpu.h | 13 + .../HighlyTheoretical/Core/m68k/m68kops.c | 48 +- .../HighlyTheoretical/Core/sega.c | 6 +- .../HighlyTheoretical/Core/yam.c | 22 +- .../src/MACLib/Old/AntiPredictorExtraHigh.cpp | 6 +- .../mac-src/src/MACLib/Old/UnBitArrayOld.cpp | 9 +- Frameworks/MAD/Files/frame.c | 6 +- .../Shorten/Files/shorten/src/shn_reader.cpp | 4 +- Frameworks/TagLib/taglib/taglib/fileref.h | 2 + .../taglib/taglib/m4a/mp4audiosampleentry.cpp | 2 +- .../TagLib/taglib/taglib/toolkit/tlist.tcc | 2 +- .../TagLib/taglib/taglib/toolkit/tstring.cpp | 2 +- Frameworks/Vorbis/Files/lib/floor1.c | 4 - Frameworks/Vorbis/Files/lib/mapping0.c | 1 - Frameworks/Vorbis/Files/lib/misc.c | 4 - Frameworks/Vorbis/Files/lib/psy.c | 1 - Frameworks/Vorbis/Files/lib/res0.c | 4 - Frameworks/WMA/WMA.xcodeproj/project.pbxproj | 12 +- Frameworks/WMA/ffmpeg-strip-wma/config.h | 2 + .../WMA/ffmpeg-strip-wma/libavcodec/avcodec.h | 2 +- .../ffmpeg-strip-wma/libavcodec/bitstream.c | 2 +- .../libavcodec/error_resilience.c | 2 +- .../ffmpeg-strip-wma/libavcodec/imgconvert.c | 6 +- .../WMA/ffmpeg-strip-wma/libavcodec/options.c | 8 +- .../WMA/ffmpeg-strip-wma/libavcodec/utils.c | 27 +- .../libavcodec/wmalosslessdec.c | 5 +- .../ffmpeg-strip-wma/libavcodec/wmaprodec.c | 1 + .../WMA/ffmpeg-strip-wma/libavformat/asfdec.c | 8 +- .../WMA/ffmpeg-strip-wma/libavformat/astdec.c | 1 + .../ffmpeg-strip-wma/libavformat/avformat.h | 2 +- .../WMA/ffmpeg-strip-wma/libavformat/avidec.c | 22 +- .../WMA/ffmpeg-strip-wma/libavformat/avio.c | 8 +- .../ffmpeg-strip-wma/libavformat/aviobuf.c | 6 +- .../WMA/ffmpeg-strip-wma/libavformat/id3v2.c | 22 +- .../WMA/ffmpeg-strip-wma/libavformat/mux.c | 3 +- .../ffmpeg-strip-wma/libavformat/options.c | 6 +- .../ffmpeg-strip-wma/libavformat/riffdec.c | 2 +- .../WMA/ffmpeg-strip-wma/libavformat/utils.c | 20 +- .../WMA/ffmpeg-strip-wma/libavformat/wavdec.c | 4 +- .../WMA/ffmpeg-strip-wma/libavformat/xwma.c | 1 + .../ffmpeg-strip-wma/libavutil/attributes.h | 2 +- .../WMA/ffmpeg-strip-wma/libavutil/bprint.c | 2 +- .../WMA/ffmpeg-strip-wma/libavutil/cpu.c | 2 +- .../WMA/ffmpeg-strip-wma/libavutil/eval.c | 5 +- .../WMA/ffmpeg-strip-wma/libavutil/frame.c | 20 +- .../WMA/ffmpeg-strip-wma/libavutil/internal.h | 1 + .../WMA/ffmpeg-strip-wma/libavutil/log.c | 6 +- .../WMA/ffmpeg-strip-wma/libavutil/opt.c | 52 +- .../WMA/ffmpeg-strip-wma/libavutil/pixdesc.c | 7 +- .../ffmpeg-strip-wma/libavutil/random_seed.c | 2 +- .../WMA/ffmpeg-strip-wma/libavutil/sha.c | 4 +- Frameworks/WavPack/Files/md5.c | 2 +- Frameworks/WavPack/Files/unpack3.c | 18 +- Frameworks/psflib/psflib/psf2fs.c | 23 +- InfoInspector/MissingAlbumArtTransformer.h | 2 +- Playlist/DNDArrayController.m | 2 +- Playlist/PlaylistController.m | 4 +- Playlist/PlaylistLoader.m | 2 +- Playlist/PlaylistView.m | 4 +- Plugins/APL/APLFile.m | 2 +- Plugins/CoreAudio/CoreAudioDecoder.m | 15 +- Plugins/FileSource/FileSource.m | 2 +- Plugins/Flac/FlacDecoder.m | 7 +- Plugins/HTTPSource/HTTPSource.m | 4 +- Plugins/HTTPSource/Utils/HTTPConnection.m | 2 +- Plugins/HTTPSource/Utils/Socket.m | 4 +- .../HighlyComplete/HCDecoder.mm | 34 +- Plugins/M3u/M3uContainer.m | 2 +- Plugins/MAD/MADDecoder.m | 2 + Plugins/Pls/PlsContainer.m | 2 +- Plugins/Vorbis/VorbisDecoder.m | 8 +- Plugins/WMA/WMA.xcodeproj/project.pbxproj | 8 +- Plugins/WMA/WMADecoder.m | 11 +- .../General/English.lproj/Preferences.xib | 22 +- Preferences/General/HotKeyControl.m | 1 + Preferences/General/NDHotKeyEvent.m | 192 +- Preferences/General/OutputsArrayController.m | 40 +- Preferences/PreferencesWindow.h | 2 +- Spotlight/SpotlightWindowController.h | 5 +- Spotlight/SpotlightWindowController.m | 4 +- TagEditor/TagEditorController.h | 3 +- TagEditor/TagEditorController.m | 2 + ThirdParty/AppleRemote/AppleRemote.m | 2 +- ThirdParty/GCWindowMenu/GCWindowMenu.m | 2 +- ThirdParty/ImageTextCell/ImageTextCell.m | 2 +- ThirdParty/NDHotKeys/NDHotKeyEvent.m | 196 +- 137 files changed, 2654 insertions(+), 10203 deletions(-) diff --git a/Application/AppController.m b/Application/AppController.m index c693a11c2..896bb6bb0 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -161,19 +161,19 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ p = [NSOpenPanel openPanel]; + [p setAllowedFileTypes:[playlistLoader acceptableFileTypes]]; [p setCanChooseDirectories:YES]; [p setAllowsMultipleSelection:YES]; + [p setResolvesAliases:YES]; - [p beginSheetForDirectory:nil file:nil types:[playlistLoader acceptableFileTypes] modalForWindow:mainWindow modalDelegate:self didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; -} - -- (void)openPanelDidEnd:(NSOpenPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo -{ - if (returnCode == NSOKButton) - { - [playlistLoader willInsertURLs:[panel URLs] origin:URLOriginInternal]; - [playlistLoader didInsertURLs:[playlistLoader addURLs:[panel URLs] sort:YES] origin:URLOriginInternal]; - } + [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]; + } else { + [p close]; + } + }]; } - (IBAction)savePlaylist:(id)sender @@ -182,16 +182,13 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ p = [NSSavePanel savePanel]; - [p setAllowedFileTypes:[playlistLoader acceptablePlaylistTypes]]; - [p beginSheetForDirectory:nil file:nil modalForWindow:mainWindow modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; -} - -- (void)savePanelDidEnd:(NSSavePanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo -{ - if (returnCode == NSOKButton) - { - [playlistLoader save:[panel filename]]; - } + [p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) { + if ( result == NSFileHandlingPanelOKButton ) { + [playlistLoader save:[[p URL] path]]; + } else { + [p close]; + } + }]; } - (IBAction)openURL:(id)sender @@ -265,7 +262,7 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ if ([fileManager fileExistsAtPath: folder] == NO) { - [fileManager createDirectoryAtPath: folder attributes: nil]; + [fileManager createDirectoryAtPath: folder withIntermediateDirectories:NO attributes:nil error:nil]; } NSString *fileName = @"Default.m3u"; diff --git a/Application/MediaKeysApplication.m b/Application/MediaKeysApplication.m index 3d0e63546..a5cbc5c9b 100644 --- a/Application/MediaKeysApplication.m +++ b/Application/MediaKeysApplication.m @@ -17,19 +17,19 @@ { case NX_KEYTYPE_PLAY: if( state == 0 ) - [[self delegate] clickPlay]; //Play pressed and released + [(AppController *)[self delegate] clickPlay]; //Play pressed and released break; case NX_KEYTYPE_NEXT: case NX_KEYTYPE_FAST: if( state == 0 ) - [[self delegate] clickNext]; //Next pressed and released + [(AppController *)[self delegate] clickNext]; //Next pressed and released break; case NX_KEYTYPE_PREVIOUS: case NX_KEYTYPE_REWIND: if( state == 0 ) - [[self delegate] clickPrev]; //Previous pressed and released + [(AppController *)[self delegate] clickPrev]; //Previous pressed and released break; } } diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m index b7883e0fb..2391562fa 100644 --- a/Application/PlaybackController.m +++ b/Application/PlaybackController.m @@ -111,7 +111,7 @@ NSString *CogPlaybackDidStopNotficiation = @"CogPlaybackDidStopNotficiation"; - (IBAction)play:(id)sender { if ([playlistView selectedRow] == -1) - [playlistView selectRow:0 byExtendingSelection:NO]; + [playlistView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; if ([playlistView selectedRow] > -1) [self playEntryAtIndex:[playlistView selectedRow]]; diff --git a/Audio/AudioPlayer.h b/Audio/AudioPlayer.h index c12872dc4..6d6da3ecc 100644 --- a/Audio/AudioPlayer.h +++ b/Audio/AudioPlayer.h @@ -54,8 +54,6 @@ - (void)setNextStream:(NSURL *)url withUserInfo:(id)userInfo withRGInfo:(NSDictionary*)rgi; - (void)resetNextStreams; -- (void)setRGInfo:(NSDictionary *)rgi; - + (NSArray *)fileTypes; + (NSArray *)schemes; + (NSArray *)containerTypes; diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m index 346422dad..cc1bbe481 100644 --- a/Audio/Chain/ConverterNode.m +++ b/Audio/Chain/ConverterNode.m @@ -17,12 +17,12 @@ void PrintStreamDesc (AudioStreamBasicDescription *inDesc) printf ("- - - - - - - - - - - - - - - - - - - -\n"); printf (" Sample Rate:%f\n", inDesc->mSampleRate); printf (" Format ID:%s\n", (char*)&inDesc->mFormatID); - printf (" Format Flags:%lX\n", inDesc->mFormatFlags); - printf (" Bytes per Packet:%ld\n", inDesc->mBytesPerPacket); - printf (" Frames per Packet:%ld\n", inDesc->mFramesPerPacket); - printf (" Bytes per Frame:%ld\n", inDesc->mBytesPerFrame); - printf (" Channels per Frame:%ld\n", inDesc->mChannelsPerFrame); - printf (" Bits per Channel:%ld\n", inDesc->mBitsPerChannel); + printf (" Format Flags:%X\n", inDesc->mFormatFlags); + printf (" Bytes per Packet:%d\n", inDesc->mBytesPerPacket); + printf (" Frames per Packet:%d\n", inDesc->mFramesPerPacket); + printf (" Bytes per Frame:%d\n", inDesc->mBytesPerFrame); + printf (" Channels per Frame:%d\n", inDesc->mChannelsPerFrame); + printf (" Bits per Channel:%d\n", inDesc->mBitsPerChannel); printf ("- - - - - - - - - - - - - - - - - - - -\n"); } diff --git a/Audio/Output/OutputCoreAudio.m b/Audio/Output/OutputCoreAudio.m index ccd1a9017..53f0e5c44 100644 --- a/Audio/Output/OutputCoreAudio.m +++ b/Audio/Output/OutputCoreAudio.m @@ -81,9 +81,12 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc if (outputDevice == -1) { NSLog(@"DEVICE IS -1"); UInt32 size = sizeof(AudioDeviceID); - err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, - &size, - &deviceID); + AudioObjectPropertyAddress theAddress = { + .mSelector = kAudioHardwarePropertyDefaultOutputDevice, + .mScope = kAudioObjectPropertyScopeGlobal, + .mElement = kAudioObjectPropertyElementMaster + }; + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &size, &deviceID); if (err != noErr) { NSLog(@"THERES NO DEFAULT OUTPUT DEVICE"); @@ -250,7 +253,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc - (void)resume { - OSStatus err = AudioOutputUnitStart(outputUnit); + AudioOutputUnitStart(outputUnit); } @end diff --git a/Audio/Plugin.h b/Audio/Plugin.h index da9023833..a8add97a1 100644 --- a/Audio/Plugin.h +++ b/Audio/Plugin.h @@ -10,7 +10,7 @@ - (BOOL)seekable; - (BOOL)seek:(long)position whence:(int)whence; - (long)tell; -- (int)read:(void *)buffer amount:(int)amount; //reads UP TO amount, returns amount read. +- (long)read:(void *)buffer amount:(long)amount; //reads UP TO amount, returns amount read. - (void)close; @end @@ -53,7 +53,7 @@ @protocol CogMetadataWriter //+ (NSArray *)fileTypes; //+ (NSArray *)mimeTypes; -+ (int)putMetadataInURL:(NSURL *)url; ++ (int)putMetadataInURL:(NSURL *)url tagData:(NSDictionary *)tagData; @end @protocol CogPropertiesReader diff --git a/Audio/PluginController.m b/Audio/PluginController.m index 65d8d6527..6dab3f7f9 100644 --- a/Audio/PluginController.m +++ b/Audio/PluginController.m @@ -89,7 +89,7 @@ static PluginController *sharedPluginController = nil; - (void)loadPluginsAtPath:(NSString *)path { - NSArray *dirContents = [[NSFileManager defaultManager] directoryContentsAtPath:path]; + NSArray *dirContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil]; for (NSString *pname in dirContents) { @@ -272,5 +272,10 @@ static PluginController *sharedPluginController = nil; } } +- (int)putMetadataInURL:(NSURL *)url +{ + return 0; +} + @end diff --git a/AudioScrobbler/AudioScrobblerClient.m b/AudioScrobbler/AudioScrobblerClient.m index b1b2e2765..44724af38 100644 --- a/AudioScrobbler/AudioScrobblerClient.m +++ b/AudioScrobbler/AudioScrobblerClient.m @@ -25,6 +25,8 @@ #import "AudioScrobblerClient.h" +#include + #define kBufferSize 1024 #define kPortsToStep 5 diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index ee82a5959..d5b0ce217 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -1,9407 +1,1740 @@ - - - - 1050 - 9J61 - 677 - 949.46 - 353.00 - - YES - - - - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - YES - - - YES - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - 4111 - 2 - {{1051, 196}, {691, 397}} - 1618479104 - Cog - MainWindow - - - B4998081-90DD-45DD-8243-0F7039C7DEA2 - - - YES - YES - YES - YES - 2 - 1 - - YES - - YES - 0D05748D-3258-44F5-9D1C-CBF211C15E2D - 2CDD90B4-2355-4E8A-AE42-A6C872DF700A - 2F487D99-16E9-4BF8-9A98-637FABEB2716 - 384C0EB5-D1D6-4D39-8113-03FB4958D7ED - 3B680DEB-106E-4549-A478-FFB8A6738053 - 6EE50288-54ED-448F-BB25-347479AE119F - A06F7688-72A2-4AAD-B9E1-C66720B2B0D3 - B042D8A5-AFF4-43B2-9DFB-E87A09B7F861 - F3591DBA-E0EC-4564-896A-C6EFFABC7873 - NSToolbarCustomizeToolbarItem - NSToolbarFlexibleSpaceItem - NSToolbarSeparatorItem - NSToolbarSpaceItem - - - YES - - - 0D05748D-3258-44F5-9D1C-CBF211C15E2D - - Search - Search - - - - 268 - {{0, 14}, {96, 22}} - YES - - 343014976 - 268436480 - - LucidaGrande - 1.300000e+01 - 1044 - - All - - YES - 1 - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - 130560 - 0 - search - _searchFieldSearch: - - - 138690815 - 0 - - 400 - 75 - - - 130560 - 0 - clear - - YES - - YES - - YES - AXDescription - NSAccessibilityEncodedAttributesValueType - - - YES - cancel - - - - - _searchFieldCancel: - - - 138690815 - 0 - - 400 - 75 - - CogFilter - 255 - - - - - - {96, 22} - {96, 22} - YES - YES - 0 - YES - 0 - - - - 2CDD90B4-2355-4E8A-AE42-A6C872DF700A - - Position - Position - - - - 270 - {{0, 14}, {96, 15}} - YES - - 604110336 - 131072 - - - LucidaGrande - 1.100000e+01 - 3100 - - - 1.000000e+04 - 0.000000e+00 - 0.000000e+00 - 0.000000e+00 - 0 - 1 - NO - NO - - - - - - {96, 15} - {10000, 15} - NO - YES - 0 - YES - 0 - - - - 2F487D99-16E9-4BF8-9A98-637FABEB2716 - - Info Inspector - Info Inspector - - - - 268 - {{23, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - NSImage - info_off - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - 384C0EB5-D1D6-4D39-8113-03FB4958D7ED - - Shuffle - Shuffle - - - - 268 - {{10, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - NSImage - shuffle_on - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - 3B680DEB-106E-4549-A478-FFB8A6738053 - - Volume - Volume - - - - 268 - {{12, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033958657 - 163 - - NSImage - volume_high - - - - 400 - 75 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - 6EE50288-54ED-448F-BB25-347479AE119F - - File Tree - File Tree - - - - 268 - {{15, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - NSImage - files_off - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - A06F7688-72A2-4AAD-B9E1-C66720B2B0D3 - - Playback Buttons - Playback Buttons - - - - 268 - {{9, 14}, {80, 24}} - YES - - -2080244224 - 0 - - - - YES - - 2.400000e+01 - - NSImage - previous - - - Previous - 0 - - - 2.400000e+01 - - NSImage - play - - - Play - 1 - 0 - - - 2.400000e+01 - - NSImage - next - - - Next - 0 - - - 2 - 2 - - - - - - {80, 24} - {80, 24} - YES - YES - 0 - YES - 0 - - - - B042D8A5-AFF4-43B2-9DFB-E87A09B7F861 - - Current Time - Current Time - - - - 268 - {{20, 14}, {38, 14}} - YES - - 67239488 - 272761856 - 0:00 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA - - - - - - - - - {38, 14} - {38, 14} - YES - YES - 0 - YES - 0 - - - - F3591DBA-E0EC-4564-896A-C6EFFABC7873 - - Repeat - Repeat - - - - 268 - {{10, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - NSImage - repeat_on - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - NSToolbarCustomizeToolbarItem - Customize - Customize - Customize Toolbar - - - 683671552 - {32, 32} - - YES - - YES - - - - TU0AKgAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAICAgbAAAABAAAAAAEBAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAQEBAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAENDQ0dJSUlW11dXbBpaWnDb29vzyAgIGUPDw8xAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAABsbGyUoKChIHh4ePSkpKUonJycsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDCEJCQoWvr6/i9fX1/fX19f7h4eH82dnZ+YODg9sYGBg8 -AAAAAAAAAAAAAAAAAAAAAAAAAAJFRUV6ZGRkvf39/f/+/v7//////0NDQ7QAAAAEAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8PDx9ISEiH2tra8/7+/v/j4+P/2NjY/7a2tv+ysrL/ -i4uL7j09PeUKCgoSAAAAAAAAAAAAAAAAUVFRlo2NjfTIyMj6x8fH/56env97e3v/ISEhMAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPDw8lRUVFjtDQ0Pb+/v7/4eHh/dDQ0P+NjY3/ -Tk5O6yoqKrIfHx+gGhoarCIiImwAAAABAAAAADg4OGWenp7/y8vL/d3d3f+8vLz/hYWF/0RERE0AAAAA -AAAAAAAAAAAfHx8sAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAj8/P2za2try9/f3/+vr6/7Kysr/ -dnZ2/D4+PvwgICB+EBAQNAICAgcAAAAPERERPQMDAwkQEBASh4eH2MHBwf/o6Oj/39/f/3R0dP88PDxO -AAAAAAAAAAAAAAAAcnJylkNDQ58HBwcIAAAAAAAAAAAAAAAAAAAAAAAAAAAGBgYMfn5+uMvLy/3Hx8f+ -u7u7/5OTk/9CQkL7HRYL7AICAgQAAAAAAAAAAAAAAAAAAAAAAgICBS4uLjOWlpbz6urq/+7u7v+rq6v/ -IyMj0wAAAAAAAAAAAAAAAIGBgZGLi4v/QkJC2Q0NDSYAAAAAAAAAAAAAAAAAAAAAGRkZJF5eXoylpaXz -pqam/4qKiv91dXX/YWFh+iwkHvojEADrJhcGoAgICA0AAAAAAAAAAAAAAAAAAAAAPj4+RJaWlvr19fX/ -6+vr/7W1tfVaWlrlAwMDbAAAAACKioqcoqKi/7+/v/9HR0fnDg4OJwAAAAAAAAAAHR0dK3V1dZ+pqanC -+vr6/9vb2/99fX3+Y2Nj+EhISOgMCAP4JhIA8jgaAPBxNADsNyMMjgcHBwsAAAAAAAAAAAAAAAAMDAwO -m5ub+Orq6v/y8vL/0NDQ7ICAgMtkZGTqcHBwzLOzs//Pz8//0tLS/0xMTNoJCQkhAAAAABoaGjZ/f3+4 -//////j4+P/9/f3/9vb2/0dHR/8oKCjkKSkpoAQCAJUNBQDXVSgA5XY5AOuTSADcOiUOewYGBgoAAAAA -AAAAAB4eHmFlZWX76Ojo/+7u7v/5+fn/5OTk9Li4uO3f39//8PDw/+Hh4f/Ly8v/Ozs7rQICAgMAAAAA -GBgYL3x8fP///////////7S0tP+np6f/QEBA+xUVFXUJCQkkBAQEDgcFA20jEQC7YzIA3n9BAOiiUwDK -NiMObgYGBgoTExNIOzs74bGxsf3Dw8P/1dXV////////////////////////////8/Pz/3R0dOcPDw9H -AAAAAQAAAAAAAAAAVVVVooCAgP/v7+//v7+//2VlZf86OjrLAQEBBgAAAAAAAAAAAAAAABENCVctFwCl -ZTQA1oZFAOCqWgDAMiMTgzExMcKzs7P4wcHB/5+fn//W1tb///////v7+/v//////////729vfOFhYXy -IyMjdAAAAAMAAAABAAAAAAAAAAAAAAAASkpKmlpaWv+RkZH/Nzc38hgYGG4AAAABAAAAAAAAAAAAAAAA -AAAAAAsFAEUwGACbaDcAzXpCAOFnRiLjs7Kx+MTExP+pqan/09PT/3p6evpdXV3rbGxs6l1dXfVXV1fs -UlJSxykpKWMAAAAGAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAQUFBmiMjI/8cHBysBQUFHQAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAsFAEAuGACfSzAT47y4s/24uLj/lJSU/9TU1P+Dg4PkMzMzzwYGBgw6OjpB -QEBASQ8PDxYbGxshAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIimgoKCi4AAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAwJBYS9u7n4r6+v/4GBgf/Pz8//iISB6CYmJqoDAwMK -AAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAABUwcHB7qurq/9ubm7/zs7O/5yOgPhlPhbf -MhsCegAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMnCgoKZsvLy++pqan/Wlpa/9LS0v+Nh4Hq -SCYE4IdDAeSbTgDLNxsAhwAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMOxoaGobV1dXzq6ur/0ZGRv/Z2dn/ -hoaGxQkEAIY6HgCyaDMA2YVAAOuWSQDZPh4AngAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgYGFEoKCio0tLS86urq/8xMTH/ -4uLi/4+Pj84AAABIAAAAAg8HAGg6HQDKaDIA4YI+APCVRQDsRSEAuAAAABMAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFhYrNTU1z9ra2vb8/Pz/ -FxcX/+rq6v+amprZAAAASAAAAAIAAAAAAAAAABAIAIY4GwDiaTEA6X46APeVRAD/SyIA0gAAABIAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICBT8/P4asrKz3 -0dHR//39/f/z8/P/paWl5gUFBVkAAAACAAAAAAAAAAAAAAAAAAAAABIJAKUxFgD6bTMA9no4AP9uLwD/ -KxIAxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBwcO -QUFBmpqamv+pqan/+Pj4/7GxsfIXFxeBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAHAMogDgD/ -WSkA/zwaAPcuEwCyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAEBAQMnJydWUFBQ85aWlvqoqKjfKioqrQEBAQUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAsFAOUXCQD6IA4AwgQCADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAgICBBR0dHmi4uLnACAgIHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAgDAMwFAgA9AAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE -AAAACQAAABAAAAAYAAAAIAAAACoAAAAxAAAANgAAADkAAAA4AQEBOQAAAC8AAAAnAAAAHQAAABUAAAAO -AAAACgAAAAsAAAAPAAAAFwAAACAAAAAqAAAAMQAAADQAAAAzAAAALQAAACQAAAAbAAAAEgAAAAsAAAAA -AAAAAAAAAAQAAAAJAAAAEAAAABgAAAAgAAAAKgAAADEAAAA2AAAAOQAAADgAAAA1AAAALwAAACcAAAAd -AAAAFQAAAA4AAAAKAAAACwAAAA8AAAAXAAAAIAAAACoAAAAxAAAANAAAADMAAAAtAAAAJAAAABsAAAAS -AAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA -EKoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE -AAABFgADAAAAAQD8AAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAA -ELIAAAAAAAgACAAIAAgAAQABAAEAAQ - - - - - - 3 - MCAwAA - - - - runToolbarCustomizationPalette: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - YES - - - - - - - - - - - - - - - - YES - - - - - - - - - - - - - - - - - YES - - - {3.40282e+38, 3.40282e+38} - - - 256 - - YES - - - 290 - {{17, 5}, {649, 15}} - - YES - - 67239488 - 138545152 - Total Duration: 00 hours 00 minutes 00 seconds - - - 1 - - - - - - - 279 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 4370 - {691, 355} - - YES - - - 256 - {691, 17} - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - YES - - index - 2.200000e+01 - 2.200000e+01 - 6.200000e+01 - - 75628032 - 67108864 - # - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 337772096 - 67110912 - Text Cell - - - - 6 - System - controlBackgroundColor - - - - - 3 - YES - - - - status - 2.000000e+01 - 2.000000e+01 - 2.000000e+01 - - 75628032 - 0 - - - - 6 - System - headerColor - - - - - - 67239424 - 33685504 - - 549453824 - {17, 17} - - YES - - YES - - - - TU0AKgAABASAACBQOCQWDQeEQmBAaBAEEwJ/vGFROKRWFCIMAwqCgJv4erZqvY3xaSQoFwMIQMGgQDgc -JAkGg8RoEsDo7g94NkNJdvhViNJlsk+Pp9PlpQQDAYDhmkgYQAoFg0RBUKhQPhMKBYOA8IhEMBkNBkNi -AQh8KhgMBwJBcLBUGvZ7vYBDZ8ryBONuABkB4yAAymc0m55O5zpOCCgUi1IHI7HY2jcaDIBA0HA4AA8G -g0AAwGScBgQBgBzuNyAAKBcLgB7Ph8gBzNpigAQvBPAB8NvStgRHkAGM7IJNNlpswzwQGhAImJQqFSJY -nEsjgd39MAAGB1CTgntABmsFhAB6up0gAODcdQJyKYABh+roAPtuuwAOMMHMAGxIq5hsFcK8ioG1qBBk -RBFkkXA5jgNQKnvBgAKbBwDoYdp2neAByGOZAAHocZwgAeYCH2AAhB5Dp/HgawAH4c5ytEAAtAAQ5eHU -chQEuRweoGcCBg6NY5DqXpFkIQQSn7IoAAOBAFAAf5/n6ABmGZDJgGCZIAB2HccAEbpXAAGwYm8AB7nC -dQAAGfb5HafAeAAUx0hafg9jmNggIG2KBAYKQsi6XRPk0TAcnMcsWG6bJoQ0eJ5vIBhqtcdTLHieh9AA -KAgusBJ6GmABkmUf4ABuFp3AAeR1JSXYAC6AAyDOwB9nueJMIGAIfiGJBXFSVBTCgfx+RCcRpmDI7XTC -d1Mn8Bb/oYcwABiGD5G2YhsAAYRpgmAAuCCcQAHyclQmYB46gAMQ6j6TBy0INKCBcGYbkyVhVFUMy2Wq -ZpmUMAp3lOAAFgiHAAAUDccAafBcgACoFWicJsgwABwnYA4ABoBxZIEwgAG4Cw8AAMxEFKYBnGKXQjII -DgPBCPxUlUVhAh0G4ZAAZxnmaABvmQTtliKOkwnoc4ABODdDHqbptAAdYDCw6oEWqBRnDjfR/zAdAEDA -AA+FucRxFWT5LTolAIgkMJPFEU5PCgJeRGYZRlAAeDqBCE4WzKeZfgAD4OnW+ZjG7FIIBrMp8PkCJ4bm -fx0aGaJzhQABMnODZ+lQTxMCIpClCKSRLE4XIzjGLgAns1YAH0ftOm2auZBeCRjuqAh5AAfx5nr1p7Hb -1p51Cfp3nv1p3QqXJk7uMxWnmQR5HoeFYIGAnkhoMg3DsYgaBcFYDm2b5vHcbhuG+fIzCaFAMiCHTQn+ -fNJH+ezWn2daJHYdNEnIcp2Hz6hwHaZprHSa5OmKdAxnwfg/0OkGAmBA5ATlEPFSaPscADwFAHB0JQPg -XA+DzHaOUeA1xrDlHSOIdg8RyjhHQO4bQ5h0j0G0PBSQ5lJNEIGaUgSiSIElIOBY6zdFOgAPkQJu5Anc -kCSdDIgxAQAADwEAAAMAAAABABEAAAEBAAMAAAABABEAAAECAAMAAAAEAAAEvgEDAAMAAAABAAUAAAEG -AAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABB4cAAAEX -AAQAAAABAAAD+wEcAAMAAAABAAEAAAE9AAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAExodz -AAcAAAwAAAAEzgAAAAAACAAIAAgACAABAAEAAQABAAAMAGFwcGwCAAAAbW50clJHQiBYWVogB9kABQAZ -AAkAOwAKYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsU1dAK4F6 -9rvEj5erkJ5dDgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANclhZWgAAASAAAAAUZ1hZWgAA -ATQAAAAUYlhZWgAAAUgAAAAUd3RwdAAAAVwAAAAUY2hhZAAAAXAAAAAsclRSQwAAAZwAAAAOZ1RSQwAA -AawAAAAOYlRSQwAAAbwAAAAOdmNndAAAAcwAAAYSbmRpbgAAB+AAAAMOZGVzYwAACvAAAACoY3BydAAA -C5gAAABAbW1vZAAAC9gAAAAoWFlaIAAAAAAAAG+DAAA5HgAAA5VYWVogAAAAAAAAYQoAALTeAAAYj1hZ -WiAAAAAAAAAmSQAAEh4AALcBWFlaIAAAAAAAAPNQAAEAAAABFr5zZjMyAAAAAAABDEEAAAXd///zKAAA -B5IAAP2Q///7ov///aMAAAPbAADAeGN1cnYAAAAAAAAAAQIzAABjdXJ2AAAAAAAAAAECMwAAY3VydgAA -AAAAAAABAjMAAHZjZ3QAAAAAAAAAAAADAQAAAgAAAD0BGgJKAu8DzgSwBZEGjgdzCHgJWApMCzoMKw0j -DhMPEhACEQMR9xL3E+4U6hXmFuIX4RjcGd0a1hvYHNAd0h7JH8cgwyHDIsEjviS8JbcmtievKK4ppiql -K54smy2VLpEvjDCGMYIyezN4NHA1bjZmN2I4WjlUOk47SDxDPT0+Oj80QDJBK0IoQyNEIUUdRhpHFUgP -SQpKAUr6S+5M5U3YTs1PwFC0UadSmFOMVH1VcFZiV1VYSVk9WjJbJlwdXRReDV8GYAFg+2H4YvVj9GTz -ZfNm9Gf1aPhp+Wr9a/9tA24GbwpwDXESchVzGnQedSF2JXcneCp5K3oseyx8LX0qfip/JYAjgR2CF4MP -hAeE/oXzhuqH34jWicuKwYu1jKqNn46Uj4mQfZFzkmaTW5RPlUOWOJcsmCGZFpoLmwCb9pzrneGe1p/N -oMOhuqKyo6mkoaWZppKnjKiGqYCqe6t3rHStcq5wr2+wbrFvsnCzc7R2tXu2gLeFuIu5kbqYu5+8p72v -vri/wcDLwdTC38PqxPXGAccOyBrJJ8o0y0PMUM1gzm7PftCO0Z7Sr9PA1NHV5Nb12AjZG9ov20LcV91q -3n/fk+Cp4b3i0+Po5P7mFOcr6EHpWepw64nsoe277tTv7/EK8iXzQvRf9Xz2m/e6+Nr5/Psd/EH9Zf6K -AAAAPgEbAk0C8wPTBLcFmAaXB30IhAllCloLSgw8DTUOJw8nEBgRGhIQExEUCRUHFgQXAhgCGP4aABr6 -G/4c+B37HvQf8yDwIfEi8CPvJO4l6ibrJ+Uo5ingKuAr2izYLdQu0S/NMMkxxjLAM740uDW4NrA3rjin -OaM6njuaPJY9kj6QP4tAikGEQoNDf0R+RXxGfEd5SHZJc0puS2tMZU1iTllPU1BKUUJSOVMvVCZVG1YS -VwVX+ljsWeBa0lvEXLZdpl6ZX4dgeGFoYlljSmQ6ZSxmHGcPaABo8mnkatZryWy6ba5un2+ScIRxd3Jq -c1x0T3VBdjV3JngaeQx5/3rye+N8133Ifrt/rICfgZCCgoN0hGWFV4ZGhzeIJ4kXigeK9ovmjNSNxY6z -j6KQkZGBknGTX5RQlT+WMJcgmBGZA5n0muab2JzMnb+es5+ooJ2hlKKKo4Oke6V1pnCnbKhpqWeqZ6to -rGutb650r3ywhrGRsp6zrrS/tdG25rf8uRS6LbtIvGS9gr6hv8HA4sIFwyjETMVxxpfHvsjkygzLM8xc -zYTOrc/U0P3SJNNL1HLVmNa91+HZBdon20ncaN2I3qbfxeDj4gHjIOQ+5V3me+eZ6Lfp1erz7BDtLe5L -72fwhPGg8rzz1/Tz9g33KPhB+Vv6c/uN/KP9u/7R/+gAAAA+ARsCTQLzA9QEtwWZBpgHfgiFCWYKWwtL -DD0NNg4oDygQGhEcEhETEhQLFQgWBhcEGAQZABoDGv0cARz6Hf0e9x/2IPMh9CLzI/Ik8iXuJu4n6Sjq -KeMq4yveLNwt2C7VL9IwzTHKMsUzwzS9Nbw2tTezOKw5qDqjO588nD2XPpU/kECQQYpCiUOFRIVFg0aC -R4BIfEl6SnVLckxrTWdOXk9YUE9RR1I+UzRUK1UfVhdXCVf+WPBZ5VrXW8lcvF2sXqBfj2CBYXJiZWNY -ZEplP2YxZydoGWkOagJq92vsbOFt127Kb8FwtXGrcp9zlHSKdX12c3dleFp5TXpBezN8Jn0Yfgl+/H/q -gNuByYK5g6eElIWChm6HW4hFiTGKHIsFi/CM2Y3Ejq2Pl5CAkWqSVJM9lCeVEJX7luWXz5i7maaakpt+ -nGudWZ5HnzagJaEWogii+qPupOOl2abQp8mow6nAqr2rvay+rcKuyK/RsNyx6rL6tA21IrY5t1K4bbmK -uqi7ybzrvg+/NcBcwYXCr8PaxQbGM8dgyI/JvsrtzB3NTc59z6vQ29IJ0zfUZNWQ1rvX5NkM2jLbWNx6 -3Zzevd/e4P7iH+NA5GHlgeah58Ho4eoA6x/sPu1c7nrvl/C18dDy7fQH9SL2O/dV+Gz5hfqa+7H8xf3a -/uz//wAAbmRpbgAAAAAAAAMGAACjwAAAVIAAAEzAAACZgAAAJxcAABF7AABQQAAAVEAAAgQ3AAHtwgAB -5+oAAwB4AAIAAAADAA4AHwA2AFUAewCoANwBFwFaAaQB9gJQArIDHQOPBAoEjgUbBbEGUAb4B6oIZQkp -CfcKzwuwDJoNjQ6KD48QnhG5EuEUFxVYFqYYABllGtQcTB3NH1Ug5CJ6JBcluydnKRwq2SygLnAwSjIv -NCA2HjgpOkI8aj6jQO1DRkWrSB1KnE0nT79SY1UUV9Bal11pYEZjLWYeaRlsHG8ocjt1VXh1e5x+x4H3 -hS6Ibou1jwSSWpW5mR+cjKACo3+nBKqRriWxwbVkuRC8w8B9xEHIDcviz7/TpNeR24TffuN+54Trj++e -87L3yfvj//8AAAADAA4AHwA2AFUAewCoANwBFwFaAaQB9gJQArIDHQOPBAoEjgUbBbEGUAb4B6oIZQkp -CfcKzwuwDJoNjQ6KD48QnRG3EtwUDBVJFpIX5xlIGrYcMR25H04g8CKcJFQmFifjKbsrni2NL4cxjTOf -Nbw35TobPF0+rEEHQ3BF6EhtSwBNoFBNUwZVy1ibW3VeWmFIZD5nPGpBbUtwWnNtdoJ5mXyvf8SC2IXs -iQCMFo8tkkeVY5iEm6ie0qIDpTqoeavBrxSycrXeuVe84MB6xCDH0MuJz0zTGtby2tXew+K95sPq1u72 -8yP3Xfun//8AAAADAA4AHwA2AFUAewCoANwBFwFaAaQB9gJQArIDHQOPBAoEjgUbBbEGUAb4B6oIZQkp -CfcKzwuwDJoNjQ6KD48QnRG3EtwUDRVKFpMX6RlKGrkcMx27H08g7yKZJEwmCifTKaUrgy1sL2AxYDNt -NYc3rTniPCU+eEDaQ0xFzkhgSwJNslBwUztWFFj4W+he4mHlZPBoAmsabjZxVXR0d5R6sX3KgN2D7Ib5 -igWNEZAckyiWNZlFnFifcKKNpbGo3qwUr1WyorX+uWq858B5xBfHwMtyzy/S9tbJ2qjek+KL5pHqpu7K -8v33QvuX//8AAGRlc2MAAAAAAAAAGjIyMDlXQSAxMC81NS8yLjIgMjAwOTA1MjUAAAAAAAAAABoAMgAy -ADAAOQBXAEEAIAAxADAALwA1ADUALwAyAC4AMgAgADIAMAAwADkAMAA1ADIANQAAAAAaMjIwOVdBIDEw -LzU1LzIuMiAyMDA5MDUyNQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHRl -eHQAAAAAQ29weXJpZ2h0IEFwcGxlIEluYy4sIDIwMDkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AABtbW9kAAAAAAAAEKwAAPARMDg4TMYC6wAAAAAAAAAAAAAAAAAAAAAAA - - NSCalibratedRGBColorSpace - 8 - 24 - 0 - - - - - - - 0 - 0 - 0 - NO - - 3 - YES - - - - title - 9.500000e+01 - 4.100000e+01 - 1.000000e+03 - - 75628032 - 0 - Title - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - title - YES - caseInsensitiveCompare: - - - - artist - 9.000000e+01 - 3.600000e+01 - 1.000000e+03 - - 67239424 - 0 - Artist - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - artist - YES - caseInsensitiveCompare: - - - - album - 9.700000e+01 - 3.900000e+01 - 1.000000e+03 - - 67239424 - 0 - Album - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - album - YES - caseInsensitiveCompare: - - - - length - 1.056201e+02 - 4.062012e+01 - 1.000000e+03 - - 67239424 - 67108864 - Length - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - - - year - 7.700000e+01 - 1.000000e+01 - 1.000000e+03 - - 67239424 - 67108864 - Year - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - - - genre - 8.300000e+01 - 1.000000e+01 - 1.000000e+03 - - 67239424 - 0 - Genre - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - genre - YES - caseInsensitiveCompare: - - - - track - 7.400000e+01 - 4.000000e+00 - 1.000000e+03 - - 67239424 - 67108864 - Track - - - - - - 337772096 - 67110912 - Text Cell - - - - - - 3 - YES - - - - path - 5.700000e+01 - 1.000000e+01 - 3.402823e+38 - - 75628032 - 0 - Path - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - YES - - - filename - 5.700000e+01 - 1.000000e+01 - 3.402823e+38 - - 75628032 - 0 - Filename - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - YES - - - 3.000000e+00 - 2.000000e+00 - - - 6 - System - gridColor - - 3 - MC41AA - - - 1.700000e+01 - -608141312 - Playlist - 1 - 15 - 0 - YES - - - {{0, 17}, {691, 355}} - - - - - 2 - - - - -2147483392 - {{85, 17}, {15, 68}} - - - _doScroller: - 8.192771e-01 - - - - -2147483392 - {{-100, -100}, {683, 15}} - - 1 - - _doScroller: - 8.209134e-01 - - - - 2304 - - YES - - - {691, 17} - - - - - 4 - - - - {691, 372} - - - 528 - - - - - - AAAAAAAAAABBmAAAQZgAAA - - - {{0, 25}, {691, 372}} - - YES - 2 - - - {691, 397} - - - {{0, 0}, {1920, 1178}} - {3.40282e+38, 3.40282e+38} - Cog - - - 4111 - 2 - {{196, 509}, {481, 0}} - 1677723648 - Cog - MiniWindow - - - 35998ECE-5AD8-429E-8479-657249B22C9C - - - YES - YES - YES - YES - 2 - 1 - - YES - - YES - 0649F8CF-02D0-4D43-9FB4-CCAFAFA03B49 - 6F5A6C43-A09C-462A-AEE2-C86DC3C55128 - 9A52F396-9BBC-4791-AC12-664859F26F89 - BBA4D635-FC27-42FC-B346-CE553195CA7C - C0FF70A3-EE67-43F6-9956-95B89425CF0E - C10E329B-9AB7-47DB-B3BA-7C40B57792E8 - EE7CA50B-9B79-414A-A257-7AC385032675 - NSToolbarCustomizeToolbarItem - NSToolbarFlexibleSpaceItem - NSToolbarSeparatorItem - NSToolbarSpaceItem - - - YES - - - 0649F8CF-02D0-4D43-9FB4-CCAFAFA03B49 - - Info Inspector - Info Inspector - - - - 268 - {{23, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - 6F5A6C43-A09C-462A-AEE2-C86DC3C55128 - - Playback Buttons - Playback Buttons - - - - 268 - {{9, 14}, {80, 24}} - YES - - -2080244224 - 0 - - - - YES - - 2.400000e+01 - - - Previous - 0 - - - 2.400000e+01 - - - Play - 1 - 0 - - - 2.400000e+01 - - - Next - 0 - - - 2 - 2 - - - - - - {80, 24} - {80, 24} - YES - YES - 0 - YES - 0 - - - - 9A52F396-9BBC-4791-AC12-664859F26F89 - - Repeat - Repeat - - - - 268 - {{10, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - BBA4D635-FC27-42FC-B346-CE553195CA7C - - Volume - Volume - - - - 268 - {{12, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033958657 - 163 - - - - 400 - 75 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - - C0FF70A3-EE67-43F6-9956-95B89425CF0E - - Current Time - Current Time - - - - 268 - {{20, 14}, {38, 14}} - YES - - 67239488 - 272761856 - 0:00 - - - - - - - - - - {38, 14} - {38, 14} - YES - YES - 0 - YES - 0 - - - - C10E329B-9AB7-47DB-B3BA-7C40B57792E8 - - Position - Position - - - - 270 - {{0, 14}, {96, 15}} - YES - - 604110336 - 131072 - - - - 1.000000e+04 - 0.000000e+00 - 0.000000e+00 - 0.000000e+00 - 0 - 1 - NO - NO - - - - - - {96, 15} - {10000, 15} - NO - YES - 0 - YES - 0 - - - - EE7CA50B-9B79-414A-A257-7AC385032675 - - Shuffle - Shuffle - - - - 268 - {{10, 14}, {24, 25}} - YES - - 67239424 - 134217728 - - - - -2033975041 - 35 - - - - 200 - 25 - - - - - - {24, 25} - {24, 25} - YES - YES - 0 - YES - 0 - - - NSToolbarCustomizeToolbarItem - Customize - Customize - Customize Toolbar - - - - runToolbarCustomizationPalette: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - YES - - - - - - - - - - - - - - YES - - - - - - - - - - - - YES - - - {3.40282e+38, 3.40282e+38} - - - 256 - {481, 0} - - - {{0, 0}, {1680, 1028}} - {3.40282e+38, 3.40282e+38} - Mini Window - - - MainMenu - - YES - - - Cog - - 1048576 - 2147483647 - - - submenuAction: - - Cog - - YES - - - About Cog - - 2147483647 - - - - - - Check for Updates... - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Support Cog... - - 1048576 - 2147483647 - - - - - - Send Feedback... - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - UHJlZmVyZW5jZXPigKY - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - - Services - - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide Cog - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit Cog - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - - File - - - YES - - - Add File... - o - 1048576 - 2147483647 - - - - - - Add URL... - O - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Save As... - s - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close Window - w - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - - Edit - - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - Select Currently Playing - l - 1048576 - 2147483647 - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Show Info Inspector - i - 1048576 - 2147483647 - - - - - - Show Spotlight Panel - F - 1179914 - 2147483647 - - - - - - Show File Tree - d - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Toggle File Tree Orientation - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Customize Toolbar... - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Increase Font Size - + - 1048576 - 2147483647 - - - - - - Decrease Font Size - - - 1048576 - 2147483647 - - - - - - - - - Control - - 1048576 - 2147483647 - - - submenuAction: - - Control - - YES - - - Play/Pause - p - 1048576 - 2147483647 - - - - - - Stop - . - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Seek Forward - 75yDA - 131072 - 2147483647 - - - - - - - - - Seek Backward - 75yCA - 131072 - 2147483647 - - - - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Next Song - 75yDA - 1048576 - 2147483647 - - - - - - Previous Song - 75yCA - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Next Album - 75yDA - 524288 - 2147483647 - - - - - - - - - Previous Album - 75yCA - 524288 - 2147483647 - - - - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Volume Up - 75yAA - 1048576 - 2147483647 - - - - - - Volume Down - 75yBA - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Fade In/Out - P - 1179648 - 2147483647 - - - - - - Stop After Current - . - 1572864 - 2147483647 - - - - - - - - - Playlist - - 1048576 - 2147483647 - - - submenuAction: - - Playlist - - YES - - - Remove All - CA - 1048576 - 2147483647 - - - - - - Remove All from Queue - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Remove - CA - 2147483647 - - - - - - Show in Finder - r - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Add to Queue - - 1048576 - 2147483647 - - - - - - Remove from Queue - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Search for Songs by Artist - - 1048576 - 2147483647 - - - - - - Search for Songs from Album - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Repeat - - 1048576 - 2147483647 - - - submenuAction: - - Repeat - - YES - - - All - r - 1572864 - 2147483647 - - - - - - Album - - 1048576 - 2147483647 - - - - - - One - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - None - - 1048576 - 2147483647 - - - - - - - - - Shuffle - - 2147483647 - - - submenuAction: - - Shuffle - - YES - - - All - s - 1572864 - 2147483647 - - - - - - Albums - - 2147483647 - - - - - - Off - - 2147483647 - - - - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Filter Playlist - f - 1048576 - 2147483647 - - - - Filter Playlist - - YES - - YES - NSFont - NSOriginalFont - NSParagraphStyle - - - YES - - LucidaGrande - 1.400000e+01 - 16 - - - - 4 - - - - - - - - - Show All Songs - Gw - 2147483647 - - - - Show All Songs - - YES - - YES - NSFont - NSOriginalFont - - - YES - - - - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - - Window - - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cog - 1 - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - Help - - YES - - - Cog Help - ? - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - - YES - 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 - - - PlaylistEntry - - YES - YES - YES - YES - YES - - - DockIconController - - - PlaybackEventController - - - AppController - - - Menu - - YES - - - YES - Current Artist - - 2147483647 - - - - - - YES - Current Song - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Play/Pause - - 1048576 - 2147483647 - - - - - - Stop - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Previous Song - - 1048576 - 2147483647 - - - - - - Next Song - - 1048576 - 2147483647 - - - - - YES - - - PlaybackController - - - Menu - - YES - - - Add to Queue - - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Search for Artist - - 2147483647 - - - - - - Search for Album - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Information - - 2147483647 - - - - - - Show in Finder - - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Remove - - 1048576 - 2147483647 - - - - - - - PreferencesController - - - SUUpdater - - - PlaylistLoader - - - Menu - - YES - - - Index - I - 1048576 - 2147483647 - 1 - - - - - - Title - T - 1048576 - 2147483647 - 1 - - - - - - Artist - A - 1048576 - 2147483647 - 1 - - - - - - Album - L - 1048576 - 2147483647 - 1 - - - - - - Genre - G - 1048576 - 2147483647 - 1 - - - - - - Length - L - 1048576 - 2147483647 - 1 - - - - - - Track - R - 1048576 - 2147483647 - 1 - - - - - - Year - Y - 1048576 - 2147483647 - 1 - - - - - - - - - 256 - - YES - - - 256 - {{43, 39}, {15, 120}} - - YES - - 67501824 - 131072 - - - - 1.000000e+02 - 0.000000e+00 - 1.000000e+02 - 0.000000e+00 - 0 - 0 - NO - YES - - - - {97, 177} - NSView - - - SpotlightWindowController - - - EntriesController - - - YES - - - - YES - - display - - - length - - - seekable - - queued - - title - - - artist - - - PlaylistEntry - YES - - - - - YES - - queued - - title - artist - album - - PlaylistEntry - - YES - - - FileTreeViewController - - - InfoWindowController - - - FeedbackController - - - - - YES - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - showHelp: - - - - 122 - - - - terminate: - - - - 139 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - hideOtherApplications: - - - - 146 - - - - hide: - - - - 152 - - - - unhideAllApplications: - - - - 153 - - - - selectAll: - - - - 179 - - - - performClose: - - - - 193 - - - - performZoom: - - - - 198 - - - - playlistController - - - - 236 - - - - playlistController - - - - 261 - - - - tableView - - - - 262 - - - - delegate - - - - 354 - - - - mainWindow - - - - 359 - - - - savePlaylist: - - - - 360 - - - - delegate - - - - 481 - - - - dockMenu - - - - 525 - - - - makeKeyAndOrderFront: - - - - 704 - - - - playlistController - - - - 706 - - - - playlistView - - - - 717 - - - - playbackController - - - - 719 - - - - initialFirstResponder - - - - 720 - - - - prev: - - - - 723 - - - - next: - - - - 724 - - - - playPauseResume: - - - - 725 - - - - stop: - - - - 726 - - - - next: - - - - 727 - - - - prev: - - - - 728 - - - - donate: - - - - 752 - - - - value: arrangedObjects.title - - - - - - value: arrangedObjects.title - value - arrangedObjects.title - - NSConditionallySetsEditable - - - 2 - - - 814 - - - - value: arrangedObjects.artist - - - - - - value: arrangedObjects.artist - value - arrangedObjects.artist - - NSConditionallySetsEditable - - - 2 - - - 815 - - - - value: arrangedObjects.album - - - - - - value: arrangedObjects.album - value - arrangedObjects.album - - NSConditionallySetsEditable - - - 2 - - - 816 - - - - dataSource - - - - 843 - - - - delegate - - - - 845 - - - - value: arrangedObjects.year - - - - - - value: arrangedObjects.year - value - arrangedObjects.year - 2 - - - 851 - - - - value: arrangedObjects.genre - - - - - - value: arrangedObjects.genre - value - arrangedObjects.genre - 2 - - - 852 - - - - value: arrangedObjects.track - - - - - - value: arrangedObjects.track - value - arrangedObjects.track - 2 - - - 853 - - - - menu - - - - 1065 - - - - playlistView - - - - 1257 - - - - playbackController - - - - 1300 - - - - checkForUpdates: - - - - 1304 - - - - playlistController - - - - 1320 - - - - playlistLoader - - - - 1321 - - - - playlistLoader - - - - 1322 - - - - showEntryInFinder: - - - - 1345 - - - - showEntryInFinder: - - - - 1346 - - - - showIndexColumn - - - - 1347 - - - - showTitleColumn - - - - 1348 - - - - showArtistColumn - - - - 1349 - - - - showAlbumColumn - - - - 1350 - - - - showGenreColumn - - - - 1351 - - - - showLengthColumn - - - - 1352 - - - - showTrackColumn - - - - 1353 - - - - showYearColumn - - - - 1354 - - - - value: arrangedObjects.index - - - - - - value: arrangedObjects.index - value - arrangedObjects.index - - NSConditionallySetsEditable - - - 2 - - - 1356 - - - - remove: - - - - 1361 - - - - stop: - - - - 1363 - - - - openFiles: - - - - 1405 - - - - remove: - - - - 1409 - - - - clearFilterPredicate: - - - - 1430 - - - - clear: - - - - 1431 - - - - enabled: filterPredicate - - - - - - enabled: filterPredicate - enabled - filterPredicate - - NSValueTransformerName - NSIsNotNil - - 2 - - - 1434 - - - - openURL: - - - - 1440 - - - - enabled: selection.index - - - - - - enabled: selection.index - enabled - selection.index - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 1449 - - - - predicate: filterPredicate - - - - - - predicate: filterPredicate - predicate - filterPredicate - - YES - - YES - NSDisplayName - NSPredicateFormat - - - YES - All - (title contains[cd] $value) OR (artist contains[cd] $value) OR (album contains[cd] $value) OR (genre contains[cd] $value) - - - 2 - - - 1576 - - - - predicate2: filterPredicate - - - - - - predicate2: filterPredicate - predicate2 - filterPredicate - - YES - - YES - NSDisplayName - NSPredicateFormat - - - YES - Title - title contains[cd] $value - - - - 2 - - - 1578 - - - - predicate3: filterPredicate - - - - - - predicate3: filterPredicate - predicate3 - filterPredicate - - YES - - YES - NSDisplayName - NSPredicateFormat - - - YES - Artist - artist contains[cd] $value - - - - 2 - - - 1580 - - - - predicate4: filterPredicate - - - - - - predicate4: filterPredicate - predicate4 - filterPredicate - - YES - - YES - NSAlwaysPresentsApplicationModalAlerts - NSDisplayName - NSPredicateFormat - NSRaisesForNotApplicableKeys - NSValidatesImmediately - - - YES - - Album - artist contains[cd] $value - - - - - - 2 - - - 1582 - - - - predicate5: filterPredicate - - - - - - predicate5: filterPredicate - predicate5 - filterPredicate - - YES - - YES - NSAlwaysPresentsApplicationModalAlerts - NSDisplayName - NSPredicateFormat - NSRaisesForNotApplicableKeys - NSValidatesImmediately - - - YES - - Genre - genre contains[cd] $value - - - - - - 2 - - - 1583 - - - - maxValue: currentEntry.length - - - - - - maxValue: currentEntry.length - maxValue - currentEntry.length - 2 - - - 1593 - - - - seek: - - - - 1597 - - - - changeVolume: - - - - 1614 - - - - volumeSlider - - - - 1615 - - - - value: arrangedObjects.length - - - - - - value: arrangedObjects.length - value - arrangedObjects.length - - NSConditionallySetsEditable - - - 2 - - - 1658 - - - - totalTimeField - - - - 1659 - - - - fileButton - - - - 1661 - - - - infoButton - - - - 1663 - - - - playPauseResume: - - - - 1667 - - - - spotlightWindowController - - - - 1677 - - - - redo: - - - - 1681 - - - - undo: - - - - 1682 - - - - contentArray: entries - - - - - - contentArray: entries - contentArray - entries - 2 - - - 1691 - - - - entriesController - - - - 1692 - - - - playlistLoader - - - - 1694 - - - - eventSeekBackward: - - - - 1697 - - - - eventSeekForward: - - - - 1698 - - - - skipToPreviousAlbum: - - - - 1700 - - - - skipToNextAlbum: - - - - 1702 - - - - spotlightWindowController - - - - 1709 - - - - volumeUp: - - - - 1719 - - - - volumeDown: - - - - 1720 - - - - toggleRepeat: - - - - 1756 - - - - value: repeat - - - - - - value: repeat - value - repeat - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSAlwaysPresentsApplicationModalAlerts - NSConditionallySetsEnabled - NSConditionallySetsHidden - NSRaisesForNotApplicableKeys - NSValidatesImmediately - NSValueTransformerName - - - YES - - - - - - - RepeatAllTransformer - - - 2 - - - 1760 - - - - value: repeat - - - - - - value: repeat - value - repeat - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSAlwaysPresentsApplicationModalAlerts - NSConditionallySetsEnabled - NSConditionallySetsHidden - NSRaisesForNotApplicableKeys - NSValidatesImmediately - NSValueTransformerName - - - YES - - - - - - - RepeatOneTransformer - - - 2 - - - 1763 - - - - value: repeat - - - - - - value: repeat - value - repeat - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSAlwaysPresentsApplicationModalAlerts - NSConditionallySetsEnabled - NSConditionallySetsHidden - NSRaisesForNotApplicableKeys - NSValidatesImmediately - NSValueTransformerName - - - YES - - - - - - - RepeatNoneTransformer - - - 2 - - - 1767 - - - - image: repeat - - - - - - image: repeat - image - repeat - - NSValueTransformerName - RepeatModeImageTransformer - - 2 - - - 1769 - - - - value: arrangedObjects.filename - - - - - - value: arrangedObjects.filename - value - arrangedObjects.filename - - NSConditionallySetsEditable - - - 2 - - - 1787 - - - - value: arrangedObjects.path - - - - - - value: arrangedObjects.path - value - arrangedObjects.path - - NSConditionallySetsEditable - - - 2 - - - 1788 - - - - value: arrangedObjects.status - - - - - - value: arrangedObjects.status - value - arrangedObjects.status - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSValueTransformerName - - - YES - - StatusImageTransformer - - - 2 - - - 1805 - - - - emptyQueueList: - - - - 1817 - - - - increaseFontSize: - - - - 1871 - - - - decreaseFontSize: - - - - 1872 - - - - runToolbarCustomizationPalette: - - - - 1873 - - - - selectText: - - - - 1876 - - - - searchByArtist: - - - - 1877 - - - - searchByAlbum: - - - - 1878 - - - - toggleWindow: - - - - 1880 - - - - cut: - - - - 1881 - - - - copy: - - - - 1882 - - - - paste: - - - - 1883 - - - - delete: - - - - 1884 - - - - fade: - - - - 1887 - - - - scrollToCurrentEntry: - - - - 1888 - - - - displayPatternValue1: totalTime - - - - - - displayPatternValue1: totalTime - displayPatternValue1 - totalTime - - NSDisplayPattern - Total Duration: %{value1}@ - - 2 - - - 1891 - - - - stopAfterCurrent: - - - - 1896 - - - - contentObject: currentEntry - - - - - - contentObject: currentEntry - contentObject - currentEntry - 2 - - - 1902 - - - - title: content.display - - - - - - title: content.display - title - content.display - - YES - - YES - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - - - YES - Cog - Cog - Cog - - - 2 - - - 1903 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1913 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1914 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1916 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1917 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1919 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1921 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1922 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1923 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1924 - - - - fontSize: values.fontSize - - - - - - fontSize: values.fontSize - fontSize - values.fontSize - 2 - - - 1925 - - - - rowHeight: values.fontSize - - - - - - rowHeight: values.fontSize - rowHeight - values.fontSize - - NSValueTransformerName - FontSizetoLineHeightTransformer - - 2 - - - 1927 - - - - toggleQueued: - - - - 1934 - - - - contentArray: arrangedObjects - - - - - - contentArray: arrangedObjects - contentArray - arrangedObjects - 2 - - - 2039 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - 2 - - - 2041 - - - - title: selection.queued - - - - - - title: selection.queued - title - selection.queued - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - Toggle Queued - Toggle Queued - Toggle Queued - Toggle Queued - - ToggleQueueTitleTransformer - - - 2 - - - 2042 - - - - enabled: selection.artist - - - - - - enabled: selection.artist - enabled - selection.artist - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 2066 - - - - enabled: selection.album - - - - - - enabled: selection.album - enabled - selection.album - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 2067 - - - - enabled: selection - - - - - - enabled: selection - enabled - selection - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNotNil - - - 2 - - - 2068 - - - - enabled: selection - - - - - - enabled: selection - enabled - selection - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 2069 - - - - enabled: selection - - - - - - enabled: selection - enabled - selection - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 2070 - - - - hidden: content - - - - - - hidden: content - hidden - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNil - - - 2 - - - 2079 - - - - title: content.title - - - - - - title: content.title - title - content.title - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - - - YES - - - - Not Playing - - - - 2 - - - 2083 - - - - title: content.artist - - - - - - title: content.artist - title - content.artist - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - - - YES - - - - Not Playing - - - - 2 - - - 2085 - - - - enabled: content - - - - - - enabled: content - enabled - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNotNil - - - 2 - - - 2096 - - - - enabled: content - - - - - - enabled: content - enabled - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNotNil - - - 2 - - - 2099 - - - - enabled: content - - - - - - enabled: content - enabled - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNotNil - - - 2 - - - 2104 - - - - enabled: content - - - - - - enabled: content - enabled - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSValueTransformerName - - - YES - - - - - NSIsNotNil - - - 2 - - - 2105 - - - - enabled: content - - - - - - enabled: content - enabled - content - - YES - - YES - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValueTransformerName - - - YES - - - - - - NSIsNotNil - - - 2 - - - 2107 - - - - searchByArtist: - - - - 2118 - - - - searchByAlbum: - - - - 2119 - - - - playbackController - - - - 2121 - - - - toggleVertical: - - - - 2176 - - - - playlistLoader - - - - 2179 - - - - splitView - - - - 2181 - - - - delegate - - - - 2182 - - - - _popView - - - - 2220 - - - - otherWindow - - - - 2304 - - - - otherWindow - - - - 2305 - - - - title: content.display - - - - - - title: content.display - title - content.display - - YES - - YES - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - - - YES - Cog - Cog - Cog - - - 2 - - - 2374 - - - - enabled: seekable - - - - - - enabled: seekable - enabled - seekable - 2 - - - 2376 - - - - maxValue: content.length - - - - - - maxValue: content.length - maxValue - content.length - - NSRaisesForNotApplicableKeys - - - 2 - - - 2377 - - - - value: position - - - - - - value: position - value - position - - 2 - - - 2378 - - - - maxValue: content.length - - - - - - maxValue: content.length - maxValue - content.length - 2 - - - 2381 - - - - value: position - - - - - - value: position - value - position - - 2 - - - 2382 - - - - enabled: seekable - - - - - - enabled: seekable - enabled - seekable - 2 - - - 2384 - - - - positionTextField - - - - 2385 - - - - positionTextField - - - - 2386 - - - - seek: - - - - 2387 - - - - _popView - - - - 2388 - - - - image: shuffle - - - - - - image: shuffle - image - shuffle - - NSValueTransformerName - ShuffleImageTransformer - - 2 - - - 2392 - - - - toggleShuffle: - - - - 2393 - - - - toggleShuffle: - - - - 2394 - - - - toggleRepeat: - - - - 2395 - - - - image: shuffle - - - - - - image: shuffle - image - shuffle - - NSValueTransformerName - ShuffleImageTransformer - - 2 - - - 2399 - - - - image: repeat - - - - - - image: repeat - image - repeat - - NSValueTransformerName - RepeatModeImageTransformer - - 2 - - - 2400 - - - - playbackController - - - - 2401 - - - - playbackController - - - - 2402 - - - - playbackController - - - - 2404 - - - - playlistLoader - - - - 2407 - - - - value: repeat - - - - - - value: repeat - value - repeat - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSConditionallySetsEnabled - NSValueTransformerName - - - YES - - - RepeatAlbumTransformer - - - 2 - - - 2412 - - - - toggleSideView: - - - - 2419 - - - - mainView - - - - 2421 - - - - toggleWindow: - - - - 2423 - - - - playlistSelectionController - - - - 2426 - - - - toggleSideView: - - - - 2427 - - - - toggleWindow: - - - - 2428 - - - - toggleWindow: - - - - 2433 - - - - showWindow: - - - - 2436 - - - - showPreferences: - - - - 2437 - - - - value: shuffle - - - - - - value: shuffle - value - shuffle - - NSValueTransformerName - ShuffleAllTransformer - - 2 - - - 2445 - - - - value: shuffle - - - - - - value: shuffle - value - shuffle - - NSValueTransformerName - ShuffleAlbumsTransformer - - 2 - - - 2448 - - - - value: shuffle - - - - - - value: shuffle - value - shuffle - - NSValueTransformerName - ShuffleOffTransformer - - 2 - - - 2451 - - - - playbackController - - - - 2452 - - - - - YES - - 0 - - YES - - - - - - -2 - - - RmlsZSdzIE93bmVyA - - - -1 - - - First Responder - - - -3 - - - Application - - - 21 - - - YES - - - - - Window - - - 2 - - - YES - - - - - - - 778 - - - YES - - - - - - 1473 - - - - - 29 - - - YES - - - - - - - - - - - MainMenu - - - 19 - - - YES - - - - - - 24 - - - YES - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 197 - - - - - 702 - - - - - 1642 - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - YES - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 196 - - - - - 302 - - - - - 303 - - - - - 751 - - - - - 1100 - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - 72 - - - - - 73 - - - - - 75 - - - - - 79 - - - - - 1149 - - - - - 1403 - - - - - 103 - - - YES - - - - - - 106 - - - YES - - - - - - 111 - - - - - 163 - - - YES - - - - - - 169 - - - YES - - - - - - - - - - - - - - - 156 - - - - - 157 - - - - - 158 - - - YES - - - - - 160 - - - - - 164 - - - - - 171 - - - - - 172 - - - - - 173 - - - - - 418 - - - YES - - - - - - 419 - - - YES - - - - - - - - - - - - - - - - - - - - - - 420 - - - - - 422 - - - - - 423 - - - - - 424 - - - - - 426 - - - - - 1136 - - - - - 1137 - - - - - 1362 - - - - - 881 - - - YES - - - - - - 882 - - - YES - - - - - - - - - - - - - - - - - - - - - - 1079 - - - - - 1116 - - - - - 1132 - - - - - 1135 - - - - - 1402 - - - - - 1408 - - - - - 218 - - - PlaylistController - - - 226 - - - AppController - - - 513 - - - YES - - - - - - - - - - - DockMenu - - - 517 - - - - - 518 - - - - - 519 - - - - - 520 - - - - - 791 - - - - - 792 - - - - - 1453 - - - - - 1454 - - - - - 705 - - - PlaybackController - - - 1063 - - - YES - - - - - - - - - - - - ContextualMenu - - - 1064 - - - - - 1360 - - - - - 1217 - - - PreferencesController - - - 1303 - - - SUUpdater - - - 1319 - - - PlaylistLoader - - - 1324 - - - YES - - - - - - - - - - - TableMenu - - - 1337 - - - - - 1338 - - - - - 1339 - - - - - 1340 - - - - - 1341 - - - - - 1342 - - - - - 1343 - - - - - 1344 - - - - - 1611 - - - YES - - - - Volume View - - - 1612 - - - YES - - - - - - 1613 - - - - - 1675 - - - - - 1683 - - - - - 1685 - - - - - 1688 - - - - - 1689 - - - - - 1699 - - - - - 1701 - - - - - 1740 - - - YES - - - - - - 1741 - - - YES - - - - - - - - - - 1742 - - - - - 1746 - - - - - 1748 - - - - - 1749 - - - - - 1791 - - - - - 1823 - - - - - 1824 - - - - - 1848 - - - YES - - - - - - 1849 - - - YES - - - - - - - - - - - - - - - 1854 - - - - - 1856 - - - - - 1857 - - - - - 1858 - - - - - 1859 - - - - - 1860 - - - - - 1861 - - - - - 1862 - - - - - 1863 - - - - - 1864 - - - - - 1865 - - - - - 1866 - - - - - 1867 - - - - - 1868 - - - - - 1869 - - - - - 1885 - - - - - 1886 - - - - - 1892 - - - - - 1893 - - - - - 1895 - - - - - 1897 - - - Current Entry Controller - - - 2020 - - - Playlist Selection Controller - - - 2045 - - - - - 2046 - - - - - 2047 - - - - - 2048 - - - - - 2049 - - - - - 2123 - - - YES - - - - - - 206 - - - YES - - - - - - - - - 207 - - - YES - - - - - - - - - - - - - - - - 1515 - - - - - 1516 - - - - - 1517 - - - - - 208 - - - YES - - - - - - 209 - - - YES - - - - - - 391 - - - YES - - - - - - 806 - - - YES - - - - - - 807 - - - YES - - - - - - 848 - - - YES - - - - - - 849 - - - YES - - - - - - 850 - - - YES - - - - - - 1712 - - - YES - - - - - - 1736 - - - YES - - - - - - 1798 - - - YES - - - - - - 1801 - - - - - 1737 - - - - - 1713 - - - - - 1513 - - - - - 1512 - - - - - 1511 - - - - - 1510 - - - - - 1509 - - - - - 1508 - - - - - 1507 - - - - - 1506 - - - - - 1853 - - - - - 1851 - - - - - 2155 - - - - - 2160 - - - - - 2172 - - - - - 2212 - - - - - 2234 - - - YES - - - - - Mini Window (Window) - - - 2235 - - - - - 2222 - - - YES - - - - - - - - - - - - - - Mini Toolbar - - - 2225 - - - - - 2227 - - - - - 2228 - - - - - 2229 - - - - - 2272 - - - YES - - - - - - 2273 - - - YES - - - - - - 2274 - - - YES - - - - - - 2275 - - - YES - - - - - - 2278 - - - YES - - - - - - 2279 - - - YES - - - - - - 2281 - - - YES - - - - - - 2282 - - - - - 2283 - - - YES - - - - - - 2284 - - - - - 2289 - - - YES - - - - - - 2290 - - - - - 2291 - - - YES - - - - - - 2292 - - - - - 2293 - - - YES - - - - - - 2294 - - - - - 2295 - - - YES - - - - - - 2296 - - - - - 1523 - - - YES - - - - - - - - - - - - - - - - - - 1673 - - - - - 1645 - - - - - 1639 - - - YES - - - - - - 1636 - - - YES - - - - - - 1630 - - - YES - - - - - - 1629 - - - YES - - - - - - 1610 - - - YES - - - - - - 1568 - - - YES - - - - - - 1552 - - - - - 1551 - - - YES - - - - - - 1539 - - - YES - - - - - - 1533 - - - YES - - - - - - 1529 - - - - - 1531 - - - YES - - - - - - 1532 - - - - - 1537 - - - YES - - - - - - 1538 - - - - - 1549 - - - YES - - - - - - 1550 - - - - - 1566 - - - YES - - - - - - 1567 - - - - - 1608 - - - YES - - - - - - 1609 - - - - - 1627 - - - YES - - - - - - 1628 - - - - - 1631 - - - YES - - - - - - 1632 - - - - - 1637 - - - YES - - - - - - 1638 - - - - - 1640 - - - YES - - - - - - 1641 - - - - - 2403 - - - - - 2405 - - - - - 2417 - - - - - 2422 - - - - - 2429 - - - YES - - - - - - 2430 - - - YES - - - - - - 2431 - - - - - 2434 - - - - - 2438 - - - YES - - - - - - 2439 - - - YES - - - - - - - - 2440 - - - - - 2442 - - - - - 2443 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - -3.ImportedFromIB2 - 103.IBPluginDependency - 103.ImportedFromIB2 - 106.IBEditorWindowLastContentRect - 106.IBPluginDependency - 106.ImportedFromIB2 - 106.editorWindowContentRectSynchronizationRect - 1063.IBEditorWindowLastContentRect - 1063.IBPluginDependency - 1063.ImportedFromIB2 - 1063.editorWindowContentRectSynchronizationRect - 1064.IBPluginDependency - 1064.ImportedFromIB2 - 1079.IBPluginDependency - 1079.ImportedFromIB2 - 1100.IBPluginDependency - 1100.ImportedFromIB2 - 111.IBPluginDependency - 111.ImportedFromIB2 - 1116.IBPluginDependency - 1116.ImportedFromIB2 - 1132.IBPluginDependency - 1132.ImportedFromIB2 - 1135.IBPluginDependency - 1135.ImportedFromIB2 - 1136.IBPluginDependency - 1136.ImportedFromIB2 - 1137.IBPluginDependency - 1137.ImportedFromIB2 - 1149.IBPluginDependency - 1149.ImportedFromIB2 - 1217.IBPluginDependency - 1217.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 130.editorWindowContentRectSynchronizationRect - 1303.IBPluginDependency - 1303.ImportedFromIB2 - 131.IBPluginDependency - 131.ImportedFromIB2 - 1319.IBPluginDependency - 1319.ImportedFromIB2 - 1324.IBEditorWindowLastContentRect - 1324.IBPluginDependency - 1324.ImportedFromIB2 - 1324.editorWindowContentRectSynchronizationRect - 1337.IBPluginDependency - 1337.ImportedFromIB2 - 1338.IBPluginDependency - 1338.ImportedFromIB2 - 1339.IBPluginDependency - 1339.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 1340.IBPluginDependency - 1340.ImportedFromIB2 - 1341.IBPluginDependency - 1341.ImportedFromIB2 - 1342.IBPluginDependency - 1342.ImportedFromIB2 - 1343.IBPluginDependency - 1343.ImportedFromIB2 - 1344.IBPluginDependency - 1344.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 1360.IBPluginDependency - 1360.ImportedFromIB2 - 1362.IBPluginDependency - 1362.ImportedFromIB2 - 1402.IBPluginDependency - 1402.ImportedFromIB2 - 1403.IBPluginDependency - 1403.ImportedFromIB2 - 1408.IBPluginDependency - 1408.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 1453.IBPluginDependency - 1453.ImportedFromIB2 - 1454.IBPluginDependency - 1454.ImportedFromIB2 - 1473.IBPluginDependency - 1473.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 1506.IBPluginDependency - 1506.ImportedFromIB2 - 1507.IBPluginDependency - 1507.ImportedFromIB2 - 1508.IBPluginDependency - 1508.ImportedFromIB2 - 1509.IBPluginDependency - 1509.ImportedFromIB2 - 1510.IBPluginDependency - 1510.ImportedFromIB2 - 1511.IBPluginDependency - 1511.ImportedFromIB2 - 1512.IBPluginDependency - 1512.ImportedFromIB2 - 1513.IBPluginDependency - 1513.ImportedFromIB2 - 1515.IBPluginDependency - 1515.ImportedFromIB2 - 1516.IBPluginDependency - 1516.ImportedFromIB2 - 1517.CustomClassName - 1517.IBPluginDependency - 1517.ImportedFromIB2 - 1523.IBEditorWindowLastContentRect - 1523.IBPluginDependency - 1523.ImportedFromIB2 - 1523.editorWindowContentRectSynchronizationRect - 1529.ImportedFromIB2 - 1531.IBPluginDependency - 1531.ImportedFromIB2 - 1532.IBPluginDependency - 1532.ImportedFromIB2 - 1533.IBPluginDependency - 1533.ImportedFromIB2 - 1537.CustomClassName - 1537.IBPluginDependency - 1537.ImportedFromIB2 - 1538.IBPluginDependency - 1538.ImportedFromIB2 - 1539.IBPluginDependency - 1539.ImportedFromIB2 - 1549.CustomClassName - 1549.IBPluginDependency - 1549.ImportedFromIB2 - 1550.CustomClassName - 1550.IBPluginDependency - 1550.ImportedFromIB2 - 1551.IBPluginDependency - 1551.ImportedFromIB2 - 1552.ImportedFromIB2 - 156.IBPluginDependency - 156.ImportedFromIB2 - 1566.CustomClassName - 1566.IBPluginDependency - 1566.ImportedFromIB2 - 1567.IBPluginDependency - 1567.ImportedFromIB2 - 1568.IBPluginDependency - 1568.ImportedFromIB2 - 157.IBPluginDependency - 157.ImportedFromIB2 - 158.IBPluginDependency - 158.ImportedFromIB2 - 160.IBPluginDependency - 160.ImportedFromIB2 - 1608.CustomClassName - 1608.IBPluginDependency - 1608.ImportedFromIB2 - 1609.IBPluginDependency - 1609.ImportedFromIB2 - 1610.IBPluginDependency - 1610.ImportedFromIB2 - 1611.IBEditorWindowLastContentRect - 1611.IBPluginDependency - 1611.ImportedFromIB2 - 1611.editorWindowContentRectSynchronizationRect - 1612.CustomClassName - 1612.IBPluginDependency - 1612.ImportedFromIB2 - 1613.IBPluginDependency - 1613.ImportedFromIB2 - 1627.IBPluginDependency - 1627.ImportedFromIB2 - 1628.IBPluginDependency - 1628.ImportedFromIB2 - 1629.IBPluginDependency - 1629.ImportedFromIB2 - 163.IBPluginDependency - 163.ImportedFromIB2 - 1630.IBPluginDependency - 1630.ImportedFromIB2 - 1631.IBPluginDependency - 1631.ImportedFromIB2 - 1632.IBPluginDependency - 1632.ImportedFromIB2 - 1636.IBPluginDependency - 1636.ImportedFromIB2 - 1637.IBPluginDependency - 1637.ImportedFromIB2 - 1638.IBPluginDependency - 1638.ImportedFromIB2 - 1639.IBPluginDependency - 1639.ImportedFromIB2 - 164.IBPluginDependency - 164.ImportedFromIB2 - 1640.IBPluginDependency - 1640.ImportedFromIB2 - 1641.IBPluginDependency - 1641.ImportedFromIB2 - 1642.IBPluginDependency - 1642.ImportedFromIB2 - 1645.IBPluginDependency - 1645.ImportedFromIB2 - 1675.IBPluginDependency - 1683.IBPluginDependency - 1685.IBPluginDependency - 1688.IBPluginDependency - 1689.IBPluginDependency - 169.IBEditorWindowLastContentRect - 169.IBPluginDependency - 169.ImportedFromIB2 - 169.editorWindowContentRectSynchronizationRect - 1699.IBPluginDependency - 1701.IBPluginDependency - 171.IBPluginDependency - 171.ImportedFromIB2 - 1712.IBPluginDependency - 1713.IBPluginDependency - 172.IBPluginDependency - 172.ImportedFromIB2 - 173.IBPluginDependency - 173.ImportedFromIB2 - 1736.IBPluginDependency - 1737.IBPluginDependency - 1740.IBPluginDependency - 1741.IBEditorWindowLastContentRect - 1741.IBPluginDependency - 1741.editorWindowContentRectSynchronizationRect - 1742.IBPluginDependency - 1746.IBPluginDependency - 1748.IBPluginDependency - 1749.IBPluginDependency - 1791.IBPluginDependency - 1798.IBPluginDependency - 1801.IBPluginDependency - 1823.IBPluginDependency - 1823.ImportedFromIB2 - 1824.IBPluginDependency - 1824.ImportedFromIB2 - 1848.IBPluginDependency - 1849.IBEditorWindowLastContentRect - 1849.IBPluginDependency - 1849.editorWindowContentRectSynchronizationRect - 1851.IBPluginDependency - 1851.ImportedFromIB2 - 1853.IBPluginDependency - 1854.IBPluginDependency - 1856.IBPluginDependency - 1856.ImportedFromIB2 - 1857.IBPluginDependency - 1858.IBPluginDependency - 1859.IBPluginDependency - 1860.IBPluginDependency - 1861.IBPluginDependency - 1862.IBPluginDependency - 1863.IBPluginDependency - 1864.IBPluginDependency - 1865.IBPluginDependency - 1866.IBPluginDependency - 1867.IBPluginDependency - 1868.IBPluginDependency - 1869.IBPluginDependency - 1885.IBPluginDependency - 1886.IBPluginDependency - 1892.IBPluginDependency - 1893.IBPluginDependency - 1895.IBPluginDependency - 1897.IBPluginDependency - 19.IBPluginDependency - 19.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBPluginDependency - 197.ImportedFromIB2 - 2.IBPluginDependency - 2.ImportedFromIB2 - 2020.IBPluginDependency - 2045.IBPluginDependency - 2046.IBPluginDependency - 2047.IBPluginDependency - 2048.IBPluginDependency - 2049.IBPluginDependency - 206.IBPluginDependency - 206.ImportedFromIB2 - 207.CustomClassName - 207.IBPluginDependency - 207.ImportedFromIB2 - 208.IBPluginDependency - 208.ImportedFromIB2 - 209.IBPluginDependency - 209.ImportedFromIB2 - 21.IBEditorWindowLastContentRect - 21.IBWindowTemplateEditedContentRect - 21.ImportedFromIB2 - 21.NSWindowTemplate.visibleAtLaunch - 21.editorWindowContentRectSynchronizationRect - 21.windowTemplate.hasMaxSize - 21.windowTemplate.maxSize - 2123.IBPluginDependency - 2155.IBPluginDependency - 2160.IBPluginDependency - 2172.IBPluginDependency - 218.CustomClassName - 218.IBPluginDependency - 218.ImportedFromIB2 - 2212.IBPluginDependency - 2222.IBEditorWindowLastContentRect - 2222.IBPluginDependency - 2229.IBPluginDependency - 2234.IBEditorWindowLastContentRect - 2234.IBWindowTemplateEditedContentRect - 2234.NSWindowTemplate.visibleAtLaunch - 2234.windowTemplate.hasMaxSize - 2234.windowTemplate.maxSize - 2235.IBPluginDependency - 226.IBPluginDependency - 226.ImportedFromIB2 - 2272.IBPluginDependency - 2272.ImportedFromIB2 - 2273.IBPluginDependency - 2273.ImportedFromIB2 - 2274.IBPluginDependency - 2274.ImportedFromIB2 - 2275.IBPluginDependency - 2275.ImportedFromIB2 - 2278.IBPluginDependency - 2278.ImportedFromIB2 - 2279.IBPluginDependency - 2279.ImportedFromIB2 - 2281.IBPluginDependency - 2281.ImportedFromIB2 - 2282.IBPluginDependency - 2282.ImportedFromIB2 - 2283.IBPluginDependency - 2283.ImportedFromIB2 - 2284.IBPluginDependency - 2284.ImportedFromIB2 - 2289.CustomClassName - 2289.IBPluginDependency - 2289.ImportedFromIB2 - 2290.IBPluginDependency - 2290.ImportedFromIB2 - 2291.CustomClassName - 2291.IBPluginDependency - 2291.ImportedFromIB2 - 2292.IBPluginDependency - 2292.ImportedFromIB2 - 2293.CustomClassName - 2293.IBPluginDependency - 2293.ImportedFromIB2 - 2294.CustomClassName - 2294.IBPluginDependency - 2294.ImportedFromIB2 - 2295.CustomClassName - 2295.IBPluginDependency - 2295.ImportedFromIB2 - 2296.IBPluginDependency - 2296.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 24.IBEditorWindowLastContentRect - 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 2403.IBPluginDependency - 2405.IBPluginDependency - 2417.IBPluginDependency - 2422.IBPluginDependency - 2429.IBPluginDependency - 2429.ImportedFromIB2 - 2430.IBPluginDependency - 2430.ImportedFromIB2 - 2431.IBPluginDependency - 2431.ImportedFromIB2 - 2434.IBPluginDependency - 2438.IBPluginDependency - 2439.IBEditorWindowLastContentRect - 2439.IBPluginDependency - 2440.IBPluginDependency - 2442.IBPluginDependency - 2443.IBPluginDependency - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 29.editorWindowContentRectSynchronizationRect - 302.IBPluginDependency - 302.ImportedFromIB2 - 303.IBPluginDependency - 303.ImportedFromIB2 - 391.IBPluginDependency - 391.ImportedFromIB2 - 418.IBPluginDependency - 418.ImportedFromIB2 - 419.IBEditorWindowLastContentRect - 419.IBPluginDependency - 419.ImportedFromIB2 - 419.editorWindowContentRectSynchronizationRect - 420.IBPluginDependency - 420.ImportedFromIB2 - 422.IBPluginDependency - 422.ImportedFromIB2 - 423.IBPluginDependency - 423.ImportedFromIB2 - 424.IBPluginDependency - 424.ImportedFromIB2 - 426.IBPluginDependency - 426.ImportedFromIB2 - 5.IBPluginDependency - 5.ImportedFromIB2 - 513.IBEditorWindowLastContentRect - 513.IBPluginDependency - 513.ImportedFromIB2 - 513.editorWindowContentRectSynchronizationRect - 517.IBPluginDependency - 517.ImportedFromIB2 - 518.IBPluginDependency - 518.ImportedFromIB2 - 519.IBPluginDependency - 519.ImportedFromIB2 - 520.IBPluginDependency - 520.ImportedFromIB2 - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect - 58.IBPluginDependency - 58.ImportedFromIB2 - 702.IBPluginDependency - 702.ImportedFromIB2 - 705.IBPluginDependency - 705.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 75.IBPluginDependency - 75.ImportedFromIB2 - 751.IBPluginDependency - 751.ImportedFromIB2 - 778.IBPluginDependency - 778.ImportedFromIB2 - 79.IBPluginDependency - 79.ImportedFromIB2 - 791.IBPluginDependency - 791.ImportedFromIB2 - 792.IBPluginDependency - 792.ImportedFromIB2 - 806.IBPluginDependency - 806.ImportedFromIB2 - 807.IBPluginDependency - 807.ImportedFromIB2 - 81.IBEditorWindowLastContentRect - 81.IBPluginDependency - 81.ImportedFromIB2 - 81.editorWindowContentRectSynchronizationRect - 83.IBPluginDependency - 83.ImportedFromIB2 - 848.IBPluginDependency - 848.ImportedFromIB2 - 849.IBPluginDependency - 849.ImportedFromIB2 - 850.IBPluginDependency - 850.ImportedFromIB2 - 881.IBPluginDependency - 881.ImportedFromIB2 - 882.IBEditorWindowLastContentRect - 882.IBPluginDependency - 882.ImportedFromIB2 - 882.editorWindowContentRectSynchronizationRect - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{582, 703}, {137, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{365, 691}, {137, 23}} - {{310, 480}, {187, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{482, 640}, {187, 133}} - 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 - - {{853, 964}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 693}, {140, 163}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{14, 571}, {140, 163}} - 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 - - 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 - - PlaylistHeaderView - com.apple.InterfaceBuilder.CocoaPlugin - - {{377, 973}, {617, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{85, 558}, {617, 0}} - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - PlaybackButtons - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - PositionSlider - com.apple.InterfaceBuilder.CocoaPlugin - - TrackingCell - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - TimeField - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - VolumeButton - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 818}, {97, 177}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{37, 809}, {97, 177}} - VolumeSlider - 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 - {{677, 664}, {252, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{213, 653}, {252, 183}} - 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 - {{823, 599}, {136, 93}} - com.apple.InterfaceBuilder.CocoaPlugin - {{675, 786}, {186, 93}} - 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 - {{721, 674}, {285, 173}} - com.apple.InterfaceBuilder.CocoaPlugin - {{257, 573}, {237, 163}} - 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 - 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 - - PlaylistView - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{347, 94}, {691, 397}} - {{347, 94}, {691, 397}} - - - {{25, 14}, {683, 396}} - - {3.40282e+38, 3.40282e+38} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - PlaylistController - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{330, 631}, {617, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{398, 631}, {481, 0}} - {{398, 631}, {481, 0}} - - - {10000, 100000} - 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 - - VolumeButton - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - TimeField - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - PositionSlider - com.apple.InterfaceBuilder.CocoaPlugin - - TrackingCell - com.apple.InterfaceBuilder.CocoaPlugin - - PlaybackButtons - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{906, 744}, {197, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{442, 733}, {197, 103}} - 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 - {{809, 609}, {142, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{260, 892}, {462, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{112, 736}, {462, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{791, 599}, {222, 293}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{307, 443}, {222, 293}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{333, 437}, {164, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 502}, {164, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 639}, {232, 253}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{124, 483}, {232, 253}} - 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 - - {{635, 744}, {189, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{171, 733}, {189, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{524, 599}, {285, 293}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{376, 543}, {299, 293}} - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 2452 - - - - YES - - AppController - NSObject - - YES - - YES - decreaseFontSize: - delEntries: - donate: - increaseFontSize: - openFiles: - openURL: - savePlaylist: - toggleInfoDrawer: - - - YES - id - id - id - id - id - id - id - id - - - - YES - - YES - fileButton - infoButton - infoDrawer - mainWindow - playbackButtons - playbackController - playlistController - playlistLoader - playlistView - repeatButton - showAlbumColumn - showArtistColumn - showGenreColumn - showIndexColumn - showLengthColumn - showTitleColumn - showTrackColumn - showYearColumn - shuffleButton - spotlightWindowController - totalTimeField - - - YES - NSButton - NSButton - NSDrawer - NSWindow - NSSegmentedControl - PlaybackController - PlaylistController - PlaylistLoader - PlaylistView - NSButton - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSButton - NSWindowController - NSTextField - - - - IBProjectSource - Application/AppController.h - - - - AppController - NSObject - - YES - - YES - nextButton - playButton - prevButton - - - YES - NSButton - NSButton - NSButton - - - - IBUserSource - - - - - DNDArrayController - NSArrayController - - tableView - NSTableView - - - IBProjectSource - Playlist/DNDArrayController.h - - - - DNDArrayController - NSArrayController - - IBUserSource - - - - - DockIconController - NSObject - - playbackController - PlaybackController - - - IBProjectSource - Application/DockIconController.h - - - - DualWindow - NSWindow - - otherWindow - DualWindow - - - IBProjectSource - Window/DualWindow.h - - - - EntriesController - NSObject - - IBProjectSource - Playlist/EntriesController.h - - - - FeedbackController - NSWindowController - - YES - - YES - cancel: - sendFeedback: - - - YES - id - id - - - - YES - - YES - fromView - messageView - sendingIndicator - subjectView - - - YES - NSTextField - NSTextView - NSProgressIndicator - NSTextField - - - - IBProjectSource - Feedback/FeedbackController.h - - - - FileTreeViewController - SideViewController - - YES - - YES - playbackController - playlistLoader - - - YES - PlaybackController - PlaylistLoader - - - - IBProjectSource - FileTree/FileTreeViewController.h - - - - FirstResponder - NSObject - - IBUserSource - - - - - InfoWindowController - NSWindowController - - toggleWindow: - id - - - playlistSelectionController - id - - - IBProjectSource - InfoInspector/InfoWindowController.h - - - - MainWindow - DualWindow - - IBProjectSource - Window/MainWindow.h - - - - MiniWindow - DualWindow - - IBProjectSource - Window/MiniWindow.h - - - - NSObject - - IBProjectSource - ThirdParty/AppleRemote/AppleRemote.h - - - - NSObject - - IBProjectSource - ThirdParty/GCWindowMenu/GCOneShotEffectTimer.h - - - - NSObject - - IBProjectSource - ThirdParty/NDHotKeys/NDHotKeyEvent.h - - - - NSSegmentedControl - NSControl - - IBUserSource - - - - - PlaybackButtons - NSSegmentedControl - - playbackController - PlaybackController - - - IBProjectSource - Window/PlaybackButtons.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 - outputDevices - playlistController - playlistView - volumeSlider - - - YES - NSArrayController - PlaylistController - PlaylistView - NSSlider - - - - IBProjectSource - Application/PlaybackController.h - - - - PlaybackController - NSObject - - YES - - YES - bitrateField - lengthField - playButton - - - YES - NSTextField - NSTextField - NSButton - - - - IBUserSource - - - - - PlaybackEventController - NSObject - - playlistLoader - PlaylistLoader - - - IBProjectSource - Application/PlaybackEventController.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 - entriesController - playbackController - playlistLoader - spotlightWindowController - - - YES - EntriesController - PlaybackController - PlaylistLoader - SpotlightWindowController - - - - IBProjectSource - Playlist/PlaylistController.h - - - - PlaylistController - DNDArrayController - - IBUserSource - - - - - PlaylistHeaderView - NSTableHeaderView - - IBProjectSource - Playlist/PlaylistHeaderView.h - - - - PlaylistLoader - NSObject - - playlistController - PlaylistController - - - IBProjectSource - Playlist/PlaylistLoader.h - - - - PlaylistLoader - NSObject - - IBUserSource - - - - - PlaylistView - NSTableView - - YES - - YES - scrollToCurrentEntry: - shufflePlaylist: - sortByPath: - toggleColumn: - - - YES - id - id - id - id - - - - YES - - YES - playbackController - playlistController - - - YES - PlaybackController - PlaylistController - - - - IBProjectSource - Playlist/PlaylistView.h - - - - PlaylistView - NSTableView - - IBUserSource - - - - - PopupButton - NSButton - - _popView - NSView - - - IBProjectSource - ThirdParty/GCWindowMenu/PopupButton.h - - - - PositionSlider - TrackingSlider - - positionTextField - TimeField - - - IBProjectSource - Window/PositionSlider.h - - - - PreferencesController - NSObject - - showPreferences: - id - - - IBProjectSource - Preferences/PreferencesController.h - - - - PreferencesController - NSObject - - IBUserSource - - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - IBUserSource - - - - - SideViewController - NSViewController - - YES - - YES - toggleSideView: - toggleVertical: - - - YES - id - id - - - - YES - - YES - firstResponder - mainView - splitView - - - YES - NSView - NSView - NSSplitView - - - - IBProjectSource - Utils/SideViewController.h - - - - SpotlightWindowController - NSWindowController - - YES - - YES - addToPlaylist: - toggleWindow: - - - YES - id - id - - - - YES - - YES - pathControl - playlistController - playlistLoader - searchField - - - YES - NSPathControl - NSArrayController - PlaylistLoader - NSSearchField - - - - IBProjectSource - Spotlight/SpotlightWindowController.h - - - - TimeField - NSTextField - - IBProjectSource - Window/TimeField.h - - - - TrackingCell - NSSliderCell - - IBProjectSource - Utils/TrackingCell.h - - - - TrackingSlider - NSSlider - - IBProjectSource - Utils/TrackingSlider.h - - - - TrackingSlider - NSSlider - - IBUserSource - - - - - VolumeButton - PopupButton - - IBProjectSource - Window/VolumeButton.h - - - - VolumeSlider - NSSlider - - IBProjectSource - Window/VolumeSlider.h - - - - - 0 - ../Cog.xcodeproj - 3 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total Duration: %{value1}@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + StatusImageTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FontSizetoLineHeightTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Title + title contains[cd] $value + + + + + Artist + artist contains[cd] $value + + + + + + + artist contains[cd] $value + + Album + + + + + + + genre contains[cd] $value + + Genre + + + + + All + (title contains[cd] $value) OR (artist contains[cd] $value) OR (album contains[cd] $value) OR (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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + ToggleQueueTitleTransformer + Toggle Queued + Toggle Queued + Toggle Queued + Toggle Queued + + + + + + + + + + + + NSIsNotNil + + + + + + + + + + + + + + + NSIsNotNil + + + + + + + + + + + + + + + + NSIsNotNil + + + + + + + + + + + + + + + NSIsNotNil + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + display + length + seekable + queued + title + artist + + + + + + + + queued + title + artist + album + + + + + + + + + + + + + + + + + + + + + + + + +YnBsaXN0MDDUAQIDBAUGRkdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QDwcI +ExQZHh8qKyw0NzpAQ1UkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5T +UmVwc1dOU0NvbG9ygAKADhIgwAAAgAOADFh7MTcsIDE3fdIVChYYWk5TLm9iamVjdHOhF4AEgAvSFQoa +HaIbHIAFgAaAChAA1iAhCiIjJCUmJygpHl8QEE5TQ2FjaGVXaW5kb3dCUFNfEBdOU0NhY2hlV2luZG93 +Q29sb3JTcGFjZV8QFE5TVElGRlJlcHJlc2VudGF0aW9uXxAQTlNDYWNoZVdpbmRvd0JQUF8QFU5TQ2Fj +aGVXaW5kb3dJc1BsYW5hchAIgAiACYAHEBhPERA2TU0AKgAABACAACBQOCQWDQeEQmBAaBgmBvGFRGJR +OFCELgoqCgJPwerdrvo3xSRQoFwMIQMGgICgUJAgGg8RoQtDs7g53tgNJZvBZiNJlsg+Px+PtpQSVgYM +gYCgYQAoFg0RBYLhQPhIKBcOBAIhEMBkNBoNiERB4KhkLh0JBcLhUGvZ8PYBDR8r0AP9xNsAMsPGQAGA +xmY3PV4ulJwQTCcWJA6ng7m0bjUZgIGg4HAAHgwGAAFgySgMCAMAOhyOUABMLBYAPd8PkAOZuMcAB94p +0APhsuMANoRHu+nM/ppttVmmeCAqXmJTKRTJYmEsjgd4dEAAGGgoFAAE9kAM5hMMAPV1OoABwbjm6uVT +gALv5cgB9tx2AByBg6AA1I1VsNhrpYEWBtYgQZESRhJFwOQ3jUCp7wWAADQdBoDoYdx2ne+RkGUAB6HG +cIAHmAh9gAIAfQ4fx4GqAB+HO0h0H+LYAEQXTRE+S5HB6gZwIGDo1jkOpekWQhBBKfshgAA4EOuf5/n6 +ABmmaZIAGAYMnh2HcbAEbxXAAGgZG+1JwnSAABn2+J3HuHgAFMc4WH4PY5jYICBmKgYGCiLIul0UBNEw +HJznMcwAG6bRowyeJ5PGBsTnMdLKnieh9AAJ4hAEAAEHooplGSfwABsF0KnkdKTl6f4ugAL4xDGNJ/n2 +ehMIGAIfiEJBXFUVRTCgfyhAAcRqGFIrWgAex3qKf4FCNBtfheGL4m4YhrgAYZogkAAtCG3B8nGdrtgc +O4AC8OQ8kwdBvm2NKCBaGQbEyVxWFYMwLAraRnGbQYCni9IFgg8wFA1M4GHyXQAAoBZsV0bAMV0dYDgA +GQHligR3HOACdjyAAxEIURgGiY5d2MgYNA4EA/FYVpXECHIbBiABnmgZwAG+ZLaBiIj6nuemIhKDlBnq +bxtAAdoCCu6YEAnShnjizR/m8AB0gQMIAD2WpwHEVhPktOCBgcB4IDCURSlUTwnCU/xmmWZYAHgd8KhC +E4WgAAR6GAAAPA8db5GKbsUAgGswnw+IIHgXwAH8dBsgAaRzBQABMHKDR+lST5MCIggBs8IpLk0UBcjK +MQtgCey3Pcfp/gAbZrZaFoJmQ6YC0Mfx5nrwR7Wz11sn7MvBHcdwAF0Yx0YqVJ5EEex81YggBeOGgzjg +PBiBqF4WAObJvG6dxtm2bx8jQKAVgyH4dNAf59Uef56tYfZ1ogdp00M0Z1HybZum8dpmGodBrk6Yx1jG +fMlw4gwEzKAPCcPKAg8CBD/HAAwAwAgdCXECGEPg8x2jkHgNcao4x0jhfQOUcI5x2jaHKOcfA2h3qaHM +ksADdSBDkIGPMgboyRkGNQQID5Az4kChUakgcKIYkFICAAAPAQAAAwAAAAEAEQAAAQEAAwAAAAEAEQAA +AQIAAwAAAAQAAAS6AQMAAwAAAAEABQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAA +ARUAAwAAAAEABAAAARYAAwAAAAEAEQAAARcABAAAAAEAAAP3ARwAAwAAAAEAAQAAAT0AAwAAAAEAAgAA +AVIAAwAAAAEAAQAAAVMAAwAAAAQAAATCh3MABwAAC2wAAATKAAAAAAAIAAgACAAIAAEAAQABAAEAAAts +YXBwbAIQAABtbnRyUkdCIFhZWiAH3QAJAAYAEAAfAChhY3NwQVBQTAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAABFkZXNjAAABUAAAAHBkc2NtAAABwAAAAEZjcHJ0AAACCAAAACR3dHB0AAACLAAAABRyWFla +AAACQAAAABRnWFlaAAACVAAAABRiWFlaAAACaAAAABRyVFJDAAACfAAACAxhYXJnAAAKiAAAACB2Y2d0 +AAAKqAAAADBuZGluAAAK2AAAAD5jaGFkAAALGAAAACxtbW9kAAALRAAAAChiVFJDAAACfAAACAxnVFJD +AAACfAAACAxhYWJnAAAKiAAAACBhYWdnAAAKiAAAACBkZXNjAAAAAAAAABZlbGVjdHIxOWIzIENhbGli +cmF0ZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAABAAAADGVuVVMAAAAqAAAAHABlAGwAZQBj +AHQAcgAxADkAYgAzACAAQwBhAGwAaQBiAHIAYQB0AGUAZAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUs +IEluYy4sIDIwMTMAWFlaIAAAAAAAAPQ2AAEAAAABahtYWVogAAAAAAAAcwAAADzHAAADIVhZWiAAAAAA +AABbQgAAq/cAABb2WFlaIAAAAAAAACiUAAAXQgAAuRZjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAj +ACgALQAyADYAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8AowCoAK0AsgC3 +ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFn +AW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJd +AmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOi +A64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6 +BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcr +Bz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5 +CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwq +DEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9B +D14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLD +EuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxay +FtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsU +GzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/q +IBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4 +JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysC +KzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFK +MYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgU +OFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9h +P6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1 +R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+T +T91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9 +WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1 +YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/ +bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnab +dvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HN +gjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Y +jf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8 +mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9 +p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSc +tRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lb +w1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+ +0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE +4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy +8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//3BhcmEAAAAA +AAMAAAACZmYAAPKnAAANWQAAE9AAAAoOdmNndAAAAAAAAAABAAD88AAAAAAAAQAAAAD88AAAAAAAAQAA +AAD88AAAAAAAAQAAbmRpbgAAAAAAAAA2AACgQAAAVsAAAEeAAACZgAAAJkAAABKAAABIgAAATAAAAjoF +AAI6BQACOgUAAAAAAAAAAHNmMzIAAAAAAAEY/QAACt///+lTAAAOKQAA/Xf///g////74gAABqwAAJNb +bW1vZAAAAAAAADAjAAAZswAAKOi3+RIAAAAAAAAAAAAAAAAAAAAAAF8QGU5TQ2FsaWJyYXRlZFJHQkNv +bG9yU3BhY2XSLS4vMFokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNDYWNoZWRJbWFnZVJlcKMxMjNfEBBO +U0NhY2hlZEltYWdlUmVwWk5TSW1hZ2VSZXBYTlNPYmplY3TSLS41NldOU0FycmF5ojUz0i0uODleTlNN +dXRhYmxlQXJyYXmjODUz0zs8Cj0+P1dOU1doaXRlXE5TQ29sb3JTcGFjZUQwIDAAEAOADdItLkFCV05T +Q29sb3KiQTPSLS5ERVdOU0ltYWdlokQzXxAPTlNLZXllZEFyY2hpdmVy0UhJVHJvb3SAAQAIABEAGgAj +AC0AMgA3AEkATwBaAGEAaAB1AHwAhACGAIgAjQCPAJEAmgCfAKoArACuALAAtQC4ALoAvAC+AMAAzQDg +APoBEQEkATwBPgFAAUIBRAFGEYARnBGhEawRtRHIEcwR3xHqEfMR+BIAEgMSCBIXEhsSIhIqEjcSPBI+ +EkASRRJNElASVRJdEmASchJ1EnoAAAAAAAACAQAAAAAAAABKAAAAAAAAAAAAAAAAAAASfA + + + + + + + + + + + + \ No newline at end of file diff --git a/FileTree/DirectoryNode.m b/FileTree/DirectoryNode.m index 86b7ec7e5..1a06080c2 100644 --- a/FileTree/DirectoryNode.m +++ b/FileTree/DirectoryNode.m @@ -20,13 +20,14 @@ - (void)updatePath { - NSArray *contents = [[[NSFileManager defaultManager] directoryContentsAtPath:[url path]] sortedArrayUsingSelector:@selector(finderCompare:)]; + NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtURL:url includingPropertiesForKeys:[NSArray arrayWithObjects:NSURLNameKey, NSURLIsDirectoryKey, nil] options:(NSDirectoryEnumerationSkipsSubdirectoryDescendants | NSDirectoryEnumerationSkipsPackageDescendants | NSDirectoryEnumerationSkipsHiddenFiles) errorHandler:^BOOL(NSURL *url, NSError *error) { + return NO; + }]; NSMutableArray *fullPaths = [[NSMutableArray alloc] init]; - for (NSString *s in contents) + for (NSURL * theUrl in enumerator) { - if (![s hasPrefix:@"."]) - [fullPaths addObject:[[url path] stringByAppendingPathComponent: s]]; + [fullPaths addObject:[theUrl path]]; } [self processPaths: fullPaths]; diff --git a/FileTree/FileTreeController.h b/FileTree/FileTreeController.h index 90deb12de..79546d6de 100644 --- a/FileTree/FileTreeController.h +++ b/FileTree/FileTreeController.h @@ -18,6 +18,7 @@ - (IBAction)addToPlaylist:(id)sender; - (IBAction)setAsPlaylist:(id)sender; +- (IBAction)playPauseResume:(NSObject *)id; - (IBAction)showEntryInFinder:(id)sender; - (IBAction)setAsRoot:(id)sender; diff --git a/FileTree/FileTreeController.m b/FileTree/FileTreeController.m index 0d0312e96..d4c3005e7 100644 --- a/FileTree/FileTreeController.m +++ b/FileTree/FileTreeController.m @@ -14,7 +14,7 @@ - (IBAction)addToPlaylist:(id)sender { - unsigned int index; + NSUInteger index; NSIndexSet *selectedIndexes = [outlineView selectedRowIndexes]; NSMutableArray *urls = [[NSMutableArray alloc] init]; @@ -41,7 +41,7 @@ - (IBAction)showEntryInFinder:(id)sender { - unsigned int index; + NSUInteger index; NSWorkspace* ws = [NSWorkspace sharedWorkspace]; NSIndexSet *selectedIndexes = [outlineView selectedRowIndexes]; @@ -55,7 +55,7 @@ - (IBAction)setAsRoot:(id)sender { - unsigned int index = [[outlineView selectedRowIndexes] firstIndex]; + NSUInteger index = [[outlineView selectedRowIndexes] firstIndex]; if (index != NSNotFound) { diff --git a/FileTree/FileTreeDataSource.m b/FileTree/FileTreeDataSource.m index e99933efe..7b5d2ef4d 100644 --- a/FileTree/FileTreeDataSource.m +++ b/FileTree/FileTreeDataSource.m @@ -39,7 +39,7 @@ change:(NSDictionary *)change context:(void *)context { - NSLog([[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]); + NSLog(@"File tree root URL: %@\n", [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]); if ([keyPath isEqualToString:@"values.fileTreeRootURL"]) { [self setRootURL:[NSURL URLWithString:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootURL"]]]; } diff --git a/FileTree/FileTreeOutlineView.m b/FileTree/FileTreeOutlineView.m index 154b2cafc..ca6cf3fb3 100644 --- a/FileTree/FileTreeOutlineView.m +++ b/FileTree/FileTreeOutlineView.m @@ -6,6 +6,7 @@ // Copyright 2008 __MyCompanyName__. All rights reserved. // +#import "FileTreeController.h" #import "FileTreeOutlineView.h" #import "FileTreeViewController.h" #import "PlaybackController.h" @@ -30,13 +31,13 @@ if (modifiers == 0 && (c == NSEnterCharacter || c == NSCarriageReturnCharacter)) { - [[self delegate] addToPlaylist:self]; + [(FileTreeController *)[self delegate] addToPlaylist:self]; return; } else if (modifiers == 0 && c == ' ') { - [[self delegate] playPauseResume:self]; + [(FileTreeController *)[self delegate] playPauseResume:self]; return; } } @@ -66,7 +67,7 @@ } else if (!currentRowIsSelected) { - [self selectRow:iRow byExtendingSelection:NO]; + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:iRow] byExtendingSelection:NO]; } return contextMenu; diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/md5.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/md5.c index 37cef67bd..dfa17ab3d 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/md5.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/md5.c @@ -263,7 +263,7 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) byteSwap(ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ if(0 != ctx->internal_buf) { free(ctx->internal_buf); ctx->internal_buf = 0; diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c index a1465f5bb..5c8c87c9b 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c @@ -434,7 +434,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type { FLAC__StreamMetadata *object; - if(type > FLAC__MAX_METADATA_TYPE_CODE) + if((unsigned int)type > FLAC__MAX_METADATA_TYPE_CODE) return 0; object = (FLAC__StreamMetadata*)calloc(1, sizeof(FLAC__StreamMetadata)); diff --git a/Frameworks/GME/gme/Ay_Apu.cpp b/Frameworks/GME/gme/Ay_Apu.cpp index 79c2c05f3..931e4e542 100644 --- a/Frameworks/GME/gme/Ay_Apu.cpp +++ b/Frameworks/GME/gme/Ay_Apu.cpp @@ -221,11 +221,11 @@ void Ay_Apu::run_until( blip_time_t final_end_time ) blip_time_t end_time = final_end_time; int const vol_mode = regs [0x08 + index]; int const vol_mode_mask = type_ == Ay8914 ? 0x30 : 0x10; - int volume = amp_table [vol_mode & 0x0F] >> half_vol + env_step_scale; + int volume = amp_table [vol_mode & 0x0F] >> (half_vol + env_step_scale); int osc_env_pos = env_pos; if ( vol_mode & vol_mode_mask ) { - volume = env_wave [osc_env_pos] >> half_vol + env_step_scale; + volume = env_wave [osc_env_pos] >> (half_vol + env_step_scale); if ( type_ == Ay8914 ) volume >>= 3 - ( ( vol_mode & vol_mode_mask ) >> 4 ); // use envelope only if it's a repeating wave or a ramp that hasn't finished if ( !(regs [13] & 1) || osc_env_pos < -32 ) @@ -374,7 +374,7 @@ void Ay_Apu::run_until( blip_time_t final_end_time ) // next envelope step if ( ++osc_env_pos >= 0 ) osc_env_pos -= 32; - volume = env_wave [osc_env_pos] >> half_vol + env_step_scale; + volume = env_wave [osc_env_pos] >> (half_vol + env_step_scale); if ( type_ == Ay8914 ) volume >>= 3 - ( ( vol_mode & vol_mode_mask ) >> 4 ); start_time = end_time; diff --git a/Frameworks/GME/gme/Dual_Resampler.cpp b/Frameworks/GME/gme/Dual_Resampler.cpp index e19dfff87..5cc0e5d0e 100644 --- a/Frameworks/GME/gme/Dual_Resampler.cpp +++ b/Frameworks/GME/gme/Dual_Resampler.cpp @@ -255,7 +255,6 @@ void Dual_Resampler::mix_extra_mono( Stereo_Buffer& stereo_buf, dsample_t out_ [ typedef dsample_t stereo_dsample_t [2]; stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count; int offset = -count; - int const gain = gain_; do { int s = BLIP_READER_READ_RAW( sn ) >> (blip_sample_bits - 16); @@ -290,7 +289,6 @@ void Dual_Resampler::mix_extra_stereo( Stereo_Buffer& stereo_buf, dsample_t out_ typedef dsample_t stereo_dsample_t [2]; stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count; int offset = -count; - int const gain = gain_; do { int sc = BLIP_READER_READ_RAW( snc ) >> (blip_sample_bits - 16); diff --git a/Frameworks/GME/gme/Vgm_Core.cpp b/Frameworks/GME/gme/Vgm_Core.cpp index 7bfded31e..4dfd6de42 100644 --- a/Frameworks/GME/gme/Vgm_Core.cpp +++ b/Frameworks/GME/gme/Vgm_Core.cpp @@ -1330,7 +1330,7 @@ blargg_err_t Vgm_Core::init_chips( double* rate, bool reinit ) } if ( qsound_rate ) { - double pcm_rate = (double)qsound_rate / 166.0; + /*double pcm_rate = (double)qsound_rate / 166.0;*/ if ( !reinit ) { int result = qsound[0].set_rate( qsound_rate ); diff --git a/Frameworks/GME/gme/c140.c b/Frameworks/GME/gme/c140.c index 9ebb520d9..f0b4add98 100644 --- a/Frameworks/GME/gme/c140.c +++ b/Frameworks/GME/gme/c140.c @@ -48,6 +48,7 @@ Unmapped registers: #include #include "c140.h" +#undef NULL #define NULL ((void *)0) #define MAX_VOICE 24 diff --git a/Frameworks/GME/gme/fm.c b/Frameworks/GME/gme/fm.c index f069f396e..380b09cd7 100644 --- a/Frameworks/GME/gme/fm.c +++ b/Frameworks/GME/gme/fm.c @@ -3842,12 +3842,12 @@ void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length) /* Check YM2610B warning message */ if( FM_KEY_IS(&F2610->CH[0].SLOT[3]) ) { - LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,0)); + /*LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,0));*/ FM_KEY_IS(&F2610->CH[3].SLOT[3]) = 0; } if( FM_KEY_IS(&F2610->CH[3].SLOT[3]) ) { - LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,3)); + /*LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,3));*/ FM_KEY_IS(&F2610->CH[3].SLOT[3]) = 0; } #endif diff --git a/Frameworks/GME/gme/fmopl.cpp b/Frameworks/GME/gme/fmopl.cpp index 179410ff8..3caf43733 100644 --- a/Frameworks/GME/gme/fmopl.cpp +++ b/Frameworks/GME/gme/fmopl.cpp @@ -1497,8 +1497,8 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) } else { /* set IRQ mask ,timer enable*/ - UINT8 st1 = v&1; - UINT8 st2 = (v>>1)&1; + /*UINT8 st1 = v&1; + UINT8 st2 = (v>>1)&1;*/ /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ OPL_STATUS_RESET(OPL, v & (0x78-0x08) ); @@ -1526,8 +1526,8 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) { if(OPL->keyboardhandler_w) OPL->keyboardhandler_w(OPL->keyboard_param,v); - else - logerror("Y8950: write unmapped KEYBOARD port\n"); + /*else + logerror("Y8950: write unmapped KEYBOARD port\n");*/ } break; case 0x07: /* DELTA-T control 1 : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */ @@ -1561,7 +1561,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) case 0x15: /* DAC data high 8 bits (F7,F6...F2) */ case 0x16: /* DAC data low 2 bits (F1, F0 in bits 7,6) */ case 0x17: /* DAC data shift (S2,S1,S0 in bits 2,1,0) */ - logerror("FMOPL.C: DAC data register written, but not implemented reg=%02x val=%02x\n",r,v); + /*logerror("FMOPL.C: DAC data register written, but not implemented reg=%02x val=%02x\n",r,v);*/ break; case 0x18: /* I/O CTRL (Direction) */ @@ -1578,7 +1578,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) break; #endif default: - logerror("FMOPL.C: write to unknown register: %02x\n",r); + /*logerror("FMOPL.C: write to unknown register: %02x\n",r);*/ break; } break; @@ -2095,8 +2095,8 @@ static unsigned char OPLRead(FM_OPL *OPL,int a) { if(OPL->keyboardhandler_r) return OPL->keyboardhandler_r(OPL->keyboard_param); - else - logerror("Y8950: read unmapped KEYBOARD port\n"); + /*else + logerror("Y8950: read unmapped KEYBOARD port\n");*/ } return 0; @@ -2116,14 +2116,14 @@ static unsigned char OPLRead(FM_OPL *OPL,int a) { if(OPL->porthandler_r) return OPL->porthandler_r(OPL->port_param); - else - logerror("Y8950:read unmapped I/O port\n"); + /*else + logerror("Y8950:read unmapped I/O port\n");*/ } return 0; case 0x1a: /* PCM-DATA */ if(OPL->type&OPL_TYPE_ADPCM) { - logerror("Y8950 A/D convertion is accessed but not implemented !\n"); + /*logerror("Y8950 A/D convertion is accessed but not implemented !\n");*/ return 0x80; /* 2's complement PCM data - result from A/D convertion */ } return 0; diff --git a/Frameworks/GME/gme/k053260.c b/Frameworks/GME/gme/k053260.c index c00087957..51fa789df 100644 --- a/Frameworks/GME/gme/k053260.c +++ b/Frameworks/GME/gme/k053260.c @@ -303,7 +303,7 @@ INLINE void check_bounds( k053260_state *ic, int channel ) UINT32 channel_end = channel_start + ic->channels[channel].size - 1; if ( channel_start > ic->rom_size ) { - logerror("K53260: Attempting to start playing past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end ); + /*logerror("K53260: Attempting to start playing past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end );*/ ic->channels[channel].play = 0; @@ -311,11 +311,11 @@ INLINE void check_bounds( k053260_state *ic, int channel ) } if ( channel_end > ic->rom_size ) { - logerror("K53260: Attempting to play past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end ); + /*logerror("K53260: Attempting to play past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end );*/ ic->channels[channel].size = ic->rom_size - channel_start; } - if (LOG) logerror("K053260: Sample Start = %06x, Sample End = %06x, Sample rate = %04x, PPCM = %s\n", channel_start, channel_end, ic->channels[channel].rate, ic->channels[channel].ppcm ? "yes" : "no" ); + /*if (LOG) logerror("K053260: Sample Start = %06x, Sample End = %06x, Sample rate = %04x, PPCM = %s\n", channel_start, channel_end, ic->channels[channel].rate, ic->channels[channel].ppcm ? "yes" : "no" );*/ } //WRITE8_DEVICE_HANDLER( k053260_w ) @@ -328,7 +328,7 @@ void k053260_w(void *chip, offs_t offset, UINT8 data) k053260_state *ic = (k053260_state *) chip; if ( r > 0x2f ) { - logerror("K053260: Writing past registers\n" ); + /*logerror("K053260: Writing past registers\n" );*/ return; } @@ -462,7 +462,7 @@ UINT8 k053260_r(void *chip, offs_t offset) if ( offs > ic->rom_size ) { //logerror("%s: K53260: Attempting to read past ROM size in ROM Read Mode (offs = %06x, size = %06x).\n", device->machine().describe_context(),offs,ic->rom_size ); - logerror("K53260: Attempting to read past ROM size in ROM Read Mode (offs = %06x, size = %06x).\n", offs,ic->rom_size ); + /*logerror("K53260: Attempting to read past ROM size in ROM Read Mode (offs = %06x, size = %06x).\n", offs,ic->rom_size );*/ return 0; } diff --git a/Frameworks/GME/gme/k054539.c b/Frameworks/GME/gme/k054539.c index 373c90bf0..63f35ae09 100644 --- a/Frameworks/GME/gme/k054539.c +++ b/Frameworks/GME/gme/k054539.c @@ -28,6 +28,7 @@ CHANNEL_DEBUG enables the following keys: #endif #include "k054539.h" +#undef NULL #define NULL ((void *)0) #define CHANNEL_DEBUG 0 @@ -365,7 +366,7 @@ else break; } default: - LOG(("Unknown sample type %x for channel %d\n", base2[0] & 0xc, ch)); + /*LOG(("Unknown sample type %x for channel %d\n", base2[0] & 0xc, ch));*/ break; } chan->pos = cur_pos; @@ -664,7 +665,7 @@ UINT8 k054539_r(void *chip, offs_t offset) case 0x22c: break; default: - LOG(("K054539 read %03x\n", offset)); + /*LOG(("K054539 read %03x\n", offset));*/ break; } return info->regs[offset]; diff --git a/Frameworks/GME/gme/okim6258.c b/Frameworks/GME/gme/okim6258.c index e333f247b..351743f46 100644 --- a/Frameworks/GME/gme/okim6258.c +++ b/Frameworks/GME/gme/okim6258.c @@ -279,7 +279,6 @@ void device_reset_okim6258(void *chip) void okim6258_set_divider(void *chip, int val) { okim6258_state *info = (okim6258_state *) chip; - int divider = dividers[val]; info->divider = dividers[val]; //stream_set_sample_rate(info->stream, info->master_clock / divider); @@ -402,7 +401,7 @@ void okim6258_ctrl_w(void *chip, offs_t offset, UINT8 data) if (data & COMMAND_RECORD) { - logerror("M6258: Record enabled\n"); + /*logerror("M6258: Record enabled\n");*/ info->status |= STATUS_RECORDING; } else diff --git a/Frameworks/GME/gme/okim6295.c b/Frameworks/GME/gme/okim6295.c index 1c2c2de21..2157380dd 100644 --- a/Frameworks/GME/gme/okim6295.c +++ b/Frameworks/GME/gme/okim6295.c @@ -605,7 +605,7 @@ void okim6295_write_command(okim6295_state *info, UINT8 data) else { //logerror("OKIM6295:'%s' requested to play invalid sample %02x\n",device->tag(),info->command); - logerror("OKIM6295: Voice %u requested to play invalid sample %02x\n",i,info->command); + /*logerror("OKIM6295: Voice %u requested to play invalid sample %02x\n",i,info->command);*/ voice->playing = 0; } } diff --git a/Frameworks/GME/gme/rf5c68.c b/Frameworks/GME/gme/rf5c68.c index 69286ee70..92c56ca8f 100644 --- a/Frameworks/GME/gme/rf5c68.c +++ b/Frameworks/GME/gme/rf5c68.c @@ -9,6 +9,7 @@ #include "rf5c68.h" #include +#undef NULL #define NULL ((void *)0) diff --git a/Frameworks/GME/gme/ym2151.c b/Frameworks/GME/gme/ym2151.c index 342d1be4c..b17eca9ae 100644 --- a/Frameworks/GME/gme/ym2151.c +++ b/Frameworks/GME/gme/ym2151.c @@ -8,15 +8,15 @@ #include #include #include -#include "mamedef.h" -#include "ym2151.h" - -#ifndef logerror -#define logerror (void) -#endif - - -/* struct describing a single operator */ +#include "mamedef.h" +#include "ym2151.h" + +#ifndef logerror +#define logerror (void) +#endif + + +/* struct describing a single operator */ typedef struct { UINT32 phase; /* accumulated operator phase */ @@ -961,7 +961,7 @@ void ym2151_write_reg(void *_chip, int r, int v) break; default: - logerror("YM2151 Write %02x to undocumented register #%02x\n",v,r); + /*logerror("YM2151 Write %02x to undocumented register #%02x\n",v,r);*/ break; } break; @@ -977,13 +977,13 @@ void ym2151_write_reg(void *_chip, int r, int v) chip->connect[r&7] = v&7; set_connect(chip, op, r&7, v&7); break; - - case 0x08: /* Key Code */ - v &= 0x7f; - if (v != (int)(op->kc)) - { - UINT32 kc, kc_channel; - + + case 0x08: /* Key Code */ + v &= 0x7f; + if (v != (int)(op->kc)) + { + UINT32 kc, kc_channel; + kc_channel = (v - (v>>2))*64; kc_channel += 768; kc_channel |= (op->kc_i & 63); @@ -1014,13 +1014,13 @@ void ym2151_write_reg(void *_chip, int r, int v) refresh_EG( op ); } break; - - case 0x10: /* Key Fraction */ - v >>= 2; - if (v != (int)(op->kc_i & 63)) - { - UINT32 kc_channel; - + + case 0x10: /* Key Fraction */ + v >>= 2; + if (v != (int)(op->kc_i & 63)) + { + UINT32 kc_channel; + kc_channel = v; kc_channel |= (op->kc_i & ~63); @@ -1633,13 +1633,13 @@ INLINE void advance_eg(YM2151 *PSG) case EG_DEC: /* decay phase */ if ( !(PSG->eg_cnt & ((1<eg_sh_d1r)-1) ) ) - { - op->volume += eg_inc[op->eg_sel_d1r + ((PSG->eg_cnt>>op->eg_sh_d1r)&7)]; - - if ( op->volume >= (INT32)(op->d1l) ) - op->state = EG_SUS; - - } + { + op->volume += eg_inc[op->eg_sel_d1r + ((PSG->eg_cnt>>op->eg_sh_d1r)&7)]; + + if ( op->volume >= (INT32)(op->d1l) ) + op->state = EG_SUS; + + } break; case EG_SUS: /* sustain phase */ diff --git a/Frameworks/GME/gme/ym2413.c b/Frameworks/GME/gme/ym2413.c index af225d237..726e880cc 100644 --- a/Frameworks/GME/gme/ym2413.c +++ b/Frameworks/GME/gme/ym2413.c @@ -41,18 +41,18 @@ to do: #include #include #include -#include "mamedef.h" -#include "ym2413.h" - -#ifndef INLINE -#define INLINE static __inline -#endif -#ifndef logerror -#define logerror (void) -#endif - -#ifndef M_PI - #define M_PI 3.14159265358979323846 +#include "mamedef.h" +#include "ym2413.h" + +#ifndef INLINE +#define INLINE static __inline +#endif +#ifndef logerror +#define logerror (void) +#endif + +#ifndef M_PI + #define M_PI 3.14159265358979323846 #endif /* output final shift */ @@ -581,24 +581,24 @@ static const unsigned char table_vrc7[15][8] = {0x01, 0x02, 0xD3, 0x05, 0x82, 0xA2, 0x31, 0x51}, {0x61, 0x22, 0x0D, 0x02, 0xC3, 0x7F, 0x24, 0x05}, {0x21, 0x62, 0x0E, 0x00, 0xA1, 0xA0, 0x44, 0x17}, - -}; - -INLINE int limit( int val, int max, int min ) { - if ( val > max ) - val = max; - else if ( val < min ) + +}; + +INLINE int limit( int val, int max, int min ) { + if ( val > max ) + val = max; + else if ( val < min ) val = min; return val; } - - -/* advance LFO to next sample */ -INLINE void advance_lfo(YM2413 *chip) -{ - /* LFO */ - chip->lfo_am_cnt += chip->lfo_am_inc; + + +/* advance LFO to next sample */ +INLINE void advance_lfo(YM2413 *chip) +{ + /* LFO */ + chip->lfo_am_cnt += chip->lfo_am_inc; if (chip->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<lfo_pm_cnt += chip->lfo_pm_inc; chip->LFO_PM = (chip->lfo_pm_cnt>>LFO_SH) & 7; -} - -/* advance to next sample */ -INLINE void advance(YM2413 *chip) -{ - OPLL_CH *CH; - OPLL_SLOT *op; +} + +/* advance to next sample */ +INLINE void advance(YM2413 *chip) +{ + OPLL_CH *CH; + OPLL_SLOT *op; unsigned int i; /* Envelope Generator */ @@ -669,13 +669,13 @@ INLINE void advance(YM2413 *chip) case EG_DEC: /* decay phase */ if ( !(chip->eg_cnt & ((1<eg_sh_dr)-1) ) ) - { - op->volume += eg_inc[op->eg_sel_dr + ((chip->eg_cnt>>op->eg_sh_dr)&7)]; - - if ( op->volume >= (INT32)(op->sl) ) - op->state = EG_SUS; - } - break; + { + op->volume += eg_inc[op->eg_sel_dr + ((chip->eg_cnt>>op->eg_sh_dr)&7)]; + + if ( op->volume >= (INT32)(op->sl) ) + op->state = EG_SUS; + } + break; case EG_SUS: /* sustain phase */ /* this is important behaviour: @@ -836,24 +836,24 @@ INLINE void advance(YM2413 *chip) i--; } -} - - -INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab) -{ - UINT32 p; - +} + + +INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab) +{ + UINT32 p; + p = (env<<5) + sin_tab[wave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<17))) >> FREQ_SH ) & SIN_MASK) ]; if (p >= TL_TAB_LEN) return 0; - return tl_tab[p]; -} - -INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab) -{ - UINT32 p; - INT32 i; + return tl_tab[p]; +} + +INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab) +{ + UINT32 p; + INT32 i; i = (phase & ~FREQ_MASK) + pm; @@ -869,13 +869,13 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsign } -#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask)) - -/* calculate output */ -INLINE void chan_calc( YM2413 *chip, OPLL_CH *CH ) -{ - OPLL_SLOT *SLOT; - unsigned int env; +#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask)) + +/* calculate output */ +INLINE void chan_calc( YM2413 *chip, OPLL_CH *CH ) +{ + OPLL_SLOT *SLOT; + unsigned int env; signed int out; signed int phase_modulation; /* phase modulation input (SLOT 2) */ @@ -943,13 +943,13 @@ number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal 8 14,17 B8 A8 + + + */ - -/* calculate rhythm */ - -INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise ) -{ - OPLL_SLOT *SLOT; - signed int out; + +/* calculate rhythm */ + +INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise ) +{ + OPLL_SLOT *SLOT; + signed int out; unsigned int env; signed int phase_modulation; /* phase modulation input (SLOT 2) */ @@ -1277,24 +1277,24 @@ static void OPLL_initalize(YM2413 *chip) chip->eg_timer_add = (1<freqbase; chip->eg_timer_overflow = ( 1 ) * (1<eg_timer_add, chip->eg_timer_overflow);*/ -} - -INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set) -{ - if( !SLOT->key ) - { + /*logerror("YM2413init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/ +} + +INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set) +{ + if( !SLOT->key ) + { /* do NOT restart Phase Generator (verified on real YM2413)*/ /* phase -> Dump */ SLOT->state = EG_DMP; } - SLOT->key |= key_set; -} - -INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr) -{ - if( SLOT->key ) - { + SLOT->key |= key_set; +} + +INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr) +{ + if( SLOT->key ) + { SLOT->key &= key_clr; if( !SLOT->key ) @@ -1304,13 +1304,13 @@ INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr) SLOT->state = EG_REL; } } -} - -/* update phase increment counter of operator (also update the EG rates if necessary) */ -INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT) -{ - int ksr; - UINT32 SLOT_rs; +} + +/* update phase increment counter of operator (also update the EG rates if necessary) */ +INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT) +{ + int ksr; + UINT32 SLOT_rs; UINT32 SLOT_dp; /* (frequency) phase increment counter */ @@ -1350,13 +1350,13 @@ INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT) SLOT_dp = 16 + (13<<2); SLOT->eg_sh_dp = eg_rate_shift [SLOT_dp + SLOT->ksr ]; SLOT->eg_sel_dp = eg_rate_select[SLOT_dp + SLOT->ksr ]; -} - -/* set multi,am,vib,EG-TYP,KSR,mul */ -INLINE void set_mul(YM2413 *chip,int slot,int v) -{ - OPLL_CH *CH = &chip->P_CH[slot/2]; - OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; +} + +/* set multi,am,vib,EG-TYP,KSR,mul */ +INLINE void set_mul(YM2413 *chip,int slot,int v) +{ + OPLL_CH *CH = &chip->P_CH[slot/2]; + OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; SLOT->mul = mul_tab[v&0x0f]; SLOT->KSR = (v&0x10) ? 0 : 2; @@ -1364,13 +1364,13 @@ INLINE void set_mul(YM2413 *chip,int slot,int v) SLOT->vib = (v&0x40); SLOT->AMmask = (v&0x80) ? ~0 : 0; CALC_FCSLOT(CH,SLOT); -} - -/* set ksl, tl */ -INLINE void set_ksl_tl(YM2413 *chip,int chan,int v) -{ - int ksl; - OPLL_CH *CH = &chip->P_CH[chan]; +} + +/* set ksl, tl */ +INLINE void set_ksl_tl(YM2413 *chip,int chan,int v) +{ + int ksl; + OPLL_CH *CH = &chip->P_CH[chan]; /* modulator */ OPLL_SLOT *SLOT = &CH->SLOT[SLOT1]; @@ -1379,13 +1379,13 @@ INLINE void set_ksl_tl(YM2413 *chip,int chan,int v) SLOT->ksl = ksl ? 3-ksl : 31; SLOT->TL = (v&0x3f)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */ SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); -} - -/* set ksl , waveforms, feedback */ -INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v) -{ - int ksl; - OPLL_CH *CH = &chip->P_CH[chan]; +} + +/* set ksl , waveforms, feedback */ +INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v) +{ + int ksl; + OPLL_CH *CH = &chip->P_CH[chan]; /* modulator */ OPLL_SLOT *SLOT = &CH->SLOT[SLOT1]; SLOT->wavetable = ((v&0x08)>>3)*SIN_LEN; @@ -1399,13 +1399,13 @@ INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v) SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); SLOT->wavetable = ((v&0x10)>>4)*SIN_LEN; -} - -/* set attack rate & decay rate */ -INLINE void set_ar_dr(YM2413 *chip,int slot,int v) -{ - OPLL_CH *CH = &chip->P_CH[slot/2]; - OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; +} + +/* set attack rate & decay rate */ +INLINE void set_ar_dr(YM2413 *chip,int slot,int v) +{ + OPLL_CH *CH = &chip->P_CH[slot/2]; + OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0; @@ -1423,13 +1423,13 @@ INLINE void set_ar_dr(YM2413 *chip,int slot,int v) SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0; SLOT->eg_sh_dr = eg_rate_shift [SLOT->dr + SLOT->ksr ]; SLOT->eg_sel_dr = eg_rate_select[SLOT->dr + SLOT->ksr ]; -} - -/* set sustain level & release rate */ -INLINE void set_sl_rr(YM2413 *chip,int slot,int v) -{ - OPLL_CH *CH = &chip->P_CH[slot/2]; - OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; +} + +/* set sustain level & release rate */ +INLINE void set_sl_rr(YM2413 *chip,int slot,int v) +{ + OPLL_CH *CH = &chip->P_CH[slot/2]; + OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; SLOT->sl = sl_tab[ v>>4 ]; @@ -1575,7 +1575,7 @@ static void OPLLWriteReg(YM2413 *chip, int r, int v) if ((chip->rhythm&0x20)==0) /*rhythm off to on*/ { - logerror("YM2413: Rhythm mode enable\n"); + /*logerror("YM2413: Rhythm mode enable\n");*/ /* Load instrument settings for channel seven(chan=6 since we're zero based). (Bass drum) */ chan = 6; @@ -1637,7 +1637,7 @@ static void OPLLWriteReg(YM2413 *chip, int r, int v) if ((chip->rhythm&0x20)==1) /*rhythm on to off*/ { - logerror("YM2413: Rhythm mode disable\n"); + /*logerror("YM2413: Rhythm mode disable\n");*/ /* Load instrument settings for channel seven(chan=6 since we're zero based).*/ chan = 6; inst = &chip->inst_tab[chip->instvol_r[chan]>>4][0]; @@ -1678,13 +1678,13 @@ static void OPLLWriteReg(YM2413 *chip, int r, int v) } break; - case 0x10: - case 0x20: - { - UINT32 block_fnum; - - chan = r&0x0f; - + case 0x10: + case 0x20: + { + UINT32 block_fnum; + + chan = r&0x0f; + if (chan >= 9) chan -= 9; /* verified on real YM2413 */ @@ -1710,8 +1710,8 @@ static void OPLLWriteReg(YM2413 *chip, int r, int v) } - if (CH->sus!=(v&0x20)) - logerror("chan=%i sus=%2x\n",chan,v&0x20); + /*if (CH->sus!=(v&0x20)) + logerror("chan=%i sus=%2x\n",chan,v&0x20);*/ CH->sus = v & 0x20; } @@ -2102,7 +2102,7 @@ void * ym2413_get_inst0(void *_chip) void ym2413_set_mask(void *_chip, UINT32 mask) { - YM2413 *chip = (YM2413 *)_chip; - - chip->mask = mask; -} + YM2413 *chip = (YM2413 *)_chip; + + chip->mask = mask; +} diff --git a/Frameworks/GME/gme/ymdeltat.cpp b/Frameworks/GME/gme/ymdeltat.cpp index 71681624c..4e14f143c 100644 --- a/Frameworks/GME/gme/ymdeltat.cpp +++ b/Frameworks/GME/gme/ymdeltat.cpp @@ -60,18 +60,18 @@ ** YM2610/B OPNB ** Y8950 MSX AUDIO ** -*/ - -#include "ymdeltat.h" -#ifndef INLINE -#define INLINE __inline -#endif -#ifndef logerror -#define logerror (void) -#endif - -#define YM_DELTAT_DELTA_MAX (24576) -#define YM_DELTAT_DELTA_MIN (127) +*/ + +#include "ymdeltat.h" +#ifndef INLINE +#define INLINE __inline +#endif +#ifndef logerror +#define logerror (void) +#endif + +#define YM_DELTAT_DELTA_MAX (24576) +#define YM_DELTAT_DELTA_MIN (127) #define YM_DELTAT_DELTA_DEF (127) #define YM_DELTAT_DECODE_RANGE 32768 @@ -231,7 +231,7 @@ value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning: /* if yes, then let's check if ADPCM memory is mapped and big enough */ if(DELTAT->memory == 0) { - logerror("YM Delta-T ADPCM rom not mapped\n"); + /*logerror("YM Delta-T ADPCM rom not mapped\n");*/ DELTAT->portstate = 0x00; DELTAT->PCM_BSY = 0; } @@ -239,12 +239,12 @@ value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning: { if( DELTAT->end >= DELTAT->memory_size ) /* Check End in Range */ { - logerror("YM Delta-T ADPCM end out of range: $%08x\n", DELTAT->end); + /*logerror("YM Delta-T ADPCM end out of range: $%08x\n", DELTAT->end);*/ DELTAT->end = DELTAT->memory_size - 1; } if( DELTAT->start >= DELTAT->memory_size ) /* Check Start in Range */ { - logerror("YM Delta-T ADPCM start out of range: $%08x\n", DELTAT->start); + /*logerror("YM Delta-T ADPCM start out of range: $%08x\n", DELTAT->start);*/ DELTAT->portstate = 0x00; DELTAT->PCM_BSY = 0; } diff --git a/Frameworks/GME/gme/ymz280b.c b/Frameworks/GME/gme/ymz280b.c index 0fc4d5873..c331f4ff8 100644 --- a/Frameworks/GME/gme/ymz280b.c +++ b/Frameworks/GME/gme/ymz280b.c @@ -1120,7 +1120,7 @@ static void write_to_register(ymz280b_state *chip, int data) case 0x80: // d0-2: DSP Rch, d3: enable Rch (0: yes, 1: no), d4-6: DSP Lch, d7: enable Lch (0: yes, 1: no) case 0x81: // d0: enable control of $82 (0: yes, 1: no) case 0x82: // DSP data - logerror("YMZ280B: DSP register write %02X = %02X\n", chip->current_register, data); + /*logerror("YMZ280B: DSP register write %02X = %02X\n", chip->current_register, data);*/ break; case 0x84: /* ROM readback / RAM write (high) */ diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.cpp index ea5860c51..b27e6bf00 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.cpp @@ -80,7 +80,7 @@ void Blip_Buffer::clear( int entire_buffer ) } } -Blip_Buffer::blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, int msec ) +Blip_Buffer::blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, long msec ) { if ( buffer_size_ == silent_buf_size ) { @@ -436,7 +436,7 @@ void Blip_Buffer::mix_samples( blip_sample_t const* in, long count ) buf_t_* out = buffer_ + (offset_ >> BLIP_BUFFER_ACCURACY) + blip_widest_impulse_ / 2; int const sample_shift = blip_sample_bits - 16; - int prev = 0; + blip_long prev = 0; while ( count-- ) { blip_long s = (blip_long) *in++ << sample_shift; diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.h index 73648d853..94810d2bf 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Blip_Buffer.h @@ -6,7 +6,7 @@ // internal #include - #if INT_MAX < 0x7FFFFFFF || LONG_MAX == 0x7FFFFFFF + #if INT_MAX < 0x7FFFFFFF || LONG_MAX >= 0x7FFFFFFF typedef long blip_long; typedef unsigned long blip_ulong; #else @@ -32,7 +32,7 @@ public: // Sets output sample rate and buffer length in milliseconds (1/1000 sec, defaults // to 1/4 second) and clears buffer. If there isn't enough memory, leaves buffer // untouched and returns "Out of memory", otherwise returns NULL. - blargg_err_t set_sample_rate( long samples_per_sec, int msec_length = 1000 / 4 ); + blargg_err_t set_sample_rate( long samples_per_sec, long msec_length = 1000 / 4 ); // Sets number of source time units per second void clock_rate( long clocks_per_sec ); @@ -67,7 +67,7 @@ public: long sample_rate() const; // Length of buffer in milliseconds - int length() const; + long length() const; // Number of source time units per second long clock_rate() const; @@ -118,7 +118,7 @@ public: // Deprecated typedef blip_resampled_time_t resampled_time_t; blargg_err_t sample_rate( long r ) { return set_sample_rate( r ); } - blargg_err_t sample_rate( long r, int msec ) { return set_sample_rate( r, msec ); } + blargg_err_t sample_rate( long r, long msec ) { return set_sample_rate( r, msec ); } private: // noncopyable Blip_Buffer( const Blip_Buffer& ); @@ -135,7 +135,7 @@ private: long sample_rate_; long clock_rate_; int bass_freq_; - int length_; + blip_long length_; Blip_Buffer* modified_; // non-zero = true (more optimal than using bool, heh) friend class Blip_Reader; }; @@ -280,7 +280,7 @@ class Silent_Blip_Buffer : public Blip_Buffer { buf_t_ buf [blip_buffer_extra_ + 1]; public: // The following cannot be used (an assertion will fail if attempted): - blargg_err_t set_sample_rate( long samples_per_sec, int msec_length ); + blargg_err_t set_sample_rate( long samples_per_sec, long msec_length ); blip_time_t count_clocks( long count ) const; void mix_samples( blip_sample_t const* buf, long count ); @@ -526,7 +526,7 @@ inline blip_eq_t::blip_eq_t( double t ) : inline blip_eq_t::blip_eq_t( double t, long rf, long sr, long cf ) : treble( t ), rolloff_freq( rf ), sample_rate( sr ), cutoff_freq( cf ) { } -inline int Blip_Buffer::length() const { return length_; } +inline long Blip_Buffer::length() const { return length_; } inline long Blip_Buffer::samples_avail() const { return (long) (offset_ >> BLIP_BUFFER_ACCURACY); } inline long Blip_Buffer::sample_rate() const { return sample_rate_; } inline int Blip_Buffer::output_latency() const { return blip_widest_impulse_ / 2; } diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.cpp index cbe7bf96d..eb3ef3c42 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.cpp @@ -121,7 +121,7 @@ blargg_err_t Effects_Buffer::set_channel_count( int count, int const* types ) } { - for ( int i = chans.size(); --i >= 0; ) + for ( blip_long i = chans.size(); --i >= 0; ) { chan_t& ch = chans [i]; ch.cfg.vol = 1.0f; @@ -242,7 +242,7 @@ int Effects_Buffer::min_delay() const return max_read * 1000L / sample_rate(); } -int Effects_Buffer::max_delay() const +blip_long Effects_Buffer::max_delay() const { require( sample_rate() ); return (echo_size / stereo - max_read) * 1000L / sample_rate(); @@ -250,7 +250,7 @@ int Effects_Buffer::max_delay() const void Effects_Buffer::apply_config() { - int i; + blip_long i; if ( !bufs_size ) return; @@ -406,7 +406,7 @@ void Effects_Buffer::assign_buffers() CALC_LEVELS( ch.vol, ch_sum, ch_diff, ch_surround ); CALC_LEVELS( bufs [h].vol, buf_sum, buf_diff, buf_surround ); - fixed_t dist = abs( ch_sum - buf_sum ) + abs( ch_diff - buf_diff ); + fixed_t dist = labs( ch_sum - buf_sum ) + labs( ch_diff - buf_diff ); if ( ch_surround != buf_surround ) dist += TO_FIXED( 1 ) / 2; diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.h index e8458f654..e65f7ac9c 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Effects_Buffer.h @@ -38,7 +38,7 @@ public: // Limits of delay (msec) int min_delay() const; - int max_delay() const; + blip_long max_delay() const; // Per-channel configuration. Two or more channels with matching parameters are // optimized to internally use the same buffer. diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.cpp index 1f0763d25..e5b3e32e0 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.cpp @@ -376,7 +376,7 @@ void Gb_Square::run( blip_time_t time, blip_time_t end_time ) if ( !vol ) { // Maintain phase when not playing - int count = (end_time - time + per - 1) / per; + blip_long count = (end_time - time + per - 1) / per; ph += count; // will be masked below time += (blip_time_t) count * per; } @@ -406,7 +406,7 @@ void Gb_Square::run( blip_time_t time, blip_time_t end_time ) // Quickly runs LFSR for a large number of clocks. For use when noise is generating // no sound. -static unsigned run_lfsr( unsigned s, unsigned mask, int count ) +static unsigned run_lfsr( unsigned s, unsigned mask, blip_long count ) { bool const optimized = true; // set to false to use only unoptimized loop in middle @@ -518,11 +518,11 @@ void Gb_Noise::run( blip_time_t time, blip_time_t end_time ) static byte const period1s [8] = { 1, 2, 4, 6, 8, 10, 12, 14 }; int const period1 = period1s [regs [3] & 7] * clk_mul; { - int extra = (end_time - time) - delay; + blip_long extra = (end_time - time) - delay; int const per2 = this->period2(); time += delay + ((divider ^ (per2 >> 1)) & (per2 - 1)) * period1; - int count = (extra < 0 ? 0 : (extra + period1 - 1) / period1); + blip_long count = (extra < 0 ? 0 : (extra + period1 - 1) / period1); divider = (divider - count) & period2_mask; delay = count * period1 - extra; } @@ -541,7 +541,7 @@ void Gb_Noise::run( blip_time_t time, blip_time_t end_time ) else if ( !vol ) { // Maintain phase when not playing - int count = (end_time - time + per - 1) / per; + blip_long count = (end_time - time + per - 1) / per; time += (blip_time_t) count * per; bits = run_lfsr( bits, ~mask, count ); } @@ -627,7 +627,7 @@ void Gb_Wave::run( blip_time_t time, blip_time_t end_time ) if ( !playing ) { // Maintain phase when not playing - int count = (end_time - time + per - 1) / per; + blip_long count = (end_time - time + per - 1) / per; ph += count; // will be masked below time += (blip_time_t) count * per; } diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.h index 4f8080025..b41278289 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Gb_Oscs.h @@ -41,7 +41,7 @@ public: Good_Synth const* good_synth; Med_Synth const* med_synth; - int delay; // clocks until frequency timer expires + blip_long delay; // clocks until frequency timer expires int length_ctr; // length counter unsigned phase; // waveform phase (or equivalent) bool enabled; // internal enabled flag diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.cpp index dfbf0771c..66d7f5f0a 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.cpp @@ -58,7 +58,7 @@ Mono_Buffer::Mono_Buffer() : Multi_Buffer( 1 ) Mono_Buffer::~Mono_Buffer() { } -blargg_err_t Mono_Buffer::set_sample_rate( long rate, int msec ) +blargg_err_t Mono_Buffer::set_sample_rate( long rate, long msec ) { RETURN_ERR( buf.set_sample_rate( rate, msec ) ); return Multi_Buffer::set_sample_rate( buf.sample_rate(), buf.length() ); @@ -138,7 +138,7 @@ Stereo_Buffer::Stereo_Buffer() : Multi_Buffer( 2 ) Stereo_Buffer::~Stereo_Buffer() { } -blargg_err_t Stereo_Buffer::set_sample_rate( long rate, int msec ) +blargg_err_t Stereo_Buffer::set_sample_rate( long rate, long msec ) { mixer.samples_read = 0; for ( int i = bufs_size; --i >= 0; ) diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.h index 0a347f157..978fb458d 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/Multi_Buffer.h @@ -32,14 +32,14 @@ public: virtual channel_t channel( int index ) BLARGG_PURE( ; ) // See Blip_Buffer.h - virtual blargg_err_t set_sample_rate( long rate, int msec = blip_default_length ) BLARGG_PURE( ; ) + virtual blargg_err_t set_sample_rate( long rate, long msec = blip_default_length ) BLARGG_PURE( ; ) virtual void clock_rate( long ) BLARGG_PURE( { } ) virtual void bass_freq( int ) BLARGG_PURE( { } ) virtual void clear() BLARGG_PURE( { } ) long sample_rate() const; // Length of buffer, in milliseconds - int length() const; + long length() const; // See Blip_Buffer.h virtual void end_frame( blip_time_t ) BLARGG_PURE( { } ) @@ -69,7 +69,7 @@ private: unsigned channels_changed_count_; long sample_rate_; - int length_; + long length_; int channel_count_; int const samples_per_frame_; int const* channel_types_; @@ -87,7 +87,7 @@ public: public: Mono_Buffer(); ~Mono_Buffer(); - blargg_err_t set_sample_rate( long rate, int msec = blip_default_length ); + blargg_err_t set_sample_rate( long rate, long msec = blip_default_length ); void clock_rate( long rate ) { buf.clock_rate( rate ); } void bass_freq( int freq ) { buf.bass_freq( freq ); } void clear() { buf.clear(); } @@ -144,7 +144,7 @@ public: public: Stereo_Buffer(); ~Stereo_Buffer(); - blargg_err_t set_sample_rate( long, int msec = blip_default_length ); + blargg_err_t set_sample_rate( long, long msec = blip_default_length ); void clock_rate( long ); void bass_freq( int ); void clear(); @@ -168,7 +168,7 @@ class Silent_Buffer : public Multi_Buffer { channel_t chan; public: Silent_Buffer(); - blargg_err_t set_sample_rate( long rate, int msec = blip_default_length ); + blargg_err_t set_sample_rate( long rate, long msec = blip_default_length ); void clock_rate( long ) { } void bass_freq( int ) { } void clear() { } @@ -179,14 +179,14 @@ public: }; -inline blargg_err_t Multi_Buffer::set_sample_rate( long rate, int msec ) +inline blargg_err_t Multi_Buffer::set_sample_rate( long rate, long msec ) { sample_rate_ = rate; length_ = msec; return 0; } -inline blargg_err_t Silent_Buffer::set_sample_rate( long rate, int msec ) +inline blargg_err_t Silent_Buffer::set_sample_rate( long rate, long msec ) { return Multi_Buffer::set_sample_rate( rate, msec ); } @@ -195,7 +195,7 @@ inline int Multi_Buffer::samples_per_frame() const { return samples_per_frame_; inline long Multi_Buffer::sample_rate() const { return sample_rate_; } -inline int Multi_Buffer::length() const { return length_; } +inline long Multi_Buffer::length() const { return length_; } inline blargg_err_t Multi_Buffer::set_channel_count( int n, int const* types ) { diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/blargg_common.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/blargg_common.h index 1203d3878..621cc2e0d 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/blargg_common.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/apu/blargg_common.h @@ -130,7 +130,7 @@ public: // blargg_long/blargg_ulong = at least 32 bits, int if it's big enough -#if INT_MAX < 0x7FFFFFFF || LONG_MAX == 0x7FFFFFFF +#if INT_MAX < 0x7FFFFFFF || LONG_MAX >= 0x7FFFFFFF typedef long blargg_long; #else typedef int blargg_long; diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA-arm.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA-arm.cpp index 37930b9fd..f54fe28b4 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA-arm.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA-arm.cpp @@ -106,7 +106,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) #define VALUE_LSL_REG_C \ unsigned int shift = gba->reg[(opcode >> 8)&15].B.B0; \ unsigned int rm = gba->reg[opcode & 0x0F].I; \ - if(opcode & 0x0F == 15) { \ + if((opcode & 0x0F) == 15) { \ rm += 4; \ } \ if (LIKELY(shift)) { \ @@ -142,7 +142,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) #define VALUE_LSR_REG_C \ unsigned int shift = gba->reg[(opcode >> 8)&15].B.B0; \ unsigned int rm = gba->reg[opcode & 0x0F].I; \ - if(opcode & 0x0F == 15) { \ + if((opcode & 0x0F) == 15) { \ rm += 4; \ } \ if (LIKELY(shift)) { \ @@ -184,7 +184,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) #define VALUE_ASR_REG_C \ unsigned int shift = gba->reg[(opcode >> 8)&15].B.B0; \ s32 rm = gba->reg[opcode & 0x0F].I; \ - if(opcode & 0x0F == 15) { \ + if((opcode & 0x0F) == 15) { \ rm += 4; \ } \ if (LIKELY(shift < 32)) { \ @@ -225,7 +225,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) #define VALUE_ROR_REG_C \ unsigned int shift = gba->reg[(opcode >> 8)&15].B.B0; \ unsigned int rm = gba->reg[opcode & 0x0F].I; \ - if(opcode & 0x0F == 15) { \ + if((opcode & 0x0F) == 15) { \ rm += 4; \ } \ if (LIKELY(shift & 0x1F)) { \ @@ -365,11 +365,13 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) #ifndef OP_TST #define OP_TST \ u32 res = gba->reg[(opcode >> 16) & 0x0F].I & value; \ + (void)dest; \ C_SETCOND_LOGICAL; #endif #ifndef OP_TEQ #define OP_TEQ \ u32 res = gba->reg[(opcode >> 16) & 0x0F].I ^ value; \ + (void)dest; \ C_SETCOND_LOGICAL; #endif #ifndef OP_CMP @@ -377,6 +379,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) u32 lhs = gba->reg[(opcode>>16)&15].I; \ u32 rhs = value; \ u32 res = lhs - rhs; \ + (void)dest; \ C_SETCOND_SUB; #endif #ifndef OP_CMN @@ -384,6 +387,7 @@ static INSN_REGPARM void armUnknownInsn(GBASystem *gba, u32 opcode) u32 lhs = gba->reg[(opcode>>16)&15].I; \ u32 rhs = value; \ u32 res = lhs + rhs; \ + (void)dest; \ C_SETCOND_ADD; #endif #ifndef OP_ORR @@ -606,6 +610,7 @@ DEFINE_ALU_INSN_C (1F, 3F, MVNS, YES) gba->clockTicks += 1 + codeTicksAccess32(gba, gba->armNextPC); #define OP_MUL \ + (void)acc; \ gba->reg[dest].I = gba->reg[mult].I * rs; #define OP_MLA \ gba->reg[dest].I = gba->reg[mult].I * rs + gba->reg[acc].I; diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA.h b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA.h index d701de752..5e70bf405 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA.h +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/GBA.h @@ -109,7 +109,7 @@ struct GBASoundOut { virtual ~GBASoundOut() { } // Receives signed 16-bit stereo audio and a byte count - virtual void write(const void * samples, unsigned bytes) = 0; + virtual void write(const void * samples, unsigned long bytes) = 0; }; struct GBASystem diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/Sound.cpp b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/Sound.cpp index 6e3c2d6f1..24016cbdd 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/Sound.cpp +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced/vbam/gba/Sound.cpp @@ -100,7 +100,7 @@ void Gba_Pcm::update( int dac ) if ( gba->soundInterpolation ) { // base filtering on how long since last sample was output - int period = time - last_time; + blip_long period = time - last_time; int idx = (unsigned) period / 512; if ( idx >= 3 ) @@ -297,13 +297,13 @@ void flush_samples(GBASystem *gba, GBA::Multi_Buffer * buffer) // that don't use the length parameter of the write method. // TODO: Update the Win32 audio drivers (DS, OAL, XA2), and flush all the // samples at once to help reducing the audio delay on all platforms. - int soundBufferLen = ( gba->soundSampleRate / 60 ) * 4; + blip_long soundBufferLen = ( gba->soundSampleRate / 60 ) * 4; // soundBufferLen should have a whole number of sample pairs assert( soundBufferLen % (2 * sizeof *gba->soundFinalWave) == 0 ); // number of samples in output buffer - int const out_buf_size = soundBufferLen / sizeof *gba->soundFinalWave; + blip_long const out_buf_size = soundBufferLen / sizeof *gba->soundFinalWave; while ( buffer->samples_avail() ) { @@ -320,11 +320,11 @@ static void apply_filtering(GBASystem *gba) gba->soundFiltering_ = gba->soundFiltering; int const base_freq = (int) (32768 - gba->soundFiltering_ * 16384); - int const nyquist = gba->stereo_buffer->sample_rate() / 2; + blip_long const nyquist = gba->stereo_buffer->sample_rate() / 2; for ( int i = 0; i < 3; i++ ) { - int cutoff = base_freq >> i; + blip_long cutoff = base_freq >> i; if ( cutoff > nyquist ) cutoff = nyquist; gba->pcm_synth [i].treble_eq( GBA::blip_eq_t( 0, 0, gba->stereo_buffer->sample_rate(), cutoff ) ); diff --git a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj index 84fd8f9ee..a626bc2df 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj @@ -19,8 +19,6 @@ 8360EF6217F92DB0005208A4 /* psx.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360EF4F17F92DB0005208A4 /* psx.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8360EF6317F92DB0005208A4 /* r3000.c in Sources */ = {isa = PBXBuildFile; fileRef = 8360EF5017F92DB0005208A4 /* r3000.c */; }; 8360EF6417F92DB0005208A4 /* r3000.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360EF5117F92DB0005208A4 /* r3000.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8360EF6517F92DB0005208A4 /* r3000asm.c in Sources */ = {isa = PBXBuildFile; fileRef = 8360EF5217F92DB0005208A4 /* r3000asm.c */; }; - 8360EF6617F92DB0005208A4 /* r3000asm.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360EF5317F92DB0005208A4 /* r3000asm.h */; }; 8360EF6717F92DB0005208A4 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 8360EF5417F92DB0005208A4 /* spu.c */; }; 8360EF6817F92DB0005208A4 /* spu.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360EF5517F92DB0005208A4 /* spu.h */; }; 8360EF6917F92DB0005208A4 /* spucore.c in Sources */ = {isa = PBXBuildFile; fileRef = 8360EF5617F92DB0005208A4 /* spucore.c */; }; @@ -44,8 +42,6 @@ 8360EF4F17F92DB0005208A4 /* psx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psx.h; path = Core/psx.h; sourceTree = ""; }; 8360EF5017F92DB0005208A4 /* r3000.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = r3000.c; path = Core/r3000.c; sourceTree = ""; }; 8360EF5117F92DB0005208A4 /* r3000.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = r3000.h; path = Core/r3000.h; sourceTree = ""; }; - 8360EF5217F92DB0005208A4 /* r3000asm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = r3000asm.c; path = Core/r3000asm.c; sourceTree = ""; }; - 8360EF5317F92DB0005208A4 /* r3000asm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = r3000asm.h; path = Core/r3000asm.h; sourceTree = ""; }; 8360EF5417F92DB0005208A4 /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spu.c; path = Core/spu.c; sourceTree = ""; }; 8360EF5517F92DB0005208A4 /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spu.h; path = Core/spu.h; sourceTree = ""; }; 8360EF5617F92DB0005208A4 /* spucore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spucore.c; path = Core/spucore.c; sourceTree = ""; }; @@ -111,8 +107,6 @@ 8360EF4F17F92DB0005208A4 /* psx.h */, 8360EF5017F92DB0005208A4 /* r3000.c */, 8360EF5117F92DB0005208A4 /* r3000.h */, - 8360EF5217F92DB0005208A4 /* r3000asm.c */, - 8360EF5317F92DB0005208A4 /* r3000asm.h */, 8360EF5417F92DB0005208A4 /* spu.c */, 8360EF5517F92DB0005208A4 /* spu.h */, 8360EF5617F92DB0005208A4 /* spucore.c */, @@ -146,7 +140,6 @@ 8360EF5E17F92DB0005208A4 /* iop.h in Headers */, 8360EF6417F92DB0005208A4 /* r3000.h in Headers */, 8360EF6C17F92DB0005208A4 /* vfs.h in Headers */, - 8360EF6617F92DB0005208A4 /* r3000asm.h in Headers */, 8360EF6A17F92DB0005208A4 /* spucore.h in Headers */, 8360EF6817F92DB0005208A4 /* spu.h in Headers */, 8360EF6017F92DB0005208A4 /* ioptimer.h in Headers */, @@ -220,7 +213,6 @@ 8360EF6117F92DB0005208A4 /* psx.c in Sources */, 8360EF6317F92DB0005208A4 /* r3000.c in Sources */, 8360EF6917F92DB0005208A4 /* spucore.c in Sources */, - 8360EF6517F92DB0005208A4 /* r3000asm.c in Sources */, 8360EF5D17F92DB0005208A4 /* iop.c in Sources */, 8360EF6B17F92DB0005208A4 /* vfs.c in Sources */, 8360EF5A17F92DB0005208A4 /* bios.c in Sources */, diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/bios.c b/Frameworks/HighlyExperimental/HighlyExperimental/Core/bios.c index ecf1ab9f7..c88e581e2 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/bios.c +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/bios.c @@ -51,9 +51,9 @@ sint32 EMU_CALL bios_getenv( uint8 *romnative = bios_get_image_native(); uint8 whole_env_area[129]; uint8 *env; - uint8 *banner = "Highly Experimental"; - sint32 banner_l = strlen(banner); - sint32 name_l = strlen(name); + const uint8 *banner = (const uint8 *) "Highly Experimental"; + sint32 banner_l = (sint32) strlen((char *)banner); + sint32 name_l = (sint32) strlen(name); sint32 i; for(i = 0; i < 128; i++) { @@ -90,7 +90,7 @@ sint32 EMU_CALL bios_getenv( // skip equals sign env++; // compute length - varnamelen = varnameend - varnamestart; + varnamelen = (sint32)(varnameend - varnamestart); // find the value for(;; env++) { uint8 c = *env; if(!c) return 1; if(c != ' ') break; } varvalstart = env; @@ -107,7 +107,7 @@ sint32 EMU_CALL bios_getenv( // skip trailing quote if it's there if(isquote && *env == '\"') env++; // compute length - varvallen = varvalend - varvalstart; + varvallen = (sint32)(varvalend - varvalstart); // now, if this is the variable name we want... if(varnamelen == name_l && !memcmp(varnamestart, name, name_l)) { diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.c b/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.c index df32958ee..1e7246884 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.c +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/iop.c @@ -491,8 +491,8 @@ static void EMU_CALL dma_transfer(struct IOP_STATE *state, uint32 core, uint32 c uint32 blocksize = (state->dma[core].chan[chan].BCR >> 0) & 0xFFFF; uint32 blockcount = (state->dma[core].chan[chan].BCR >> 16) & 0xFFFF; int is_writing = (state->dma[core].chan[chan].CHCR >> 0) & 1; - int is_continuous = (state->dma[core].chan[chan].CHCR >> 9) & 1; - int is_linked = (state->dma[core].chan[chan].CHCR >> 10) & 1; +// int is_continuous = (state->dma[core].chan[chan].CHCR >> 9) & 1; +// int is_linked = (state->dma[core].chan[chan].CHCR >> 10) & 1; uint32 len = blocksize * 4 * blockcount; // uint32 i; uint64 cycles_delay = 0; diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.c b/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.c index dd4c59383..66b313d13 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.c +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/psx.c @@ -269,7 +269,7 @@ static EMU_INLINE uint32 EMU_CALL get32lsb(uint8 *src) { // Determine if an ASCII string exists in a byte block // static int string_exists(const char *block, uint32 len, const char *string) { - uint32 sl = strlen(string); + uint32 sl = (uint32)strlen(string); uint32 i; if(sl > len) return 0; len = (len - sl) + 1; @@ -408,7 +408,7 @@ static sint32 EMU_CALL vread(void *vfsstate, uint8 *ram_native, uint32 ram_size, #ifdef PSX_BIG_ENDIAN vreadswap(ram_native, ofs, len); #endif - r = vfs_read(vfsstate, emufd, ram_native + ofs, len); + r = vfs_read(vfsstate, emufd, (char *)ram_native + ofs, len); #ifdef PSX_BIG_ENDIAN vreadswap(ram_native, ofs, len); #endif diff --git a/Frameworks/HighlyExperimental/HighlyExperimental/Core/spucore.c b/Frameworks/HighlyExperimental/HighlyExperimental/Core/spucore.c index d076bf683..5088f2b21 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental/Core/spucore.c +++ b/Frameworks/HighlyExperimental/HighlyExperimental/Core/spucore.c @@ -1477,7 +1477,6 @@ static void EMU_CALL reverb_engine22(struct SPUCORE_STATE *state, uint16 *ram, s //////////////////////////////////////////////////////////////////////////////// static void EMU_CALL reverb_process(struct SPUCORE_STATE *state, uint16 *ram, sint32 *buf, int samples) { - int n; int q = state->reverb.resampler.queue_index; /* ** Sample loop diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic/Core/qsound.c b/Frameworks/HighlyQuixotic/HighlyQuixotic/Core/qsound.c index c10818722..be2c0b0cf 100644 --- a/Frameworks/HighlyQuixotic/HighlyQuixotic/Core/qsound.c +++ b/Frameworks/HighlyQuixotic/HighlyQuixotic/Core/qsound.c @@ -575,7 +575,7 @@ sint32 EMU_CALL qsound_execute( // // Otherwise return the number of cycles we executed // - r = QSOUNDSTATE->odometer - old_odometer; + r = (sint32)(QSOUNDSTATE->odometer - old_odometer); return r; } diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.c b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.c index 0ce3f683d..19271e632 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.c +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.c @@ -501,11 +501,13 @@ void m68k_set_irq(m68ki_cpu_core *m68k, int irqline, int state) } /* translate logical to physical addresses */ +#if 0 static int m68k_translate( m68ki_cpu_core *m68k, unsigned int *address ) { /* only applies to the program address space and only does something if the MMU's enabled */ return TRUE; } +#endif /* Execute some instructions until we use up cycles clock cycles */ int m68k_execute(m68ki_cpu_core *m68k, unsigned int cycles) diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.h b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.h index 5ab72afe1..76c04e9f0 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.h +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kcpu.h @@ -46,6 +46,10 @@ /* ======================================================================== */ /* Check for > 32bit sizes */ +#undef MAKE_INT_8 +#undef MAKE_INT_16 +#undef MAKE_INT_32 + #define MAKE_INT_8(A) (INT8)(A) #define MAKE_INT_16(A) (INT16)(A) #define MAKE_INT_32(A) (INT32)(A) @@ -281,6 +285,7 @@ /* Configuration switches (see m68kconf.h for explanation) */ +#undef M68K_EMULATE_TRACE #define M68K_EMULATE_TRACE 0 /* Enable or disable trace emulation */ @@ -726,7 +731,9 @@ INLINE void m68kx_write_memory_32_pd(m68ki_cpu_core *m68k, unsigned int address, */ INLINE UINT32 m68ki_read_imm_16(m68ki_cpu_core *m68k) { +#if M68K_EMULATE_PREFETCH UINT32 result; +#endif uint pc; m68ki_check_address_error(m68k, REG_PC, MODE_READ, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */ @@ -1299,6 +1306,7 @@ INLINE void m68ki_stack_frame_buserr(m68ki_cpu_core *m68k, UINT32 sr) /* Format 8 stack frame (68010). * 68010 only. This is the 29 word bus/address error frame. */ +#if 0 void m68ki_stack_frame_1000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector) { /* VERSION @@ -1347,12 +1355,14 @@ void m68ki_stack_frame_1000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 v /* STATUS REGISTER */ m68ki_push_16(m68k, sr); } +#endif /* Format A stack frame (short bus fault). * This is used only by 68020 for bus fault and address error * if the error happens at an instruction boundary. * PC stacked is address of next instruction. */ +#if 0 void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc) { /* INTERNAL REGISTER */ @@ -1394,12 +1404,14 @@ void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT /* STATUS REGISTER */ m68ki_push_16(m68k, sr); } +#endif /* Format B stack frame (long bus fault). * This is used only by 68020 for bus fault and address error * if the error happens during instruction execution. * PC stacked is address of instruction in progress. */ +#if 0 void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc) { /* INTERNAL REGISTERS (18 words) */ @@ -1466,6 +1478,7 @@ void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT /* STATUS REGISTER */ m68ki_push_16(m68k, sr); } +#endif /* Used for Group 2 exceptions. diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kops.c b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kops.c index 4dc9ee365..949955424 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kops.c +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/m68k/m68kops.c @@ -26060,7 +26060,7 @@ static void m68k_op_ror_32_s(m68ki_cpu_core *m68k) m68k->n_flag = NFLAG_32(res); m68k->not_z_flag = res; - m68k->c_flag = src << (9-shift); + m68k->c_flag = (unsigned int)(src << (9-shift)); m68k->v_flag = VFLAG_CLEAR; } @@ -26132,7 +26132,7 @@ static void m68k_op_ror_32_r(m68ki_cpu_core *m68k) m68k->remaining_cycles -= orig_shift<cyc_shift; *r_dst = res; - m68k->c_flag = (src >> ((shift - 1) & 31)) << 8; + m68k->c_flag = (unsigned int)((src >> ((shift - 1) & 31)) << 8); m68k->n_flag = NFLAG_32(res); m68k->not_z_flag = res; m68k->v_flag = VFLAG_CLEAR; @@ -26140,8 +26140,8 @@ static void m68k_op_ror_32_r(m68ki_cpu_core *m68k) } m68k->c_flag = CFLAG_CLEAR; - m68k->n_flag = NFLAG_32(src); - m68k->not_z_flag = src; + m68k->n_flag = (unsigned int)NFLAG_32(src); + m68k->not_z_flag = (unsigned int)src; m68k->v_flag = VFLAG_CLEAR; } @@ -26304,7 +26304,7 @@ static void m68k_op_rol_32_s(m68ki_cpu_core *m68k) m68k->n_flag = NFLAG_32(res); m68k->not_z_flag = res; - m68k->c_flag = src >> (24-shift); + m68k->c_flag = (unsigned int)(src >> (24-shift)); m68k->v_flag = VFLAG_CLEAR; } @@ -26393,7 +26393,7 @@ static void m68k_op_rol_32_r(m68ki_cpu_core *m68k) *r_dst = res; - m68k->c_flag = (src >> ((32 - shift) & 0x1f)) << 8; + m68k->c_flag = (unsigned int)((src >> ((32 - shift) & 0x1f)) << 8); m68k->n_flag = NFLAG_32(res); m68k->not_z_flag = res; m68k->v_flag = VFLAG_CLEAR; @@ -26401,8 +26401,8 @@ static void m68k_op_rol_32_r(m68ki_cpu_core *m68k) } m68k->c_flag = CFLAG_CLEAR; - m68k->n_flag = NFLAG_32(src); - m68k->not_z_flag = src; + m68k->n_flag = (unsigned int)NFLAG_32(src); + m68k->not_z_flag = (unsigned int)src; m68k->v_flag = VFLAG_CLEAR; } @@ -26566,13 +26566,13 @@ static void m68k_op_roxr_32_s(m68ki_cpu_core *m68k) res = ROR_33_64(res, shift); - m68k->c_flag = m68k->x_flag = res >> 24; + m68k->c_flag = m68k->x_flag = (unsigned int)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; + *r_dst = (unsigned int)res; - m68k->n_flag = NFLAG_32(res); - m68k->not_z_flag = res; + m68k->n_flag = (unsigned int)NFLAG_32(res); + m68k->not_z_flag = (unsigned int)res; m68k->v_flag = VFLAG_CLEAR; } @@ -26652,12 +26652,12 @@ static void m68k_op_roxr_32_r(m68ki_cpu_core *m68k) m68k->remaining_cycles -= orig_shift<cyc_shift; - m68k->c_flag = m68k->x_flag = res >> 24; + m68k->c_flag = m68k->x_flag = (unsigned int)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; - m68k->n_flag = NFLAG_32(res); - m68k->not_z_flag = res; + *r_dst = (unsigned int)res; + m68k->n_flag = (unsigned int)NFLAG_32(res); + m68k->not_z_flag = (unsigned int)res; m68k->v_flag = VFLAG_CLEAR; return; } @@ -26842,13 +26842,13 @@ static void m68k_op_roxl_32_s(m68ki_cpu_core *m68k) res = ROL_33_64(res, shift); - m68k->c_flag = m68k->x_flag = res >> 24; + m68k->c_flag = m68k->x_flag = (unsigned int)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; + *r_dst = (unsigned int)res; - m68k->n_flag = NFLAG_32(res); - m68k->not_z_flag = res; + m68k->n_flag = (unsigned int)NFLAG_32(res); + m68k->not_z_flag = (unsigned int)res; m68k->v_flag = VFLAG_CLEAR; } @@ -26929,12 +26929,12 @@ static void m68k_op_roxl_32_r(m68ki_cpu_core *m68k) m68k->remaining_cycles -= orig_shift<cyc_shift; - m68k->c_flag = m68k->x_flag = res >> 24; + m68k->c_flag = m68k->x_flag = (unsigned int)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; - m68k->n_flag = NFLAG_32(res); - m68k->not_z_flag = res; + *r_dst = (unsigned int)res; + m68k->n_flag = (unsigned int)NFLAG_32(res); + m68k->not_z_flag = (unsigned int)res; m68k->v_flag = VFLAG_CLEAR; return; } diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/sega.c b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/sega.c index cdbd3b5b5..c680150e0 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/sega.c +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/sega.c @@ -100,12 +100,14 @@ sint32 EMU_CALL sega_init(void) { const char* EMU_CALL sega_getversion(void) { static const char s[] = "SegaCore0001 (built " __DATE__ ")"; static char rv[500]; - int sl = strlen(s); + int sl = (int)strlen(s); memcpy(rv, s, sl); #ifndef DISABLE_SSF rv[sl] = '\n'; #ifdef USE_STARSCREAM strcpy(rv+sl+1, s68000_get_version()); +#elif defined(USE_M68K) + strcpy(rv+sl+1, "M68K"); #else strcpy(rv+sl+1, "C68K"); #endif @@ -228,6 +230,7 @@ static uint32 get32lsb(uint8 *src) { ((((uint32)(src[3])) & 0xFF) << 24); } +#if 0 static uint32 get32msb(uint8 *src) { return ((((uint32)(src[3])) & 0xFF) << 0) | @@ -235,6 +238,7 @@ static uint32 get32msb(uint8 *src) { ((((uint32)(src[1])) & 0xFF) << 16) | ((((uint32)(src[0])) & 0xFF) << 24); } +#endif ///////////////////////////////////////////////////////////////////////////// // diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/yam.c b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/yam.c index 5c579d641..f69df9bbc 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/yam.c +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical/Core/yam.c @@ -62,6 +62,7 @@ // Static information // +#if 0 #define MAKELFOPHASEINC(x) (((uint64)(0x100000000)) / ((uint64)(x))) static uint32 lfophaseinctable[0x20] = { @@ -85,6 +86,7 @@ static uint8 envattackshift[0x3D][4] = { /* 30-37 */ {4,4,4,4},{3,4,4,4},{3,4,3,4},{3,3,3,4},{3,3,3,3},{2,3,3,3},{2,3,2,3},{2,2,2,3}, /* 38-3C */ {2,2,2,2},{1,2,2,2},{1,2,1,2},{1,1,1,2},{1,1,1,1} }; +#endif static uint8 envdecayvalue[0x3D][4] = { /* 00-07 */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1}, @@ -97,6 +99,7 @@ static uint8 envdecayvalue[0x3D][4] = { /* 38-3C */ {4,4,4,4},{8,4,4,4},{8,4,8,4},{8,8,8,4},{8,8,8,8} }; +#if 0 static sint32 adpcmscale[8] = { 0x0E6, 0x0E6, 0x0E6, 0x0E6, 0x133, 0x199, 0x200, 0x266 }; @@ -105,6 +108,7 @@ static sint32 adpcmdiff[16] = { 1, 3, 5, 7, 9, 11, 13, 15, -1,-3,-5,-7,-9,-11,-13,-15 }; +#endif static sint32 qtable[32] = { 0x0E00,0x0E80,0x0F00,0x0F80, @@ -1655,7 +1659,9 @@ static void chan_aica_store_reg(struct YAM_STATE *state, uint8 ch, uint8 a, uint // DSP registers // static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) { +#ifdef ENABLE_DYNAREC sint16 old = state->coef[n]; +#endif yam_flush(state); n &= 0x7F; state->coef[n] <<= 3; @@ -1668,7 +1674,9 @@ static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) } static void madrs_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) { +#ifdef ENABLE_DYNAREC uint16 old = state->madrs[n]; +#endif yam_flush(state); n &= 0x3F; state->madrs[n] &= ~mask; @@ -2345,10 +2353,12 @@ void EMU_CALL yam_aica_store_reg(void *state, uint32 a, uint32 d, uint32 mask, u // // Generate random data // +#if 0 static uint32 yamrand16(struct YAM_STATE *state) { state->randseed = 1103515245 * state->randseed + 12345; return state->randseed >> 16; } +#endif ///////////////////////////////////////////////////////////////////////////// // @@ -2795,7 +2805,7 @@ static void __fastcall dsp_sample_interpret(struct YAM_STATE *state) { if((mpro->__kisxzbon) & 0x80) { x = state->temp[(state->mdec_ct)&0x7F]; state->xzbchoice[XZBCHOICE_ACC] = - ((((sint64)x) * ((sint64)(state->yychoice[YYCHOICE_FRC_REG]))) >> 12) + x; + (sint32)((((sint64)x) * ((sint64)(state->yychoice[YYCHOICE_FRC_REG]))) >> 12) + x; continue; } state->xzbchoice[XZBCHOICE_TEMP] = state->temp[((mpro->t_0rrrrrrr)+(state->mdec_ct))&0x7F]; @@ -2841,7 +2851,7 @@ static void __fastcall dsp_sample_interpret(struct YAM_STATE *state) { // // Multiply and accumulate // - state->xzbchoice[XZBCHOICE_ACC] = ((((sint64)x) * ((sint64)y)) >> 12) + b; + state->xzbchoice[XZBCHOICE_ACC] = (sint32)((((sint64)x) * ((sint64)y)) >> 12) + b; // // Temp write // @@ -2916,6 +2926,7 @@ static void __fastcall dsp_sample_interpret(struct YAM_STATE *state) { #define STRUCTOFS(thetype,thefield) ((uint32)(&(((struct thetype*)0)->thefield))) #define STATEOFS(thefield) STRUCTOFS(YAM_STATE,thefield) +#ifdef ENABLE_DYNAREC static int instruction_uses_shifted(struct MPRO *mpro) { // uses SHIFTED if: // - ADRL and INTERP @@ -2933,6 +2944,7 @@ static int instruction_uses_shifted(struct MPRO *mpro) { // otherwise not return 0; } +#endif // // Compile x86 code out of the current DSP program/coef/address set @@ -3315,9 +3327,9 @@ struct render_priority sint32 channel_number; sint32 priority_level; }; -int __cdecl render_priority_compare(void * a, void * b) { - struct render_priority *_a = (struct render_priority *) a; - struct render_priority *_b = (struct render_priority *) b; +int __cdecl render_priority_compare(const void * a, const void * b) { + const struct render_priority *_a = (const struct render_priority *) a; + const struct render_priority *_b = (const struct render_priority *) b; return _b->priority_level - _a->priority_level; } static void render(struct YAM_STATE *state, uint32 odometer, uint32 samples) { diff --git a/Frameworks/MAC/mac-src/src/MACLib/Old/AntiPredictorExtraHigh.cpp b/Frameworks/MAC/mac-src/src/MACLib/Old/AntiPredictorExtraHigh.cpp index 33d854081..cb09cf198 100644 --- a/Frameworks/MAC/mac-src/src/MACLib/Old/AntiPredictorExtraHigh.cpp +++ b/Frameworks/MAC/mac-src/src/MACLib/Old/AntiPredictorExtraHigh.cpp @@ -246,15 +246,15 @@ void CAntiPredictorExtraHigh3800ToCurrent::AntiPredict(int *pInputArray, int *pO if (FP[0] == 0) { - EXPAND_8_TIMES(nDotProduct += *pFP * *pFM--; *pFP-- = *(pFP - 1);) + EXPAND_8_TIMES(nDotProduct += *pFP * *pFM--; *pFP = *(pFP - 1); --pFP;) } else if (FP[0] > 0) { - EXPAND_8_TIMES(nDotProduct += *pFP * *pFM; *pFM-- += ((*pFP >> 30) & 2) - 1; *pFP-- = *(pFP - 1);) + EXPAND_8_TIMES(nDotProduct += *pFP * *pFM; *pFM-- += ((*pFP >> 30) & 2) - 1; *pFP = *(pFP - 1); --pFP;) } else { - EXPAND_8_TIMES(nDotProduct += *pFP * *pFM; *pFM-- -= ((*pFP >> 30) & 2) - 1; *pFP-- = *(pFP - 1);) + EXPAND_8_TIMES(nDotProduct += *pFP * *pFM; *pFM-- -= ((*pFP >> 30) & 2) - 1; *pFP = *(pFP - 1); --pFP;) } *ip -= nDotProduct >> 9; diff --git a/Frameworks/MAC/mac-src/src/MACLib/Old/UnBitArrayOld.cpp b/Frameworks/MAC/mac-src/src/MACLib/Old/UnBitArrayOld.cpp index 90dfda5a9..1dbb96c4e 100644 --- a/Frameworks/MAC/mac-src/src/MACLib/Old/UnBitArrayOld.cpp +++ b/Frameworks/MAC/mac-src/src/MACLib/Old/UnBitArrayOld.cpp @@ -75,7 +75,8 @@ uint32 CUnBitArrayOld::DecodeValueRiceUnsigned(uint32 k) // plug through the string of 0's (the overflow) uint32 BitInitial = m_nCurrentBitIndex; - while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex++ & 31])) {} + while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex & 31])) {++m_nCurrentBitIndex;} + ++m_nCurrentBitIndex; // if k = 0, your done if (k == 0) @@ -189,7 +190,8 @@ void CUnBitArrayOld::GenerateArrayOld(int* Output_Array, uint32 Number_of_Elemen { // plug through the string of 0's (the overflow) uint32 Bit_Initial = m_nCurrentBitIndex; - while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex++ & 31])) {} + while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex & 31])) {++m_nCurrentBitIndex;} + ++m_nCurrentBitIndex; // if k = 0, your done if (k == 0) @@ -295,7 +297,8 @@ __inline int CUnBitArrayOld::DecodeValueNew(BOOL bCapOverflow) // plug through the string of 0's (the overflow) uint32 Bit_Initial = m_nCurrentBitIndex; - while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex++ & 31])) {} + while (!(m_pBitArray[m_nCurrentBitIndex >> 5] & Powers_of_Two_Reversed[m_nCurrentBitIndex & 31])) {++m_nCurrentBitIndex;} + ++m_nCurrentBitIndex; int nOverflow = (m_nCurrentBitIndex - Bit_Initial - 1); diff --git a/Frameworks/MAD/Files/frame.c b/Frameworks/MAD/Files/frame.c index 0cb3d0f33..f36efd877 100644 --- a/Frameworks/MAD/Files/frame.c +++ b/Frameworks/MAD/Files/frame.c @@ -142,13 +142,15 @@ int decode_header(struct mad_header *header, struct mad_stream *stream) } /* layer */ - header->layer = 4 - mad_bit_read(&stream->ptr, 2); + index = 4 - mad_bit_read(&stream->ptr, 2); - if (header->layer == 4) { + if (index == 4) { stream->error = MAD_ERROR_BADLAYER; return -1; } + header->layer = index; + /* protection_bit */ if (mad_bit_read(&stream->ptr, 1) == 0) { header->flags |= MAD_FLAG_PROTECTION; diff --git a/Frameworks/Shorten/Files/shorten/src/shn_reader.cpp b/Frameworks/Shorten/Files/shorten/src/shn_reader.cpp index 42818c6d7..32a77beac 100644 --- a/Frameworks/Shorten/Files/shorten/src/shn_reader.cpp +++ b/Frameworks/Shorten/Files/shorten/src/shn_reader.cpp @@ -294,7 +294,7 @@ int shn_reader::get_wave_header() { int version = FORMAT_VERSION; int ftype = TYPE_EOF; - char *magic = MAGIC; + const char *magic = MAGIC; int internal_ftype; int retval = 1; @@ -549,7 +549,7 @@ void shn_reader::Run() slong lpcqoffset = 0; int version = FORMAT_VERSION, bitshift = 0; int ftype = TYPE_EOF; - char *magic = MAGIC; + const char *magic = MAGIC; int blocksize = DEFAULT_BLOCK_SIZE, nchan = DEFAULT_NCHAN; int i, chan, nwrap, nskip = DEFAULT_NSKIP; int *qlpc = NULL, maxnlpc = DEFAULT_MAXNLPC, nmean = UNDEFINED_UINT; diff --git a/Frameworks/TagLib/taglib/taglib/fileref.h b/Frameworks/TagLib/taglib/taglib/fileref.h index 4cda5cd36..c1f53d807 100644 --- a/Frameworks/TagLib/taglib/taglib/fileref.h +++ b/Frameworks/TagLib/taglib/taglib/fileref.h @@ -108,6 +108,8 @@ namespace TagLib { bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average) const = 0; + + virtual ~FileTypeResolver() { } }; /*! diff --git a/Frameworks/TagLib/taglib/taglib/m4a/mp4audiosampleentry.cpp b/Frameworks/TagLib/taglib/taglib/m4a/mp4audiosampleentry.cpp index 62c985063..4dee1f1ee 100755 --- a/Frameworks/TagLib/taglib/taglib/m4a/mp4audiosampleentry.cpp +++ b/Frameworks/TagLib/taglib/taglib/m4a/mp4audiosampleentry.cpp @@ -101,7 +101,7 @@ void MP4::Mp4AudioSampleEntry::parseEntry() if( DecCfgTag[0] != 0x04 ) return; // read decoder configuration length - TagLib::uint deccfg_len = mp4file->readSystemsLen(); + /*TagLib::uint deccfg_len =*/ mp4file->readSystemsLen(); // read object type Id ByteVector objId = mp4file->readBlock(1); // read stream type id diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc index cbc328b8f..f0a079a69 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc @@ -73,7 +73,7 @@ public: } void clear() { if(autoDelete) { - typename std::list::const_iterator it = list.begin(); + typename std::list::iterator it = list.begin(); for(; it != list.end(); ++it) delete *it; } diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp index 644dbe4e0..b9a429387 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp @@ -37,7 +37,7 @@ namespace TagLib { inline unsigned short byteSwap(unsigned short x) { - return ((x) >> 8) & 0xff | ((x) & 0xff) << 8; + return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8); } inline unsigned short combine(unsigned char c1, unsigned char c2) diff --git a/Frameworks/Vorbis/Files/lib/floor1.c b/Frameworks/Vorbis/Files/lib/floor1.c index 0dd3bc7c5..415b24a15 100644 --- a/Frameworks/Vorbis/Files/lib/floor1.c +++ b/Frameworks/Vorbis/Files/lib/floor1.c @@ -413,7 +413,6 @@ static int accumulate_fit(const float *flr,const float *mdct, int x0, int x1,lsfit_acc *a, int n,vorbis_info_floor1 *info){ long i; - int quantized=vorbis_dBquant(flr+x0); long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0; @@ -591,8 +590,6 @@ static int post_Y(int *A,int *B,int pos){ return (A[pos]+B[pos])>>1; } -static int seq=0; - int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look, const float *logmdct, /* in */ const float *logmask){ @@ -763,7 +760,6 @@ int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, long i,j; vorbis_info_floor1 *info=look->vi; - long n=look->n; long posts=look->posts; codec_setup_info *ci=vb->vd->vi->codec_setup; int out[VIF_POSIT+2]; diff --git a/Frameworks/Vorbis/Files/lib/mapping0.c b/Frameworks/Vorbis/Files/lib/mapping0.c index a7231b559..b4c082713 100644 --- a/Frameworks/Vorbis/Files/lib/mapping0.c +++ b/Frameworks/Vorbis/Files/lib/mapping0.c @@ -735,7 +735,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_info_mapping *l){ codec_setup_info *ci=vi->codec_setup; private_state *b=vd->backend_state; vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l; - int hs=ci->halfrate_flag; int i,j; long n=vb->pcmend=ci->blocksizes[vb->W]; diff --git a/Frameworks/Vorbis/Files/lib/misc.c b/Frameworks/Vorbis/Files/lib/misc.c index ab3f0cea3..9ae2a8b55 100644 --- a/Frameworks/Vorbis/Files/lib/misc.c +++ b/Frameworks/Vorbis/Files/lib/misc.c @@ -25,10 +25,6 @@ static void **pointers=NULL; static long *insertlist=NULL; /* We can't embed this in the pointer list; a pointer can have any value... */ -static char **files=NULL; -static long *file_bytes=NULL; -static int filecount=0; - static int ptop=0; static int palloced=0; static int pinsert=0; diff --git a/Frameworks/Vorbis/Files/lib/psy.c b/Frameworks/Vorbis/Files/lib/psy.c index 402b01db6..f3725dd5d 100644 --- a/Frameworks/Vorbis/Files/lib/psy.c +++ b/Frameworks/Vorbis/Files/lib/psy.c @@ -1214,7 +1214,6 @@ void hf_reduction(vorbis_info_psy_global *g, int i,j,n=p->n, de=0.3*p->m_val; int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; - int start=p->vi->normal_start; for(i=0; icoupling_steps; i++){ /* for(j=start; jinfo; - vorbis_info *vi=vb->vd->vi; - codec_setup_info *ci=vi->codec_setup; /* move all this setup out later */ int samples_per_partition=info->grouping; @@ -498,8 +496,6 @@ static int _01forward(oggpack_buffer *opb, vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; vorbis_info_residue0 *info=look->info; - vorbis_dsp_state *vd=vb->vd; - /* move all this setup out later */ int samples_per_partition=info->grouping; int possible_partitions=info->partitions; diff --git a/Frameworks/WMA/WMA.xcodeproj/project.pbxproj b/Frameworks/WMA/WMA.xcodeproj/project.pbxproj index 2ac32d508..678b0f0c8 100644 --- a/Frameworks/WMA/WMA.xcodeproj/project.pbxproj +++ b/Frameworks/WMA/WMA.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -33,7 +33,6 @@ 830F0BEA17FC4FB900042E8F /* wmaprodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 830F0BA817FC4FB900042E8F /* wmaprodec.c */; }; 830F0BEB17FC4FB900042E8F /* wmavoice.c in Sources */ = {isa = PBXBuildFile; fileRef = 830F0BA917FC4FB900042E8F /* wmavoice.c */; }; 830F0BEC17FC4FB900042E8F /* wmavoice_data.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BAA17FC4FB900042E8F /* wmavoice_data.h */; }; - 830F0BED17FC4FB900042E8F /* mathops.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BAC17FC4FB900042E8F /* mathops.h */; }; 830F0BEE17FC4FB900042E8F /* allformats.c in Sources */ = {isa = PBXBuildFile; fileRef = 830F0BAE17FC4FB900042E8F /* allformats.c */; }; 830F0BEF17FC4FB900042E8F /* asf.c in Sources */ = {isa = PBXBuildFile; fileRef = 830F0BAF17FC4FB900042E8F /* asf.c */; }; 830F0BF017FC4FB900042E8F /* avformat.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BB017FC4FB900042E8F /* avformat.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -66,7 +65,6 @@ 830F0C0B17FC4FB900042E8F /* pixfmt.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BCC17FC4FB900042E8F /* pixfmt.h */; settings = {ATTRIBUTES = (Public, ); }; }; 830F0C0C17FC4FB900042E8F /* rational.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BCD17FC4FB900042E8F /* rational.h */; settings = {ATTRIBUTES = (Public, ); }; }; 830F0C0D17FC4FB900042E8F /* samplefmt.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BCE17FC4FB900042E8F /* samplefmt.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 830F0C0E17FC4FB900042E8F /* bswap.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0BD017FC4FB900042E8F /* bswap.h */; }; 830F0C1117FC4FF400042E8F /* avfft.c in Sources */ = {isa = PBXBuildFile; fileRef = 830F0C0F17FC4FF400042E8F /* avfft.c */; }; 830F0C1217FC4FF400042E8F /* avfft.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0C1017FC4FF400042E8F /* avfft.h */; }; 830F0C1417FC500B00042E8F /* fft-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 830F0C1317FC500B00042E8F /* fft-internal.h */; }; @@ -1053,7 +1051,6 @@ 830F0CEF17FC7F1E00042E8F /* mpegvideo.h in Headers */, 830F0C5017FC7CA300042E8F /* riff.h in Headers */, 830F0D5B17FC893E00042E8F /* tableprint.h in Headers */, - 830F0C0E17FC4FB900042E8F /* bswap.h in Headers */, 830F0BE117FC4FB900042E8F /* simple_idct.h in Headers */, 830F0D0C17FC80B400042E8F /* rectangle.h in Headers */, 830F0C2F17FC551F00042E8F /* asfcrypt.h in Headers */, @@ -1070,7 +1067,6 @@ 830F0C1C17FC523000042E8F /* url.h in Headers */, 830F0BD717FC4FB900042E8F /* get_bits.h in Headers */, 830F0C2417FC527400042E8F /* atomic.h in Headers */, - 830F0BED17FC4FB900042E8F /* mathops.h in Headers */, 830F0C5D17FC7CEA00042E8F /* id3v1.h in Headers */, 830F0C6A17FC7DB100042E8F /* avassert.h in Headers */, 830F0D6D17FC8C0700042E8F /* aactab.h in Headers */, @@ -1158,9 +1154,10 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { + LastUpgradeCheck = 0500; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WMA" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -1335,6 +1332,7 @@ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1362,6 +1360,7 @@ 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1388,6 +1387,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = macosx; }; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/config.h b/Frameworks/WMA/ffmpeg-strip-wma/config.h index c4a30a6b7..9f21856e3 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/config.h +++ b/Frameworks/WMA/ffmpeg-strip-wma/config.h @@ -54,6 +54,8 @@ #define HAVE_PTHREADS 1 #define HAVE_ATOMICS_GCC 1 #define HAVE_ATOMICS_NATIVE 1 +#define HAVE_PRAGMA_DEPRECATED 1 +#define HAVE_UNISTD_H 1 #define CONFIG_FRAME_THREAD_ENCODER 0 #define SIMPLE_IDCT 1 #define CONFIG_MEMORY_POISONING 0 diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h index 91383a4f3..1662c90f2 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h @@ -3186,7 +3186,7 @@ typedef struct AVSubtitle { * if c is non-NULL, returns the next registered codec after c, * or NULL if c is the last one. */ -AVCodec *av_codec_next(const AVCodec *c); +const AVCodec *av_codec_next(const AVCodec *c); /** * Return the LIBAVCODEC_VERSION_INT constant. diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c index 299ee23b4..5129c12bb 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c @@ -275,7 +275,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { - while (state = avpriv_atomic_ptr_cas(&vlc->init_state, NULL, vlc)) { + while ((state = avpriv_atomic_ptr_cas(&vlc->init_state, NULL, vlc))) { if (state == vlc + 1) { av_assert0(vlc->table_size && vlc->table_size == vlc->table_allocated); return 0; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c index b9924a6dc..b7bdf974a 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c @@ -900,7 +900,7 @@ void ff_er_frame_end(ERContext *s) s->cur_pic->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 * sizeof(uint16_t)); if (!s->cur_pic->ref_index_buf[i] || !s->cur_pic->motion_val_buf[i]) break; - s->cur_pic->ref_index[i] = s->cur_pic->ref_index_buf[i]->data; + s->cur_pic->ref_index[i] = (int8_t*) s->cur_pic->ref_index_buf[i]->data; s->cur_pic->motion_val[i] = (int16_t (*)[2])s->cur_pic->motion_val_buf[i]->data + 4; } if (i < 2) { diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c index d9dc55d32..d586c7737 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c @@ -209,7 +209,7 @@ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, int has_alpha) { int loss; - int ret = get_pix_fmt_score(dst_pix_fmt, src_pix_fmt, &loss, has_alpha ? ~0 : ~FF_LOSS_ALPHA); + int ret = get_pix_fmt_score(dst_pix_fmt, src_pix_fmt, (unsigned int *)&loss, has_alpha ? ~0 : ~FF_LOSS_ALPHA); if (ret < 0) return ret; return loss; @@ -229,8 +229,8 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt loss_mask &= ~FF_LOSS_ALPHA; dst_pix_fmt = AV_PIX_FMT_NONE; - score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); - score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask); + score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, (unsigned int *)&loss1, loss_mask); + score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, (unsigned int *)&loss2, loss_mask); if (score1 == score2) { if(av_get_padded_bits_per_pixel(desc2) != av_get_padded_bits_per_pixel(desc1)) { diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c index 02fb89f5c..9c00c62e1 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c @@ -53,7 +53,7 @@ static void *codec_child_next(void *obj, void *prev) static const AVClass *codec_child_class_next(const AVClass *prev) { - AVCodec *c = NULL; + const AVCodec *c = NULL; /* find the codec that corresponds to prev */ while (prev && (c = av_codec_next(c))) @@ -61,7 +61,7 @@ static const AVClass *codec_child_class_next(const AVClass *prev) break; /* find next codec with priv options */ - while (c = av_codec_next(c)) + while ((c = av_codec_next(c))) if (c->priv_class) return c->priv_class; return NULL; @@ -111,7 +111,9 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) flags= AV_OPT_FLAG_VIDEO_PARAM; else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE) flags= AV_OPT_FLAG_SUBTITLE_PARAM; + AV_NOWARN_DEPRECATED( av_opt_set_defaults2(s, flags, flags); + ); s->time_base = (AVRational){0,1}; s->get_buffer2 = avcodec_default_get_buffer2; @@ -140,7 +142,7 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) int ret; const AVCodecDefault *d = codec->defaults; while (d->key) { - ret = av_opt_set(s, d->key, d->value, 0); + ret = av_opt_set(s, (const char *) d->key, (const char *) d->value, 0); av_assert0(ret >= 0); d++; } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c index e2730044f..08dd556f9 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c @@ -128,7 +128,7 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) /* encoder management */ static AVCodec *first_avcodec = NULL; -AVCodec *av_codec_next(const AVCodec *c) +const AVCodec *av_codec_next(const AVCodec *c) { if (c) return c->next; @@ -712,6 +712,7 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) } av_frame_set_channels(frame, avctx->channels); break; + default:break; } return 0; } @@ -921,7 +922,7 @@ static int reget_buffer_internal(AVCodecContext *avctx, AVFrame *frame) return ret; } - av_image_copy(frame->data, frame->linesize, tmp.data, tmp.linesize, + av_image_copy(frame->data, frame->linesize, (const uint8_t **)tmp.data, tmp.linesize, frame->format, frame->width, frame->height); av_frame_unref(&tmp); @@ -1376,7 +1377,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->channel_layout = 0; } } - if (avctx->channels && avctx->channels < 0 || + if (avctx->channels < 0 || avctx->channels > FF_SANE_NB_CHANNELS) { ret = AVERROR(EINVAL); goto free_and_end; @@ -1455,7 +1456,7 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size) av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size); avpkt->data = avctx->internal->byte_buffer; avpkt->size = avctx->internal->byte_buffer_size; - avpkt->destruct = NULL; + AV_NOWARN_DEPRECATED( avpkt->destruct = NULL; ); } } @@ -1622,7 +1623,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, } avpkt->buf = user_pkt.buf; avpkt->data = user_pkt.data; - avpkt->destruct = user_pkt.destruct; + AV_NOWARN_DEPRECATED( avpkt->destruct = user_pkt.destruct; ); } else { if (av_dup_packet(avpkt) < 0) { ret = AVERROR(ENOMEM); @@ -1816,7 +1817,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, } avpkt->buf = user_pkt.buf; avpkt->data = user_pkt.data; - avpkt->destruct = user_pkt.destruct; + AV_NOWARN_DEPRECATED( avpkt->destruct = user_pkt.destruct; ); } else { if (av_dup_packet(avpkt) < 0) { ret = AVERROR(ENOMEM); @@ -1949,11 +1950,11 @@ static int add_metadata_from_side_data(AVCodecContext *avctx, AVFrame *frame) end = side_metadata + size; while (side_metadata < end) { const uint8_t *key = side_metadata; - const uint8_t *val = side_metadata + strlen(key) + 1; - int ret = av_dict_set(avpriv_frame_get_metadatap(frame), key, val, 0); + const uint8_t *val = side_metadata + strlen((const char *)key) + 1; + int ret = av_dict_set(avpriv_frame_get_metadatap(frame), (const char *)key, (const char *)val, 0); if (ret < 0) break; - side_metadata = val + strlen(val) + 1; + side_metadata = val + strlen((const char *)val) + 1; } end: return ret; @@ -2313,7 +2314,7 @@ static int utf8_check(const uint8_t *str) 1 << (5 * (byte - str) - 4); if (codepoint < min || codepoint >= 0x110000 || codepoint == 0xFFFE /* BOM */ || - codepoint >= 0xD800 && codepoint <= 0xDFFF /* surrogates */) + (codepoint >= 0xD800 && codepoint <= 0xDFFF) /* surrogates */) return 0; str = byte; } @@ -2362,7 +2363,7 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, } for (i = 0; i < sub->num_rects; i++) { - if (sub->rects[i]->ass && !utf8_check(sub->rects[i]->ass)) { + if (sub->rects[i]->ass && !utf8_check((const uint8_t *)sub->rects[i]->ass)) { av_log(avctx, AV_LOG_ERROR, "Invalid UTF-8 in decoded subtitles text; " "maybe missing -sub_charenc option\n"); @@ -3011,6 +3012,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) return blocks * ((ba - 4 * ch) * 2 / ch); case AV_CODEC_ID_ADPCM_MS: return blocks * (2 + (ba - 7 * ch) * 2 / ch); + default:break; } } @@ -3027,6 +3029,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) return frame_bytes / ((FFALIGN(ch, 2) * bps) / 8); case AV_CODEC_ID_S302M: return 2 * (frame_bytes / ((bps + 4) / 4)) / ch; + default:break; } } } @@ -3286,7 +3289,7 @@ int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf) ret = av_bprint_finalize(buf, &str); if (ret < 0) return ret; - avctx->extradata = str; + avctx->extradata = (uint8_t *) str; /* Note: the string is NUL terminated (so extradata can be read as a * string), but the ending character is not accounted in the size (in * binary formats you are likely not supposed to mux that character). When diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c index ab764ed8d..a745794ed 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c @@ -24,6 +24,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" +#include "libavutil/internal.h" #include "avcodec.h" #include "internal.h" @@ -676,7 +677,7 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred) for (i = 0; i < ich; i++) pred[ich] += s->channel_residues[i][icoef] * s->mclms_coeffs_cur[i + num_channels * ich]; - pred[ich] += 1 << s->mclms_scaling - 1; + pred[ich] += 1 << (s->mclms_scaling - 1); pred[ich] >>= s->mclms_scaling; s->channel_residues[ich][icoef] += pred[ich]; } @@ -708,7 +709,7 @@ static void lms_update(WmallDecodeCtx *s, int ich, int ilms, { int icoef; int recent = s->cdlms[ich][ilms].recent; - int range = 1 << s->bits_per_sample - 1; + int range = 1 << (s->bits_per_sample - 1); if (residue < 0) { for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++) diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c index 99b18eb7a..33705084e 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c @@ -89,6 +89,7 @@ #include "libavutil/float_dsp.h" #include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" +#include "libavutil/internal.h" #include "avcodec.h" #include "internal.h" #include "get_bits.h" diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c index 72865c144..670a2e63e 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c @@ -229,7 +229,7 @@ static int asf_read_picture(AVFormatContext *s, int len) desc = av_malloc(desc_len); if (!desc) return AVERROR(ENOMEM); - len -= avio_get_str16le(s->pb, len - picsize, desc, desc_len); + len -= avio_get_str16le(s->pb, len - picsize, (char *) desc, desc_len); ret = av_get_packet(s->pb, &pkt, picsize); if (ret < 0) @@ -248,11 +248,11 @@ static int asf_read_picture(AVFormatContext *s, int len) st->attached_pic.flags |= AV_PKT_FLAG_KEY; if (*desc) - av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(&st->metadata, "title", (char *) desc, AV_DICT_DONT_STRDUP_VAL); else av_freep(&desc); - av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0); + av_dict_set(&st->metadata, "comment", (const char *) ff_id3v2_picture_types[type], 0); return 0; @@ -288,7 +288,7 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len, int if (type == 0) { // UTF16-LE avio_get_str16le(s->pb, len, value, 2 * len + 1); } else if (type == -1) { // ASCII - avio_read(s->pb, value, len); + avio_read(s->pb, (unsigned char *) value, len); value[len]=0; } else if (type == 1) { // byte array if (!strcmp(key, "WM/Picture")) { // handle cover art diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c index 9d3db04fb..a76bb206f 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c @@ -23,6 +23,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" +#include "libavutil/internal.h" #include "avformat.h" #include "internal.h" #include "ast.h" diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h index cb00751a2..b30d3c2d9 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h @@ -1657,7 +1657,7 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, int wanted_stream_nb, int related_stream, - AVCodec **decoder_ret, + const AVCodec **decoder_ret, int flags); #if FF_API_READ_PACKET diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c index c7210f026..8e316ca04 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c @@ -135,10 +135,10 @@ static int get_riff(AVFormatContext *s, AVIOContext *pb) int i; /* check RIFF header */ - avio_read(pb, header, 4); + avio_read(pb, (unsigned char *)header, 4); avi->riff_end = avio_rl32(pb); /* RIFF chunk size */ avi->riff_end += avio_tell(pb); /* RIFF chunk end */ - avio_read(pb, header + 4, 4); + avio_read(pb, (unsigned char *)header + 4, 4); for (i = 0; avi_headers[i][0]; i++) if (!memcmp(header, avi_headers[i], 8)) @@ -303,7 +303,7 @@ static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, value = av_malloc(size + 1); if (!value) return AVERROR(ENOMEM); - avio_read(pb, value, size); + avio_read(pb, (unsigned char *)value, size); value[size] = 0; AV_WL32(key, tag); @@ -348,7 +348,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end) uint16_t size = avio_rl16(s->pb); const char *name = NULL; char buffer[64] = { 0 }; - size -= avio_read(s->pb, buffer, + size -= avio_read(s->pb, (unsigned char *)buffer, FFMIN(size, sizeof(buffer) - 1)); switch (tag) { case 0x03: @@ -444,7 +444,7 @@ static int avi_read_header(AVFormatContext *s) size += (size & 1); size -= avio_read(pb, date, FFMIN(size, sizeof(date) - 1)); avio_skip(pb, size); - avi_metadata_creation_time(&s->metadata, date); + avi_metadata_creation_time(&s->metadata, (char *)date); break; } case MKTAG('d', 'm', 'l', 'h'): @@ -747,9 +747,9 @@ static int avi_read_header(AVFormatContext *s) av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align); ast->dshow_block_align = 0; } - if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024 || - st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 4096 && ast->sample_size == 4096 || - st->codec->codec_id == AV_CODEC_ID_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152) { + if ((st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024) || + (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 4096 && ast->sample_size == 4096) || + (st->codec->codec_id == AV_CODEC_ID_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152)) { av_log(s, AV_LOG_DEBUG, "overriding sample_size\n"); ast->sample_size = 0; } @@ -906,7 +906,7 @@ fail: static int read_gab2_sub(AVStream *st, AVPacket *pkt) { if (pkt->size >= 7 && - !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) { + !strcmp((char *)pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) { uint8_t desc[256]; int score = AVPROBE_SCORE_EXTENSION, ret; AVIStream *ast = st->priv_data; @@ -921,10 +921,10 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) if (desc_len > pb->buf_end - pb->buf_ptr) goto error; - ret = avio_get_str16le(pb, desc_len, desc, sizeof(desc)); + ret = avio_get_str16le(pb, desc_len, (char *)desc, sizeof(desc)); avio_skip(pb, desc_len - ret); if (*desc) - av_dict_set(&st->metadata, "title", desc, 0); + av_dict_set(&st->metadata, "title", (const char *)desc, 0); avio_rl16(pb); /* flags? */ avio_rl32(pb); /* data size */ diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c index 87561fc61..0a19b96da 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c @@ -64,7 +64,7 @@ static const AVClass *urlcontext_child_class_next(const AVClass *prev) break; /* find next protocol with priv options */ - while (p = ffurl_protocol_next(p)) + while ((p = ffurl_protocol_next(p))) if (p->priv_data_class) return p->priv_data_class; return NULL; @@ -220,8 +220,8 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, "Missing call to av_register_all()?\n"); } - if (filename[proto_len] != ':' && - (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) || + if ((filename[proto_len] != ':' && + (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':'))) || is_dos_path(filename)) strcpy(proto_str, "file"); else @@ -233,7 +233,7 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, if ((ptr = strchr(proto_nested, '+'))) *ptr = '\0'; - while (up = ffurl_protocol_next(up)) { + while ((up = ffurl_protocol_next(up))) { if (!strcmp(proto_str, up->name)) return url_alloc_for_protocol (puc, up, filename, flags, int_cb); if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME && diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c index 8218078da..0bf78e482 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c @@ -317,7 +317,7 @@ int avio_put_str(AVIOContext *s, const char *str) int avio_put_str16le(AVIOContext *s, const char *str) { - const uint8_t *q = str; + const uint8_t *q = (const uint8_t *) str; int ret = 0; while (*q) { @@ -891,7 +891,7 @@ int avio_printf(AVIOContext *s, const char *fmt, ...) va_start(ap, fmt); ret = vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - avio_write(s, buf, strlen(buf)); + avio_write(s, (const unsigned char *) buf, strlen(buf)); return ret; } @@ -1036,7 +1036,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) /* don't attempt to pad fixed-size packet buffers */ if (!s->max_packet_size) { - avio_write(s, padbuf, sizeof(padbuf)); + avio_write(s, (const unsigned char *) padbuf, sizeof(padbuf)); padding = FF_INPUT_BUFFER_PADDING_SIZE; } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c index 4bc76a321..9b9c1c94b 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c @@ -289,13 +289,13 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, } if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) && - (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) && + (sscanf((const char *) dst, "(%d)", &genre) == 1 || sscanf((const char *) dst, "%d", &genre) == 1) && genre <= ID3v1_GENRE_MAX) { av_freep(&dst); - dst = av_strdup(ff_id3v1_genre_str[genre]); + dst = (uint8_t *) av_strdup(ff_id3v1_genre_str[genre]); } else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX"))) { /* dst now contains the key, need to get value */ - key = dst; + key = (const char *) dst; if (decode_str(s, pb, encoding, &dst, &taglen) < 0) { av_log(s, AV_LOG_ERROR, "Error reading frame %s, skipped\n", key); av_freep(&key); @@ -306,7 +306,7 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, av_freep(&dst); if (dst) - av_dict_set(metadata, key, dst, dict_flags); + av_dict_set(metadata, key, (const char *) dst, dict_flags); } /** @@ -536,7 +536,7 @@ static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta end = avio_rb32(pb); avio_skip(pb, 8); - chapter = avpriv_new_chapter(s, s->nb_chapters + 1, time_base, start, end, dst); + chapter = avpriv_new_chapter(s, s->nb_chapters + 1, time_base, start, end, (const char *) dst); if (!chapter) { av_free(dst); return; @@ -544,7 +544,7 @@ static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta len -= 16; while (len > 10) { - avio_read(pb, tag, 4); + avio_read(pb, (unsigned char *) tag, 4); tag[4] = 0; taglen = avio_rb32(pb); avio_skip(pb, 2); @@ -667,7 +667,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, unsigned long dlen; if (isv34) { - avio_read(s->pb, tag, 4); + avio_read(s->pb, (unsigned char *) tag, 4); tag[4] = 0; if (version == 3) { tlen = avio_rb32(s->pb); @@ -676,7 +676,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, tflags = avio_rb16(s->pb); tunsync = tflags & ID3v2_FLAG_UNSYNCH; } else { - avio_read(s->pb, tag, 3); + avio_read(s->pb, (unsigned char *) tag, 3); tag[3] = 0; tlen = avio_rb24(s->pb); } @@ -726,7 +726,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, pbx = s->pb; if (unsync || tunsync || tcomp) { - av_fast_malloc(&buffer, &buffer_size, tlen); + av_fast_malloc(&buffer, (unsigned int *) &buffer_size, tlen); if (!buffer) { av_log(s, AV_LOG_ERROR, "Failed to alloc %d bytes\n", tlen); goto seek; @@ -758,7 +758,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, av_log(s, AV_LOG_DEBUG, "Compresssed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen); - av_fast_malloc(&uncompressed_buffer, &uncompressed_buffer_size, dlen); + av_fast_malloc(&uncompressed_buffer, (unsigned int *) &uncompressed_buffer_size, dlen); if (!uncompressed_buffer) { av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen); goto seek; @@ -880,7 +880,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = apic->id; - av_dict_set(&st->metadata, "title", apic->description, 0); + av_dict_set(&st->metadata, "title", (const char *) apic->description, 0); av_dict_set(&st->metadata, "comment", apic->type, 0); av_init_packet(&st->attached_pic); diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c index ace8ca88f..ba2960032 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c @@ -288,6 +288,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) } } break; + default:break; } if (of->codec_tag) { @@ -388,7 +389,7 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) { int ret = 0; - if (ret = init_muxer(s, options)) + if ((ret = init_muxer(s, options))) return ret; if (s->oformat->write_header) { diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c index 5218e5b92..d58d76104 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c @@ -41,7 +41,7 @@ static void *format_child_next(void *obj, void *prev) AVFormatContext *s = obj; if (!prev && s->priv_data && ((s->iformat && s->iformat->priv_class) || - s->oformat && s->oformat->priv_class)) + (s->oformat && s->oformat->priv_class))) return s->priv_data; if (s->pb && s->pb->av_class && prev != s->pb) return s->pb; @@ -65,11 +65,11 @@ static const AVClass *format_child_class_next(const AVClass *prev) if (ofmt->priv_class == prev) break; if (!ofmt) - while (ifmt = av_iformat_next(ifmt)) + while ((ifmt = av_iformat_next(ifmt))) if (ifmt->priv_class) return ifmt->priv_class; - while (ofmt = av_oformat_next(ofmt)) + while ((ofmt = av_oformat_next(ofmt))) if (ofmt->priv_class) return ofmt->priv_class; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c index e7c52e09c..77f4cb96b 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c @@ -240,7 +240,7 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) AV_WL32(key, chunk_code); - if (avio_read(pb, value, chunk_size) != chunk_size) { + if (avio_read(pb, (unsigned char *)value, chunk_size) != chunk_size) { av_log(s, AV_LOG_WARNING, "premature end of file while reading INFO tag\n"); } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c index 6484f078f..888ca5b61 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c @@ -100,7 +100,7 @@ static int64_t wrap_timestamp(AVStream *st, int64_t timestamp) MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) -static AVCodec *find_decoder(AVStream *st, enum AVCodecID codec_id) +static const AVCodec *find_decoder(AVStream *st, enum AVCodecID codec_id) { if (st->codec->codec) return st->codec->codec; @@ -215,7 +215,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE]; if (!lpd.buf) - lpd.buf = zerobuffer; + lpd.buf = (unsigned char *) zerobuffer; if (lpd.buf_size > 10 && ff_id3v2_match(lpd.buf, ID3v2_DEFAULT_MAGIC)) { int id3len = ff_id3v2_tag_len(lpd.buf); @@ -347,7 +347,7 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, } if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { - if (!av_strcasecmp(mime_type, "audio/aacp")) { + if (!av_strcasecmp((const char *) mime_type, "audio/aacp")) { *fmt = av_find_input_format("aac"); } av_freep(&mime_type); @@ -579,6 +579,7 @@ static void force_codec_ids(AVFormatContext *s, AVStream *st) case AVMEDIA_TYPE_SUBTITLE: if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id; break; + default:break; } } @@ -859,7 +860,7 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in // reference time stamp should be 60 s before first time stamp int64_t pts_wrap_reference = st->first_dts - av_rescale(60, st->time_base.den, st->time_base.num); // if first time stamp is not more than 1/8 and 60s before the wrap point, subtract rather than add wrap offset - int pts_wrap_behavior = (st->first_dts < (1LL<pts_wrap_bits) - (1LL<pts_wrap_bits-3)) || + int pts_wrap_behavior = (st->first_dts < (1LL<pts_wrap_bits) - (1LL<<(st->pts_wrap_bits-3))) || (st->first_dts < (1LL<pts_wrap_bits) - av_rescale(60, st->time_base.den, st->time_base.num)) ? AV_PTS_WRAP_ADD_OFFSET : AV_PTS_WRAP_SUB_OFFSET; @@ -2431,6 +2432,8 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr) break; case AVMEDIA_TYPE_DATA: if(avctx->codec_id == AV_CODEC_ID_NONE) return 1; + break; + default:break; } if (avctx->codec_id == AV_CODEC_ID_NONE) @@ -3068,6 +3071,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) st->disposition = AV_DISPOSITION_COMMENT; break; case AV_AUDIO_SERVICE_TYPE_KARAOKE: st->disposition = AV_DISPOSITION_KARAOKE; break; + default:break; } } } @@ -3129,13 +3133,13 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, int wanted_stream_nb, int related_stream, - AVCodec **decoder_ret, + const AVCodec **decoder_ret, int flags) { int i, nb_streams = ic->nb_streams; int ret = AVERROR_STREAM_NOT_FOUND, best_count = -1, best_bitrate = -1, best_multiframe = -1, count, bitrate, multiframe; unsigned *program = NULL; - AVCodec *decoder = NULL, *best_decoder = NULL; + const AVCodec *decoder = NULL, *best_decoder = NULL; if (related_stream >= 0 && wanted_stream_nb < 0) { AVProgram *p = av_find_program_from_stream(ic, NULL, related_stream); @@ -3378,7 +3382,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) program = av_mallocz(sizeof(AVProgram)); if (!program) return NULL; - dynarray_add(&ac->programs, &ac->nb_programs, program); + dynarray_add(&ac->programs, (int *) &ac->nb_programs, program); program->discard = AVDISCARD_NONE; } program->id = id; @@ -3404,7 +3408,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, chapter= av_mallocz(sizeof(AVChapter)); if(!chapter) return NULL; - dynarray_add(&s->chapters, &s->nb_chapters, chapter); + dynarray_add(&s->chapters, (int *) &s->nb_chapters, chapter); } av_dict_set(&chapter->metadata, "title", title, 0); chapter->id = id; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c index d2702d057..575a2f3b0 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c @@ -147,7 +147,7 @@ static inline int wav_parse_bext_string(AVFormatContext *s, const char *key, int ret; av_assert0(length <= sizeof(temp)); - if ((ret = avio_read(s->pb, temp, length)) < 0) + if ((ret = avio_read(s->pb, (unsigned char *) temp, length)) < 0) return ret; temp[length] = 0; @@ -217,7 +217,7 @@ static int wav_parse_bext_tag(AVFormatContext *s, int64_t size) if (!(coding_history = av_malloc(size + 1))) return AVERROR(ENOMEM); - if ((ret = avio_read(s->pb, coding_history, size)) < 0) + if ((ret = avio_read(s->pb, (unsigned char *) coding_history, size)) < 0) return ret; coding_history[size] = 0; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c index 34e653964..4591c60c1 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "internal.h" +#include "libavutil/internal.h" #include "riff.h" /* diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h index 8c0e5b297..0f8ff423c 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h @@ -96,7 +96,7 @@ * scheduled for removal. */ #ifndef AV_NOWARN_DEPRECATED -#if AV_GCC_VERSION_AT_LEAST(4,6) +#if AV_GCC_VERSION_AT_LEAST(4,6) || defined(__clang__) # define AV_NOWARN_DEPRECATED(code) \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c index 7786e3bce..2535c1728 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c @@ -221,7 +221,7 @@ void av_bprint_get_buffer(AVBPrint *buf, unsigned size, if (size > av_bprint_room(buf)) av_bprint_alloc(buf, size); *actual_size = av_bprint_room(buf); - *mem = *actual_size ? buf->str + buf->len : NULL; + *mem = *actual_size ? (unsigned char *)buf->str + buf->len : NULL; } void av_bprint_clear(AVBPrint *buf) diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c index a31e195b6..cec94e545 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c @@ -193,7 +193,7 @@ int av_parse_cpu_caps(unsigned *flags, const char *s) }; const AVClass *pclass = &class; - return av_opt_eval_flags(&pclass, &cpuflags_opts[0], s, flags); + return av_opt_eval_flags(&pclass, &cpuflags_opts[0], s, (int *) flags); } int av_cpu_count(void) diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c index 460385747..ea869e776 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c @@ -35,7 +35,7 @@ #include "eval.h" #include "log.h" #include "mathematics.h" -#include "time.h" +#include "time_.h" #include "avstring.h" typedef struct Parser { @@ -237,7 +237,9 @@ static double eval_expr(Parser *p, AVExpr *e) double x_max = eval_expr(p, e->param[1]); for(i=-1; i<1024; i++) { if(i<255) { + AV_NOWARN_DEPRECATED( p->var[0] = av_reverse[i&255]*x_max/255; + ); } else { p->var[0] = x_max*pow(0.9, i-255); if (i&1) p->var[0] *= -1; @@ -294,6 +296,7 @@ static double eval_expr(Parser *p, AVExpr *e) case e_hypot:return e->value * (sqrt(d*d + d2*d2)); case e_bitand: return isnan(d) || isnan(d2) ? NAN : e->value * ((long int)d & (long int)d2); case e_bitor: return isnan(d) || isnan(d2) ? NAN : e->value * ((long int)d | (long int)d2); + default:break; } } } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c index 6eb2caf01..de3b757ba 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c @@ -53,22 +53,26 @@ int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int qp_type) f->qp_table_buf = buf; - f->qscale_table = buf->data; +AV_NOWARN_DEPRECATED( + f->qscale_table = (int8_t *) buf->data; f->qstride = stride; f->qscale_type = qp_type; +); return 0; } int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) { +AV_NOWARN_DEPRECATED( *stride = f->qstride; *type = f->qscale_type; +); if (!f->qp_table_buf) return NULL; - return f->qp_table_buf->data; + return (int8_t *) f->qp_table_buf->data; } const char *av_get_colorspace_name(enum AVColorSpace val) @@ -272,7 +276,7 @@ int av_frame_ref(AVFrame *dst, AVFrame *src) av_samples_copy(dst->extended_data, src->extended_data, 0, 0, dst->nb_samples, ch, dst->format); } else { - av_image_copy(dst->data, dst->linesize, src->data, src->linesize, + av_image_copy(dst->data, dst->linesize, (const uint8_t **) src->data, src->linesize, dst->format, dst->width, dst->height); } return 0; @@ -425,7 +429,7 @@ int av_frame_make_writable(AVFrame *frame) av_samples_copy(tmp.extended_data, frame->extended_data, 0, 0, frame->nb_samples, ch, frame->format); } else { - av_image_copy(tmp.data, tmp.linesize, frame->data, frame->linesize, + av_image_copy(tmp.data, tmp.linesize, (const uint8_t **) frame->data, frame->linesize, frame->format, frame->width, frame->height); } @@ -459,7 +463,9 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; #if FF_API_AVFRAME_LAVC +AV_NOWARN_DEPRECATED( dst->type = src->type; +); #endif dst->pkt_pts = src->pkt_pts; dst->pkt_dts = src->pkt_dts; @@ -496,15 +502,19 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); } +AV_NOWARN_DEPRECATED( dst->qscale_table = NULL; dst->qstride = 0; dst->qscale_type = 0; +); if (src->qp_table_buf) { dst->qp_table_buf = av_buffer_ref(src->qp_table_buf); if (dst->qp_table_buf) { - dst->qscale_table = dst->qp_table_buf->data; +AV_NOWARN_DEPRECATED( + dst->qscale_table = (int8_t *) dst->qp_table_buf->data; dst->qstride = src->qstride; dst->qscale_type = src->qscale_type; +); } } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h index 6bc426e92..ae7f4cc11 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h @@ -144,6 +144,7 @@ * without modification. Used to disable the definition of strings * (for example AVCodec long_names). */ +#undef NULL_IF_CONFIG_SMALL #if CONFIG_SMALL # define NULL_IF_CONFIG_SMALL(x) NULL #else diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c index 53be3ea4e..34fd169b6 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c @@ -242,11 +242,11 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) count = 0; } strcpy(prev, line); - sanitize(part[0].str); + sanitize((uint8_t *) part[0].str); colored_fputs(type[0], part[0].str); - sanitize(part[1].str); + sanitize((uint8_t *) part[1].str); colored_fputs(type[1], part[1].str); - sanitize(part[2].str); + sanitize((uint8_t *) part[2].str); colored_fputs(av_clip(level >> 3, 0, 6), part[2].str); av_bprint_finalize(part+2, NULL); } diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c index c03530705..c6381461d 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c @@ -85,6 +85,7 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6 *den = ((AVRational*)dst)->den; return 0; case AV_OPT_TYPE_CONST: *num = o->default_val.dbl; return 0; + default:break; } return AVERROR(EINVAL); } @@ -169,7 +170,7 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **dst) { av_freep(dst); - *dst = av_strdup(val); + *dst = (uint8_t *)av_strdup(val); return 0; } @@ -341,6 +342,8 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val); return ret; } + break; + default:break; } av_log(obj, AV_LOG_ERROR, "Invalid option type.\n"); @@ -588,19 +591,19 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) buf[0] = 0; switch (o->type) { - case AV_OPT_TYPE_FLAGS: ret = snprintf(buf, sizeof(buf), "0x%08X", *(int *)dst);break; - case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d" , *(int *)dst);break; - case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t*)dst);break; - case AV_OPT_TYPE_FLOAT: ret = snprintf(buf, sizeof(buf), "%f" , *(float *)dst);break; - case AV_OPT_TYPE_DOUBLE: ret = snprintf(buf, sizeof(buf), "%f" , *(double *)dst);break; + case AV_OPT_TYPE_FLAGS: ret = snprintf((char *)buf, sizeof(buf), "0x%08X", *(int *)dst);break; + case AV_OPT_TYPE_INT: ret = snprintf((char *)buf, sizeof(buf), "%d" , *(int *)dst);break; + case AV_OPT_TYPE_INT64: ret = snprintf((char *)buf, sizeof(buf), "%"PRId64, *(int64_t*)dst);break; + case AV_OPT_TYPE_FLOAT: ret = snprintf((char *)buf, sizeof(buf), "%f" , *(float *)dst);break; + case AV_OPT_TYPE_DOUBLE: ret = snprintf((char *)buf, sizeof(buf), "%f" , *(double *)dst);break; case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_RATIONAL: ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break; - case AV_OPT_TYPE_CONST: ret = snprintf(buf, sizeof(buf), "%f" , o->default_val.dbl);break; + case AV_OPT_TYPE_RATIONAL: ret = snprintf((char *)buf, sizeof(buf), "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break; + case AV_OPT_TYPE_CONST: ret = snprintf((char *)buf, sizeof(buf), "%f" , o->default_val.dbl);break; case AV_OPT_TYPE_STRING: if (*(uint8_t**)dst) - *out_val = av_strdup(*(uint8_t**)dst); + *out_val = (uint8_t*)av_strdup(*(char**)dst); else - *out_val = av_strdup(""); + *out_val = (uint8_t*)av_strdup(""); return 0; case AV_OPT_TYPE_BINARY: len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *)); @@ -610,25 +613,25 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) return AVERROR(ENOMEM); bin = *(uint8_t**)dst; for (i = 0; i < len; i++) - snprintf(*out_val + i*2, 3, "%02X", bin[i]); + snprintf((char *)*out_val + i*2, 3, "%02X", bin[i]); return 0; case AV_OPT_TYPE_IMAGE_SIZE: - ret = snprintf(buf, sizeof(buf), "%dx%d", ((int *)dst)[0], ((int *)dst)[1]); + ret = snprintf((char *)buf, sizeof(buf), "%dx%d", ((int *)dst)[0], ((int *)dst)[1]); break; case AV_OPT_TYPE_PIXEL_FMT: - ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_pix_fmt_name(*(enum AVPixelFormat *)dst), "none")); + ret = snprintf((char *)buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_pix_fmt_name(*(enum AVPixelFormat *)dst), "none")); break; case AV_OPT_TYPE_SAMPLE_FMT: - ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none")); + ret = snprintf((char *)buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none")); break; case AV_OPT_TYPE_DURATION: i64 = *(int64_t *)dst; - ret = snprintf(buf, sizeof(buf), "%"PRIi64"d:%02d:%02d.%06d", + ret = snprintf((char *)buf, sizeof(buf), "%"PRIi64"d:%02d:%02d.%06d", i64 / 3600000000, (int)((i64 / 60000000) % 60), (int)((i64 / 1000000) % 60), (int)(i64 % 1000000)); break; case AV_OPT_TYPE_COLOR: - ret = snprintf(buf, sizeof(buf), "0x%02x%02x%02x%02x", ((int *)dst)[0], ((int *)dst)[1], ((int *)dst)[2], ((int *)dst)[3]); + ret = snprintf((char *)buf, sizeof(buf), "0x%02x%02x%02x%02x", ((int *)dst)[0], ((int *)dst)[1], ((int *)dst)[2], ((int *)dst)[3]); break; default: return AVERROR(EINVAL); @@ -636,7 +639,7 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) if (ret >= sizeof(buf)) return AVERROR(EINVAL); - *out_val = av_strdup(buf); + *out_val = (uint8_t*) av_strdup((char *)buf); return 0; } @@ -932,6 +935,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, av_log(av_log_obj, AV_LOG_INFO, ")"); } break; + default:break; } av_opt_freep_ranges(&r); } @@ -972,6 +976,8 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, case AV_OPT_TYPE_STRING: case AV_OPT_TYPE_VIDEO_RATE: av_log(av_log_obj, AV_LOG_INFO, "\"%s\"", opt->default_val.str); + break; + default:break; } av_log(av_log_obj, AV_LOG_INFO, ")"); } @@ -998,7 +1004,9 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) void av_opt_set_defaults(void *s) { #if FF_API_OLD_AVOPTIONS +AV_NOWARN_DEPRECATED( av_opt_set_defaults2(s, 0, 0); +); } void av_opt_set_defaults2(void *s, int mask, int flags) @@ -1300,18 +1308,18 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, if (search_flags & AV_OPT_SEARCH_CHILDREN) { if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) { const AVClass *child = NULL; - while (child = av_opt_child_class_next(c, child)) - if (o = av_opt_find2(&child, name, unit, opt_flags, search_flags, NULL)) + while ((child = av_opt_child_class_next(c, child))) + if ((o = av_opt_find2(&child, name, unit, opt_flags, search_flags, NULL))) return o; } else { void *child = NULL; - while (child = av_opt_child_next(obj, child)) - if (o = av_opt_find2(child, name, unit, opt_flags, search_flags, target_obj)) + while ((child = av_opt_child_next(obj, child))) + if ((o = av_opt_find2(child, name, unit, opt_flags, search_flags, target_obj))) return o; } } - while (o = av_opt_next(obj, o)) { + while ((o = av_opt_next(obj, o))) { if (!strcmp(o->name, name) && (o->flags & opt_flags) == opt_flags && ((!unit && o->type != AV_OPT_TYPE_CONST) || (unit && o->type == AV_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit)))) { diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c index 9a33000e6..78f21c320 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c @@ -1992,10 +1992,13 @@ int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt) } void ff_check_pixfmt_descriptors(void){ - int i, j; + int i, j, k; - for (i=0; i 4 || i-last_i > 64 || TEST && i-last_i > 8) + if((last_i && i-last_i > 4) || i-last_i > 64 || (TEST && i-last_i > 8)) break; } last_t = t; diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c index 0cf94245a..c3c9284e2 100644 --- a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c +++ b/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c @@ -343,9 +343,9 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest) int i; uint64_t finalcount = av_be2ne64(ctx->count << 3); - av_sha_update(ctx, "\200", 1); + av_sha_update(ctx, (const uint8_t *) "\200", 1); while ((ctx->count & 63) != 56) - av_sha_update(ctx, "", 1); + av_sha_update(ctx, (const uint8_t *) "", 1); av_sha_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */ for (i = 0; i < ctx->digest_len; i++) AV_WB32(digest + i*4, ctx->state[i]); diff --git a/Frameworks/WavPack/Files/md5.c b/Frameworks/WavPack/Files/md5.c index 170024098..31433f216 100644 --- a/Frameworks/WavPack/Files/md5.c +++ b/Frameworks/WavPack/Files/md5.c @@ -157,7 +157,7 @@ void MD5Final(digest, ctx) MD5Transform(ctx->buf, (uint32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } diff --git a/Frameworks/WavPack/Files/unpack3.c b/Frameworks/WavPack/Files/unpack3.c index 92ade0215..eb4be0a18 100644 --- a/Frameworks/WavPack/Files/unpack3.c +++ b/Frameworks/WavPack/Files/unpack3.c @@ -503,8 +503,8 @@ static int unpack_size (WavpackStream3 *wps) byte_sum += sizeof (wps->dc.weight); } - if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) - for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) + if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) { + for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { if (dpp->term > 0) { byte_sum += sizeof (dpp->samples_A [0]) * dpp->term; byte_sum += sizeof (dpp->weight_A); @@ -518,6 +518,8 @@ static int unpack_size (WavpackStream3 *wps) byte_sum += sizeof (dpp->samples_A [0]) + sizeof (dpp->samples_B [0]); byte_sum += sizeof (dpp->weight_A) + sizeof (dpp->weight_B); } + } + } return byte_sum; } @@ -571,8 +573,8 @@ static void *unpack_save (WavpackStream3 *wps, void *destin) SAVE (destin, wps->dc.weight); } - if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) - for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) + if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) { + for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { if (dpp->term > 0) { int count = dpp->term; int index = wps->dc.m; @@ -602,6 +604,8 @@ static void *unpack_save (WavpackStream3 *wps, void *destin) SAVE (destin, dpp->samples_A [0]); SAVE (destin, dpp->samples_B [0]); } + } + } return destin; } @@ -683,8 +687,8 @@ static void *unpack_restore (WavpackStream3 *wps, void *source, int keep_resourc RESTORE (wps->dc.weight, source); } - if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) - for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) + if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) { + for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { if (dpp->term > 0) { int count = dpp->term; int index = wps->dc.m; @@ -714,6 +718,8 @@ static void *unpack_restore (WavpackStream3 *wps, void *source, int keep_resourc RESTORE (dpp->samples_A [0], source); RESTORE (dpp->samples_B [0], source); } + } + } return source; } diff --git a/Frameworks/psflib/psflib/psf2fs.c b/Frameworks/psflib/psflib/psf2fs.c index e1e4015c9..796628ed0 100644 --- a/Frameworks/psflib/psflib/psf2fs.c +++ b/Frameworks/psflib/psflib/psf2fs.c @@ -90,25 +90,6 @@ void psf2fs_delete(void *psf2fs) { static int isdirsep(char c) { return (c == '/' || c == '\\' || c == '|' || c == ':'); } -static void makelibpath(const char *path, const char *libpath, char *finalpath, int finalpath_length) { - int l; - int p_l = 0; - for(l = 0; path[l]; l++) { if(isdirsep(path[l])) { p_l = l + 1; } } - while(isdirsep(*libpath)) libpath++; - if(!finalpath_length) return; - *finalpath = 0; - if(p_l > (finalpath_length - 1)) p_l = (finalpath_length - 1); - if(p_l) { - memcpy(finalpath, path, p_l); - finalpath[p_l] = 0; - finalpath += p_l; - finalpath_length -= p_l; - } - if(!finalpath_length) return; - strncpy(finalpath, libpath, finalpath_length); - finalpath[finalpath_length - 1] = 0; -} - ///////////////////////////////////////////////////////////////////////////// static unsigned read32lsb(const uint8_t * foo) { @@ -273,7 +254,7 @@ static struct DIR_ENTRY *mergedir( // delink entry_from entry_from->next = NULL; // look for a duplicate entry in "to" - entry_to = finddirentry(to, entry_from->name, strlen(entry_from->name)); + entry_to = finddirentry(to, entry_from->name, (int)strlen(entry_from->name)); // if there is one, do something fancy and then free entry_from. if(entry_to) { // if both are subdirs, merge the subdirs @@ -358,7 +339,7 @@ int psf2fs_load_callback(void * psf2fs, const uint8_t * exe, size_t exe_size, struct PSF2FS *fs = (struct PSF2FS*)psf2fs; (void)exe; (void)exe_size; - return addarchive(fs, reserved, reserved_size, &(fs->sources), &(fs->dir)); + return addarchive(fs, reserved, (int)reserved_size, &(fs->sources), &(fs->dir)); } ///////////////////////////////////////////////////////////////////////////// diff --git a/InfoInspector/MissingAlbumArtTransformer.h b/InfoInspector/MissingAlbumArtTransformer.h index 88a1d94b0..71abf7a2e 100644 --- a/InfoInspector/MissingAlbumArtTransformer.h +++ b/InfoInspector/MissingAlbumArtTransformer.h @@ -9,7 +9,7 @@ #import -@interface MissingAlbumArtTransformer : NSObject { +@interface MissingAlbumArtTransformer : NSValueTransformer { } diff --git a/Playlist/DNDArrayController.m b/Playlist/DNDArrayController.m index 244744dcc..705343065 100755 --- a/Playlist/DNDArrayController.m +++ b/Playlist/DNDArrayController.m @@ -84,7 +84,7 @@ NSString *iTunesDropType = @"CorePasteboardFlavorType 0x6974756E"; { NSArray *objects = [self arrangedObjects]; - int index = [indexSet lastIndex]; + NSUInteger index = [indexSet lastIndex]; int aboveInsertIndexCount = 0; id object; diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 652de6dae..fd5a98a07 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -510,7 +510,7 @@ if ([pe album] == nil) i--; else - i = [(NSNumber *)[[filtered objectAtIndex:0] index] intValue]; + i = [(PlaylistEntry *)[filtered objectAtIndex:0] index]; } } @@ -693,8 +693,6 @@ - (IBAction)showEntryInFinder:(id)sender { NSWorkspace* ws = [NSWorkspace sharedWorkspace]; - if ([self selectionIndex] < 0) - return; NSURL *url = [[[self selectedObjects] objectAtIndex:0] URL]; if ([url isFileURL]) diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index 214941d39..491f84dd1 100755 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -129,7 +129,7 @@ } [fileHandle truncateFileAtOffset:0]; - [fileHandle writeData:[[NSString stringWithFormat:@"[playlist]\nnumberOfEntries=%i\n\n",[[playlistController content] count]] dataUsingEncoding:NSUTF8StringEncoding]]; + [fileHandle writeData:[[NSString stringWithFormat:@"[playlist]\nnumberOfEntries=%lu\n\n",(unsigned long)[[playlistController content] count]] dataUsingEncoding:NSUTF8StringEncoding]]; int i = 1; for (PlaylistEntry *pe in [playlistController content]) diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index 486e76171..9d83a63d6 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -158,7 +158,7 @@ } else { - [self selectRow:iRow byExtendingSelection:NO]; + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:iRow] byExtendingSelection:NO]; } } @@ -214,7 +214,7 @@ - (IBAction)scrollToCurrentEntry:(id)sender { [self scrollRowToVisible:[[playlistController currentEntry] index]]; - [self selectRow:[[playlistController currentEntry] index] byExtendingSelection:NO]; + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:[[playlistController currentEntry] index]] byExtendingSelection:NO]; } - (IBAction)sortByPath:(id)sender diff --git a/Plugins/APL/APLFile.m b/Plugins/APL/APLFile.m index 4aa3785e9..5dd820e3d 100644 --- a/Plugins/APL/APLFile.m +++ b/Plugins/APL/APLFile.m @@ -67,7 +67,7 @@ NSString* line = nil; NSScanner *scanner = nil; //NSCharacterSet *whitespace = [NSCharacterSet whitespaceAndNewlineCharacterSet]; - while(line = [self readline:f]) { + while((line = [self readline:f])) { if (![line compare:@"----- APE TAG (DO NOT TOUCH!!!) -----\r\n" options:NSCaseInsensitiveSearch]) break; if([line characterAtIndex:0] == '-') break; [scanner release]; diff --git a/Plugins/CoreAudio/CoreAudioDecoder.m b/Plugins/CoreAudio/CoreAudioDecoder.m index b1bd62dba..5226d05e8 100644 --- a/Plugins/CoreAudio/CoreAudioDecoder.m +++ b/Plugins/CoreAudio/CoreAudioDecoder.m @@ -41,24 +41,13 @@ - (BOOL)open:(id)source; { OSStatus err; - FSRef ref; NSURL *url = [source url]; [source close]; //There's no room for your kind around here! - if (![[url scheme] isEqualToString:@"file"]) - return NO; - - - // Open the input file - err = FSPathMakeRef((const UInt8 *)[[url path] UTF8String], &ref, NULL); + err = ExtAudioFileOpenURL((CFURLRef)url, &_in); if(noErr != err) { - return NO; - } - - err = ExtAudioFileOpen(&ref, &_in); - if(noErr != err) { - NSLog(@"Error opening file: %s", &err); + NSLog(@"Error opening file: %d", err); return NO; } diff --git a/Plugins/FileSource/FileSource.m b/Plugins/FileSource/FileSource.m index ce73881cb..2dc249e9a 100644 --- a/Plugins/FileSource/FileSource.m +++ b/Plugins/FileSource/FileSource.m @@ -35,7 +35,7 @@ return ftell(_fd); } -- (int)read:(void *)buffer amount:(int)amount +- (long)read:(void *)buffer amount:(long)amount { return fread(buffer, 1, amount, _fd); } diff --git a/Plugins/Flac/FlacDecoder.m b/Plugins/Flac/FlacDecoder.m index 2bdce617d..7b23a1bce 100644 --- a/Plugins/Flac/FlacDecoder.m +++ b/Plugins/Flac/FlacDecoder.m @@ -14,12 +14,13 @@ FLAC__StreamDecoderReadStatus ReadCallback(const FLAC__StreamDecoder *decoder, FLAC__byte blockBuffer[], size_t *bytes, void *client_data) { FlacDecoder *flacDecoder = (FlacDecoder *)client_data; - *bytes = [[flacDecoder source] read:blockBuffer amount:*bytes]; + long ret = [[flacDecoder source] read:blockBuffer amount:*bytes]; + *bytes = ret; - if(*bytes < 0) { + if(ret < 0) { return FLAC__STREAM_DECODER_READ_STATUS_ABORT; } - else if(*bytes == 0) { + else if(ret == 0) { [flacDecoder setEndOfStream:YES]; return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; } diff --git a/Plugins/HTTPSource/HTTPSource.m b/Plugins/HTTPSource/HTTPSource.m index 3f288653a..0d4663896 100644 --- a/Plugins/HTTPSource/HTTPSource.m +++ b/Plugins/HTTPSource/HTTPSource.m @@ -52,9 +52,9 @@ return _byteCount; } -- (int)read:(void *)buffer amount:(int)amount +- (long)read:(void *)buffer amount:(long)amount { - int totalRead = 0; + long totalRead = 0; while (totalRead < amount) { NSInteger amountReceived = [_connection receiveData:((uint8_t *)buffer) + totalRead amount:amount - totalRead]; diff --git a/Plugins/HTTPSource/Utils/HTTPConnection.m b/Plugins/HTTPSource/Utils/HTTPConnection.m index dcec86775..bd372e807 100644 --- a/Plugins/HTTPSource/Utils/HTTPConnection.m +++ b/Plugins/HTTPSource/Utils/HTTPConnection.m @@ -168,7 +168,7 @@ return [self connect]; } - NSLog(@"Returned status: %i", statusCode); + NSLog(@"Returned status: %li", (long)statusCode); return NO; } diff --git a/Plugins/HTTPSource/Utils/Socket.m b/Plugins/HTTPSource/Utils/Socket.m index 6bef8a439..dabc629a4 100644 --- a/Plugins/HTTPSource/Utils/Socket.m +++ b/Plugins/HTTPSource/Utils/Socket.m @@ -11,12 +11,12 @@ @implementation Socket -+ (id)socketWithHost:(NSString *)host port:(NSInteger)port ++ (id)socketWithHost:(NSString *)host port:(int)port { return [[[Socket alloc] initWithHost:host port:port] autorelease]; } -- (id)initWithHost:(NSString *)host port:(NSInteger) port +- (id)initWithHost:(NSString *)host port:(int) port { self = [super init]; if (self) diff --git a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm index 61cdfd128..d6d0fd8d7 100644 --- a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm +++ b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm @@ -323,7 +323,7 @@ static int psf1_info(void * context, const char * name, const char * value) if ( !state->refresh && [sname isEqualToString:@"_refresh"] ) { - state->refresh = [svalue integerValue]; + state->refresh = [svalue intValue]; } return 0; @@ -367,9 +367,10 @@ int psf1_loader(void * context, const uint8_t * exe, size_t exe_size, psxexe_hdr_t *psx = (psxexe_hdr_t *) exe; if ( exe_size < 0x800 ) return -1; + if ( exe_size > UINT_MAX ) return -1; uint32_t addr = get_le32( &psx->exec.t_addr ); - uint32_t size = exe_size - 0x800; + uint32_t size = (uint32_t)exe_size - 0x800; addr &= 0x1fffff; if ( ( addr < 0x10000 ) || ( size > 0x1f0000 ) || ( addr + size > 0x200000 ) ) return -1; @@ -426,8 +427,8 @@ int sdsf_loader(void * context, const uint8_t * exe, size_t exe_size, uint32_t src_start = get_le32( exe ); dst_start &= 0x7fffff; src_start &= 0x7fffff; - uint32_t dst_len = state->data_size - 4; - uint32_t src_len = exe_size - 4; + size_t dst_len = state->data_size - 4; + size_t src_len = exe_size - 4; if ( dst_len > 0x800000 ) dst_len = 0x800000; if ( src_len > 0x800000 ) src_len = 0x800000; @@ -444,7 +445,7 @@ int sdsf_loader(void * context, const uint8_t * exe, size_t exe_size, } if ( ( src_start + src_len ) > ( dst_start + dst_len ) ) { - uint32_t diff = ( src_start + src_len ) - ( dst_start + dst_len ); + size_t diff = ( src_start + src_len ) - ( dst_start + dst_len ); state->data_size = dst_len + 4 + diff; state->data = dst = ( uint8_t * ) realloc( dst, state->data_size ); memset( dst + 4 + dst_len, 0, diff ); @@ -537,7 +538,7 @@ int gsf_loader(void * context, const uint8_t * exe, size_t exe_size, struct gsf_loader_state * state = ( struct gsf_loader_state * ) context; unsigned char *iptr; - unsigned isize; + size_t isize; unsigned char *xptr; unsigned xentry = get_le32(exe + 0); unsigned xsize = get_le32(exe + 8); @@ -556,7 +557,7 @@ int gsf_loader(void * context, const uint8_t * exe, size_t exe_size, } if (!iptr) { - unsigned rsize = xofs + xsize; + size_t rsize = xofs + xsize; { rsize -= 1; rsize |= rsize >> 1; @@ -574,7 +575,7 @@ int gsf_loader(void * context, const uint8_t * exe, size_t exe_size, } else if (isize < xofs + xsize) { - unsigned rsize = xofs + xsize; + size_t rsize = xofs + xsize; { rsize -= 1; rsize |= rsize >> 1; @@ -609,7 +610,7 @@ struct gsf_sound_out : public GBASoundOut gsf_sound_out() : buffer( nil ), samples_written( 0 ), buffer_size( 0 ) { } virtual ~gsf_sound_out() { if ( buffer ) free( buffer ); } // Receives signed 16-bit stereo audio and a byte count - virtual void write(const void * samples, unsigned bytes) + virtual void write(const void * samples, unsigned long bytes) { if ( bytes + samples_written > buffer_size ) { @@ -680,12 +681,12 @@ struct gsf_sound_out : public GBASoundOut sega_enable_dsp_dynarec( emulatorCore, 0 ); uint32_t start = *(uint32_t*) state.data; - uint32_t length = state.data_size; - const uint32_t max_length = ( type == 0x12 ) ? 0x800000 : 0x80000; + size_t length = state.data_size; + const size_t max_length = ( type == 0x12 ) ? 0x800000 : 0x80000; if ( ( start + ( length - 4 ) ) > max_length ) { length = max_length - start + 4; } - sega_upload_program( emulatorCore, state.data, length ); + sega_upload_program( emulatorCore, state.data, (uint32_t)length ); free( state.data ); } @@ -697,13 +698,16 @@ struct gsf_sound_out : public GBASoundOut if ( psf_load( [currentUrl UTF8String], &source_callbacks, 0x22, gsf_loader, &state, 0, 0 ) <= 0 ) return NO; + if ( state.data_size > UINT_MAX ) + return NO; + GBASystem * system = new GBASystem; emulatorCore = ( uint8_t * ) system; system->cpuIsMultiBoot = ((state.entry >> 24) == 2); - CPULoadRom( system, state.data, state.data_size ); + CPULoadRom( system, state.data, (uint32_t)state.data_size ); free( state.data ); @@ -835,7 +839,7 @@ struct gsf_sound_out : public GBASoundOut if ( frames * 4 > sound_out->samples_written ) CPULoop( system, 250000 ); - UInt32 frames_rendered = sound_out->samples_written / 4; + unsigned long frames_rendered = sound_out->samples_written / 4; if ( frames_rendered >= frames ) { @@ -846,7 +850,7 @@ struct gsf_sound_out : public GBASoundOut else { memcpy( buf, sound_out->buffer, frames_rendered * 4 ); - frames = frames_rendered; + frames = (UInt32)frames_rendered; frames_rendered = 0; } sound_out->samples_written = frames_rendered; diff --git a/Plugins/M3u/M3uContainer.m b/Plugins/M3u/M3uContainer.m index cbf2b2f5c..40ba5758e 100644 --- a/Plugins/M3u/M3uContainer.m +++ b/Plugins/M3u/M3uContainer.m @@ -97,7 +97,7 @@ NSEnumerator *e = [[contents componentsSeparatedByString:@"\n"] objectEnumerator]; NSMutableArray *entries = [NSMutableArray array]; - while (entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]) + while ((entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]])) { if ([entry hasPrefix:@"#"] || [entry isEqualToString:@""]) //Ignore extra info continue; diff --git a/Plugins/MAD/MADDecoder.m b/Plugins/MAD/MADDecoder.m index c33b6222f..b532b257e 100644 --- a/Plugins/MAD/MADDecoder.m +++ b/Plugins/MAD/MADDecoder.m @@ -410,6 +410,7 @@ static inline signed long audio_linear_dither(unsigned int bits, mad_fixed_t sam * madplay - MPEG audio decoder and player * Copyright (C) 2000-2004 Robert Leslie */ +#if 0 static int32_t audio_linear_round(unsigned int bits, mad_fixed_t sample) @@ -431,6 +432,7 @@ audio_linear_round(unsigned int bits, /* quantize and scale */ return sample >> (MAD_F_FRACBITS + 1 - bits); } +#endif // End madplay code diff --git a/Plugins/Pls/PlsContainer.m b/Plugins/Pls/PlsContainer.m index c122adbaa..4469a0dc7 100644 --- a/Plugins/Pls/PlsContainer.m +++ b/Plugins/Pls/PlsContainer.m @@ -99,7 +99,7 @@ NSEnumerator *e = [[contents componentsSeparatedByString:@"\n"] objectEnumerator]; NSMutableArray *entries = [NSMutableArray array]; - while (entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]) + while ((entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]])) { NSScanner *scanner = [[NSScanner alloc] initWithString:entry]; NSString *lhs = nil; diff --git a/Plugins/Vorbis/VorbisDecoder.m b/Plugins/Vorbis/VorbisDecoder.m index 2138196a0..af36cbbe8 100644 --- a/Plugins/Vorbis/VorbisDecoder.m +++ b/Plugins/Vorbis/VorbisDecoder.m @@ -44,10 +44,10 @@ long sourceTell(void *datasource) source = [s retain]; ov_callbacks callbacks = { - read_func: sourceRead, - seek_func: sourceSeek, - close_func: sourceClose, - tell_func: sourceTell + .read_func = sourceRead, + .seek_func = sourceSeek, + .close_func = sourceClose, + .tell_func = sourceTell }; if (ov_open_callbacks(source, &vorbisRef, NULL, 0, callbacks) != 0) diff --git a/Plugins/WMA/WMA.xcodeproj/project.pbxproj b/Plugins/WMA/WMA.xcodeproj/project.pbxproj index c9096810b..cf379facb 100644 --- a/Plugins/WMA/WMA.xcodeproj/project.pbxproj +++ b/Plugins/WMA/WMA.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -185,9 +185,10 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { + LastUpgradeCheck = 0500; }; buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "WMA" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -251,6 +252,7 @@ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -280,6 +282,7 @@ 1DEB913C08733D840010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -303,6 +306,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = macosx; }; diff --git a/Plugins/WMA/WMADecoder.m b/Plugins/WMA/WMADecoder.m index 3d350b33b..56a592c32 100644 --- a/Plugins/WMA/WMADecoder.m +++ b/Plugins/WMA/WMADecoder.m @@ -104,9 +104,9 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) if ((entry = av_dict_get(metadata, "album", NULL, 0))) NSLog(@"Album: %s", entry->value); if ((entry = av_dict_get(metadata, "year", NULL, 0))) - NSLog(@"Year: %d", entry->value); + NSLog(@"Year: %s", entry->value); if ((entry = av_dict_get(metadata, "track", NULL, 0))) - NSLog(@"Track: %d", entry->value); + NSLog(@"Track: %s", entry->value); if ((entry = av_dict_get(metadata, "genre", NULL, 0))) NSLog(@"Genre: %s", entry->value); if ((entry = av_dict_get(metadata, "copyright", NULL, 0))) @@ -139,6 +139,9 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) case AV_SAMPLE_FMT_DBLP: bitsPerSample = 32; break; + + default: + return NO; } totalFrames = c->sample_rate * (ic->duration/1000000LL); frequency = c->sample_rate; @@ -160,8 +163,6 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) - (int)readAudio:(void *)buf frames:(UInt32)frames { - uint8_t *inbuf_ptr; - int size, out_size, len; AVPacket framePacket; int framesRead = 0; @@ -275,6 +276,8 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) } } break; + + default: break; } } } diff --git a/Preferences/General/English.lproj/Preferences.xib b/Preferences/General/English.lproj/Preferences.xib index 6e08fb61e..4a73ab9b6 100644 --- a/Preferences/General/English.lproj/Preferences.xib +++ b/Preferences/General/English.lproj/Preferences.xib @@ -176,7 +176,7 @@ - + @@ -187,8 +187,8 @@ - + @@ -230,7 +230,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -271,8 +271,8 @@ - + @@ -295,8 +295,8 @@ - +