Manually refactored cases the refactoring to Modern Objective-C was complaining about

//FREEBIE
pull/1/head
Craig Gidney 10 years ago committed by Frederic Jacobs
parent 1e9a3e9a46
commit 84eb87ac60

@ -255,7 +255,7 @@ static OSStatus playbackCallback(void *inRefCon,
if (availableByteCount < requestedByteCount) { if (availableByteCount < requestedByteCount) {
NSUInteger starveAmount = requestedByteCount - availableByteCount; NSUInteger starveAmount = requestedByteCount - availableByteCount;
[instance->starveLogger markOccurrence:[NSNumber numberWithDouble:starveAmount]]; [instance->starveLogger markOccurrence:@(starveAmount)];
} else { } else {
NSData* audioToCopyVolatile = [[instance playbackQueue] dequeuePotentialyVolatileDataWithLength:requestedByteCount]; NSData* audioToCopyVolatile = [[instance playbackQueue] dequeuePotentialyVolatileDataWithLength:requestedByteCount];
memcpy(ioData->mBuffers[0].mData, [audioToCopyVolatile bytes], [audioToCopyVolatile length]); memcpy(ioData->mBuffers[0].mData, [audioToCopyVolatile bytes], [audioToCopyVolatile length]);
@ -309,7 +309,7 @@ static OSStatus playbackCallback(void *inRefCon,
} else if (resultCode == errSecParam){ } else if (resultCode == errSecParam){
failure = @"oneOrMoreNonValidParameter"; failure = @"oneOrMoreNonValidParameter";
}else { }else {
failure = [[NSNumber numberWithInt:resultCode] description]; failure = [@(resultCode) description];
} }
[conditionLogger logError:[NSString stringWithFormat:@"StatusCheck failed: %@", failure]]; [conditionLogger logError:[NSString stringWithFormat:@"StatusCheck failed: %@", failure]];
} }

@ -34,7 +34,7 @@
return false; return false;
} }
[idsInJitterQueue addObject:[NSNumber numberWithUnsignedInt:sequenceNumber]]; [idsInJitterQueue addObject:@(sequenceNumber)];
[resultPriorityQueue enqueue:audioPacket]; [resultPriorityQueue enqueue:audioPacket];
if ([NumberUtil congruentDifferenceMod2ToThe16From:largestLatestEnqueued to:sequenceNumber] > 0) { if ([NumberUtil congruentDifferenceMod2ToThe16From:largestLatestEnqueued to:sequenceNumber] > 0) {
largestLatestEnqueued = sequenceNumber; largestLatestEnqueued = sequenceNumber;
@ -58,7 +58,7 @@
badArrivalType = JitterBadArrivalType_Stale; badArrivalType = JitterBadArrivalType_Stale;
} else if (sequenceNumberRelativeToReadHead > READ_HEAD_MAX_QUEUE_AHEAD) { } else if (sequenceNumberRelativeToReadHead > READ_HEAD_MAX_QUEUE_AHEAD) {
badArrivalType = JitterBadArrivalType_TooSoon; badArrivalType = JitterBadArrivalType_TooSoon;
} else if ([idsInJitterQueue containsObject:[NSNumber numberWithUnsignedInt:sequenceNumber]]) { } else if ([idsInJitterQueue containsObject:@(sequenceNumber)]) {
badArrivalType = JitterBadArrivalType_Duplicate; badArrivalType = JitterBadArrivalType_Duplicate;
} else { } else {
return true; return true;
@ -100,7 +100,7 @@
EncodedAudioPacket* discarded = [resultPriorityQueue dequeue]; EncodedAudioPacket* discarded = [resultPriorityQueue dequeue];
uint16_t discardedSequenceNumber = [discarded sequenceNumber]; uint16_t discardedSequenceNumber = [discarded sequenceNumber];
[idsInJitterQueue removeObject:[NSNumber numberWithUnsignedInt:discardedSequenceNumber]]; [idsInJitterQueue removeObject:@(discardedSequenceNumber)];
uint16_t oldReadHeadMax = readHeadMin+readHeadSpan-1; uint16_t oldReadHeadMax = readHeadMin+readHeadSpan-1;
readHeadMin = [[resultPriorityQueue peek] sequenceNumber]; readHeadMin = [[resultPriorityQueue peek] sequenceNumber];
@ -124,7 +124,7 @@
EncodedAudioPacket* result = [resultPriorityQueue dequeue]; EncodedAudioPacket* result = [resultPriorityQueue dequeue];
readHeadMin = [result sequenceNumber]+1; readHeadMin = [result sequenceNumber]+1;
readHeadSpan = 1; readHeadSpan = 1;
[idsInJitterQueue removeObject:[NSNumber numberWithUnsignedInt:[result sequenceNumber]]]; [idsInJitterQueue removeObject:@([result sequenceNumber])];
for (id<JitterQueueNotificationReceiver> e in watchers) { for (id<JitterQueueNotificationReceiver> e in watchers) {
[e notifyDequeue:[result sequenceNumber] withRemainingEnqueuedItemCount:[idsInJitterQueue count]]; [e notifyDequeue:[result sequenceNumber] withRemainingEnqueuedItemCount:[idsInJitterQueue count]];

@ -36,7 +36,7 @@ NSString *const CALL_TYPE_IMAGE_NAME_OUTGOING = @"outgoing_call_icon";
#pragma mark - Serialization #pragma mark - Serialization
- (void)encodeWithCoder:(NSCoder *)encoder { - (void)encodeWithCoder:(NSCoder *)encoder {
[encoder encodeObject:[NSNumber numberWithInt:callType] forKey:DEFAULTS_KEY_CALL_TYPE]; [encoder encodeObject:@(callType) forKey:DEFAULTS_KEY_CALL_TYPE];
[encoder encodeObject:phoneNumber forKey:DEFAULTS_KEY_PHONE_NUMBER]; [encoder encodeObject:phoneNumber forKey:DEFAULTS_KEY_PHONE_NUMBER];
[encoder encodeObject:@((int)contactRecordID) forKey:DEFAULTS_KEY_CONTACT_ID]; [encoder encodeObject:@((int)contactRecordID) forKey:DEFAULTS_KEY_CONTACT_ID];
[encoder encodeObject:date forKey:DEFAULTS_KEY_DATE]; [encoder encodeObject:date forKey:DEFAULTS_KEY_DATE];

@ -161,7 +161,7 @@ andSynchronizationSourceIdentifier:(uint32_t)synchronizedSourceIdentifier
NSMutableArray* contributingSources = [NSMutableArray array]; NSMutableArray* contributingSources = [NSMutableArray array];
for (NSUInteger i = 0; i < contributingSourceCount; i++) { for (NSUInteger i = 0; i < contributingSourceCount; i++) {
uint32_t ccsrc = [packetData bigEndianUInt32At:*offset]; uint32_t ccsrc = [packetData bigEndianUInt32At:*offset];
[contributingSources addObject:[NSNumber numberWithUnsignedLong:ccsrc]]; [contributingSources addObject:@(ccsrc)];
*offset += CONTRIBUTING_SOURCE_ID_LENGTH; *offset += CONTRIBUTING_SOURCE_ID_LENGTH;
} }

@ -205,11 +205,11 @@
uint8_t authIdsCount = [flags lowUint4AtByteOffset:AUTH_ID_AND_CIPHER_ID_FLAG_INDEX]; uint8_t authIdsCount = [flags lowUint4AtByteOffset:AUTH_ID_AND_CIPHER_ID_FLAG_INDEX];
uint8_t agreeIdsCount = [flags highUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX]; uint8_t agreeIdsCount = [flags highUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX];
uint8_t sasIdsCount = [flags lowUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX]; uint8_t sasIdsCount = [flags lowUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX];
NSArray* counts = @[[NSNumber numberWithUnsignedInteger:hashIdsCount], NSArray* counts = @[@(hashIdsCount),
[NSNumber numberWithUnsignedInteger:cipherIdsCount], @(cipherIdsCount),
[NSNumber numberWithUnsignedInteger:authIdsCount], @(authIdsCount),
[NSNumber numberWithUnsignedInteger:agreeIdsCount], @(agreeIdsCount),
[NSNumber numberWithUnsignedInteger:sasIdsCount]]; @(sasIdsCount)];
NSArray* specIds = [HelloPacket getSpecIdsFromPayload:payload counts:counts]; NSArray* specIds = [HelloPacket getSpecIdsFromPayload:payload counts:counts];
hashIds = specIds[HASH_IDS_INDEX]; hashIds = specIds[HASH_IDS_INDEX];

Loading…
Cancel
Save