From 590965736889bb9881c35bd8a54ac230fbf6db1b Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Fri, 4 Dec 2015 22:47:14 +0000 Subject: [PATCH] Changed enums to NS_ENUM to better support Swift. Added launch images to remove warnings --- .../LaunchImage.launchimage/Contents.json | 79 +++++++++++------- .../LaunchImage.launchimage/TX6sV-1.png | Bin 0 -> 17533 bytes .../LaunchImage.launchimage/TX6sV-2.png | Bin 0 -> 17533 bytes StreamingKit/StreamingKit/STKAudioPlayer.h | 15 ++-- 4 files changed, 56 insertions(+), 38 deletions(-) create mode 100644 ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png create mode 100644 ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json index 83b8ad2..fb0c438 100644 --- a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -33,41 +33,62 @@ "minimum-system-version" : "7.0", "scale" : "2x" }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "TX6sV-2.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, { "orientation" : "portrait", "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "TX6sV-1.png", + "extent" : "full-screen", "subtype" : "retina4", "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" } ], "info" : { diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png new file mode 100644 index 0000000000000000000000000000000000000000..20c76521156658b3955e79aa43bb6581f88f31aa GIT binary patch literal 17533 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 literal 0 HcmV?d00001 diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png new file mode 100644 index 0000000000000000000000000000000000000000..20c76521156658b3955e79aa43bb6581f88f31aa GIT binary patch literal 17533 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 literal 0 HcmV?d00001 diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h index e4dd707..5c268ef 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.h +++ b/StreamingKit/StreamingKit/STKAudioPlayer.h @@ -44,7 +44,7 @@ #include "UIKit/UIApplication.h" #endif -typedef enum +typedef NS_OPTIONS(NSInteger, STKAudioPlayerState) { STKAudioPlayerStateReady, STKAudioPlayerStateRunning = 1, @@ -54,10 +54,9 @@ typedef enum STKAudioPlayerStateStopped = (1 << 4), STKAudioPlayerStateError = (1 << 5), STKAudioPlayerStateDisposed = (1 << 6) -} -STKAudioPlayerState; +}; -typedef enum +typedef NS_ENUM(NSInteger, STKAudioPlayerStopReason) { STKAudioPlayerStopReasonNone = 0, STKAudioPlayerStopReasonEof, @@ -65,10 +64,9 @@ typedef enum STKAudioPlayerStopReasonPendingNext, STKAudioPlayerStopReasonDisposed, STKAudioPlayerStopReasonError = 0xffff -} -STKAudioPlayerStopReason; +}; -typedef enum +typedef NS_ENUM(NSInteger, STKAudioPlayerErrorCode) { STKAudioPlayerErrorNone = 0, STKAudioPlayerErrorDataSource, @@ -77,8 +75,7 @@ typedef enum STKAudioPlayerErrorCodecError, STKAudioPlayerErrorDataNotFound, STKAudioPlayerErrorOther = 0xffff -} -STKAudioPlayerErrorCode; +}; /// /// Options to initiailise the Audioplayer with.