Touch Manager

SmartDeviceLink/CGPoint_Util.h

@@ -0,0 +1,39 @@
+//
+//  CGPoint_Util.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 6/14/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#ifndef CGPoint_Util_h
+#define CGPoint_Util_h
+
+#include <stdio.h>
+#include <CoreGraphics/CGGeometry.h>
+
+/**
+ *  @abstract
+ *      Calculate the center of two points.
+ *  @param point1
+ *      First point.
+ *  @param point2
+ *      Second point.
+ *  @return CGPoint
+ *      Center of the points.
+ */
+CGPoint CGPointCenterOfPoints(CGPoint point1, CGPoint point2);
+
+/**
+ *  @abstract
+ *      Calculate the distance between two points.
+ *  @param point1
+ *      First point.
+ *  @param point2
+ *      Second point.
+ *  @return CGFloat
+ *      Distance between the points.
+ */
+CGFloat CGPointDistanceBetweenPoints(CGPoint point1, CGPoint point2);
+
+#endif /* CGPoint_Util_h */

SmartDeviceLink/CGPoint_Util.m

@@ -0,0 +1,20 @@
+//
+//  CGPoint_Util.c
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 6/14/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#include "CGPoint_Util.h"
+#include "math.h"
+
+CGPoint CGPointCenterOfPoints(CGPoint point1, CGPoint point2) {
+    CGFloat xCenter = (point1.x + point2.x) / 2.0f;
+    CGFloat yCenter = (point1.y + point2.y) / 2.0f;
+    return CGPointMake(xCenter, yCenter);
+}
+
+CGFloat CGPointDistanceBetweenPoints(CGPoint point1, CGPoint point2) {
+    return hypotf(point1.x - point2.x, point1.y - point2.y);
+}

SmartDeviceLink/SDLPinchGesture.h

@@ -0,0 +1,62 @@
+//
+//  SDLPinchGesture.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 6/14/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import "SDLTouch.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SDLPinchGesture : NSObject
+
+/**
+ *  @abstract
+ *      Initializes a pinch gesture.
+ *  @param firstTouch
+ *      First touch of the gesture
+ *  @param secondTouch
+ *      Second touch of the gesture
+ *  @return SDLPinchGesture
+ *      Instance of SDLPinchGesture.
+ */
+- (instancetype)initWithFirstTouch:(SDLTouch*)firstTouch secondTouch:(SDLTouch*)secondTouch;
+
+/**
+ *  @abstract
+ *      First touch of a pinch gesture.
+ */
+@property (nonatomic, strong) SDLTouch* firstTouch;
+
+/**
+ *  @abstract
+ *      Second touch of a pinch gesture.
+ */
+@property (nonatomic, strong) SDLTouch* secondTouch;
+
+/**
+ *  @abstract
+ *      Distance between first and second touches.
+ */
+@property (nonatomic, assign, readonly) CGFloat distance;
+
+/**
+ *  @abstract
+ *      Center point between first and second touches.
+ */
+@property (nonatomic, assign, readonly) CGPoint center;
+
+/**
+ *  @abstract
+ *      Returns whether or not the pinch gesture is valid. This is true if both touches
+ *      are non null.
+ */
+@property (nonatomic, assign, readonly) BOOL isValid;
+
+@end
+
+NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLPinchGesture.m

@@ -0,0 +1,79 @@
+//
+//  SDLPinchGesture.m
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 6/14/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import "SDLPinchGesture.h"
+
+#import "SDLTouch.h"
+#import "CGPoint_Util.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation SDLPinchGesture
+
+@synthesize distance = _distance;
+@synthesize center = _center;
+
+- (instancetype)initWithFirstTouch:(SDLTouch*)firstTouch secondTouch:(SDLTouch*)secondTouch {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    _firstTouch = firstTouch;
+    _secondTouch = secondTouch;
+    _distance = -1;
+    _center = CGPointZero;
+
+    return self;
+}
+
+#pragma mark - Setters
+- (void)setFirstTouch:(SDLTouch *)firstTouch {
+    if (firstTouch.identifier == SDLTouchIdentifierFirstFinger) {
+        _firstTouch = firstTouch;
+        [self sdl_invalidate];
+    }
+}
+
+- (void)setSecondTouch:(SDLTouch *)secondTouch {
+    if (secondTouch.identifier == SDLTouchIdentifierSecondFinger) {
+        _secondTouch = secondTouch;
+        [self sdl_invalidate];
+    }
+}
+
+#pragma mark - Getters
+- (CGFloat)distance {
+    if (_distance == -1) {
+        _distance = CGPointDistanceBetweenPoints(self.firstTouch.location,
+                                                 self.secondTouch.location);
+    }
+    return _distance;
+}
+
+- (CGPoint)center {
+    if (CGPointEqualToPoint(_center, CGPointZero)) {
+        _center = CGPointCenterOfPoints(self.firstTouch.location,
+                                        self.secondTouch.location);
+    }
+    return _center;
+}
+
+- (BOOL)isValid {
+    return (self.firstTouch != nil) && (self.secondTouch != nil);
+}
+
+#pragma mark - Private
+- (void)sdl_invalidate {
+    _distance = -1;
+    _center = CGPointZero;
+}
+
+@end
+
+NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLProxy.m

@@ -174,12 +174,12 @@ - (SDLStreamingMediaManager *)streamingMediaManager {
         }
         _streamingMediaManager = [[SDLStreamingMediaManager alloc] initWithProtocol:self.protocol displayCapabilities:self.displayCapabilities];
         [self.protocol.protocolDelegateTable addObject:_streamingMediaManager];
+        [self.mutableProxyListeners addObject:_streamingMediaManager.touchManager];
     }
 
     return _streamingMediaManager;
 }
 
-
 #pragma mark - SDLProtocolListener Implementation
 - (void)onProtocolOpened {
     _isConnected = YES;

SmartDeviceLink/SDLStreamingMediaManager.h

@@ -13,6 +13,7 @@
 
 @class SDLAbstractProtocol;
 @class SDLDisplayCapabilities;
+@class SDLTouchManager;
 
 
 NS_ASSUME_NONNULL_BEGIN
@@ -89,6 +90,11 @@ typedef void (^SDLStreamingStartBlock)(BOOL success, NSError *__nullable error);
 @property (assign, nonatomic, readonly) BOOL videoSessionConnected;
 @property (assign, nonatomic, readonly) BOOL audioSessionConnected;
 
+/**
+ *  Touch Manager responsible for providing touch event notifications.
+ */
+@property (nonatomic, strong, readonly) SDLTouchManager* touchManager;
+
 /**
  *  The settings used in a VTCompressionSessionRef encoder. These will be verified when the video stream is started. Acceptable properties for this are located in VTCompressionProperties. If set to nil, the defaultVideoEncoderSettings will be used.
  *

SmartDeviceLink/SDLStreamingMediaManager.m

@@ -15,6 +15,8 @@
 #import "SDLGlobals.h"
 #import "SDLImageResolution.h"
 #import "SDLScreenParams.h"
+#import "SDLTouchManager.h"
+
 
 NSString *const SDLErrorDomainStreamingMediaVideo = @"com.sdl.streamingmediamanager.video";
 NSString *const SDLErrorDomainStreamingMediaAudio = @"com.sdl.streamingmediamanager.audio";
@@ -36,6 +38,8 @@ @interface SDLStreamingMediaManager ()
 @property (copy, nonatomic, nullable) SDLStreamingStartBlock videoStartBlock;
 @property (copy, nonatomic, nullable) SDLStreamingStartBlock audioStartBlock;
 
+@property (nonatomic, strong, readwrite) SDLTouchManager *touchManager;
+
 @end
 
 
@@ -90,10 +94,20 @@ - (instancetype)init {
 
     _videoStartBlock = nil;
     _audioStartBlock = nil;
+
+	_screenSize = CGSizeMake(640, 480);
+    _videoEncoderSettings = self.defaultVideoEncoderSettings;
+	_touchManager = [[SDLTouchManager alloc] init];
 
-    _screenSize = CGSizeMake(640, 480);
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(sdl_applicationDidEnterBackground:)
+                                                 name:UIApplicationDidEnterBackgroundNotification
+                                               object:nil];
 
-    _videoEncoderSettings = self.defaultVideoEncoderSettings;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(sdl_applicationDidResignActive:)
+                                                 name:UIApplicationWillResignActiveNotification
+                                               object:nil];
 
     return self;
 }
@@ -104,7 +118,7 @@ - (instancetype)init {
 - (void)startVideoSessionWithStartBlock:(SDLStreamingStartBlock)startBlock {
     if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) {
         NSAssert(NO, @"SDL Video Sessions can only be run on iOS 8+ devices");
-        startBlock(NO, [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLSTreamingVideoErrorInvalidOperatingSystemVersion userInfo:nil]);
+        startBlock(NO, [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorInvalidOperatingSystemVersion userInfo:nil]);
 
         return;
     }
@@ -291,7 +305,7 @@ - (BOOL)sdl_configureVideoEncoderWithError:(NSError *__autoreleasing *)error {
 
     if (status != noErr) {
         // TODO: Log the error
-        if (*error == nil) {
+        if (*error != nil) {
             *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionCreationFailure userInfo:@{ @"OSStatus" : @(status) }];
         }
 
@@ -302,7 +316,7 @@ - (BOOL)sdl_configureVideoEncoderWithError:(NSError *__autoreleasing *)error {
     CFDictionaryRef supportedProperties;
     status = VTSessionCopySupportedPropertyDictionary(self.compressionSession, &supportedProperties);
     if (status != noErr) {
-        if (*error == nil) {
+        if (*error != nil) {
             *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure userInfo:@{ @"OSStatus" : @(status) }];
         }
 
@@ -311,7 +325,7 @@ - (BOOL)sdl_configureVideoEncoderWithError:(NSError *__autoreleasing *)error {
 
     for (NSString* key in self.videoEncoderSettings.allKeys) {
         if (CFDictionaryContainsKey(supportedProperties, (__bridge CFStringRef)key) == false) {
-            if (*error == nil) {
+            if (*error != nil) {
                 NSString* description = [NSString stringWithFormat:@"\"%@\" is not a supported key.", key];
                 *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure userInfo:@{NSLocalizedDescriptionKey : description}];
             }
@@ -327,7 +341,7 @@ - (BOOL)sdl_configureVideoEncoderWithError:(NSError *__autoreleasing *)error {
 
         status = VTSessionSetProperty(self.compressionSession, (__bridge CFStringRef)key, (__bridge CFTypeRef)value);
         if (status != noErr) {
-            if (*error == nil) {
+            if (*error != nil) {
                 *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure userInfo:@{ @"OSStatus" : @(status) }];
             }
 
@@ -433,6 +447,15 @@ + (dispatch_queue_t)sdl_streamingDataSerialQueue {
     return streamingDataQueue;
 }
 
+#pragma mark - Private Functions
+- (void)sdl_applicationDidEnterBackground:(NSNotification*)notification {
+    [self.touchManager cancelPendingTouches];
+}
+
+- (void)sdl_applicationDidResignActive:(NSNotification*)notification {
+    [self.touchManager cancelPendingTouches];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END