summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2017-12-15 16:23:03 -0500
committerJoel Fischer <joeljfischer@gmail.com>2017-12-15 16:23:03 -0500
commit2a17cd16d0a057999d650babb5d5b5b211a88c02 (patch)
tree4d1f5d27329c85f84ba872740cfbeba2c9ce4c74
parente14775a6e012076f6f44b5ba0a963f08e43d49a0 (diff)
downloadsdl_ios-2a17cd16d0a057999d650babb5d5b5b211a88c02.tar.gz
Update name for clarity
-rw-r--r--SmartDeviceLink/SDLStreamingMediaConfiguration.h2
-rw-r--r--SmartDeviceLink/SDLStreamingMediaConfiguration.m2
-rw-r--r--SmartDeviceLink/SDLStreamingMediaLifecycleManager.m4
3 files changed, 4 insertions, 4 deletions
diff --git a/SmartDeviceLink/SDLStreamingMediaConfiguration.h b/SmartDeviceLink/SDLStreamingMediaConfiguration.h
index 72a36100f..1c3912dfd 100644
--- a/SmartDeviceLink/SDLStreamingMediaConfiguration.h
+++ b/SmartDeviceLink/SDLStreamingMediaConfiguration.h
@@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
When YES, the StreamingMediaManager will run a CADisplayLink with the framerate set to the video encoder settings kVTCompressionPropertyKey_ExpectedFrameRate. This then forces TouchManager (and CarWindow, if used) to sync their callbacks to the framerate. If using CarWindow, this *must* be YES. If NO, `enableSyncedPanning` on SDLTouchManager will be set to NO. Defaults to YES.
*/
-@property (assign, nonatomic) BOOL forceFramerateSync;
+@property (assign, nonatomic) BOOL enableForcedFramerateSync;
/**
Create an insecure video streaming configuration. No security managers will be provided and the encryption flag will be set to None. If you'd like custom video encoder settings, you can set the property manually.
diff --git a/SmartDeviceLink/SDLStreamingMediaConfiguration.m b/SmartDeviceLink/SDLStreamingMediaConfiguration.m
index aaf07035b..1682c0f4a 100644
--- a/SmartDeviceLink/SDLStreamingMediaConfiguration.m
+++ b/SmartDeviceLink/SDLStreamingMediaConfiguration.m
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
_dataSource = dataSource;
_rootViewController = rootViewController;
_carWindowDrawsAfterScreenUpdates = YES;
- _forceFramerateSync = YES;
+ _enableForcedFramerateSync = YES;
return self;
}
diff --git a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
index 1658b2969..ffae34e4d 100644
--- a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
@@ -114,7 +114,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
_videoEncoderSettings = configuration.customVideoEncoderSettings ?: SDLH264VideoEncoder.defaultVideoEncoderSettings;
if (configuration.rootViewController != nil) {
- NSAssert(configuration.forceFramerateSync, @"When using CarWindow (rootViewController != nil), forceFrameRateSync must be YES");
+ NSAssert(configuration.enableForcedFramerateSync, @"When using CarWindow (rootViewController != nil), forceFrameRateSync must be YES");
if (@available(iOS 9.0, *)) {
SDLLogD(@"Initializing focusable item locator");
_focusableItemManager = [[SDLFocusableItemLocator alloc] initWithViewController:configuration.rootViewController connectionManager:_connectionManager];
@@ -129,7 +129,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
_requestedEncryptionType = configuration.maximumDesiredEncryption;
_dataSource = configuration.dataSource;
- _useDisplayLink = configuration.forceFramerateSync;
+ _useDisplayLink = configuration.enableForcedFramerateSync;
_screenSize = SDLDefaultScreenSize;
_backgroundingPixelBuffer = NULL;
_preferredFormatIndex = 0;