summaryrefslogtreecommitdiff
path: root/SmartDeviceLink
diff options
context:
space:
mode:
authorMuller, Alexander (A.) <amulle19@ford.com>2016-07-28 18:12:59 -0700
committerMuller, Alexander (A.) <amulle19@ford.com>2016-07-28 18:12:59 -0700
commite8e5a5b684f23d2645b565c11ab9d47c3b0f3735 (patch)
treece24a18f565560c8e2f62aef8f2239f4071bdb2f /SmartDeviceLink
parent4e39844a110224bbf97ffbf8a554de61cfd51f2e (diff)
downloadsdl_ios-e8e5a5b684f23d2645b565c11ab9d47c3b0f3735.tar.gz
Updated starting audio session function declaration to match video session functions.
Diffstat (limited to 'SmartDeviceLink')
-rw-r--r--SmartDeviceLink/SDLStreamingMediaManager.h4
-rw-r--r--SmartDeviceLink/SDLStreamingMediaManager.m6
2 files changed, 5 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h
index 776e39fa4..9978913e9 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.h
+++ b/SmartDeviceLink/SDLStreamingMediaManager.h
@@ -86,10 +86,10 @@ typedef void (^SDLStreamingEncryptionStartBlock)(BOOL success, BOOL encryption,
*
* @param startBlock A block that will be called with the result of attempting to start an audio session
*/
-- (void)startAudioStreamingWithStartBlock:(SDLStreamingStartBlock)startBlock;
+- (void)startAudioSessionWithStartBlock:(SDLStreamingStartBlock)startBlock;
// TODO: Documentation
-- (void)startAudioStreamingWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock;
+- (void)startAudioSessionWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock;
/**
* This method will stop a running audio session if there is one running.
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index 5f890d109..99de10e07 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -114,14 +114,14 @@ NS_ASSUME_NONNULL_BEGIN
[self.protocol endServiceWithType:SDLServiceType_Video];
}
-- (void)startAudioStreamingWithStartBlock:(SDLStreamingStartBlock)startBlock {
- [self startAudioStreamingWithTLS:SDLEncryptionFlagNone
+- (void)startAudioSessionWithStartBlock:(SDLStreamingStartBlock)startBlock {
+ [self startAudioSessionWithTLS:SDLEncryptionFlagNone
startBlock:^(BOOL success, BOOL encryption, NSError *_Nullable error) {
startBlock(success, error);
}];
}
-- (void)startAudioStreamingWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock {
+- (void)startAudioSessionWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock {
self.audioStartBlock = [startBlock copy];
self.encryptAudioSession = (encryptionFlag == SDLEncryptionFlagAuthenticateAndEncrypt ? YES : NO);