diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-04-05 13:27:12 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-04-05 13:27:12 -0400 |
| commit | 6b81058b11df8079e30397d9bee6817b20d88bdb (patch) | |
| tree | 1a5624bf3ed7278e9b4d7e0530fee8dd08301e6c /SmartDeviceLink/SDLLifecycleConfiguration.h | |
| parent | 8b2dc2174cc579832d32f3d28011af595adceab6 (diff) | |
| parent | a912993d78989e288746516e35af2a25677b43ec (diff) | |
| download | sdl_ios-6b81058b11df8079e30397d9bee6817b20d88bdb.tar.gz | |
Merge branch 'develop' into feature/streaming_media_manager
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLLifecycleConfiguration.h
# SmartDeviceLink/SDLLifecycleConfiguration.m
# SmartDeviceLink/SDLStreamingMediaManager.m
# SmartDeviceLink/SDLTouchManager.m
* Removes the ability to set a video streaming background string
Diffstat (limited to 'SmartDeviceLink/SDLLifecycleConfiguration.h')
| -rw-r--r-- | SmartDeviceLink/SDLLifecycleConfiguration.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.h b/SmartDeviceLink/SDLLifecycleConfiguration.h index 78ffe0d87..82e036e7b 100644 --- a/SmartDeviceLink/SDLLifecycleConfiguration.h +++ b/SmartDeviceLink/SDLLifecycleConfiguration.h @@ -20,13 +20,6 @@ @protocol SDLSecurityType; -typedef NS_OPTIONS(NSUInteger, SDLLogOutput) { - SDLLogOutputNone = 0, - SDLLogOutputConsole = 1 << 0, - SDLLogOutputFile = 1 << 1, -}; - - NS_ASSUME_NONNULL_BEGIN /** @@ -134,11 +127,6 @@ NS_ASSUME_NONNULL_BEGIN @property (copy, nonatomic, nullable) NSArray<Class<SDLSecurityType>> *securityManagers; /** - * Which logging capabilities are currently enabled. The default is Console logging only. - */ -@property (assign, nonatomic) SDLLogOutput logFlags; - -/** * What encryption level video/audio streaming should be. The default is SDLStreamingEncryptionFlagAuthenticateAndEncrypt. */ @property (assign, nonatomic) SDLStreamingEncryptionFlag streamingEncryption; @@ -148,12 +136,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (copy, nonatomic, nullable) NSDictionary<NSString *, id> *videoEncoderSettings; -/** - * What to display when a streaming app is backgrounded. - * @remark: If default, the string will be "Please re-open <App Name>" - */ -@property (copy, nonatomic, null_resettable) NSString *backgroundTitleString; - @end NS_ASSUME_NONNULL_END |