Changed enums to NS_ENUM to better support Swift. Added launch images to remove warnings

This commit is contained in:
Thong Nguyen 2015-12-04 22:47:14 +00:00
parent 50bec46acc
commit 5909657368
4 changed files with 56 additions and 38 deletions

View File

@ -33,41 +33,62 @@
"minimum-system-version" : "7.0", "minimum-system-version" : "7.0",
"scale" : "2x" "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", "orientation" : "portrait",
"idiom" : "iphone", "idiom" : "iphone",
"extent" : "full-screen", "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", "subtype" : "retina4",
"scale" : "2x" "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" : { "info" : {

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -44,7 +44,7 @@
#include "UIKit/UIApplication.h" #include "UIKit/UIApplication.h"
#endif #endif
typedef enum typedef NS_OPTIONS(NSInteger, STKAudioPlayerState)
{ {
STKAudioPlayerStateReady, STKAudioPlayerStateReady,
STKAudioPlayerStateRunning = 1, STKAudioPlayerStateRunning = 1,
@ -54,10 +54,9 @@ typedef enum
STKAudioPlayerStateStopped = (1 << 4), STKAudioPlayerStateStopped = (1 << 4),
STKAudioPlayerStateError = (1 << 5), STKAudioPlayerStateError = (1 << 5),
STKAudioPlayerStateDisposed = (1 << 6) STKAudioPlayerStateDisposed = (1 << 6)
} };
STKAudioPlayerState;
typedef enum typedef NS_ENUM(NSInteger, STKAudioPlayerStopReason)
{ {
STKAudioPlayerStopReasonNone = 0, STKAudioPlayerStopReasonNone = 0,
STKAudioPlayerStopReasonEof, STKAudioPlayerStopReasonEof,
@ -65,10 +64,9 @@ typedef enum
STKAudioPlayerStopReasonPendingNext, STKAudioPlayerStopReasonPendingNext,
STKAudioPlayerStopReasonDisposed, STKAudioPlayerStopReasonDisposed,
STKAudioPlayerStopReasonError = 0xffff STKAudioPlayerStopReasonError = 0xffff
} };
STKAudioPlayerStopReason;
typedef enum typedef NS_ENUM(NSInteger, STKAudioPlayerErrorCode)
{ {
STKAudioPlayerErrorNone = 0, STKAudioPlayerErrorNone = 0,
STKAudioPlayerErrorDataSource, STKAudioPlayerErrorDataSource,
@ -77,8 +75,7 @@ typedef enum
STKAudioPlayerErrorCodecError, STKAudioPlayerErrorCodecError,
STKAudioPlayerErrorDataNotFound, STKAudioPlayerErrorDataNotFound,
STKAudioPlayerErrorOther = 0xffff STKAudioPlayerErrorOther = 0xffff
} };
STKAudioPlayerErrorCode;
/// ///
/// Options to initiailise the Audioplayer with. /// Options to initiailise the Audioplayer with.