From 6ef69bacf0a5b1f6e5b27c71c535911f7e4e92c2 Mon Sep 17 00:00:00 2001 From: Kipp Hickman Date: Fri, 18 Dec 2015 13:54:51 -0800 Subject: [PATCH] Changed init methods to return instancetype instead of id. Using instancetype allows the compiler to perform more error checking. This article provides an in-depth explanation: http://nshipster.com/instancetype/. --- StreamingKit/StreamingKit/STKAudioPlayer.h | 4 ++-- StreamingKit/StreamingKit/STKAudioPlayer.m | 6 +++--- .../StreamingKit/STKAutoRecoveringHTTPDataSource.h | 2 +- .../StreamingKit/STKAutoRecoveringHTTPDataSource.m | 6 +++--- StreamingKit/StreamingKit/STKDataSourceWrapper.h | 2 +- StreamingKit/StreamingKit/STKDataSourceWrapper.m | 2 +- StreamingKit/StreamingKit/STKHTTPDataSource.h | 10 +++++----- StreamingKit/StreamingKit/STKHTTPDataSource.m | 8 ++++---- StreamingKit/StreamingKit/STKLocalFileDataSource.h | 2 +- StreamingKit/StreamingKit/STKLocalFileDataSource.m | 2 +- StreamingKit/StreamingKit/STKQueueEntry.h | 2 +- StreamingKit/StreamingKit/STKQueueEntry.m | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h index 5c268ef..c6d429c 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.h +++ b/StreamingKit/StreamingKit/STKAudioPlayer.h @@ -174,10 +174,10 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn +(STKDataSource*) dataSourceFromURL:(NSURL*)url; /// Initializes a new STKAudioPlayer with the default options --(id) init; +-(instancetype) init; /// Initializes a new STKAudioPlayer with the given options --(id) initWithOptions:(STKAudioPlayerOptions)optionsIn; +-(instancetype) initWithOptions:(STKAudioPlayerOptions)optionsIn; /// Plays an item from the given URL string (all pending queued items are removed). /// The NSString is used as the queue item ID diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index 0dac272..2ed83c8 100755 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -173,7 +173,7 @@ STKAudioPlayerInternalState; @end @implementation STKFrameFilterEntry --(id) initWithFilter:(STKFrameFilter)filterIn andName:(NSString*)nameIn +-(instancetype) initWithFilter:(STKFrameFilter)filterIn andName:(NSString*)nameIn { if (self = [super init]) { @@ -504,12 +504,12 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn } } --(id) init +-(instancetype) init { return [self initWithOptions:(STKAudioPlayerOptions){}]; } --(id) initWithOptions:(STKAudioPlayerOptions)optionsIn +-(instancetype) initWithOptions:(STKAudioPlayerOptions)optionsIn { if (self = [super init]) { diff --git a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h index c55895f..f9813ba 100644 --- a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h +++ b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h @@ -45,7 +45,7 @@ STKAutoRecoveringHTTPDataSourceOptions; @interface STKAutoRecoveringHTTPDataSource : STKDataSourceWrapper --(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource; +-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource; @property (readonly) STKHTTPDataSource* innerDataSource; diff --git a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m index 445d44d..8dfe3a8 100644 --- a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m +++ b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m @@ -108,17 +108,17 @@ static void PopulateOptionsWithDefault(STKAutoRecoveringHTTPDataSourceOptions* o return (STKHTTPDataSource*)self.innerDataSource; } --(id) initWithDataSource:(STKDataSource *)innerDataSource +-(instancetype) initWithDataSource:(STKDataSource *)innerDataSource { return [self initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource]; } --(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn +-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn { return [self initWithHTTPDataSource:innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions){}]; } --(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions)optionsIn +-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions)optionsIn { if (self = [super initWithDataSource:innerDataSourceIn]) { diff --git a/StreamingKit/StreamingKit/STKDataSourceWrapper.h b/StreamingKit/StreamingKit/STKDataSourceWrapper.h index 4d3e035..d91e9e5 100644 --- a/StreamingKit/StreamingKit/STKDataSourceWrapper.h +++ b/StreamingKit/StreamingKit/STKDataSourceWrapper.h @@ -36,7 +36,7 @@ @interface STKDataSourceWrapper : STKDataSource --(id) initWithDataSource:(STKDataSource*)innerDataSource; +-(instancetype) initWithDataSource:(STKDataSource*)innerDataSource; @property (readonly) STKDataSource* innerDataSource; diff --git a/StreamingKit/StreamingKit/STKDataSourceWrapper.m b/StreamingKit/StreamingKit/STKDataSourceWrapper.m index 76e1634..c75a499 100644 --- a/StreamingKit/StreamingKit/STKDataSourceWrapper.m +++ b/StreamingKit/StreamingKit/STKDataSourceWrapper.m @@ -40,7 +40,7 @@ @implementation STKDataSourceWrapper --(id) initWithDataSource:(STKDataSource*)innerDataSourceIn +-(instancetype) initWithDataSource:(STKDataSource*)innerDataSourceIn { if (self = [super init]) { diff --git a/StreamingKit/StreamingKit/STKHTTPDataSource.h b/StreamingKit/StreamingKit/STKHTTPDataSource.h index 9bf7002..d1cc366 100644 --- a/StreamingKit/StreamingKit/STKHTTPDataSource.h +++ b/StreamingKit/StreamingKit/STKHTTPDataSource.h @@ -46,11 +46,11 @@ typedef void(^STKAsyncURLProvider)(STKHTTPDataSource* dataSource, BOOL forSeek, @property (readonly) UInt32 httpStatusCode; +(AudioFileTypeID) audioFileTypeHintFromMimeType:(NSString*)fileExtension; --(id) initWithURL:(NSURL*)url; --(id) initWithURL:(NSURL *)url httpRequestHeaders:(NSDictionary *)httpRequestHeaders; --(id) initWithURLProvider:(STKURLProvider)urlProvider; --(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider; --(NSRunLoop*) eventsRunLoop; +-(instancetype) initWithURL:(NSURL*)url; +-(instancetype) initWithURL:(NSURL*)url httpRequestHeaders:(NSDictionary*)httpRequestHeaders; +-(instancetype) initWithURLProvider:(STKURLProvider)urlProvider; +-(instancetype) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider; +-(nullable NSRunLoop*) eventsRunLoop; -(void) reconnect; @end diff --git a/StreamingKit/StreamingKit/STKHTTPDataSource.m b/StreamingKit/StreamingKit/STKHTTPDataSource.m index bd66ab5..47d4a48 100755 --- a/StreamingKit/StreamingKit/STKHTTPDataSource.m +++ b/StreamingKit/StreamingKit/STKHTTPDataSource.m @@ -64,19 +64,19 @@ @implementation STKHTTPDataSource --(id) initWithURL:(NSURL*)urlIn +-(instancetype) initWithURL:(NSURL*)urlIn { return [self initWithURLProvider:^NSURL* { return urlIn; }]; } --(id) initWithURL:(NSURL *)urlIn httpRequestHeaders:(NSDictionary *)httpRequestHeaders +-(instancetype) initWithURL:(NSURL *)urlIn httpRequestHeaders:(NSDictionary *)httpRequestHeaders { self = [self initWithURLProvider:^NSURL* { return urlIn; }]; self->requestHeaders = httpRequestHeaders; return self; } --(id) initWithURLProvider:(STKURLProvider)urlProviderIn +-(instancetype) initWithURLProvider:(STKURLProvider)urlProviderIn { urlProviderIn = [urlProviderIn copy]; @@ -86,7 +86,7 @@ }]; } --(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProviderIn +-(instancetype) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProviderIn { if (self = [super init]) { diff --git a/StreamingKit/StreamingKit/STKLocalFileDataSource.h b/StreamingKit/StreamingKit/STKLocalFileDataSource.h index 2a5f571..ee918c7 100644 --- a/StreamingKit/StreamingKit/STKLocalFileDataSource.h +++ b/StreamingKit/StreamingKit/STKLocalFileDataSource.h @@ -38,6 +38,6 @@ +(AudioFileTypeID) audioFileTypeHintFromFileExtension:(NSString*)fileExtension; @property (readonly, copy) NSString* filePath; --(id) initWithFilePath:(NSString*)filePath; +-(instancetype) initWithFilePath:(NSString*)filePath; @end diff --git a/StreamingKit/StreamingKit/STKLocalFileDataSource.m b/StreamingKit/StreamingKit/STKLocalFileDataSource.m index 2aded28..afdd2fd 100644 --- a/StreamingKit/StreamingKit/STKLocalFileDataSource.m +++ b/StreamingKit/StreamingKit/STKLocalFileDataSource.m @@ -47,7 +47,7 @@ @implementation STKLocalFileDataSource @synthesize filePath; --(id) initWithFilePath:(NSString*)filePathIn +-(instancetype) initWithFilePath:(NSString*)filePathIn { if (self = [super init]) { diff --git a/StreamingKit/StreamingKit/STKQueueEntry.h b/StreamingKit/StreamingKit/STKQueueEntry.h index 3ae6f6a..a5fa781 100755 --- a/StreamingKit/StreamingKit/STKQueueEntry.h +++ b/StreamingKit/StreamingKit/STKQueueEntry.h @@ -35,7 +35,7 @@ @property (readwrite, retain) NSObject* queueItemId; @property (readwrite, retain) STKDataSource* dataSource; --(id) initWithDataSource:(STKDataSource*)dataSource andQueueItemId:(NSObject*)queueItemId; +-(instancetype) initWithDataSource:(STKDataSource*)dataSource andQueueItemId:(NSObject*)queueItemId; -(void) reset; -(double) duration; diff --git a/StreamingKit/StreamingKit/STKQueueEntry.m b/StreamingKit/StreamingKit/STKQueueEntry.m index b5c351b..0c1d1e3 100755 --- a/StreamingKit/StreamingKit/STKQueueEntry.m +++ b/StreamingKit/StreamingKit/STKQueueEntry.m @@ -14,7 +14,7 @@ @implementation STKQueueEntry --(id) initWithDataSource:(STKDataSource*)dataSourceIn andQueueItemId:(NSObject*)queueItemIdIn +-(instancetype) initWithDataSource:(STKDataSource*)dataSourceIn andQueueItemId:(NSObject*)queueItemIdIn { if (self = [super init]) { @@ -121,4 +121,4 @@ return [[self queueItemId] description]; } -@end \ No newline at end of file +@end