summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2017-10-05 11:00:50 -0400
committerNicoleYarroch <nicole@livio.io>2017-10-05 11:00:50 -0400
commit5d541856dddf5bedf99b5b95144a3d6442d7f734 (patch)
tree32278a1ad11902a356c5331a1af3b3f2fa956e68
parentb8e810621a5777e356238c66a9b0699d9099cbcf (diff)
downloadsdl_ios-5d541856dddf5bedf99b5b95144a3d6442d7f734.tar.gz
Cleanup
Signed-off-by: NicoleYarroch <nicole@livio.io>
-rw-r--r--SmartDeviceLink/SDLProtocol.m1
-rw-r--r--SmartDeviceLink/SDLStreamDelegate.m7
-rw-r--r--SmartDeviceLink/SDLStreamingMediaLifecycleManager.m10
3 files changed, 2 insertions, 16 deletions
diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m
index ba6d4f639..186226414 100644
--- a/SmartDeviceLink/SDLProtocol.m
+++ b/SmartDeviceLink/SDLProtocol.m
@@ -403,7 +403,6 @@ NS_ASSUME_NONNULL_BEGIN
// TODO: This is a v4 packet (create new delegate methods)
- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK {
-
// V5 Packet
if (startServiceACK.header.version >= 5) {
switch (startServiceACK.header.serviceType) {
diff --git a/SmartDeviceLink/SDLStreamDelegate.m b/SmartDeviceLink/SDLStreamDelegate.m
index 1ffe836e6..11bba6e5e 100644
--- a/SmartDeviceLink/SDLStreamDelegate.m
+++ b/SmartDeviceLink/SDLStreamDelegate.m
@@ -17,8 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
@implementation SDLStreamDelegate
- (instancetype)init {
- SDLLogV(@"Initing SDLStreamDelegate");
-
self = [super init];
if (self) {
_streamOpenHandler = defaultStreamOpenHandler;
@@ -27,16 +25,11 @@ NS_ASSUME_NONNULL_BEGIN
_streamErrorHandler = defaultStreamErrorHandler;
_streamEndHandler = defaultStreamErrorHandler;
- SDLLogV(@"Creating com.sdl.streamdelegate.input");
_input_stream_queue = dispatch_queue_create("com.sdl.streamdelegate.input", DISPATCH_QUEUE_SERIAL);
}
return self;
}
--(void)dealloc {
- SDLLogV(@"Dealloc SDLStreamDelegate");
-}
-
- (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode {
switch (eventCode) {
case NSStreamEventOpenCompleted: {
diff --git a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
index f801c8b41..29273220c 100644
--- a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
@@ -145,16 +145,13 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
}
- (void)startWithProtocol:(SDLAbstractProtocol *)protocol {
- SDLLogV(@"Streaming media LCM start with protocol called: \(%@) hmi: %@", protocol, self.hmiLevel);
_protocol = protocol;
if (![self.protocol.protocolDelegateTable containsObject:self]) {
- SDLLogV(@"Adding protocol to table");
[self.protocol.protocolDelegateTable addObject:self];
- } else {
- SDLLogV(@"Not adding protocol to table");
}
+ SDLLogD(@"Requesting video capabilities");
__weak typeof(self) weakSelf = self;
[self sdl_requestVideoCapabilities:^(SDLVideoStreamingCapability * _Nullable capability) {
SDLLogD(@"Received video capability response");
@@ -613,23 +610,20 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
- (void)sdl_startVideoSession {
SDLLogV(@"Attempting to start video session");
if (!self.isStreamingSupported) {
- SDLLogW(@"AAA video streaming not supported");
return;
}
if (self.shouldRestartVideoStream && [self.videoStreamStateMachine isCurrentState:SDLVideoStreamStateReady]) {
[self sdl_stopVideoSession];
- SDLLogW(@"AAA Stopping video session");
return;
}
if ([self.videoStreamStateMachine isCurrentState:SDLVideoStreamStateStopped]
&& self.isHmiStateVideoStreamCapable
&& self.isAppStateVideoStreamCapable) {
- SDLLogV(@"AAA videoStreamStateMachine transitioning to SDLVideoStreamStateStarting");
[self.videoStreamStateMachine transitionToState:SDLVideoStreamStateStarting];
} else {
- SDLLogE(@"AAA Unable to start video stream\n"
+ SDLLogE(@"Unable to start video stream\n"
"State: %@\n"
"HMI state: %@\n"
"App state: %@", self.videoStreamStateMachine.currentState, self.hmiLevel, self.appStateMachine.currentState);