diff options
| author | BrettyWhite <geekman3454@protonmail.com> | 2017-07-31 15:55:26 -0400 |
|---|---|---|
| committer | BrettyWhite <geekman3454@protonmail.com> | 2017-07-31 15:55:26 -0400 |
| commit | 7e5fa4f7e37f9166c31350327954eaef97716944 (patch) | |
| tree | 08a1db072572dc5b2a9875a70677b95e4d4bc78c | |
| parent | faea50489a248dc9573920ebceed585aad071421 (diff) | |
| download | sdl_ios-7e5fa4f7e37f9166c31350327954eaef97716944.tar.gz | |
Addressing requested changes
| -rw-r--r-- | SmartDeviceLink/SDLNames.h | 1 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLSystemCapability.m | 8 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLVideoStreamingCapability.m | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h index 324dab99d..effb5855d 100644 --- a/SmartDeviceLink/SDLNames.h +++ b/SmartDeviceLink/SDLNames.h @@ -438,6 +438,7 @@ #define NAMES_videoCodec @"videoCodec" #define NAMES_videoProtocol @"videoProtocol" #define NAMES_videoStreaming @"videoStreaming" +#define NAMES_videoStreamingCapability @"videoStreamingCapability" #define NAMES_vin @"vin" #define NAMES_voiceRecOn @"voiceRecOn" #define NAMES_vrCapabilities @"vrCapabilities" diff --git a/SmartDeviceLink/SDLSystemCapability.m b/SmartDeviceLink/SDLSystemCapability.m index 6901abf42..09f68f2cf 100644 --- a/SmartDeviceLink/SDLSystemCapability.m +++ b/SmartDeviceLink/SDLSystemCapability.m @@ -119,15 +119,15 @@ - (void)setVideoStreamingCapability:(SDLVideoStreamingCapability *)videoStreamingCapability { if (videoStreamingCapability != nil) { - store[NAMES_videoStreaming] = videoStreamingCapability; + store[NAMES_videoStreamingCapability] = videoStreamingCapability; } else { - [store removeObjectForKey:NAMES_videoStreaming]; + [store removeObjectForKey:NAMES_videoStreamingCapability]; } } - (SDLVideoStreamingCapability *)videoStreamingCapability { - NSObject *obj = store[NAMES_videoStreaming]; - if (obj == nil || [obj isKindOfClass:SDLPhoneCapability.class]) { + NSObject *obj = store[NAMES_videoStreamingCapability]; + if (obj == nil || [obj isKindOfClass:SDLVideoStreamingCapability.class]) { return (SDLVideoStreamingCapability *)obj; } else { return [[SDLVideoStreamingCapability alloc] initWithDictionary:(NSMutableDictionary *)obj]; diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.m b/SmartDeviceLink/SDLVideoStreamingCapability.m index e54db9f82..3dff5cac0 100644 --- a/SmartDeviceLink/SDLVideoStreamingCapability.m +++ b/SmartDeviceLink/SDLVideoStreamingCapability.m @@ -25,7 +25,6 @@ } - (instancetype)initWithVideoStreaming:(SDLImageResolution *)preferredResolution maxBitrate:(NSNumber *)maxBitrate supportedFormats:(NSArray<SDLVideoStreamingFormat *> *)supportedFormats { - self = [self init]; if (!self) { return self; |