diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2016-07-28 16:39:05 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2016-07-28 16:39:05 -0400 |
| commit | e67a81badeb1e6820b4f2fc147aea5e6c2d73545 (patch) | |
| tree | ab2454a83fce2cc3af53a2453872a3a50a59bb0e | |
| parent | 300e0756a7b025aa75680333402216ee80ce89c6 (diff) | |
| parent | 42a69dbdae88944ee900425be42d3b1968c50c41 (diff) | |
| download | sdl_ios-e67a81badeb1e6820b4f2fc147aea5e6c2d73545.tar.gz | |
Merge branch 'develop' into feature/external_security_support
| -rw-r--r-- | SmartDeviceLink/SDLStreamingMediaManager.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h index 3989b65c6..8b1f21803 100644 --- a/SmartDeviceLink/SDLStreamingMediaManager.h +++ b/SmartDeviceLink/SDLStreamingMediaManager.h @@ -17,11 +17,12 @@ NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSInteger, SDLStreamingVideoError) { - SDLStreamingVideoErrorHeadUnitNACK, - SDLSTreamingVideoErrorInvalidOperatingSystemVersion, - SDLStreamingVideoErrorConfigurationCompressionSessionCreationFailure, - SDLStreamingVideoErrorConfigurationAllocationFailure, - SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure + SDLStreamingVideoErrorHeadUnitNACK = 0, + SDLSTreamingVideoErrorInvalidOperatingSystemVersion __deprecated_enum_msg("Use SDLStreamingVideoErrorInvalidOperatingSystemVersion instead") = 1, + SDLStreamingVideoErrorInvalidOperatingSystemVersion = 1, + SDLStreamingVideoErrorConfigurationCompressionSessionCreationFailure = 2, + SDLStreamingVideoErrorConfigurationAllocationFailure = 3, + SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure = 4 }; typedef NS_ENUM(NSInteger, SDLEncryptionFlag) { |