Use NSNumber Literals as much as possible

Replaced a bunch of [NSNumber numberWith...] with NSNumber Literals.

Signed-off-by: Christopher Snowhill <[email protected]>

Application/AppController.m

@@ -187,7 +187,7 @@ - (void)awakeFromNib {
 		int lastIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"lastTrackPlaying"];
 
 		if(lastStatus != CogStatusStopped && lastIndex >= 0) {
-			[playbackController playEntryAtIndex:lastIndex startPaused:(lastStatus == CogStatusPaused) andSeekTo:[NSNumber numberWithDouble:[[NSUserDefaults standardUserDefaults] floatForKey:@"lastTrackPosition"]]];
+			[playbackController playEntryAtIndex:lastIndex startPaused:(lastStatus == CogStatusPaused) andSeekTo:@([[NSUserDefaults standardUserDefaults] doubleForKey:@"lastTrackPosition"])];
 		}
 	}
 
@@ -495,7 +495,7 @@ - (void)initDefaults {
 
 	// Font defaults
 	float fFontSize = [NSFont systemFontSizeForControlSize:NSControlSizeSmall];
-	NSNumber *fontSize = [NSNumber numberWithFloat:fFontSize];
+	NSNumber *fontSize = @(fFontSize);
 	[userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"];
 
 	NSString *feedURLdefault = @"https://cogcdn.cog.losno.co/mercury.xml";
@@ -508,20 +508,20 @@ - (void)initDefaults {
 
 	[userDefaultsValuesDict setObject:@"cubic" forKey:@"resampling"];
 
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInteger:CogStatusStopped] forKey:@"lastPlaybackStatus"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInteger:-1] forKey:@"lastTrackPlaying"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithDouble:0] forKey:@"lastTrackPosition"];
+	[userDefaultsValuesDict setObject:@(CogStatusStopped) forKey:@"lastPlaybackStatus"];
+	[userDefaultsValuesDict setObject:@(-1) forKey:@"lastTrackPlaying"];
+	[userDefaultsValuesDict setObject:@(0.0) forKey:@"lastTrackPosition"];
 
 	[userDefaultsValuesDict setObject:@"dls appl" forKey:@"midiPlugin"];
 
 	[userDefaultsValuesDict setObject:@"default" forKey:@"midi.flavor"];
 
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:NO] forKey:@"resumePlaybackOnStartup"];
+	[userDefaultsValuesDict setObject:@(NO) forKey:@"resumePlaybackOnStartup"];
 
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:NO] forKey:@"quitOnNaturalStop"];
+	[userDefaultsValuesDict setObject:@(NO) forKey:@"quitOnNaturalStop"];
 
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:NO] forKey:@"spectrumFreqMode"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"spectrumProjectionMode"];
+	[userDefaultsValuesDict setObject:@(NO) forKey:@"spectrumFreqMode"];
+	[userDefaultsValuesDict setObject:@(YES) forKey:@"spectrumProjectionMode"];
 
 	NSValueTransformer *colorToValueTransformer = [NSValueTransformer valueTransformerForName:@"ColorToValueTransformer"];
 
@@ -616,7 +616,7 @@ - (void)clickSeek:(NSTimeInterval)position {
 - (void)changeFontSize:(float)size {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	float fCurrentSize = [defaults floatForKey:@"fontSize"];
-	NSNumber *newSize = [NSNumber numberWithFloat:(fCurrentSize + size)];
+	NSNumber *newSize = @(fCurrentSize + size);
 	[defaults setObject:newSize forKey:@"fontSize"];
 }
 

Application/DockIconController.m

@@ -59,7 +59,7 @@ - (void)refreshDockIcon:(NSInteger)playbackStatus withProgress:(double)progressS
 	else {
 		if(progressStatus < 0 && [lastProgressStatus doubleValue] >= 0)
 			removeProgress = YES;
-		lastProgressStatus = [NSNumber numberWithDouble:progressStatus];
+		lastProgressStatus = @(progressStatus);
 	}
 
 	BOOL displayProgress = (progressStatus >= 0.0);
@@ -197,7 +197,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 - (void)awakeFromNib {
 	dockImage = [[NSImage imageNamed:@"Plaque"] copy];
 	lastColorfulStatus = -1;
-	lastProgressStatus = [NSNumber numberWithDouble:-1];
+	lastProgressStatus = @(-1.0);
 	imageView = nil;
 	progressIndicator = nil;
 	[self startObserving];

Application/PlaybackController.m

@@ -57,12 +57,12 @@ - (id)init {
 }
 
 - (void)initDefaults {
-	NSDictionary *defaultsDictionary = @{ @"volume": [NSNumber numberWithDouble:75.0],
-		                                  @"GraphicEQenable": [NSNumber numberWithBool:NO],
-		                                  @"GraphicEQpreset": [NSNumber numberWithInt:-1],
-		                                  @"GraphicEQtrackgenre": [NSNumber numberWithBool:NO],
-		                                  @"volumeLimit": [NSNumber numberWithBool:YES],
-		                                  @"headphoneVirtualization": [NSNumber numberWithBool:NO] };
+	NSDictionary *defaultsDictionary = @{ @"volume": @(75.0),
+		                                  @"GraphicEQenable": @(NO),
+		                                  @"GraphicEQpreset": @(-1),
+		                                  @"GraphicEQtrackgenre": @(NO),
+		                                  @"volumeLimit": @(YES),
+		                                  @"headphoneVirtualization": @(NO) };
 
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
 }
@@ -125,13 +125,13 @@ - (IBAction)stop:(id)sender {
 
 // called by double-clicking on table
 - (void)playEntryAtIndex:(NSInteger)i {
-	[self playEntryAtIndex:i startPaused:NO andSeekTo:[NSNumber numberWithDouble:0.0]];
+	[self playEntryAtIndex:i startPaused:NO andSeekTo:@(0.0)];
 }
 
 - (void)playEntryAtIndex:(NSInteger)i startPaused:(BOOL)paused {
 	PlaylistEntry *pe = [playlistController entryAtIndex:i];
 
-	[self playEntry:pe startPaused:paused andSeekTo:[NSNumber numberWithDouble:0.0]];
+	[self playEntry:pe startPaused:paused andSeekTo:@(0.0)];
 }
 
 - (void)playEntryAtIndex:(NSInteger)i startPaused:(BOOL)paused andSeekTo:(id)offset {
@@ -161,24 +161,24 @@ - (IBAction)play:(id)sender {
 NSDictionary *makeRGInfo(PlaylistEntry *pe) {
 	NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
 	if(pe.replayGainAlbumGain != 0)
-		[dictionary setObject:[NSNumber numberWithFloat:pe.replayGainAlbumGain] forKey:@"replayGainAlbumGain"];
+		[dictionary setObject:@(pe.replayGainAlbumGain) forKey:@"replayGainAlbumGain"];
 	if(pe.replayGainAlbumPeak != 0)
-		[dictionary setObject:[NSNumber numberWithFloat:pe.replayGainAlbumPeak] forKey:@"replayGainAlbumPeak"];
+		[dictionary setObject:@(pe.replayGainAlbumPeak) forKey:@"replayGainAlbumPeak"];
 	if(pe.replayGainTrackGain != 0)
-		[dictionary setObject:[NSNumber numberWithFloat:pe.replayGainTrackGain] forKey:@"replayGainTrackGain"];
+		[dictionary setObject:@(pe.replayGainTrackGain) forKey:@"replayGainTrackGain"];
 	if(pe.replayGainTrackPeak != 0)
-		[dictionary setObject:[NSNumber numberWithFloat:pe.replayGainTrackPeak] forKey:@"replayGainTrackPeak"];
+		[dictionary setObject:@(pe.replayGainTrackPeak) forKey:@"replayGainTrackPeak"];
 	if(pe.volume != 1)
-		[dictionary setObject:[NSNumber numberWithFloat:pe.volume] forKey:@"volume"];
+		[dictionary setObject:@(pe.volume) forKey:@"volume"];
 	return dictionary;
 }
 
 - (void)playEntry:(PlaylistEntry *)pe {
-	[self playEntry:pe startPaused:NO andSeekTo:[NSNumber numberWithDouble:0.0]];
+	[self playEntry:pe startPaused:NO andSeekTo:@(0.0)];
 }
 
 - (void)playEntry:(PlaylistEntry *)pe startPaused:(BOOL)paused {
-	[self playEntry:pe startPaused:paused andSeekTo:[NSNumber numberWithDouble:0.0]];
+	[self playEntry:pe startPaused:paused andSeekTo:@(0.0)];
 }
 
 - (void)playEntry:(PlaylistEntry *)pe startPaused:(BOOL)paused andSeekTo:(id)offset {
@@ -398,7 +398,7 @@ - (IBAction)fade:(id)sender {
 		return;
 	fading = YES;
 
-	NSNumber *originalVolume = [NSNumber numberWithDouble:[audioPlayer volume]];
+	NSNumber *originalVolume = @([audioPlayer volume]);
 	NSTimer *fadeTimer;
 
 	if(playbackStatus == CogStatusPlaying) {
@@ -771,9 +771,9 @@ - (void)sendMetaData {
 			NSDate *releaseYear = [calendar dateWithEra:1 year:entry.year month:0 day:0 hour:0 minute:0 second:0 nanosecond:0];
 			[songInfo setObject:releaseYear forKey:MPMediaItemPropertyReleaseDate];
 		}
-		[songInfo setObject:[NSNumber numberWithFloat:[entry currentPosition]] forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
+		[songInfo setObject:@([entry currentPosition]) forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
 		[songInfo setObject:[entry length] forKey:MPMediaItemPropertyPlaybackDuration];
-		[songInfo setObject:[NSNumber numberWithFloat:[entry index]] forKey:MPMediaItemPropertyPersistentID];
+		[songInfo setObject:@([entry index]) forKey:MPMediaItemPropertyPersistentID];
 	}
 
 	switch(playbackStatus) {

Application/PlaybackEventController.m

@@ -124,7 +124,7 @@ - (NSDictionary *)fillNotificationDictionary:(PlaylistEntry *)pe status:(TrackSt
 	if(pe.track)
 		[dict setObject:pe.trackText forKey:TrackNumber];
 	if(pe.length)
-		[dict setObject:[NSNumber numberWithInteger:(NSInteger)([pe.length doubleValue] * 1000.0)]
+		[dict setObject:@((NSInteger)([pe.length doubleValue] * 1000.0))
 		         forKey:TrackLength];
 
 	NSString *state = nil;

Application/ScriptAdditions.m

@@ -12,22 +12,22 @@
 @implementation NSApplication (APLApplicationExtensions)
 - (id)playbackStart:(NSScriptCommand *)command {
 	[(AppController *)[NSApp delegate] clickPlay];
-	return [NSNumber numberWithBool:YES];
+	return @(YES);
 }
 - (id)playbackPause:(NSScriptCommand *)command {
 	[(AppController *)[NSApp delegate] clickPause];
-	return [NSNumber numberWithBool:YES];
+	return @(YES);
 }
 - (id)playbackStop:(NSScriptCommand *)command {
 	[(AppController *)[NSApp delegate] clickStop];
-	return [NSNumber numberWithBool:YES];
+	return @(YES);
 }
 - (id)playbackPrevious:(NSScriptCommand *)command {
 	[(AppController *)[NSApp delegate] clickPrev];
-	return [NSNumber numberWithBool:YES];
+	return @(YES);
 }
 - (id)playbackNext:(NSScriptCommand *)command {
 	[(AppController *)[NSApp delegate] clickNext];
-	return [NSNumber numberWithBool:YES];
+	return @(YES);
 }
 @end

Audio/AudioPlayer.m

@@ -486,15 +486,15 @@ - (void)sendDelegateMethod:(SEL)selector withObject:(id)obj withObject:(id)obj2
 - (void)setPlaybackStatus:(int)status waitUntilDone:(BOOL)wait {
 	currentPlaybackStatus = status;
 
-	[self sendDelegateMethod:@selector(audioPlayer:didChangeStatus:userInfo:) withObject:[NSNumber numberWithInt:status] withObject:[bufferChain userInfo] waitUntilDone:wait];
+	[self sendDelegateMethod:@selector(audioPlayer:didChangeStatus:userInfo:) withObject:@(status) withObject:[bufferChain userInfo] waitUntilDone:wait];
 }
 
 - (void)sustainHDCD {
 	[self sendDelegateMethod:@selector(audioPlayer:sustainHDCD:) withObject:[bufferChain userInfo] waitUntilDone:NO];
 }
 
 - (void)setError:(BOOL)status {
-	[self sendDelegateMethod:@selector(audioPlayer:setError:toTrack:) withObject:[NSNumber numberWithBool:status] withObject:[bufferChain userInfo] waitUntilDone:NO];
+	[self sendDelegateMethod:@selector(audioPlayer:setError:toTrack:) withObject:@(status) withObject:[bufferChain userInfo] waitUntilDone:NO];
 }
 
 - (void)setPlaybackStatus:(int)status {

Audio/Output/OutputCoreAudio.m

@@ -344,7 +344,7 @@ - (void)threadEntry:(id)arg {
 					stopNext = YES;
 					break;
 				}
-				[delayedEvents addObject:[NSNumber numberWithDouble:secondsBuffered]];
+				[delayedEvents addObject:@(secondsBuffered)];
 				delayedEventsPopped = NO;
 				if(!started) {
 					started = YES;

Equalizer/EqualizerWindowController.m

@@ -183,7 +183,7 @@ static void loadPresets() {
 									} else if(object_entry[j].value->type == json_integer) {
 										int64_t value = object_entry[j].value->u.integer;
 										float floatValue = ((value <= 401 && value >= 1) ? ((float)(value - 201) / 10.0) : 0.0);
-										[equalizerItem setObject:[NSNumber numberWithFloat:floatValue] forKey:key];
+										[equalizerItem setObject:@(floatValue) forKey:key];
 										++requiredItemsPresent;
 									}
 								} else if([key isEqualToString:cog_equalizer_extra_genres]) {

Formatters/SecondsFormatter.m

@@ -83,7 +83,7 @@ - (BOOL)getObjectValue:(id *)object forString:(NSString *)string errorDescriptio
 	}
 
 	if(result && NULL != object) {
-		*object = [NSNumber numberWithUnsignedInt:seconds];
+		*object = @(seconds);
 	} else if(NULL != error) {
 		*error = @"Couldn't convert value to seconds";
 	}

Playlist/PlaylistEntry.m

@@ -213,7 +213,7 @@ - (NSString *)spam {
 		SecondsFormatter *secondsFormatter = [[SecondsFormatter alloc] init];
 		[elements addObject:@" ("];
 		if(hasCurrentPosition) {
-			[elements addObject:[secondsFormatter stringForObjectValue:[NSNumber numberWithDouble:self.currentPosition]]];
+			[elements addObject:[secondsFormatter stringForObjectValue:@(self.currentPosition)]];
 		}
 		if(hasLength) {
 			if(hasCurrentPosition) {
@@ -301,7 +301,7 @@ - (NSString *)gainInfo {
 @dynamic positionText;
 - (NSString *)positionText {
 	SecondsFormatter *secondsFormatter = [[SecondsFormatter alloc] init];
-	NSString *time = [secondsFormatter stringForObjectValue:[NSNumber numberWithDouble:self.currentPosition]];
+	NSString *time = [secondsFormatter stringForObjectValue:@(self.currentPosition)];
 	return time;
 }
 
@@ -365,7 +365,7 @@ - (void)setAlbumArtInternal:(NSData *)albumArtInternal {
 
 @dynamic length;
 - (NSNumber *)length {
-	return [NSNumber numberWithDouble:(self.metadataLoaded) ? ((double)self.totalFrames / self.sampleRate) : 0.0];
+	return (self.metadataLoaded) ? @(((double)self.totalFrames / self.sampleRate)) : @(0.0);
 }
 
 NSURL *_Nullable urlForPath(NSString *_Nullable path) {

Playlist/PlaylistLoader.m

@@ -56,7 +56,7 @@ - (id)init {
 }
 
 - (void)initDefaults {
-	NSDictionary *defaultsDictionary = @{@"readCueSheetsInFolders": [NSNumber numberWithBool:YES]};
+	NSDictionary *defaultsDictionary = @{ @"readCueSheetsInFolders": @(YES) };
 
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
 }
@@ -217,7 +217,7 @@ - (BOOL)saveXml:(NSString *)filename {
 	NSMutableArray *queueList = [[NSMutableArray alloc] init];
 
 	for(PlaylistEntry *pe in [playlistController queueList]) {
-		[queueList addObject:[NSNumber numberWithInteger:pe.index]];
+		[queueList addObject:@(pe.index)];
 	}
 
 	NSDictionary *dictionary = @{@"albumArt": albumArtSet, @"queue": queueList, @"items": topLevel};

Plugins/APL/APLDecoder.m

@@ -27,7 +27,7 @@ - (NSDictionary *)properties {
 	NSMutableDictionary *properties = [[decoder properties] mutableCopy];
 
 	// Need to alter length
-	[properties setObject:[NSNumber numberWithLong:trackLength] forKey:@"totalFrames"];
+	[properties setObject:@(trackLength) forKey:@"totalFrames"];
 	return [NSDictionary dictionaryWithDictionary:properties];
 }
 

Plugins/AdPlug/AdPlug/AdPlugDecoder.mm

@@ -80,16 +80,16 @@ - (BOOL)open:(id<CogSource>)s {
 }
 
 - (NSDictionary *)properties {
-	return @{@"bitrate": [NSNumber numberWithInt:0],
-			 @"sampleRate": [NSNumber numberWithFloat:44100],
-			 @"totalFrames": [NSNumber numberWithDouble:length],
-			 @"bitsPerSample": [NSNumber numberWithInt:16], // Samples are short
-			 @"floatingPoint": [NSNumber numberWithBool:NO],
-			 @"channels": [NSNumber numberWithInt:2], // output from gme_play is in stereo
-			 @"seekable": [NSNumber numberWithBool:YES],
-			 @"codec": [NSString stringWithUTF8String:m_player->gettype().c_str()],
-			 @"encoding": @"synthesized",
-			 @"endian": @"host"};
+	return @{ @"bitrate": @(0),
+		      @"sampleRate": @(44100.0),
+		      @"totalFrames": @(length),
+		      @"bitsPerSample": @(16), // Samples are short
+		      @"floatingPoint": @(NO),
+		      @"channels": @(2), // output from gme_play is in stereo
+		      @"seekable": @(YES),
+		      @"codec": guess_encoding_of_string(m_player->gettype().c_str()),
+		      @"encoding": @"synthesized",
+		      @"endian": @"host" };
 }
 
 - (NSDictionary *)metadata {

Plugins/CoreAudio/CoreAudioDecoder.m

@@ -389,17 +389,17 @@ + (NSArray *)fileTypeAssociations {
 }
 
 - (NSDictionary *)properties {
-	return @{@"channels": [NSNumber numberWithInt:channels],
-			 @"channelConfig": [NSNumber numberWithUnsignedInt:channelConfig],
-			 @"bitsPerSample": [NSNumber numberWithInt:bitsPerSample],
-			 @"floatingPoint": [NSNumber numberWithBool:floatingPoint],
-			 @"bitrate": [NSNumber numberWithInt:bitrate],
-			 @"sampleRate": [NSNumber numberWithFloat:frequency],
-			 @"totalFrames": [NSNumber numberWithLong:totalFrames],
-			 @"seekable": [NSNumber numberWithBool:YES],
-			 @"codec": codec,
-			 @"endian": floatingPoint ? @"host" : @"big",
-			 @"encoding": _audioFile_is_lossy ? @"lossy" : @"lossless"};
+	return @{ @"channels": @(channels),
+		      @"channelConfig": @(channelConfig),
+		      @"bitsPerSample": @(bitsPerSample),
+		      @"floatingPoint": @(floatingPoint),
+		      @"bitrate": @(bitrate),
+		      @"sampleRate": @(frequency),
+		      @"totalFrames": @(totalFrames),
+		      @"seekable": @(YES),
+		      @"codec": codec,
+		      @"endian": floatingPoint ? @"host" : @"big",
+		      @"encoding": _audioFile_is_lossy ? @"lossy" : @"lossless" };
 }
 
 - (NSDictionary *)metadata {

Plugins/CueSheet/CueSheetDecoder.m

@@ -43,7 +43,7 @@ - (NSDictionary *)properties {
 
 	// Need to alter length
 	if(!noFragment)
-		[properties setObject:[NSNumber numberWithLong:(trackEnd - trackStart)] forKey:@"totalFrames"];
+		[properties setObject:@(trackEnd - trackStart) forKey:@"totalFrames"];
 
 	return [NSDictionary dictionaryWithDictionary:properties];
 }

Plugins/CueSheet/CueSheetMetadataReader.m

@@ -82,13 +82,13 @@ + (NSDictionary *)processDataForTrack:(CueSheetTrack *)track {
 	if([track artist]) [cuesheetMetadata setValue:[track artist] forKey:@"artist"];
 	if([track album]) [cuesheetMetadata setValue:[track album] forKey:@"album"];
 	if([track title]) [cuesheetMetadata setValue:[track title] forKey:@"title"];
-	if([[track track] intValue]) [cuesheetMetadata setValue:[NSNumber numberWithInt:[[track track] intValue]] forKey:@"track"];
+	if([[track track] intValue]) [cuesheetMetadata setValue:@([[track track] intValue]) forKey:@"track"];
 	if([track genre]) [cuesheetMetadata setValue:[track genre] forKey:@"genre"];
-	if([[track year] intValue]) [cuesheetMetadata setValue:[NSNumber numberWithInt:[[track year] intValue]] forKey:@"year"];
-	if([track albumGain]) [cuesheetMetadata setValue:[NSNumber numberWithFloat:[track albumGain]] forKey:@"replayGainAlbumGain"];
-	if([track albumPeak]) [cuesheetMetadata setValue:[NSNumber numberWithFloat:[track albumPeak]] forKey:@"replayGainAlbumPeak"];
-	if([track trackGain]) [cuesheetMetadata setValue:[NSNumber numberWithFloat:[track trackGain]] forKey:@"replayGainTrackGain"];
-	if([track trackPeak]) [cuesheetMetadata setValue:[NSNumber numberWithFloat:[track trackPeak]] forKey:@"replayGainTrackPeak"];
+	if([[track year] intValue]) [cuesheetMetadata setValue:@([[track year] intValue]) forKey:@"year"];
+	if([track albumGain]) [cuesheetMetadata setValue:@([track albumGain]) forKey:@"replayGainAlbumGain"];
+	if([track albumPeak]) [cuesheetMetadata setValue:@([track albumPeak]) forKey:@"replayGainAlbumPeak"];
+	if([track trackGain]) [cuesheetMetadata setValue:@([track trackGain]) forKey:@"replayGainTrackGain"];
+	if([track trackPeak]) [cuesheetMetadata setValue:@([track trackPeak]) forKey:@"replayGainTrackPeak"];
 
 	return [NSDictionary dictionaryWithDictionary:cuesheetMetadata];
 }