Bumping app version for v1.1.3

Fix some pairing glitches and add a cancel button
Fix detection of running apps on GFE 3.1
2016-10-26 19:08:33 -07:00 · 2016-10-21 12:07:29 -07:00 · 2016-10-21 11:41:42 -07:00 · 2016-10-05 23:45:48 -07:00 · 2016-10-05 23:00:46 -07:00 · 2016-10-05 22:58:38 -07:00
35 changed files with 739 additions and 219 deletions
@@ -1,3 +1,4 @@
 **/xcuserdata/
 **/Moonlight.xcscmblueprint
 Build
+DerivedData
@@ -15,7 +15,6 @@
@property (nullable, nonatomic, retain) NSString *id;
@property (nullable, nonatomic, retain) NSData *image;
@property (nullable, nonatomic, retain) NSString *name;
-@property (nonatomic) BOOL isRunning;
@property (nullable, nonatomic, retain) TemporaryHost *host;

 NS_ASSUME_NONNULL_BEGIN
@@ -15,6 +15,7 @@
@property (nonatomic) BOOL online;
@property (nonatomic) PairState pairState;
@property (nonatomic, nullable) NSString * activeAddress;
+@property (nonatomic, nullable) NSString * currentGame;

 NS_ASSUME_NONNULL_BEGIN

@@ -17,6 +17,7 @@
 - (id) init {
    self = [super init];
    self.appList = [[NSMutableSet alloc] init];
+    self.currentGame = @"0";
    
    return self;
 }
@@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
@@ -36,6 +46,16 @@
      "filename" : "[email protected]",
      "scale" : "3x"
    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
    {
      "size" : "29x29",
      "idiom" : "ipad",
@@ -1,23 +0,0 @@
-//
-//  Controller.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 2/1/15.
-//  Copyright (c) 2015 Moonlight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface Controller : NSObject
-
-@property (nonatomic) int playerIndex;
-@property (nonatomic) int lastButtonFlags;
-@property (nonatomic) int emulatingButtonFlags;
-@property (nonatomic) char lastLeftTrigger;
-@property (nonatomic) char lastRightTrigger;
-@property (nonatomic) short lastLeftStickX;
-@property (nonatomic) short lastLeftStickY;
-@property (nonatomic) short lastRightStickX;
-@property (nonatomic) short lastRightStickY;
-
-@end
@@ -1,15 +0,0 @@
-//
-//  Controller.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 2/1/15.
-//  Copyright (c) 2015 Moonlight Stream. All rights reserved.
-//
-
-#import "Controller.h"
-
-@implementation Controller
-@synthesize playerIndex;
-@synthesize lastButtonFlags, emulatingButtonFlags, lastLeftTrigger, lastRightTrigger;
-@synthesize lastLeftStickX, lastLeftStickY, lastRightStickX, lastRightStickY;
-@end
@@ -0,0 +1,26 @@
+//
+//  Controller.swift
+//  Moonlight
+//
+//  Created by David Aghassi on 4/11/16.
+//  Copyright © 2016 Moonlight Stream. All rights reserved.
+//
+
+import Foundation
+
+@objc
+/**
+ Defines a controller layout
+ */
+class Controller: NSObject {
+  // Swift requires initial properties
+  var playerIndex: CInt = 0           // Controller number (e.g. 1, 2 ,3 etc)
+  var lastButtonFlags: CInt = 0
+  var emulatingButtonFlags: CInt = 0
+  var lastLeftTrigger: CChar = 0      // Last left trigger pressed
+  var lastRightTrigger: CChar = 0     // Last right trigger pressed
+  var lastLeftStickX: CShort = 0      // Last X direction the left joystick went
+  var lastLeftStickY: CShort = 0      // Last Y direction the left joystick went
+  var lastRightStickX: CShort = 0     // Last X direction the right joystick went
+  var lastRightStickY: CShort = 0     // Last Y direction the right joystick went
+}
@@ -7,7 +7,10 @@
 //

 #import <Foundation/Foundation.h>
-#import "Controller.h"
+
+// Swift
+#import "Moonlight-Swift.h"
+@class Controller;

@class OnScreenControls;

@@ -29,6 +32,7 @@
 -(void) clearButtonFlag:(Controller*)controller flags:(int)flags;

 -(void) updateFinished:(Controller*)controller;
+-(Controller*) getOscController;

@property (nonatomic, strong) id connectObserver;
@property (nonatomic, strong) id disconnectObserver;
@@ -8,9 +8,12 @@

 #import "ControllerSupport.h"
 #import "OnScreenControls.h"
-#import "Controller.h"
 #include "Limelight.h"

+// Swift
+#import "Moonlight-Swift.h"
+@class Controller;
+
@import GameController;

@implementation ControllerSupport {
@@ -19,6 +22,10 @@
    
    OnScreenControls *_osc;
    
+    // This controller object is shared between on-screen controls
+    // and player 0
+    Controller *_player0osc;
+    
    char _controllerNumbers;
    
 #define EMULATING_SELECT     0x1
@@ -272,9 +279,17 @@
    for (int i = 0; i < 4; i++) {
        if (!(_controllerNumbers & (1 << i))) {
            _controllerNumbers |= (1 << i);
-            Controller* limeController = [[Controller alloc] init];
            controller.playerIndex = i;
-            limeController.playerIndex = i;
+            
+            Controller* limeController;
+            if (i == 0) {
+                // Player 0 shares a controller object with the on-screen controls
+                limeController = _player0osc;
+            } else {
+                limeController = [[Controller alloc] init];
+                limeController.playerIndex = i;
+            }
+
            [_controllers setObject:limeController forKey:[NSNumber numberWithInteger:controller.playerIndex]];
            
            Log(LOG_I, @"Assigning controller index: %d", i);
@@ -283,6 +298,10 @@
    }
 }

+-(Controller*) getOscController {
+    return _player0osc;
+}
+
 -(id) init
 {
    self = [super init];
@@ -290,6 +309,8 @@
    _controllerStreamLock = [[NSLock alloc] init];
    _controllers = [[NSMutableDictionary alloc] init];
    _controllerNumbers = 0;
+    _player0osc = [[Controller alloc] init];
+    _player0osc.playerIndex = 0;
    
    Log(LOG_I, @"Number of controllers connected: %ld", (long)[[GCController controllers] count]);
    for (GCController* controller in [GCController controllers]) {
@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
@@ -8,9 +8,12 @@

 #import "OnScreenControls.h"
 #import "ControllerSupport.h"
-#import "Controller.h"
+//#import "Controller.h"
 #include "Limelight.h"

+#import "Moonlight-Swift.h"
+@class Controller;
+
 #define UPDATE_BUTTON(x, y) (buttonFlags = \
 (y) ? (buttonFlags | (x)) : (buttonFlags & ~(x)))

@@ -41,10 +44,7 @@
    UITouch* _bTouch;
    UITouch* _xTouch;
    UITouch* _yTouch;
-    UITouch* _upTouch;
-    UITouch* _downTouch;
-    UITouch* _leftTouch;
-    UITouch* _rightTouch;
+    UITouch* _dpadTouch;
    UITouch* _lsTouch;
    UITouch* _rsTouch;
    UITouch* _startTouch;
@@ -119,8 +119,7 @@ static float L3_Y;
    self = [self init];
    _view = view;
    _controllerSupport = controllerSupport;
-    _controller = [[Controller alloc] init];
-    _controller.playerIndex = 0;
+    _controller = [controllerSupport getOscController];
    _edgeDelegate = swipeDelegate;
    _deadTouches = [[NSMutableArray alloc] init];
    
@@ -570,6 +569,26 @@ static float L3_Y;
            [_controllerSupport updateRightStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
            
            updated = true;
+        } else if (touch == _dpadTouch) {
+            [_controllerSupport clearButtonFlag:_controller
+                                          flags:UP_FLAG | DOWN_FLAG | LEFT_FLAG | RIGHT_FLAG];
+            
+            // Allow the user to slide their finger to another d-pad button
+            if ([_upButton.presentationLayer hitTest:touchLocation]) {
+                [_controllerSupport setButtonFlag:_controller flags:UP_FLAG];
+                updated = true;
+            } else if ([_downButton.presentationLayer hitTest:touchLocation]) {
+                [_controllerSupport setButtonFlag:_controller flags:DOWN_FLAG];
+                updated = true;
+            } else if ([_leftButton.presentationLayer hitTest:touchLocation]) {
+                [_controllerSupport setButtonFlag:_controller flags:LEFT_FLAG];
+                updated = true;
+            } else if ([_rightButton.presentationLayer hitTest:touchLocation]) {
+                [_controllerSupport setButtonFlag:_controller flags:RIGHT_FLAG];
+                updated = true;
+            }
+            
+            buttonTouch = true;
        } else if (touch == _aTouch) {
            buttonTouch = true;
        } else if (touch == _bTouch) {
@@ -578,14 +597,6 @@ static float L3_Y;
            buttonTouch = true;
        } else if (touch == _yTouch) {
            buttonTouch = true;
-        } else if (touch == _upTouch) {
-            buttonTouch = true;
-        } else if (touch == _downTouch) {
-            buttonTouch = true;
-        } else if (touch == _leftTouch) {
-            buttonTouch = true;
-        } else if (touch == _rightTouch) {
-            buttonTouch = true;
        } else if (touch == _startTouch) {
            buttonTouch = true;
        } else if (touch == _selectTouch) {
@@ -637,19 +648,19 @@ static float L3_Y;
            updated = true;
        } else if ([_upButton.presentationLayer hitTest:touchLocation]) {
            [_controllerSupport setButtonFlag:_controller flags:UP_FLAG];
-            _upTouch = touch;
+            _dpadTouch = touch;
            updated = true;
        } else if ([_downButton.presentationLayer hitTest:touchLocation]) {
            [_controllerSupport setButtonFlag:_controller flags:DOWN_FLAG];
-            _downTouch = touch;
+            _dpadTouch = touch;
            updated = true;
        } else if ([_leftButton.presentationLayer hitTest:touchLocation]) {
            [_controllerSupport setButtonFlag:_controller flags:LEFT_FLAG];
-            _leftTouch = touch;
+            _dpadTouch = touch;
            updated = true;
        } else if ([_rightButton.presentationLayer hitTest:touchLocation]) {
            [_controllerSupport setButtonFlag:_controller flags:RIGHT_FLAG];
-            _rightTouch = touch;
+            _dpadTouch = touch;
            updated = true;
        } else if ([_startButton.presentationLayer hitTest:touchLocation]) {
            [_controllerSupport setButtonFlag:_controller flags:PLAY_FLAG];
@@ -755,21 +766,10 @@ static float L3_Y;
            [_controllerSupport clearButtonFlag:_controller flags:Y_FLAG];
            _yTouch = nil;
            updated = true;
-        } else if (touch == _upTouch) {
-            [_controllerSupport clearButtonFlag:_controller flags:UP_FLAG];
-            _upTouch = nil;
-            updated = true;
-        } else if (touch == _downTouch) {
-            [_controllerSupport clearButtonFlag:_controller flags:DOWN_FLAG];
-            _downTouch = nil;
-            updated = true;
-        } else if (touch == _leftTouch) {
-            [_controllerSupport clearButtonFlag:_controller flags:LEFT_FLAG];
-            _leftTouch = nil;
-            updated = true;
-        } else if (touch == _rightTouch) {
-            [_controllerSupport clearButtonFlag:_controller flags:RIGHT_FLAG];
-            _rightTouch = nil;
+        } else if (touch == _dpadTouch) {
+            [_controllerSupport clearButtonFlag:_controller
+                                          flags:UP_FLAG | DOWN_FLAG | LEFT_FLAG | RIGHT_FLAG];
+            _dpadTouch = nil;
            updated = true;
        } else if (touch == _startTouch) {
            [_controllerSupport clearButtonFlag:_controller flags:PLAY_FLAG];
@@ -17,6 +17,9 @@
    BOOL touchMoved;
    OnScreenControls* onScreenControls;
    
+    BOOL isDragging;
+    NSTimer* dragTimer;
+    
    float xDeltaFactor;
    float yDeltaFactor;
    float screenFactor;
@@ -49,11 +52,27 @@
        UITouch *touch = [[event allTouches] anyObject];
        touchLocation = [touch locationInView:self];
        touchMoved = false;
+        if ([[event allTouches] count] == 1 && !isDragging) {
+            dragTimer = [NSTimer scheduledTimerWithTimeInterval:0.650
+                                                     target:self
+                                                   selector:@selector(onDragStart:)
+                                                   userInfo:nil
+                                                    repeats:NO];
+        }
+    }
+}
+
+- (void)onDragStart:(NSTimer*)timer {
+    if (!touchMoved && !isDragging){
+        isDragging = true;
+        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
    }
 }

 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
    if (![onScreenControls handleTouchMovedEvent:touches]) {
+        [dragTimer invalidate];
+        dragTimer = nil;
        if ([[event allTouches] count] == 1) {
            UITouch *touch = [[event allTouches] anyObject];
            CGPoint currentLocation = [touch locationInView:self];
@@ -91,6 +110,8 @@
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
    Log(LOG_D, @"Touch up");
    if (![onScreenControls handleTouchUpEvent:touches]) {
+        [dragTimer invalidate];
+        dragTimer = nil;
        if (!touchMoved) {
            if ([[event allTouches] count]  == 2) {
                Log(LOG_D, @"Sending right mouse button press");
@@ -101,19 +122,23 @@
                usleep(100 * 1000);
                
                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
-                
-                
            } else {
-                Log(LOG_D, @"Sending left mouse button press");
-                
-                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-                
-                // Wait 100 ms to simulate a real button press
-                usleep(100 * 1000);
-                
+                if (!isDragging){
+                    Log(LOG_D, @"Sending left mouse button press");
+                    
+                    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+                    
+                    // Wait 100 ms to simulate a real button press
+                    usleep(100 * 1000);
+                }
+                isDragging = false;
                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
            }
        }
+        else if (isDragging) {
+            isDragging = false;
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+        }
    }
 }

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.4</string>
+	<string>1.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -19,7 +19,6 @@
 static const char* TAG_APP = "App";
 static const char* TAG_APP_TITLE = "AppTitle";
 static const char* TAG_APP_ID = "ID";
-static const char* TAG_APP_IS_RUNNING = "IsRunning";

 - (void)populateWithData:(NSData *)xml {
    self.data = xml;
@@ -67,7 +66,6 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
            xmlNodePtr appInfoNode = node->xmlChildrenNode;
            NSString* appName = @"";
            NSString* appId = nil;
-            BOOL appIsRunning = NO;
            while (appInfoNode != NULL) {
                if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_TITLE)) {
                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
@@ -83,14 +81,6 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
                        appId = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
                        xmlFree(nodeVal);
                    }
-                } else if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_IS_RUNNING)) {
-                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
-                    if (nodeVal != NULL) {
-                        appIsRunning = [[[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding] isEqualToString:@"1"];
-                        xmlFree(nodeVal);
-                    } else {
-                        appIsRunning = NO;
-                    }
                }
                appInfoNode = appInfoNode->next;
            }
@@ -98,7 +88,6 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
                TemporaryApp* app = [[TemporaryApp alloc] init];
                app.name = appName;
                app.id = appId;
-                app.isRunning = appIsRunning;
                [_appList addObject:app];
            }
        }
@@ -64,7 +64,7 @@
            callback(host, nil);
        }
    } else {
-        callback(nil, @"Could not connect to host");
+        callback(nil, @"Could not connect to host. Ensure GameStream is enabled in GeForce Experience on your PC.");
    }
    
 }
@@ -95,14 +95,23 @@
 }

 - (BOOL) addHostToDiscovery:(TemporaryHost *)host {
-    if (host.uuid.length > 0 && ![self isHostInDiscovery:host]) {
+    if (host.uuid.length == 0) {
+        return NO;
+    }
+    
+    TemporaryHost *existingHost = [self getHostInDiscovery:host.uuid];
+    if (existingHost != nil) {
+        // Update address of existing host
+        existingHost.address = existingHost.activeAddress = host.address;
+        return NO;
+    }
+    else {
        [_hostQueue addObject:host];
        if (shouldDiscover) {
            [_opQueue addOperation:[self createWorkerForHost:host]];
        }
        return YES;
    }
-    return NO;
 }

 - (void) removeHostFromDiscovery:(TemporaryHost *)host {
@@ -133,14 +142,14 @@
    });
 }

- (BOOL) isHostInDiscovery:(TemporaryHost*)host {
+- (TemporaryHost*) getHostInDiscovery:(NSString*)uuidString {
    for (int i = 0; i < _hostQueue.count; i++) {
        TemporaryHost* discoveredHost = [_hostQueue objectAtIndex:i];
-        if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:host.uuid]) {
-            return YES;
+        if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:uuidString]) {
+            return discoveredHost;
        }
    }
-    return NO;
+    return nil;
 }

 - (NSOperation*) createWorkerForHost:(TemporaryHost*)host {
@@ -68,12 +68,15 @@
    }
    NSInteger pairedStatus;
    if (![pairResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
-        [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
        [_callback pairFailed:@"Pairing was declined by the target."];
        return;
    }
    
    NSString* plainCert = [pairResp getStringTag:@"plaincert"];
+    if ([plainCert length] == 0) {
+        [_callback pairFailed:@"Another pairing attempt is already in progress."];
+        return;
+    }
    
    CryptoManager* cryptoMan = [[CryptoManager alloc] init];
    NSData* aesKey;
@@ -15,6 +15,8 @@
 #define TAG_UNIQUE_ID @"uniqueid"
 #define TAG_MAC_ADDRESS @"mac"
 #define TAG_PAIR_STATUS @"PairStatus"
+#define TAG_STATE @"state"
+#define TAG_CURRENT_GAME @"currentgame"

@interface ServerInfoResponse : HttpResponse <Response>

@@ -23,6 +23,15 @@
    host.localAddress = [[self getStringTag:TAG_LOCAL_IP] trim];
    host.uuid = [[self getStringTag:TAG_UNIQUE_ID] trim];
    host.mac = [[self getStringTag:TAG_MAC_ADDRESS] trim];
+    host.currentGame = [[self getStringTag:TAG_CURRENT_GAME] trim];
+    
+    NSString *state = [[self getStringTag:TAG_STATE] trim];
+    if ([state hasSuffix:@"_SERVER_AVAILABLE"]) {
+        // GFE 2.8 started keeping currentgame set to the last game played. As a result, it no longer
+        // has the semantics that its name would indicate. To contain the effects of this change as much
+        // as possible, we'll force the current game to zero if the server isn't in a streaming session.
+        host.currentGame = @"0";
+    }
    
    NSInteger pairStatus;
    if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) {
@@ -12,48 +12,83 @@
 #import <sys/socket.h>
 #import <netinet/in.h>
 #import <arpa/inet.h>
+#import <netdb.h>

@implementation WakeOnLanManager

 static const int numPorts = 5;
 static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};

+ (void) populateAddress:(struct sockaddr_storage*)addr withPort:(unsigned short)port {
+    if (addr->ss_family == AF_INET) {
+        struct sockaddr_in *sin = (struct sockaddr_in*)addr;
+        sin->sin_port = htons(port);
+    }
+    else if (addr->ss_family == AF_INET6) {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)addr;
+        sin6->sin6_port = htons(port);
+    }
+}
+
 + (void) wakeHost:(TemporaryHost*)host {
    NSData* wolPayload = [WakeOnLanManager createPayload:host];
-    CFDataRef dataPayload = CFDataCreate(kCFAllocatorDefault, [wolPayload bytes], [wolPayload length]);
-    CFSocketRef wolSocket = CFSocketCreate(kCFAllocatorDefault, PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0, NULL, NULL);
-    if (!wolSocket) {
-        CFRelease(dataPayload);
-        Log(LOG_E, @"Failed to create WOL socket");
-        return;
-    }
-    Log(LOG_I, @"WOL socket created");
    
-    struct sockaddr_in addr;
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = AF_INET;
-    addr.sin_len = sizeof(addr);
-    
-    
-    for (int i = 0; i < 2; i++) {
-        // try all ip addresses
-        if (i == 0) {
-            inet_aton([host.localAddress UTF8String], &addr.sin_addr);
-        } else {
-            inet_aton([host.externalAddress UTF8String], &addr.sin_addr);
-        }
-
-        CFDataRef dataAddress = CFDataCreate(kCFAllocatorDefault, (unsigned char*)&addr, sizeof(addr));
+    for (int i = 0; i < 3; i++) {
+        const char* address;
+        struct addrinfo hints, *res, *curr;
        
-        // try all ports
-        for (int j = 0; j < numPorts; j++) {
-            addr.sin_port = htons(ports[j]);
-            Log(LOG_I, @"Sending WOL packet");
-            CFSocketSendData(wolSocket, dataAddress, dataPayload, 0);
+        // try all ip addresses
+        if (i == 0 && host.localAddress != nil) {
+            address = [host.localAddress UTF8String];
+        } else if (i == 1 && host.externalAddress != nil) {
+            address = [host.externalAddress UTF8String];
+        } else if (i == 2 && host.address != nil) {
+            address = [host.address UTF8String];
+        } else {
+            // Requested address wasn't present
+            continue;
        }
-        CFRelease(dataAddress);
+        
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = AF_UNSPEC;
+        hints.ai_flags = AI_ADDRCONFIG;
+        if (getaddrinfo(address, NULL, &hints, &res) != 0 || res == NULL) {
+            // Failed to resolve address
+            Log(LOG_E, @"Failed to resolve WOL address");
+            continue;
+        }
+        
+        // Try all addresses that this DNS name resolves to. We have
+        // to create a new socket each time because the addresses
+        // may be different address families.
+        for (curr = res; curr != NULL; curr = curr->ai_next) {
+            int wolSocket;
+            
+            wolSocket = socket(curr->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+            if (wolSocket < 0) {
+                Log(LOG_E, @"Failed to create WOL socket");
+                continue;
+            }
+            
+            struct sockaddr_storage addr;
+            memset(&addr, 0, sizeof(addr));
+            memcpy(&addr, curr->ai_addr, curr->ai_addrlen);
+            
+            for (int j = 0; j < numPorts; j++) {
+                [WakeOnLanManager populateAddress:&addr withPort:ports[j]];
+                long err = sendto(wolSocket,
+                                 [wolPayload bytes],
+                                 [wolPayload length],
+                                 0,
+                                 (struct sockaddr*)&addr,
+                                 curr->ai_addrlen);
+                Log(LOG_I, @"Sending WOL packet returned: %ld", err);
+            }
+            
+            close(wolSocket);
+        }
+        freeaddrinfo(res);
    }
-    CFRelease(dataPayload);
 }

 + (NSData*) createPayload:(TemporaryHost*)host {
@@ -14,20 +14,19 @@

 - (void) connectionStarted;
 - (void) connectionTerminated:(long)errorCode;
- (void) stageStarting:(char*)stageName;
- (void) stageComplete:(char*)stageName;
- (void) stageFailed:(char*)stageName withError:(long)errorCode;
+- (void) stageStarting:(const char*)stageName;
+- (void) stageComplete:(const char*)stageName;
+- (void) stageFailed:(const char*)stageName withError:(long)errorCode;
 - (void) launchFailed:(NSString*)message;
- (void) displayMessage:(char*)message;
- (void) displayTransientMessage:(char*)message;
+- (void) displayMessage:(const char*)message;
+- (void) displayTransientMessage:(const char*)message;

@end

@interface Connection : NSOperation <NSStreamDelegate>

-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion;
+-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks;
 -(void) terminate;
-(void) terminateInternal;
 -(void) main;

@end
@@ -15,14 +15,14 @@
 #include "opus.h"

@implementation Connection {
-    const char* _host;
+    SERVER_INFORMATION _serverInfo;
    STREAM_CONFIGURATION _streamConfig;
    CONNECTION_LISTENER_CALLBACKS _clCallbacks;
    DECODER_RENDERER_CALLBACKS _drCallbacks;
    AUDIO_RENDERER_CALLBACKS _arCallbacks;
-    int _serverMajorVersion;
 }

+static NSLock* initLock;
 static OpusDecoder *opusDecoder;
 static id<ConnectionCallbacks> _callbacks;

@@ -228,17 +228,17 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength)

 void ClStageStarting(int stage)
 {
-    [_callbacks stageStarting:(char*)LiGetStageName(stage)];
+    [_callbacks stageStarting:LiGetStageName(stage)];
 }

 void ClStageComplete(int stage)
 {
-    [_callbacks stageComplete:(char*)LiGetStageName(stage)];
+    [_callbacks stageComplete:LiGetStageName(stage)];
 }

 void ClStageFailed(int stage, long errorCode)
 {
-    [_callbacks stageFailed:(char*)LiGetStageName(stage) withError:errorCode];
+    [_callbacks stageFailed:LiGetStageName(stage) withError:errorCode];
 }

 void ClConnectionStarted(void)
@@ -251,40 +251,47 @@ void ClConnectionTerminated(long errorCode)
    [_callbacks connectionTerminated: errorCode];
 }

-void ClDisplayMessage(char* message)
+void ClDisplayMessage(const char* message)
 {
    [_callbacks displayMessage: message];
 }

-void ClDisplayTransientMessage(char* message)
+void ClDisplayTransientMessage(const char* message)
 {
    [_callbacks displayTransientMessage: message];
 }

-(void) terminateInternal
+-(void) terminate
 {
    // We dispatch this async to get out because this can be invoked
-    // on a thread inside common and we don't want to deadlock
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // This is safe to call even before LiStartConnection
+    // on a thread inside common and we don't want to deadlock. It also avoids
+    // blocking on the caller's thread waiting to acquire initLock.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        [initLock lock];
        LiStopConnection();
+        [initLock unlock];
    });
 }

-(void) terminate
-{
-    // We're guaranteed to not be on a moonlight-common thread
-    // here so it's safe to call stop directly
-    LiStopConnection();
-}
-
-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion
+-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks
 {
    self = [super init];
-    _host = [config.host cStringUsingEncoding:NSUTF8StringEncoding];
+    
+    // Use a lock to ensure that only one thread is initializing
+    // or deinitializing a connection at a time.
+    if (initLock == nil) {
+        initLock = [[NSLock alloc] init];
+    }
+    
+    LiInitializeServerInformation(&_serverInfo);
+    _serverInfo.address = [config.host cStringUsingEncoding:NSUTF8StringEncoding];
+    _serverInfo.serverInfoAppVersion = [config.appVersion cStringUsingEncoding:NSUTF8StringEncoding];
+    if (config.gfeVersion != nil) {
+        _serverInfo.serverInfoGfeVersion = [config.gfeVersion cStringUsingEncoding:NSUTF8StringEncoding];
+    }
+    
    renderer = myRenderer;
    _callbacks = callbacks;
-    _serverMajorVersion = serverMajorVersion;
    
    LiInitializeStreamConfiguration(&_streamConfig);
    _streamConfig.width = config.width;
@@ -403,12 +410,14 @@ static OSStatus playbackCallback(void *inRefCon,

 -(void) main
 {
-    LiStartConnection(_host,
+    [initLock lock];
+    LiStartConnection(&_serverInfo,
                      &_streamConfig,
                      &_clCallbacks,
                      &_drCallbacks,
                      &_arCallbacks,
-                      NULL, 0, _serverMajorVersion);
+                      NULL, 0);
+    [initLock unlock];
 }

@end
@@ -11,6 +11,8 @@
@interface StreamConfiguration : NSObject

@property NSString* host;
+@property NSString* appVersion;
+@property NSString* gfeVersion;
@property NSString* appID;
@property int width;
@property int height;
@@ -14,6 +14,5 @@

 - (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionCallbacks:(id<ConnectionCallbacks>)callback;
 - (void) stopStream;
- (void) stopStreamInternal;

@end
@@ -50,6 +50,7 @@
                                       fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
    NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
    NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
+    NSString* gfeVersion = [serverInfoResp getStringTag:@"GfeVersion"];
    NSString* serverState = [serverInfoResp getStringTag:@"state"];
    if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) {
        [_callbacks launchFailed:@"Failed to connect to PC"];
@@ -82,29 +83,21 @@
    [((StreamView*)_renderView) setMouseDeltaFactors:_config.width / screenSize.width
                                                   y:_config.height / screenSize.height];
    
-    int majorVersion = [[appversion substringToIndex:1] intValue];
-    Log(LOG_I, @"Server is generation %d", majorVersion);
+    // Populate the config's version fields from serverinfo
+    _config.appVersion = appversion;
+    _config.gfeVersion = gfeVersion;
    
    VideoDecoderRenderer* renderer = [[VideoDecoderRenderer alloc]initWithView:_renderView];
-    _connection = [[Connection alloc] initWithConfig:_config renderer:renderer connectionCallbacks:_callbacks serverMajorVersion:majorVersion];
+    _connection = [[Connection alloc] initWithConfig:_config renderer:renderer connectionCallbacks:_callbacks];
    NSOperationQueue* opQueue = [[NSOperationQueue alloc] init];
    [opQueue addOperation:_connection];
 }

-// This should NEVER be called from within a thread
-// owned by moonlight-common
 - (void) stopStream
 {
    [_connection terminate];
 }

-// This should only be called from within a thread
-// owned by moonlight-common
- (void) stopStreamInternal
-{
-    [_connection terminateInternal];
-}
-
 - (BOOL) launchApp:(HttpManager*)hMan {
    HttpResponse* launchResp = [[HttpResponse alloc] init];
    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:launchResp withUrlRequest:
@@ -60,7 +60,7 @@ static UIImage* noImage;
        _appOverlay = nil;
    }
    
-    if (_app.isRunning) {
+    if ([_app.id isEqualToString:_app.host.currentGame]) {
        // Only create the app overlay if needed
        _appOverlay = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Play"]];
        _appOverlay.layer.shadowColor = [UIColor blackColor].CGColor;
@@ -87,7 +87,8 @@ static UIImage* noImage;
        }
        
        // This size of image might be blank image received from GameStream.
-        if (!(appImage.size.width == 130.f && appImage.size.height == 180.f)) {
+        if (!(appImage.size.width == 130.f && appImage.size.height == 180.f) && // GFE 2.0
+            !(appImage.size.width == 628.f && appImage.size.height == 888.f)) { // GFE 3.0
            _appButton.frame = CGRectMake(0, 0, appImage.size.width / 2, appImage.size.height / 2);
            self.frame = CGRectMake(0, 0, appImage.size.width / 2, appImage.size.height / 2);
            _appOverlay.frame = CGRectMake(0, 0, self.frame.size.width / 2.f, self.frame.size.height / 4.f);
@@ -48,21 +48,26 @@ static NSMutableSet* hostList;
        _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing"
                                                         message:[NSString stringWithFormat:@"Enter the following PIN on the host machine: %@", PIN]
                                                  preferredStyle:UIAlertControllerStyleAlert];
+        [_pairAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action) {
+            [_discMan startDiscovery];
+            [self hideLoadingFrame];
+        }]];
        [self presentViewController:_pairAlert animated:YES completion:nil];
    });
 }

 - (void)pairFailed:(NSString *)message {
    dispatch_async(dispatch_get_main_queue(), ^{
-        [_pairAlert dismissViewControllerAnimated:YES completion:nil];
-        _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing Failed"
-                                                         message:message
-                                                  preferredStyle:UIAlertControllerStyleAlert];
-        [_pairAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
-        [self presentViewController:_pairAlert animated:YES completion:nil];
-        
-        [_discMan startDiscovery];
-        [self hideLoadingFrame];
+        [_pairAlert dismissViewControllerAnimated:YES completion:^{
+            _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing Failed"
+                                                             message:message
+                                                      preferredStyle:UIAlertControllerStyleAlert];
+            [_pairAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+            [self presentViewController:_pairAlert animated:YES completion:nil];
+            
+            [_discMan startDiscovery];
+            [self hideLoadingFrame];
+        }];
    });
 }

@@ -166,7 +171,6 @@ static NSMutableSet* hostList;
        for (TemporaryApp* savedApp in host.appList) {
            if ([app.id isEqualToString:savedApp.id]) {
                savedApp.name = app.name;
-                savedApp.isRunning = app.isRunning;
                appAlreadyInList = YES;
                break;
            }
@@ -417,6 +421,17 @@ static NSMutableSet* hostList;
                                            // Exempt this host from discovery while handling the quit operation
                                            [_discMan removeHostFromDiscovery:app.host];
                                            [hMan executeRequestSynchronously:quitRequest];
+                                            if (quitResponse.statusCode == 200) {
+                                                ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
+                                                [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
+                                                                                                            fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
+                                                if (![serverInfoResp isStatusOk] || ![[serverInfoResp getStringTag:@"state"] hasSuffix:@"_SERVER_AVAILABLE"]) {
+                                                    // On newer GFE versions, the quit request succeeds even though the app doesn't
+                                                    // really quit if another client tries to kill your app. We'll patch the response
+                                                    // to look like the old error in that case, so the UI behaves.
+                                                    quitResponse.statusCode = 599;
+                                                }
+                                            }
                                            [_discMan addHostToDiscovery:app.host];
                                            
                                            UIAlertController* alert;
@@ -430,7 +445,7 @@ static NSMutableSet* hostList;
                                            }
                                            // If it succeeds and we're to start streaming, segue to the stream and return
                                            else if (![app.id isEqualToString:currentApp.id]) {
-                                                currentApp.isRunning = NO;
+                                                app.host.currentGame = @"0";
                                                
                                                dispatch_async(dispatch_get_main_queue(), ^{
                                                    [self updateAppsForHost:app.host];
@@ -441,7 +456,7 @@ static NSMutableSet* hostList;
                                            }
                                            // Otherwise, display a dialog to notify the user that the app was quit
                                            else {
-                                                currentApp.isRunning = NO;
+                                                app.host.currentGame = @"0";
                                                
                                                alert = [UIAlertController alertControllerWithTitle:@"Quitting App"
                                                                                            message:@"The app was quit successfully."
@@ -464,7 +479,7 @@ static NSMutableSet* hostList;

 - (TemporaryApp*) findRunningApp:(TemporaryHost*)host {
    for (TemporaryApp* app in host.appList) {
-        if (app.isRunning) {
+        if ([app.id isEqualToString:host.currentGame]) {
            return app;
        }
    }
@@ -539,14 +554,13 @@ static NSMutableSet* hostList;
    hostScrollView.delaysContentTouches = NO;
    
    UIButton* pullArrow = [[UIButton alloc] init];
+    [pullArrow addTarget:self.revealViewController action:@selector(revealToggle:) forControlEvents:UIControlEventTouchDown];
    [pullArrow setImage:[UIImage imageNamed:@"PullArrow"] forState:UIControlStateNormal];
    [pullArrow sizeToFit];
    pullArrow.frame = CGRectMake(0,
-                                 self.collectionView.frame.size.height / 2 - pullArrow.frame.size.height / 2 - self.navigationController.navigationBar.frame.size.height,
+                                 self.collectionView.frame.size.height / 6 - pullArrow.frame.size.height / 2 - self.navigationController.navigationBar.frame.size.height,
                                 pullArrow.frame.size.width,
                                 pullArrow.frame.size.height);
-    [self.view addSubview:pullArrow];
-    
    
    self.collectionView.delaysContentTouches = NO;
    self.collectionView.allowsMultipleSelection = NO;
@@ -562,6 +576,7 @@ static NSMutableSet* hostList;
    
    [self updateHosts];
    [self.view addSubview:hostScrollView];
+    [self.view addSubview:pullArrow];
 }

 -(void)dealloc
@@ -571,8 +586,8 @@ static NSMutableSet* hostList;

 -(void)handleReturnToForeground
 {
-    // This will refresh the applist
-    if (_selectedHost != nil) {
+    // This will refresh the applist when a paired host is selected
+    if (_selectedHost != nil && _selectedHost.pairState == PairStatePaired) {
        [self hostClicked:_selectedHost view:nil];
    }
 }
@@ -84,10 +84,10 @@
        [self presentViewController:conTermAlert animated:YES completion:nil];
    });

-    [_streamMan stopStreamInternal];
+    [_streamMan stopStream];
 }

- (void) stageStarting:(char*)stageName {
+- (void) stageStarting:(const char*)stageName {
    Log(LOG_I, @"Starting %s", stageName);
    dispatch_async(dispatch_get_main_queue(), ^{
        NSString* lowerCase = [NSString stringWithFormat:@"%s in progress...", stageName];
@@ -98,10 +98,10 @@
    });
 }

- (void) stageComplete:(char*)stageName {
+- (void) stageComplete:(const char*)stageName {
 }

- (void) stageFailed:(char*)stageName withError:(long)errorCode {
+- (void) stageFailed:(const char*)stageName withError:(long)errorCode {
    Log(LOG_I, @"Stage %s failed: %ld", stageName, errorCode);

    dispatch_async(dispatch_get_main_queue(), ^{
@@ -115,7 +115,7 @@
        [self presentViewController:alert animated:YES completion:nil];
    });
    
-    [_streamMan stopStreamInternal];
+    [_streamMan stopStream];
 }

 - (void) launchFailed:(NSString*)message {
@@ -132,11 +132,11 @@
    });
 }

- (void) displayMessage:(char*)message {
+- (void) displayMessage:(const char*)message {
    Log(LOG_I, @"Display message: %s", message);
 }

- (void) displayTransientMessage:(char*)message {
+- (void) displayTransientMessage:(const char*)message {
    Log(LOG_I, @"Display transient message: %s", message);
 }

@@ -18,6 +18,8 @@
 		9E5D60131A5A5A3900689918 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */; };
 		9E5D60151A5A5A3900689918 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */; };
 		9E5D60161A5A5A3900689918 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */; };
+		D46A73AD1CBC7D090039F1EE /* ControllerUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D46A73AC1CBC7D090039F1EE /* ControllerUnitTests.swift */; };
+		D4746EEC1CBC740C006FB401 /* Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4746EEB1CBC740C006FB401 /* Controller.swift */; };
 		FB1D59971BBCCB6400F482CA /* ComputerScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = FB1D59961BBCCB6400F482CA /* ComputerScrollView.m */; };
 		FB1D599A1BBCCD7E00F482CA /* AppCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = FB1D59991BBCCD7E00F482CA /* AppCollectionView.m */; };
 		FB290CF219B2C406004C83CF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF119B2C406004C83CF /* Foundation.framework */; };
@@ -66,7 +68,6 @@
 		FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD391A7E05CE00872C98 /* ServerInfoResponse.m */; };
 		FB9AFD3D1A7E111600872C98 /* AppAssetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD3C1A7E111600872C98 /* AppAssetResponse.m */; };
 		FB9AFD401A7E127D00872C98 /* AppListResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD3F1A7E127D00872C98 /* AppListResponse.m */; };
-		FB9AFD431A7F0C6900872C98 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD421A7F0C6900872C98 /* Controller.m */; };
 		FBD1C8E21A8AD71400C6703C /* Logger.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD1C8E11A8AD71400C6703C /* Logger.m */; };
 		FBD3494319FC9C04002D2A60 /* AppAssetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494219FC9C04002D2A60 /* AppAssetManager.m */; };
 		FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494F19FF2174002D2A60 /* SettingsViewController.m */; };
@@ -94,6 +95,13 @@
 			remoteGlobalIDString = FB290E2D19B37A4E004C83CF;
 			remoteInfo = "moonlight-common";
 		};
+		D46A73A51CBC7CB60039F1EE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = FB290CE619B2C406004C83CF /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FB290CED19B2C406004C83CF;
+			remoteInfo = Moonlight;
+		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
@@ -111,6 +119,12 @@
 		9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Medium.ttf"; sourceTree = "<group>"; };
 		9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Regular.ttf"; sourceTree = "<group>"; };
 		9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = "<group>"; };
+		D46A73A01CBC7CB60039F1EE /* MoonlightUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MoonlightUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		D46A73A41CBC7CB60039F1EE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		D46A73AB1CBC7D080039F1EE /* MoonlightUnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MoonlightUnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
+		D46A73AC1CBC7D090039F1EE /* ControllerUnitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ControllerUnitTests.swift; path = Input/ControllerUnitTests.swift; sourceTree = "<group>"; };
+		D4746EEA1CBC740C006FB401 /* Moonlight-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Moonlight-Bridging-Header.h"; path = "Input/Moonlight-Bridging-Header.h"; sourceTree = "<group>"; };
+		D4746EEB1CBC740C006FB401 /* Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Controller.swift; sourceTree = "<group>"; };
 		FB1D59951BBCCB6400F482CA /* ComputerScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComputerScrollView.h; sourceTree = "<group>"; };
 		FB1D59961BBCCB6400F482CA /* ComputerScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComputerScrollView.m; sourceTree = "<group>"; };
 		FB1D59981BBCCD7E00F482CA /* AppCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppCollectionView.h; sourceTree = "<group>"; };
@@ -274,8 +288,6 @@
 		FB9AFD3C1A7E111600872C98 /* AppAssetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppAssetResponse.m; sourceTree = "<group>"; };
 		FB9AFD3E1A7E127D00872C98 /* AppListResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppListResponse.h; sourceTree = "<group>"; };
 		FB9AFD3F1A7E127D00872C98 /* AppListResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppListResponse.m; sourceTree = "<group>"; };
-		FB9AFD411A7F0C6900872C98 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-		FB9AFD421A7F0C6900872C98 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
 		FBB460391B50ACE400F3099C /* Moonlight v1.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Moonlight v1.0.xcdatamodel"; sourceTree = "<group>"; };
 		FBD1C8E01A8AD69E00C6703C /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
 		FBD1C8E11A8AD71400C6703C /* Logger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logger.m; sourceTree = "<group>"; };
@@ -303,6 +315,13 @@
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
+		D46A739D1CBC7CB60039F1EE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		FB290CEB19B2C406004C83CF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -356,11 +375,30 @@
 			path = Roboto;
 			sourceTree = "<group>";
 		};
+		D46A73A11CBC7CB60039F1EE /* MoonlightUnitTests */ = {
+			isa = PBXGroup;
+			children = (
+				D46A73AB1CBC7D080039F1EE /* MoonlightUnitTests-Bridging-Header.h */,
+				D46A73AA1CBC7CEF0039F1EE /* Input */,
+				D46A73A41CBC7CB60039F1EE /* Info.plist */,
+			);
+			path = MoonlightUnitTests;
+			sourceTree = "<group>";
+		};
+		D46A73AA1CBC7CEF0039F1EE /* Input */ = {
+			isa = PBXGroup;
+			children = (
+				D46A73AC1CBC7D090039F1EE /* ControllerUnitTests.swift */,
+			);
+			name = Input;
+			sourceTree = "<group>";
+		};
 		FB290CE519B2C406004C83CF = {
 			isa = PBXGroup;
 			children = (
 				98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */,
-				FB290CF919B2C406004C83CF /* Limelight */,
+				FB290CF919B2C406004C83CF /* Moonlight */,
+				D46A73A11CBC7CB60039F1EE /* MoonlightUnitTests */,
 				FB290CF019B2C406004C83CF /* Frameworks */,
 				FB290CEF19B2C406004C83CF /* Products */,
 			);
@@ -370,6 +408,7 @@
 			isa = PBXGroup;
 			children = (
 				FB290CEE19B2C406004C83CF /* Moonlight.app */,
+				D46A73A01CBC7CB60039F1EE /* MoonlightUnitTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -393,9 +432,10 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		FB290CF919B2C406004C83CF /* Limelight */ = {
+		FB290CF919B2C406004C83CF /* Moonlight */ = {
 			isa = PBXGroup;
 			children = (
+				D4746EEA1CBC740C006FB401 /* Moonlight-Bridging-Header.h */,
 				9E5D5FF61A5A5A3900689918 /* Font */,
 				FB89460419F646E200339C8A /* Crypto */,
 				FB89460919F646E200339C8A /* Input */,
@@ -421,6 +461,7 @@
 				FB1D59981BBCCD7E00F482CA /* AppCollectionView.h */,
 				FB1D59991BBCCD7E00F482CA /* AppCollectionView.m */,
 			);
+			name = Moonlight;
 			path = Limelight;
 			sourceTree = "<group>";
 		};
@@ -453,8 +494,7 @@
 			children = (
 				FB89460A19F646E200339C8A /* ControllerSupport.h */,
 				FB89460B19F646E200339C8A /* ControllerSupport.m */,
-				FB9AFD411A7F0C6900872C98 /* Controller.h */,
-				FB9AFD421A7F0C6900872C98 /* Controller.m */,
+				D4746EEB1CBC740C006FB401 /* Controller.swift */,
 				FB89460C19F646E200339C8A /* StreamView.h */,
 				FB89460D19F646E200339C8A /* StreamView.m */,
 				FB4678EB1A50C40900377732 /* OnScreenControls.h */,
@@ -750,6 +790,24 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
+		D46A739F1CBC7CB60039F1EE /* MoonlightUnitTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D46A73A91CBC7CB60039F1EE /* Build configuration list for PBXNativeTarget "MoonlightUnitTests" */;
+			buildPhases = (
+				D46A739C1CBC7CB60039F1EE /* Sources */,
+				D46A739D1CBC7CB60039F1EE /* Frameworks */,
+				D46A739E1CBC7CB60039F1EE /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				D46A73A61CBC7CB60039F1EE /* PBXTargetDependency */,
+			);
+			name = MoonlightUnitTests;
+			productName = MoonlightUnitTests;
+			productReference = D46A73A01CBC7CB60039F1EE /* MoonlightUnitTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		FB290CED19B2C406004C83CF /* Moonlight */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = FB290D2019B2C406004C83CF /* Build configuration list for PBXNativeTarget "Moonlight" */;
@@ -774,11 +832,18 @@
 		FB290CE619B2C406004C83CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Moonlight Stream";
 				TargetAttributes = {
+					D46A739F1CBC7CB60039F1EE = {
+						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
+						TestTargetID = FB290CED19B2C406004C83CF;
+					};
 					FB290CED19B2C406004C83CF = {
 						DevelopmentTeam = DM46QST4M7;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -801,6 +866,7 @@
 			projectRoot = "";
 			targets = (
 				FB290CED19B2C406004C83CF /* Moonlight */,
+				D46A739F1CBC7CB60039F1EE /* MoonlightUnitTests */,
 			);
 		};
 /* End PBXProject section */
@@ -816,6 +882,13 @@
 /* End PBXReferenceProxy section */

 /* Begin PBXResourcesBuildPhase section */
+		D46A739E1CBC7CB60039F1EE /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		FB290CEC19B2C406004C83CF /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -838,6 +911,14 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
+		D46A739C1CBC7CB60039F1EE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D46A73AD1CBC7D090039F1EE /* ControllerUnitTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		FB290CEA19B2C406004C83CF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -877,12 +958,12 @@
 				FB9AFD371A7E02DB00872C98 /* HttpRequest.m in Sources */,
 				FB4678ED1A50C40900377732 /* OnScreenControls.m in Sources */,
 				FB290D0019B2C406004C83CF /* main.m in Sources */,
-				FB9AFD431A7F0C6900872C98 /* Controller.m in Sources */,
 				FBD3494319FC9C04002D2A60 /* AppAssetManager.m in Sources */,
 				FB6549561A57907E001C8F39 /* DiscoveryWorker.m in Sources */,
 				FB89462A19F646E200339C8A /* ControllerSupport.m in Sources */,
 				FB9AFD3D1A7E111600872C98 /* AppAssetResponse.m in Sources */,
 				FBD349621A0089F6002D2A60 /* DataManager.m in Sources */,
+				D4746EEC1CBC740C006FB401 /* Controller.swift in Sources */,
 				FBFCB3351B50B29400089F8A /* App.m in Sources */,
 				FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */,
 				FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */,
@@ -898,6 +979,11 @@
 			name = "moonlight-common";
 			targetProxy = 98AB2E851CAD468B0089BB98 /* PBXContainerItemProxy */;
 		};
+		D46A73A61CBC7CB60039F1EE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FB290CED19B2C406004C83CF /* Moonlight */;
+			targetProxy = D46A73A51CBC7CB60039F1EE /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
@@ -912,6 +998,54 @@
 /* End PBXVariantGroup section */

 /* Begin XCBuildConfiguration section */
+		D46A73A71CBC7CB60039F1EE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = MoonlightUnitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.MoonlightUnitTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "MoonlightUnitTests/MoonlightUnitTests-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Moonlight.app/Moonlight";
+			};
+			name = Debug;
+		};
+		D46A73A81CBC7CB60039F1EE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = MoonlightUnitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.MoonlightUnitTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "MoonlightUnitTests/MoonlightUnitTests-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Moonlight.app/Moonlight";
+			};
+			name = Release;
+		};
 		FB290D1E19B2C406004C83CF /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -925,15 +1059,20 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -966,14 +1105,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -992,6 +1136,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
@@ -1005,6 +1150,7 @@
 					"$(PROJECT_DIR)/libs/**",
 				);
 				INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/libs/opus/lib",
@@ -1014,6 +1160,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = NO;
+				SWIFT_OBJC_BRIDGING_HEADER = "Limelight/Input/Moonlight-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -1022,6 +1171,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
@@ -1035,6 +1185,7 @@
 					"$(PROJECT_DIR)/libs/**",
 				);
 				INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/libs/opus/lib",
@@ -1044,6 +1195,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = NO;
+				SWIFT_OBJC_BRIDGING_HEADER = "Limelight/Input/Moonlight-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -1051,6 +1205,15 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
+		D46A73A91CBC7CB60039F1EE /* Build configuration list for PBXNativeTarget "MoonlightUnitTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D46A73A71CBC7CB60039F1EE /* Debug */,
+				D46A73A81CBC7CB60039F1EE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		FB290CE919B2C406004C83CF /* Build configuration list for PBXProject "Moonlight" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
@@ -0,0 +1,192 @@
+//
+//  ControllerUnitTests.swift
+//  Moonlight
+//
+//  Created by David Aghassi on 4/11/16.
+//  Copyright © 2016 Moonlight Stream. All rights reserved.
+//
+
+import XCTest
+@testable import Moonlight
+
+/**
+ Tests the `Controller.swift` class
+ */
+class ControllerUnitTests: XCTestCase {
+  var controllerUnderTest: Controller!
+  
+  override func setUp() {
+    controllerUnderTest = Controller()
+    XCTAssertNotNil(controllerUnderTest, "controllerUnderTest is nil, and should not be for this test. See line \(#line) \n")
+  }
+  
+  override func tearDown() {
+    resetAllValues()
+  }
+  
+  
+  // MARK: Helper Methods
+  /**
+   Sets all the values of `controllerUnderTest` to `0`
+   */
+  func resetAllValues() {
+    controllerUnderTest.emulatingButtonFlags = CInt(0)
+    controllerUnderTest.lastButtonFlags = CInt(0)
+    
+    controllerUnderTest.lastLeftStickX = CShort(0)
+    controllerUnderTest.lastLeftStickY = CShort(0)
+    controllerUnderTest.lastRightStickX = CShort(0)
+    controllerUnderTest.lastRightStickY = CShort(0)
+    
+    controllerUnderTest.lastLeftTrigger = CChar(0)
+    controllerUnderTest.lastRightTrigger = CChar(0)
+  }
+  
+  /**
+   Displays "*name* failed to set CInt correctly." Shows expected and actual, as well as failure line.
+   
+   - parameter name:     The property being tested
+   - parameter expected: The expected value for the property
+   - parameter actual:   The actual value for the property
+   
+   - returns: A string with the failure in it. Formatted to state actual, expected, and the failure line.
+   */
+  func displayCIntFailure(name: String, expected: CInt, actual: CInt) -> String {
+    return "\(name) failed to set CInt correctly \n. Expected: \(expected)\n. Actual: \(actual) \n. See line \(#line) \n"
+  }
+  
+  /**
+   Displays "*name* failed to set CShort correctly." Shows expected and actual, as well as failure line.
+   
+   - parameter name:     The property being tested
+   - parameter expected: The expected value for the property
+   - parameter actual:   The actual value for the property
+   
+   - returns: A string with the failure in it. Formatted to state actual, expected, and the failure line.
+   */
+  func displayCShortFailure(name: String, expected: CShort, actual: CShort) -> String {
+    return "\(name) failed to set CShort correctly \n. Expected: \(expected)\n. Actual: \(actual) \n. See line \(#line) \n"
+  }
+  
+  /**
+   Displays "*name* failed to set CCHar correctly." Shows expected and actual, as well as the failure line.
+   
+   - parameter name:     The property being tested
+   - parameter expected: The expected value for the property
+   - parameter actual:   The actual value for the property
+   
+   - returns: A string with the failure in it. Formatted to state actual, expected, and the failure line.
+   */
+  func displayCCharFailure(name: String, expected: CChar, actual: CChar) -> String {
+    return "\(name) failed to set CChar correctly \n. Expected: \(expected)\n. Actual: \(actual) \n. See line \(#line) \n"
+  }
+  
+  
+  // MARK: Tests
+  /**
+   Asserts that the `emulatingButtonFlags` is of type `CInt` and can be set and gotten from properly
+   */
+  func test_Assert_emulatingButtonFlags_Sets_To_CInt() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.emulatingButtonFlags.dynamicType == CInt.self, "Expected emulatingButtonFlags to be of type CInt. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CInt(1)
+    controllerUnderTest.emulatingButtonFlags = expected
+    XCTAssertTrue(controllerUnderTest.emulatingButtonFlags == expected, displayCIntFailure("emulatingButtonFlags", expected: expected, actual: controllerUnderTest.emulatingButtonFlags))
+  }
+  
+  /**
+   Asserts that the `lastButtonFlags` is of type `CInt` and can be set and gotten from properly
+   */
+  func test_Assert_lastButtonFlags_Sets_To_CInt() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastButtonFlags.dynamicType == CInt.self, "Expected lastButtonFlags to be of type CInt. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CInt(1)
+    controllerUnderTest.lastButtonFlags = expected
+    XCTAssertTrue(controllerUnderTest.lastButtonFlags == expected, displayCIntFailure("lastButtonFlags", expected: expected, actual: controllerUnderTest.lastButtonFlags))
+  }
+  
+  /**
+   Asserts that the `lastLeftStickX` is of type `CShort` and can be set and gotten from properly
+   */
+  func test_Assert_lastLeftStickX_Sets_To_CShort() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastLeftStickX.dynamicType == CShort.self, "Expected lastLeftStickX to be of type CShort. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CShort(1)
+    controllerUnderTest.lastLeftStickX = expected
+    XCTAssertTrue(controllerUnderTest.lastLeftStickX == expected, displayCShortFailure("lastLeftStickX", expected: expected, actual: controllerUnderTest.lastLeftStickX))
+  }
+  
+  /**
+   Asserts that lastLeftStickY` is of type `CShort` and can be set and gotten from properly
+   */
+  func test_Assert_lastLeftStickY_Sets_To_CShort() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastLeftStickY.dynamicType == CShort.self, "Expected lastLeftStickY to be of type CShort. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CShort(1)
+    controllerUnderTest.lastLeftStickY = expected
+    XCTAssertTrue(controllerUnderTest.lastLeftStickY == expected, displayCShortFailure("lastLeftStickY", expected: expected, actual: controllerUnderTest.lastLeftStickY))
+  }
+  
+  /**
+   Asserts that the `lastRightStickX` is of type `CShort` and can be set and gotten from properly
+   */
+  func test_Assert_lastRightStickX_SetsTo_CShort() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastRightStickX.dynamicType == CShort.self, "Expected lastRightStickX to be of type CShort. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CShort(1)
+    controllerUnderTest.lastRightStickX = expected
+    XCTAssertTrue(controllerUnderTest.lastRightStickX == expected, displayCShortFailure("lastRightStickX", expected: expected, actual: controllerUnderTest.lastRightStickX))
+  }
+  
+  /**
+   Asserts that the `lastRightStickY` is of type `CShort` and can be set and gotten from properly
+   */
+  func test_Assert_lastRightStickY_Sets_To_CShort() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastRightStickY.dynamicType == CShort.self, "Expected lastRightStickY to be of type CShort. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CShort(1)
+    controllerUnderTest.lastRightStickY = expected
+    XCTAssertTrue(controllerUnderTest.lastRightStickY == expected, displayCShortFailure("lastRightStickY", expected: expected, actual: controllerUnderTest.lastRightStickY))
+  }
+  
+  /**
+   Asserts that the `lastLeftTrigger` is of type `CChar` and can be set and gotten from properly
+   */
+  func test_Assert_lastLeftTrigger_Sets_To_CChar() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastLeftTrigger.dynamicType == CChar.self, "Expected lastLeftTrigger to be of type CChar. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CChar(1)
+    controllerUnderTest.lastLeftTrigger = expected
+    XCTAssertTrue(controllerUnderTest.lastLeftTrigger == expected, displayCCharFailure("lastLeftTrigger", expected: expected, actual: controllerUnderTest.lastLeftTrigger))
+    
+  }
+  
+  /**
+   Asserts that the `lastRightTrigger` is of type `CChar` and can be set and gotten from properly
+   */
+  func test_Assert_lastRightTrigger_Sets_To_CChar() {
+    // Assert type hasn't changed
+    XCTAssertTrue(controllerUnderTest.lastRightTrigger.dynamicType == CChar.self, "Expected lastRightTrigger to be of type CChar. See line \(#line) \n")
+    
+    // Assert value is assigned properly.
+    let expected = CChar(1)
+    controllerUnderTest.lastRightTrigger = expected
+    XCTAssertTrue(controllerUnderTest.lastRightTrigger == expected, displayCCharFailure("lastRightTrigger", expected: expected, actual: controllerUnderTest.lastRightTrigger))
+    
+  }
+  
+}
@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
@@ -8,7 +8,7 @@ your powerful desktop computer to your iOS Device.
 There are also versions for [Android](https://github.com/moonlight-stream/moonlight-android) and [PC](https://github.com/moonlight-stream/moonlight-pc). 

 ##### Apple TV Note: 
-We current cannot write a port for Apple TV due to a limitation in the tvOS SDK that prevents Moonlight from using the APIs that would be necessary for it to work. Thank you for your interest - you can track this issue [here](https://github.com/moonlight-stream/moonlight-ios/issues/184). 
+We currently cannot port Moonlight to Apple TV due to a limitation in the tvOS SDK that prevents Moonlight from using the APIs that would be necessary for it to work. Thank you for your interest - you can track this issue [here](https://github.com/moonlight-stream/moonlight-ios/issues/184). 

 ##### Questions?
-Check out our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki).
+Check out our [wiki](https://github.com/moonlight-stream/moonlight-docs/wiki).
@@ -267,7 +267,7 @@
 		FB290E2619B37A4E004C83CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Moonlight Stream";
 			};
 			buildConfigurationList = FB290E2919B37A4E004C83CF /* Build configuration list for PBXProject "moonlight-common" */;
@@ -338,13 +338,17 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COPY_PHASE_STRIP = NO;
+				DEFINES_MODULE = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					LC_DEBUG,
@@ -380,13 +384,17 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
Author	SHA1	Message	Date
Diego Waxemberg	9e18b8021b	Bumping app version for v1.1.3	2016-10-26 19:08:33 -07:00
Cameron Gutman	ce95f2c153	Fix some pairing glitches and add a cancel button	2016-10-21 12:07:29 -07:00
Cameron Gutman	fd50b71b16	Fix detection of running apps on GFE 3.1	2016-10-21 11:41:42 -07:00
Diego Waxemberg	39ab472cf6	Updated to use swift 3	2016-10-05 23:45:48 -07:00
Diego Waxemberg	48ba7eb2dc	Bump version for v1.1.2	2016-10-05 23:00:46 -07:00
Diego Waxemberg	42edaa1bad	Added DerivedData to gitignore	2016-10-05 22:58:38 -07:00
Diego Waxemberg	955fb59156	Merge branch 'master' of github.com:moonlight-stream/moonlight-ios	2016-10-05 22:57:43 -07:00
Diego Waxemberg	2fbc67ef00	Bumped version for v1.1.1	2016-10-05 22:56:40 -07:00
Cameron Gutman	23564a3028	Add support for GFE 3.0.7	2016-10-05 17:32:30 -07:00
Cameron Gutman	9a07d5a33a	Display an error if attempting to close another session's app rather than silently failing	2016-09-24 21:26:50 -07:00
Cameron Gutman	84c037f235	Move the pull arrow up to the top of the left side and make it clickable on the PC view page	2016-09-24 20:39:43 -07:00
Cameron Gutman	c13df82f5b	Update common-c to fix Gen 3 servers	2016-09-24 19:09:21 -07:00
Cameron Gutman	b15d61a5bf	Allow existing host to be updated via the Add PC dialog	2016-09-24 18:53:52 -07:00
Cameron Gutman	5aff719984	Add message to enable GameStream for GFE 3.0	2016-09-24 18:51:55 -07:00
Cameron Gutman	b0c2978405	Update common-c submodule with const char * change	2016-07-31 17:10:32 -07:00
Cameron Gutman	91dcb505de	Fix displaying names of custom added apps on GFE 3.0	2016-07-31 14:40:08 -07:00
Cameron Gutman	d1f35d938b	Apply Xcode 8 recommended project settings	2016-07-31 12:02:35 -07:00
Cameron Gutman	359b822951	Migrate to Swift 2.3 for Xcode 8	2016-07-31 12:00:09 -07:00
Cameron Gutman	39580e4352	Fix wiki link	2016-05-30 12:23:41 -05:00
Cameron Gutman	7b3d099449	Use the same Controller object for player 0 and the on-screen controls so tapping on-screen buttons doesn't reset all physical controller input to 0. Fixes pressing L3 to run in some games.	2016-05-22 17:11:30 -05:00
Cameron Gutman	b17c45e9ca	Update common-c to include MTU fix for LTE streaming	2016-05-21 21:32:36 -05:00
Cameron Gutman	4c7a2cecdd	Allow the user to slide between directions on the d-pad. This closes #222	2016-05-08 15:42:08 -04:00
Cameron Gutman	175074ece8	Tweaks to dragging behavior to match Moonlight Android	2016-05-08 15:09:43 -04:00
Cameron Gutman	8a5ec513bf	Update common-c	2016-05-08 14:59:08 -04:00
Cameron Gutman	7cfb7f73a2	Fix some WOL issues including crashes and broken functionality with DNS names	2016-05-08 14:56:22 -04:00
Cameron Gutman	c608685737	Update common-c with bugfixes	2016-04-27 02:24:54 -04:00
Cameron Gutman	3beca2fc72	Update moonlight-common-c to fix a couple crashing bugs	2016-04-18 16:46:59 -04:00
Cameron Gutman	c59aafb4bb	Merge pull request #215 from Mimiste/master Drag and drop	2016-04-18 14:02:07 -04:00
Mimiste	256e40acdc	1 Second touch for the drag and drop Changed the timer duration to 1 second to initiate the drag and drop	2016-04-18 19:44:00 +02:00
Mimiste	39b1b65e16	Merge remote-tracking branch 'moonlight-stream/master'	2016-04-16 18:56:02 +02:00
Cameron Gutman	1783abec13	Lock around LiStartConnection() and LiStopConnection() to fix thread-safety issues. This will hopefully address the crashes seen in 1.0.3 and 1.0.4.	2016-04-12 00:50:59 -04:00
David	983c65d399	Rewrote the Controller class in Swift (#216 ) * Enabled Defines Modules for swift code * Created bridge header, created swift Controller - Created Controller.swift - Created bridge header for use of objc in swift * Finished porting Controller files to swift * Added comments, created MoonlightUnitTest - Added comments for Controller.swift - Created MoonlightUnitTest for testing new class * Started writing tests for ControllerUnitTests - General formatting - Wrote helper functions - Wrote tests for first four properties * Finished writing Controller tests * Removed commented out lines	2016-04-11 20:44:02 -07:00
Mimiste	4caa9672c9	Drag and drop The drag and drop is now enabled only if touching with one finger. The tap to drop does not fire another timer	2016-04-10 13:02:00 +02:00
Mimiste	15be6a3f75	Merge remote-tracking branch 'moonlight-stream/master'	2016-04-10 11:48:30 +02:00
Michelle Bergeron	d38eb0a3ba	s/current/currently	2016-04-09 23:12:59 -07:00
Mimiste	e8ea942ad2	Drag and drop Possibility to initiate a drag and drop - Touch for 2 second to initiate a drag - Move the cursor as usual - Tap top drop	2016-04-08 00:12:59 +02:00