Bumping app version for 1.4.0

Drag and drop

.gitignore

@@ -1,3 +1,4 @@
 **/xcuserdata/
 **/Moonlight.xcscmblueprint
 Build
+DerivedData

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "limelight-common-c"]
+[submodule "moonlight-common/moonlight-common-c"]
-	path = limelight-common-c
+	path = moonlight-common/moonlight-common-c
-	url = git@github.com:limelight-stream/limelight-common-c.git
+	url = https://github.com/moonlight-stream/moonlight-common-c.git

Launch Screen.xib

@@ -28,8 +28,8 @@
                     </view>
                     <navigationItem key="navigationItem" id="rW0-BH-s7l">
                         <barButtonItem key="leftBarButtonItem" enabled="NO" id="d9R-Zo-Uml">
-                            <button key="customView" opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9JC-B5-BAE">
+                            <button key="customView" opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="9JC-B5-BAE">
-                                <rect key="frame" x="-23" y="-15" width="46" height="30"/>
+                                <rect key="frame" x="20" y="-1" width="109" height="46"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>

Limelight/Crypto/CryptoManager.h

@@ -17,8 +17,10 @@
 + (NSData*) getSignatureFromCert:(NSData*)cert;
 + (NSData*) nullTerminateString:(NSData*)data;
 
-- (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN;
+- (NSData*) createAESKeyFromSaltSHA1:(NSData*)saltedPIN;
+- (NSData*) createAESKeyFromSaltSHA256:(NSData*)saltedPIN;
 - (NSData*) SHA1HashData:(NSData*)data;
+- (NSData*) SHA256HashData:(NSData*)data;
 - (NSData*) aesEncrypt:(NSData*)data withKey:(NSData*)key;
 - (NSData*) aesDecrypt:(NSData*)data withKey:(NSData*)key;
 - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert;

Limelight/Crypto/CryptoManager.m

@@ -16,19 +16,31 @@
 #include <openssl/evp.h>
 
 @implementation CryptoManager
-static const int SHA1_DIGEST_LENGTH = 20;
+static const int SHA1_HASH_LENGTH = 20;
+static const int SHA256_HASH_LENGTH = 32;
 static NSData* key = nil;
 static NSData* cert = nil;
 static NSData* p12 = nil;
 
-- (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN {
+- (NSData*) createAESKeyFromSaltSHA1:(NSData*)saltedPIN {
     return [[self SHA1HashData:saltedPIN] subdataWithRange:NSMakeRange(0, 16)];
 }
 
+- (NSData*) createAESKeyFromSaltSHA256:(NSData*)saltedPIN {
+    return [[self SHA256HashData:saltedPIN] subdataWithRange:NSMakeRange(0, 16)];
+}
+
 - (NSData*) SHA1HashData:(NSData*)data {
-    unsigned char sha1[SHA1_DIGEST_LENGTH];
+    unsigned char sha1[SHA1_HASH_LENGTH];
     SHA1([data bytes], [data length], sha1);
-    NSData* bytes = [NSData dataWithBytes:sha1 length:20];
+    NSData* bytes = [NSData dataWithBytes:sha1 length:sizeof(sha1)];
+    return bytes;
+}
+
+- (NSData*) SHA256HashData:(NSData*)data {
+    unsigned char sha256[SHA256_HASH_LENGTH];
+    SHA256([data bytes], [data length], sha256);
+    NSData* bytes = [NSData dataWithBytes:sha256 length:sizeof(sha256)];
     return bytes;
 }
 

Limelight/Database/DataManager.m

@@ -19,7 +19,17 @@
 - (id) init {
     self = [super init];
     
-    _appDelegate = [[UIApplication sharedApplication] delegate];
+    // HACK: Avoid calling [UIApplication delegate] off the UI thread to keep
+    // Main Thread Checker happy.
+    if ([NSThread isMainThread]) {
+        _appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    }
+    else {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            _appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        });
+    }
+    
     _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
     [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
     

Limelight/Database/TemporaryApp.h

@@ -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

Limelight/Database/TemporaryHost.h

@@ -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
 

Limelight/Database/TemporaryHost.m

@@ -17,6 +17,7 @@
 - (id) init {
     self = [super init];
     self.appList = [[NSMutableSet alloc] init];
+    self.currentGame = @"0";
     
     return self;
 }

Limelight/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,82 +1,108 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "app_icon_settings_58x58_@2x-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "app_icon_settings_87x87_@3x.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "app_icon_spotlight_80x80_@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "app_icon_spotlight_120x120_@3x.png",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "app_icon_120x120_@2x.png",
+      "filename" : "Icon-App-60x60@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "app_icon_180x180_@3x.png",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "app_icon_settings_29x29_@1x.png",
+      "filename" : "Icon-App-[email protected]",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "app_icon_settings_58x58_@2x.png",
+      "filename" : "Icon-App-29x29@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "app_icon_spotlight_40x40_@1x.png",
+      "filename" : "Icon-App-[email protected]",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "app_icon_spotlight_80x80_@2x.png",
+      "filename" : "Icon-App-40x40@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_76x76_@1x.png",
+      "filename" : "Icon-App-[email protected]",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_152x152_@2x.png",
+      "filename" : "Icon-App-76x76@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "app_icon_167x167_@2x.png",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "1024x icon.png",
+      "scale" : "1x"
     }
   ],
   "info" : {

Limelight/Images.xcassets/Logo.imageset/Contents.json

@@ -6,8 +6,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
+      "filename" : "logo.png",
-      "filename" : "logo_universal.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",

Limelight/Input/Controller.h

@@ -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

Limelight/Input/Controller.m

@@ -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

Limelight/Input/Controller.swift

@@ -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
+}

Limelight/Input/ControllerSupport.h

@@ -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;

Limelight/Input/ControllerSupport.m

@@ -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
@@ -139,7 +146,8 @@
 {
     [_controllerStreamLock lock];
     @synchronized(controller) {
-        LiSendMultiControllerEvent(controller.playerIndex, controller.lastButtonFlags, controller.lastLeftTrigger, controller.lastRightTrigger, controller.lastLeftStickX, controller.lastLeftStickY, controller.lastRightStickX, controller.lastRightStickY);
+        // Player 1 is always present for OSC
+        LiSendMultiControllerEvent(controller.playerIndex, _controllerNumbers | 1, controller.lastButtonFlags, controller.lastLeftTrigger, controller.lastRightTrigger, controller.lastLeftStickX, controller.lastLeftStickY, controller.lastRightStickX, controller.lastRightStickY);
     }
     [_controllerStreamLock unlock];
 }
@@ -272,9 +280,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 +299,10 @@
     }
 }
 
+-(Controller*) getOscController {
+    return _player0osc;
+}
+
 -(id) init
 {
     self = [super init];
@@ -290,6 +310,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]) {

Limelight/Input/Moonlight-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

Limelight/Input/OnScreenControls.m

@@ -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* _dpadTouch;
-    UITouch* _downTouch;
-    UITouch* _leftTouch;
-    UITouch* _rightTouch;
     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 = [controllerSupport getOscController];
-    _controller.playerIndex = 0;
     _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) {
+        } else if (touch == _dpadTouch) {
-            [_controllerSupport clearButtonFlag:_controller flags:UP_FLAG];
+            [_controllerSupport clearButtonFlag:_controller
-            _upTouch = nil;
+                                          flags:UP_FLAG | DOWN_FLAG | LEFT_FLAG | RIGHT_FLAG];
-            updated = true;
+            _dpadTouch = nil;
-        } 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;
             updated = true;
         } else if (touch == _startTouch) {
             [_controllerSupport clearButtonFlag:_controller flags:PLAY_FLAG];

Limelight/Input/StreamView.m

@@ -13,10 +13,13 @@
 #import "ControllerSupport.h"
 
 @implementation StreamView {
-    CGPoint touchLocation;
+    CGPoint touchLocation, originalLocation;
     BOOL touchMoved;
     OnScreenControls* onScreenControls;
     
+    BOOL isDragging;
+    NSTimer* dragTimer;
+    
     float xDeltaFactor;
     float yDeltaFactor;
     float screenFactor;
@@ -43,17 +46,38 @@
     }
 }
 
+- (Boolean)isConfirmedMove:(CGPoint)currentPoint from:(CGPoint)originalPoint {
+    // Movements of greater than 20 pixels are considered confirmed
+    return hypotf(originalPoint.x - currentPoint.x, originalPoint.y - currentPoint.y) >= 20;
+}
+
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
     Log(LOG_D, @"Touch down");
     if (![onScreenControls handleTouchDownEvent:touches]) {
         UITouch *touch = [[event allTouches] anyObject];
-        touchLocation = [touch locationInView:self];
+        originalLocation = 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];
@@ -69,8 +93,13 @@
                 
                 if (deltaX != 0 || deltaY != 0) {
                     LiSendMouseMoveEvent(deltaX, deltaY);
-                    touchMoved = true;
                     touchLocation = currentLocation;
+                    
+                    // If we've moved far enough to confirm this wasn't just human/machine error,
+                    // mark it as such.
+                    if ([self isConfirmedMove:touchLocation from:originalLocation]) {
+                        touchMoved = true;
+                    }
                 }
             }
         } else if ([[event allTouches] count] == 2) {
@@ -81,7 +110,13 @@
             if (touchLocation.y != avgLocation.y) {
                 LiSendScrollEvent(avgLocation.y - touchLocation.y);
             }
-            touchMoved = true;
+
+            // If we've moved far enough to confirm this wasn't just human/machine error,
+            // mark it as such.
+            if ([self isConfirmedMove:firstLocation from:originalLocation]) {
+                touchMoved = true;
+            }
+            
             touchLocation = avgLocation;
         }
     }
@@ -91,6 +126,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 +138,37 @@
                 usleep(100 * 1000);
                 
                 LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
-                
-                
             } else {
-                Log(LOG_D, @"Sending left mouse button press");
+                if (!isDragging){
-                
+                    Log(LOG_D, @"Sending left mouse button press");
-                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+                    
-                
+                    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-                // Wait 100 ms to simulate a real button press
+                    
-                usleep(100 * 1000);
+                    // 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);
+        }
+        
+        // We we're moving from 2+ touches to 1. Synchronize the current position
+        // of the active finger so we don't jump unexpectedly on the next touchesMoved
+        // callback when finger 1 switches on us.
+        if ([[event allTouches] count] - [touches count] == 1) {
+            NSMutableSet *activeSet = [[NSMutableSet alloc] initWithCapacity:[[event allTouches] count]];
+            [activeSet unionSet:[event allTouches]];
+            [activeSet minusSet:touches];
+            touchLocation = [[activeSet anyObject] locationInView:self];
+            
+            // Mark this touch as moved so we don't send a left mouse click if the user
+            // right clicks without moving their other finger.
+            touchMoved = true;
+        }
     }
 }
 

Limelight/Limelight-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>

Limelight/Network/AppListResponse.m

@@ -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];
             }
         }

Limelight/Network/DiscoveryManager.m

@@ -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,42 @@
 }
 
 - (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
+        if (host.address != nil) {
+            existingHost.address = host.address;
+        }
+        if (host.localAddress != nil) {
+            existingHost.localAddress = host.localAddress;
+        }
+        if (host.externalAddress != nil) {
+            existingHost.externalAddress = host.externalAddress;
+        }
+        existingHost.activeAddress = host.activeAddress;
+        return NO;
+    }
+    else {
+        // If we were added without an explicit address,
+        // populate it from our other available addresses
+        if (host.address == nil) {
+            if (host.externalAddress != nil) {
+                host.address = host.externalAddress;
+            }
+            else {
+                host.address = host.localAddress;
+            }
+        }
         [_hostQueue addObject:host];
         if (shouldDiscover) {
             [_opQueue addOperation:[self createWorkerForHost:host]];
         }
         return YES;
     }
-    return NO;
 }
 
 - (void) removeHostFromDiscovery:(TemporaryHost *)host {
@@ -133,14 +161,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]) {
+        if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:uuidString]) {
-            return YES;
+            return discoveredHost;
         }
     }
-    return NO;
+    return nil;
 }
 
 - (NSOperation*) createWorkerForHost:(TemporaryHost*)host {

Limelight/Network/MDNSManager.m

@@ -49,8 +49,8 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
     for (NSNetService* service in services) {
         if (service.hostName != nil) {
             TemporaryHost* host = [[TemporaryHost alloc] init];
-            host.activeAddress = host.address = service.hostName;
+            host.activeAddress = host.localAddress = service.hostName;
-            host.name = host.address;
+            host.name = service.hostName;
             [hosts addObject:host];
         }
     }

Limelight/Network/PairManager.h

@@ -22,6 +22,6 @@
 - (id) initWithManager:(HttpManager*)httpManager andCert:(NSData*)cert callback:(id<PairCallback>)callback;
 - (NSString*) generatePIN;
 - (NSData*) saltPIN:(NSString*)PIN;
-- (void) initiatePair;
+- (void) initiatePair:(int)serverMajorVersion;
 
 @end

Limelight/Network/PairManager.m

@@ -41,14 +41,21 @@
         if (![[serverInfoResp getStringTag:@"state"] hasSuffix:@"_SERVER_AVAILABLE"]) {
             [_callback pairFailed:@"You must stop streaming before attempting to pair."];
         } else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) {
-            [self initiatePair];
+            NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
+            if (appversion == nil) {
+                [_callback pairFailed:@"Missing XML element"];
+                return;
+            }            
+            [self initiatePair: [[appversion substringToIndex:1] intValue]];
         } else {
             [_callback alreadyPaired];
         }
     }
 }
 
-- (void) initiatePair {
+- (void) initiatePair:(int)serverMajorVersion {
+    Log(LOG_I, @"Pairing with generation %d server", serverMajorVersion);
+    
     NSString* PIN = [self generatePIN];
     NSData* salt = [self saltPIN:PIN];
     Log(LOG_I, @"PIN: %@, saltedPIN: %@", PIN, salt);
@@ -61,15 +68,29 @@
     }
     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 = [cryptoMan createAESKeyFromSalt:salt];
+    NSData* aesKey;
+    
+    // Gen 7 servers use SHA256 to get the key
+    int hashLength;
+    if (serverMajorVersion >= 7) {
+        aesKey = [cryptoMan createAESKeyFromSaltSHA256:salt];
+        hashLength = 32;
+    }
+    else {
+        aesKey = [cryptoMan createAESKeyFromSaltSHA1:salt];
+        hashLength = 20;
+    }
     
     NSData* randomChallenge = [Utils randomBytes:16];
     NSData* encryptedChallenge = [cryptoMan aesEncrypt:randomChallenge withKey:aesKey];
@@ -88,11 +109,18 @@
     NSData* encServerChallengeResp = [Utils hexToBytes:[challengeResp getStringTag:@"challengeresponse"]];
     NSData* decServerChallengeResp = [cryptoMan aesDecrypt:encServerChallengeResp withKey:aesKey];
     
-    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, 20)];
+    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, hashLength)];
-    NSData* serverChallenge = [decServerChallengeResp subdataWithRange:NSMakeRange(20, 16)];
+    NSData* serverChallenge = [decServerChallengeResp subdataWithRange:NSMakeRange(hashLength, 16)];
     
     NSData* clientSecret = [Utils randomBytes:16];
-    NSData* challengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:serverChallenge with:[CryptoManager getSignatureFromCert:_cert]] with:clientSecret]];
+    NSData* challengeRespHashInput = [self concatData:[self concatData:serverChallenge with:[CryptoManager getSignatureFromCert:_cert]] with:clientSecret];
+    NSData* challengeRespHash;
+    if (serverMajorVersion >= 7) {
+        challengeRespHash = [cryptoMan SHA256HashData: challengeRespHashInput];
+    }
+    else {
+        challengeRespHash = [cryptoMan SHA1HashData: challengeRespHashInput];
+    }
     NSData* challengeRespEncrypted = [cryptoMan aesEncrypt:challengeRespHash withKey:aesKey];
     
     HttpResponse* secretResp = [[HttpResponse alloc] init];
@@ -116,7 +144,14 @@
         return;
     }
     
-    NSData* serverChallengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret]];
+    NSData* serverChallengeRespHashInput = [self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret];
+    NSData* serverChallengeRespHash;
+    if (serverMajorVersion >= 7) {
+        serverChallengeRespHash = [cryptoMan SHA256HashData: serverChallengeRespHashInput];
+    }
+    else {
+        serverChallengeRespHash = [cryptoMan SHA1HashData: serverChallengeRespHashInput];
+    }
     if (![serverChallengeRespHash isEqual:serverResponse]) {
         [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
         [_callback pairFailed:@"Incorrect PIN"];

Limelight/Network/ServerInfoResponse.h

@@ -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>
 

Limelight/Network/ServerInfoResponse.m

@@ -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]) {

Limelight/Network/WakeOnLanManager.m

@@ -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;
+    for (int i = 0; i < 3; i++) {
-    memset(&addr, 0, sizeof(addr));
+        const char* address;
-    addr.sin_family = AF_INET;
+        struct addrinfo hints, *res, *curr;
-    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));
         
-        // try all ports
+        // try all ip addresses
-        for (int j = 0; j < numPorts; j++) {
+        if (i == 0 && host.localAddress != nil) {
-            addr.sin_port = htons(ports[j]);
+            address = [host.localAddress UTF8String];
-            Log(LOG_I, @"Sending WOL packet");
+        } else if (i == 1 && host.externalAddress != nil) {
-            CFSocketSendData(wolSocket, dataAddress, dataPayload, 0);
+            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 {

Limelight/Stream/Connection.h

@@ -14,20 +14,19 @@
 
 - (void) connectionStarted;
 - (void) connectionTerminated:(long)errorCode;
-- (void) stageStarting:(char*)stageName;
+- (void) stageStarting:(const char*)stageName;
-- (void) stageComplete:(char*)stageName;
+- (void) stageComplete:(const char*)stageName;
-- (void) stageFailed:(char*)stageName withError:(long)errorCode;
+- (void) stageFailed:(const char*)stageName withError:(long)errorCode;
 - (void) launchFailed:(NSString*)message;
-- (void) displayMessage:(char*)message;
+- (void) displayMessage:(const char*)message;
-- (void) displayTransientMessage:(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

Limelight/Stream/Connection.m

@@ -10,19 +10,20 @@
 
 #import <AudioUnit/AudioUnit.h>
 #import <AVFoundation/AVFoundation.h>
+#import <VideoToolbox/VideoToolbox.h>
 
 #include "Limelight.h"
 #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;
 
@@ -45,6 +46,12 @@ static int audioBufferQueueLength;
 static AudioComponentInstance audioUnit;
 static VideoDecoderRenderer* renderer;
 
+int DrDecoderSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags)
+{
+    [renderer setupWithVideoFormat:videoFormat];
+    return 0;
+}
+
 int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
 {
     int offset = 0;
@@ -65,7 +72,7 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
     return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
 }
 
-void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
+int ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags)
 {
     int err;
     
@@ -101,6 +108,7 @@ void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
     
     if (status) {
         Log(LOG_E, @"Unable to instantiate new AudioComponent: %d", (int32_t)status);
+        return status;
     }
     
     AudioStreamBasicDescription audioFormat = {0};
@@ -122,6 +130,7 @@ void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
                                   sizeof(audioFormat));
     if (status) {
         Log(LOG_E, @"Unable to set audio unit to input: %d", (int32_t)status);
+        return status;
     }
     
     AURenderCallbackStruct callbackStruct = {0};
@@ -136,17 +145,22 @@ void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
                                   sizeof(callbackStruct));
     if (status) {
         Log(LOG_E, @"Unable to set audio unit callback: %d", (int32_t)status);
+        return status;
     }
     
     status = AudioUnitInitialize(audioUnit);
     if (status) {
         Log(LOG_E, @"Unable to initialize audioUnit: %d", (int32_t)status);
+        return status;
     }
     
     status = AudioOutputUnitStart(audioUnit);
     if (status) {
         Log(LOG_E, @"Unable to start audioUnit: %d", (int32_t)status);
+        return status;
     }
+    
+    return status;
 }
 
 void ArCleanup(void)
@@ -228,17 +242,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 +265,55 @@ 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 ClLogMessage(const char* format, ...)
 {
-    // We dispatch this async to get out because this can be invoked
+    va_list va;
-    // on a thread inside common and we don't want to deadlock
+    va_start(va, format);
-    dispatch_async(dispatch_get_main_queue(), ^{
+    vfprintf(stderr, format, va);
-        // This is safe to call even before LiStartConnection
+    va_end(va);
-        LiStopConnection();
-    });
 }
 
 -(void) terminate
 {
-    // We're guaranteed to not be on a moonlight-common thread
+    // We dispatch this async to get out because this can be invoked
-    // here so it's safe to call stop directly
+    // on a thread inside common and we don't want to deadlock. It also avoids
-    LiStopConnection();
+    // 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];
+    });
 }
 
--(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;
@@ -292,6 +321,12 @@ void ClDisplayTransientMessage(char* message)
     _streamConfig.fps = config.frameRate;
     _streamConfig.bitrate = config.bitRate;
     
+    // On iOS 11, we can use HEVC if the server supports encoding it
+    // and this device has hardware decode for it (A9 and later)
+    if (@available(iOS 11.0, *)) {
+        _streamConfig.supportsHevc = VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC);
+    }
+    
     // FIXME: We should use 1024 when streaming remotely
     _streamConfig.packetSize = 1292;
     
@@ -301,8 +336,12 @@ void ClDisplayTransientMessage(char* message)
     memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId));
     
     LiInitializeVideoCallbacks(&_drCallbacks);
+    _drCallbacks.setup = DrDecoderSetup;
     _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
     
+    // RFI doesn't work properly with HEVC on iOS 11 with an iPhone SE (at least)
+    _drCallbacks.capabilities = CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC;
+    
     LiInitializeAudioCallbacks(&_arCallbacks);
     _arCallbacks.init = ArInit;
     _arCallbacks.cleanup = ArCleanup;
@@ -316,6 +355,7 @@ void ClDisplayTransientMessage(char* message)
     _clCallbacks.connectionTerminated = ClConnectionTerminated;
     _clCallbacks.displayMessage = ClDisplayMessage;
     _clCallbacks.displayTransientMessage = ClDisplayTransientMessage;
+    _clCallbacks.logMessage = ClLogMessage;
     
     return self;
 }
@@ -403,12 +443,15 @@ static OSStatus playbackCallback(void *inRefCon,
 
 -(void) main
 {
-    LiStartConnection(_host,
+    [initLock lock];
+    LiStartConnection(&_serverInfo,
                       &_streamConfig,
                       &_clCallbacks,
                       &_drCallbacks,
                       &_arCallbacks,
-                      NULL, 0, _serverMajorVersion);
+                      NULL, 0,
+                      NULL, 0);
+    [initLock unlock];
 }
 
 @end

Limelight/Stream/StreamConfiguration.h

@@ -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;

Limelight/Stream/StreamManager.h

@@ -14,6 +14,5 @@
 
 - (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionCallbacks:(id<ConnectionCallbacks>)callback;
 - (void) stopStream;
-- (void) stopStreamInternal;
 
 @end

Limelight/Stream/StreamManager.m

@@ -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];
+    // Populate the config's version fields from serverinfo
-    Log(LOG_I, @"Server is generation %d", majorVersion);
+    _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:

Limelight/Stream/VideoDecoderRenderer.h

@@ -14,6 +14,8 @@
 
 - (id)initWithView:(UIView*)view;
 
+- (void)setupWithVideoFormat:(int)videoFormat;
+
 - (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength;
 
 - (int)submitDecodeBuffer:(unsigned char *)data length:(int)length;

Limelight/Stream/VideoDecoderRenderer.m

@@ -14,9 +14,10 @@
     UIView *_view;
     
     AVSampleBufferDisplayLayer* displayLayer;
-    Boolean waitingForSps, waitingForPps;
+    Boolean waitingForSps, waitingForPps, waitingForVps;
+    int videoFormat;
     
-    NSData *spsData, *ppsData;
+    NSData *spsData, *ppsData, *vpsData;
     CMVideoFormatDescriptionRef formatDesc;
 }
 
@@ -43,6 +44,8 @@
     spsData = nil;
     waitingForPps = true;
     ppsData = nil;
+    waitingForVps = true;
+    vpsData = nil;
     
     if (formatDesc != nil) {
         CFRelease(formatDesc);
@@ -61,11 +64,65 @@
     return self;
 }
 
+- (void)setupWithVideoFormat:(int)videoFormat
+{
+    self->videoFormat = videoFormat;
+}
+
 #define FRAME_START_PREFIX_SIZE 4
 #define NALU_START_PREFIX_SIZE 3
 #define NAL_LENGTH_PREFIX_SIZE 4
-#define NAL_TYPE_SPS 0x7
+#define AVC_NAL_TYPE_SPS 0x67
-#define NAL_TYPE_PPS 0x8
+#define AVC_NAL_TYPE_PPS 0x68
+#define HEVC_NAL_TYPE_VPS 0x40
+#define HEVC_NAL_TYPE_SPS 0x42
+#define HEVC_NAL_TYPE_PPS 0x44
+
+#define IS_NAL_SPS(x) ((videoFormat == VIDEO_FORMAT_H264) ? ((x) == AVC_NAL_TYPE_SPS) : ((x) == HEVC_NAL_TYPE_SPS))
+#define IS_NAL_PPS(x) ((videoFormat == VIDEO_FORMAT_H264) ? ((x) == AVC_NAL_TYPE_PPS) : ((x) == HEVC_NAL_TYPE_PPS))
+#define IS_NAL_VPS(x) ((videoFormat == VIDEO_FORMAT_H265) && ((x) == HEVC_NAL_TYPE_VPS))
+
+- (Boolean)readyForPictureData
+{
+    if (videoFormat == VIDEO_FORMAT_H264) {
+        return !waitingForSps && !waitingForPps;
+    }
+    else {
+        // H.265 requires VPS in addition to SPS and PPS
+        return !waitingForVps && !waitingForSps && !waitingForPps;
+    }
+}
+
+- (Boolean)isNalReferencePicture:(unsigned char)nalType
+{
+    if (videoFormat == VIDEO_FORMAT_H264) {
+        return nalType == 0x65;
+    }
+    else {
+        // HEVC has several types of reference NALU types
+        switch (nalType) {
+            case 0x20:
+            case 0x22:
+            case 0x24:
+            case 0x26:
+            case 0x28:
+            case 0x2A:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
+
+- (Boolean)isNalPictureData:(unsigned char)nalType
+{
+    if (videoFormat == VIDEO_FORMAT_H264) {
+        return !(nalType == AVC_NAL_TYPE_SPS || nalType == AVC_NAL_TYPE_PPS);
+    }
+    else {
+        return !(nalType == HEVC_NAL_TYPE_VPS || nalType == HEVC_NAL_TYPE_SPS || nalType == HEVC_NAL_TYPE_PPS);
+    }
+}
 
 - (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength
 {
@@ -136,7 +193,7 @@
 // This function must free data
 - (int)submitDecodeBuffer:(unsigned char *)data length:(int)length
 {
-    unsigned char nalType = data[FRAME_START_PREFIX_SIZE] & 0x1F;
+    unsigned char nalType = data[FRAME_START_PREFIX_SIZE];
     OSStatus status;
     
     // Check for previous decoder errors before doing anything
@@ -150,35 +207,69 @@
         return DR_NEED_IDR;
     }
     
-    if (nalType == NAL_TYPE_SPS || nalType == NAL_TYPE_PPS) {
+    if (![self isNalPictureData:nalType]) {
-        if (nalType == NAL_TYPE_SPS) {
+        if (IS_NAL_VPS(nalType)) {
+            Log(LOG_I, @"Got VPS");
+            vpsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
+            waitingForVps = false;
+            
+            // We got a new VPS so wait for a new SPS to match it
+            waitingForSps = true;
+        }
+        else if (IS_NAL_SPS(nalType)) {
             Log(LOG_I, @"Got SPS");
             spsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
             waitingForSps = false;
             
             // We got a new SPS so wait for a new PPS to match it
             waitingForPps = true;
-        } else if (nalType == NAL_TYPE_PPS) {
+        } else if (IS_NAL_PPS(nalType)) {
             Log(LOG_I, @"Got PPS");
             ppsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
             waitingForPps = false;
         }
         
-        // See if we've got all the parameter sets we need
+        // See if we've got all the parameter sets we need for our video format
-        if (!waitingForSps && !waitingForPps) {
+        if ([self readyForPictureData]) {
-            const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] };
+            if (videoFormat == VIDEO_FORMAT_H264) {
-            const size_t parameterSetSizes[] = { [spsData length], [ppsData length] };
+                const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] };
-            
+                const size_t parameterSetSizes[] = { [spsData length], [ppsData length] };
-            Log(LOG_I, @"Constructing new format description");
+                
-            status = CMVideoFormatDescriptionCreateFromH264ParameterSets(kCFAllocatorDefault,
+                Log(LOG_I, @"Constructing new H264 format description");
-                                                                         2, /* count of parameter sets */
+                status = CMVideoFormatDescriptionCreateFromH264ParameterSets(kCFAllocatorDefault,
-                                                                         parameterSetPointers,
+                                                                             2, /* count of parameter sets */
-                                                                         parameterSetSizes,
+                                                                             parameterSetPointers,
-                                                                         NAL_LENGTH_PREFIX_SIZE,
+                                                                             parameterSetSizes,
-                                                                         &formatDesc);
+                                                                             NAL_LENGTH_PREFIX_SIZE,
-            if (status != noErr) {
+                                                                             &formatDesc);
-                Log(LOG_E, @"Failed to create format description: %d", (int)status);
+                if (status != noErr) {
-                formatDesc = NULL;
+                    Log(LOG_E, @"Failed to create H264 format description: %d", (int)status);
+                    formatDesc = NULL;
+                }
+            }
+            else {
+                const uint8_t* const parameterSetPointers[] = { [vpsData bytes], [spsData bytes], [ppsData bytes] };
+                const size_t parameterSetSizes[] = { [vpsData length], [spsData length], [ppsData length] };
+                
+                Log(LOG_I, @"Constructing new HEVC format description");
+                if (@available(iOS 11.0, *)) {
+                    status = CMVideoFormatDescriptionCreateFromHEVCParameterSets(kCFAllocatorDefault,
+                                                                                 3, /* count of parameter sets */
+                                                                                 parameterSetPointers,
+                                                                                 parameterSetSizes,
+                                                                                 NAL_LENGTH_PREFIX_SIZE,
+                                                                                 nil,
+                                                                                 &formatDesc);
+                } else {
+                    // This means Moonlight-common-c decided to give us an HEVC stream
+                    // even though we said we couldn't support it. All we can do is abort().
+                    abort();
+                }
+                
+                if (status != noErr) {
+                    Log(LOG_E, @"Failed to create HEVC format description: %d", (int)status);
+                    formatDesc = NULL;
+                }
             }
         }
         
@@ -195,12 +286,6 @@
         return DR_OK;
     }
     
-    if (nalType != 0x1 && nalType != 0x5) {
-        // Don't submit parameter set data
-        free(data);
-        return DR_OK;
-    }
-    
     // Now we're decoding actual frame data here
     CMBlockBufferRef blockBuffer;
     
@@ -252,7 +337,7 @@
     CFDictionarySetValue(dict, kCMSampleAttachmentKey_DisplayImmediately, kCFBooleanTrue);
     CFDictionarySetValue(dict, kCMSampleAttachmentKey_IsDependedOnByOthers, kCFBooleanTrue);
     
-    if (nalType == 1) {
+    if (![self isNalReferencePicture:nalType]) {
         // P-frame
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_NotSync, kCFBooleanTrue);
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_DependsOnOthers, kCFBooleanTrue);

Limelight/UIAppView.m

@@ -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);

Limelight/ViewControllers/MainFrameViewController.m

@@ -48,27 +48,45 @@ 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) {
+            _pairAlert = nil;
+            [_discMan startDiscovery];
+            [self hideLoadingFrame];
+        }]];
         [self presentViewController:_pairAlert animated:YES completion:nil];
     });
 }
 
+- (void)displayFailureDialog:(NSString *)message {
+    UIAlertController* failedDialog = [UIAlertController alertControllerWithTitle:@"Pairing Failed"
+                                                     message:message
+                                              preferredStyle:UIAlertControllerStyleAlert];
+    [failedDialog addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+    [self presentViewController:failedDialog animated:YES completion:nil];
+    
+    [_discMan startDiscovery];
+    [self hideLoadingFrame];
+}
+
 - (void)pairFailed:(NSString *)message {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [_pairAlert dismissViewControllerAnimated:YES completion:nil];
+        if (_pairAlert != nil) {
-        _pairAlert = [UIAlertController alertControllerWithTitle:@"Pairing Failed"
+            [_pairAlert dismissViewControllerAnimated:YES completion:^{
-                                                         message:message
+                [self displayFailureDialog:message];
-                                                  preferredStyle:UIAlertControllerStyleAlert];
+            }];
-        [_pairAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+            _pairAlert = nil;
-        [self presentViewController:_pairAlert animated:YES completion:nil];
+        }
-        
+        else {
-        [_discMan startDiscovery];
+            [self displayFailureDialog:message];
-        [self hideLoadingFrame];
+        }
     });
 }
 
 - (void)pairSuccessful {
     dispatch_async(dispatch_get_main_queue(), ^{
         [_pairAlert dismissViewControllerAnimated:YES completion:nil];
+        _pairAlert = nil;
+
         [_discMan startDiscovery];
         [self alreadyPaired];
     });
@@ -166,7 +184,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;
             }
@@ -255,8 +272,10 @@ static NSMutableSet* hostList;
     
     // If we are online, paired, and have a cached app list, skip straight
     // to the app grid without a loading frame. This is the fast path that users
-    // should hit most.
+    // should hit most. Check for a valid view because we don't want to hit the fast
-    if (host.online && host.pairState == PairStatePaired && host.appList.count > 0) {
+    // path after coming back from streaming, since we need to fetch serverinfo too
+    // so that our active game data is correct.
+    if (host.online && host.pairState == PairStatePaired && host.appList.count > 0 && view != nil) {
         [self alreadyPaired];
         return;
     }
@@ -417,6 +436,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 +460,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 +471,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 +494,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 +569,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 +591,7 @@ static NSMutableSet* hostList;
     
     [self updateHosts];
     [self.view addSubview:hostScrollView];
+    [self.view addSubview:pullArrow];
 }
 
 -(void)dealloc
@@ -571,8 +601,8 @@ static NSMutableSet* hostList;
 
 -(void)handleReturnToForeground
 {
-    // This will refresh the applist
+    // This will refresh the applist when a paired host is selected
-    if (_selectedHost != nil) {
+    if (_selectedHost != nil && _selectedHost.pairState == PairStatePaired) {
         [self hostClicked:_selectedHost view:nil];
     }
 }
@@ -580,6 +610,9 @@ static NSMutableSet* hostList;
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    
+    [[self revealViewController] setPrimaryViewController:self];
+    
     [self.navigationController setNavigationBarHidden:NO animated:YES];
     
     // Hide 1px border line

Limelight/ViewControllers/SWRevealViewController.h

@@ -180,6 +180,8 @@ typedef NS_ENUM(NSInteger, SWRevealToggleAnimationType)
 
 @interface SWRevealViewController : UIViewController
 
+- (void)setPrimaryViewController:(UIViewController*)viewController;
+
 /* Basic API */
 
 // Object instance init and rear view setting

Limelight/ViewControllers/SWRevealViewController.m

@@ -583,6 +583,7 @@ static CGFloat scaledValue( CGFloat v1, CGFloat min2, CGFloat max2, CGFloat min1
     FrontViewPosition _panInitialFrontPosition;
     NSMutableArray *_animationQueue;
     BOOL _userInteractionStore;
+    UIViewController *_primaryViewController;
 }
 
 const int FrontViewPositionNone = 0xff;
@@ -1364,6 +1365,26 @@ const int FrontViewPositionNone = 0xff;
     _enqueue( [theSelf _performTransitionOperation:operation withViewController:newViewController animated:animated] );
 }
 
+- (void)setPrimaryViewController:(UIViewController*)viewController
+{
+    _primaryViewController = viewController;
+
+    // These are derived from the primary view controller
+    if (@available(iOS 11.0, *)) {
+        [self setNeedsUpdateOfHomeIndicatorAutoHidden];
+        [self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
+    }
+}
+
+- (UIViewController*)childViewControllerForHomeIndicatorAutoHidden
+{
+    return _primaryViewController;
+}
+
+- (UIViewController*)childViewControllerForScreenEdgesDeferringSystemGestures
+{
+    return _primaryViewController;
+}
 
 #pragma mark Animated view controller deployment and layout
 

Limelight/ViewControllers/SettingsViewController.m

@@ -14,9 +14,30 @@
 
 @implementation SettingsViewController {
     NSInteger _bitrate;
+    Boolean _adjustedForSafeArea;
 }
 static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    // Adjust the subviews for the safe area on the iPhone X.
+    if (!_adjustedForSafeArea) {
+        if (@available(iOS 11.0, *)) {
+            for (UIView* view in self.view.subviews) {
+                // HACK: The official safe area is much too large for our purposes
+                // so we'll just use the presence of any safe area to indicate we should
+                // pad by 20.
+                if (self.view.safeAreaInsets.left >= 20 || self.view.safeAreaInsets.right >= 20) {
+                    view.frame = CGRectMake(view.frame.origin.x + 20, view.frame.origin.y, view.frame.size.width, view.frame.size.height);
+                }
+            }
+        }
+
+        _adjustedForSafeArea = true;
+    }
+}
 
 - (void)viewDidLoad {
     [super viewDidLoad];

Limelight/ViewControllers/StreamFrameViewController.m

@@ -21,6 +21,13 @@
     StreamManager *_streamMan;
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    [[self revealViewController] setPrimaryViewController:self];
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -84,10 +91,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 +105,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 +122,7 @@
         [self presentViewController:alert animated:YES completion:nil];
     });
     
-    [_streamMan stopStreamInternal];
+    [_streamMan stopStream];
 }
 
 - (void) launchFailed:(NSString*)message {
@@ -132,11 +139,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);
 }
 
@@ -146,6 +153,11 @@
     // Dispose of any resources that can be recreated.
 }
 
+// Require a confirmation when streaming to activate a system gesture
+- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures {
+    return UIRectEdgeAll;
+}
+
 - (BOOL)shouldAutorotate {
     return YES;
 }

Moonlight.xcodeproj/project.pbxproj

@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		9832D1361BBCD5C50036EF48 /* TemporaryApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 9832D1351BBCD5C50036EF48 /* TemporaryApp.m */; };
-		987140041B04542F00AB57D5 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */; };
+		98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98AB2E841CAD46840089BB98 /* libmoonlight-common.a */; };
 		98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */; };
 		98D585701C0ED0E800F6CC00 /* TemporarySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */; };
 		9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF81A5A5A3900689918 /* Apache License.txt */; };
@@ -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 */; };
@@ -80,26 +81,33 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		987140011B04541A00AB57D5 /* PBXContainerItemProxy */ = {
+		98AB2E831CAD46840089BB98 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */;
+			containerPortal = 98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = FB290E2E19B37A4E004C83CF;
+			remoteInfo = "moonlight-common";
+		};
+		98AB2E851CAD468B0089BB98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FB290E2D19B37A4E004C83CF;
 			remoteInfo = "moonlight-common";
 		};
-		FB1E430F1AE8B0F200AFF679 /* PBXContainerItemProxy */ = {
+		D46A73A51CBC7CB60039F1EE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */;
+			containerPortal = FB290CE619B2C406004C83CF /* Project object */;
-			proxyType = 2;
+			proxyType = 1;
-			remoteGlobalIDString = FB290E2E19B37A4E004C83CF;
+			remoteGlobalIDString = FB290CED19B2C406004C83CF;
-			remoteInfo = "moonlight-common";
+			remoteInfo = Moonlight;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
 		9832D1341BBCD5C50036EF48 /* TemporaryApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryApp.h; path = Database/TemporaryApp.h; sourceTree = "<group>"; };
 		9832D1351BBCD5C50036EF48 /* TemporaryApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporaryApp.m; path = Database/TemporaryApp.m; sourceTree = "<group>"; };
-		98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "limelight-common-c/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
+		98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "moonlight-common/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
 		98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryHost.h; path = Database/TemporaryHost.h; sourceTree = "<group>"; };
 		98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporaryHost.m; path = Database/TemporaryHost.m; sourceTree = "<group>"; };
 		98D5856E1C0ED0E800F6CC00 /* TemporarySettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporarySettings.h; path = Database/TemporarySettings.h; sourceTree = "<group>"; };
@@ -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,11 +315,18 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		D46A739D1CBC7CB60039F1EE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		FB290CEB19B2C406004C83CF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				987140041B04542F00AB57D5 /* libmoonlight-common.a in Frameworks */,
+				98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */,
 				FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */,
 				FB8946EB19F6AFE100339C8A /* libcrypto.a in Frameworks */,
 				FB8946EC19F6AFE400339C8A /* libssl.a in Frameworks */,
@@ -326,6 +345,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		98AB2E801CAD46830089BB98 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2E841CAD46840089BB98 /* libmoonlight-common.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		9E5D5FF61A5A5A3900689918 /* Font */ = {
 			isa = PBXGroup;
 			children = (
@@ -348,19 +375,30 @@
 			path = Roboto;
 			sourceTree = "<group>";
 		};
-		FB1E430C1AE8B0F200AFF679 /* Products */ = {
+		D46A73A11CBC7CB60039F1EE /* MoonlightUnitTests */ = {
 			isa = PBXGroup;
 			children = (
-				FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */,
+				D46A73AB1CBC7D080039F1EE /* MoonlightUnitTests-Bridging-Header.h */,
+				D46A73AA1CBC7CEF0039F1EE /* Input */,
+				D46A73A41CBC7CB60039F1EE /* Info.plist */,
 			);
-			name = Products;
+			path = MoonlightUnitTests;
+			sourceTree = "<group>";
+		};
+		D46A73AA1CBC7CEF0039F1EE /* Input */ = {
+			isa = PBXGroup;
+			children = (
+				D46A73AC1CBC7D090039F1EE /* ControllerUnitTests.swift */,
+			);
+			name = Input;
 			sourceTree = "<group>";
 		};
 		FB290CE519B2C406004C83CF = {
 			isa = PBXGroup;
 			children = (
-				98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */,
+				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 */,
+				D4746EEB1CBC740C006FB401 /* Controller.swift */,
-				FB9AFD421A7F0C6900872C98 /* Controller.m */,
 				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" */;
@@ -761,7 +819,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				987140021B04541A00AB57D5 /* PBXTargetDependency */,
+				98AB2E861CAD468B0089BB98 /* PBXTargetDependency */,
 			);
 			name = Moonlight;
 			productName = Limelight;
@@ -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;
 					};
 				};
 			};
@@ -794,28 +859,36 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = FB1E430C1AE8B0F200AFF679 /* Products */;
+					ProductGroup = 98AB2E801CAD46830089BB98 /* Products */;
-					ProjectRef = 98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */;
+					ProjectRef = 98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */;
 				},
 			);
 			projectRoot = "";
 			targets = (
 				FB290CED19B2C406004C83CF /* Moonlight */,
+				D46A739F1CBC7CB60039F1EE /* MoonlightUnitTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */ = {
+		98AB2E841CAD46840089BB98 /* libmoonlight-common.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libmoonlight-common.a";
-			remoteRef = FB1E430F1AE8B0F200AFF679 /* PBXContainerItemProxy */;
+			remoteRef = 98AB2E831CAD46840089BB98 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* 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 */,
@@ -893,10 +974,15 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		987140021B04541A00AB57D5 /* PBXTargetDependency */ = {
+		98AB2E861CAD468B0089BB98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "moonlight-common";
-			targetProxy = 987140011B04541A00AB57D5 /* PBXContainerItemProxy */;
+			targetProxy = 98AB2E851CAD468B0089BB98 /* PBXContainerItemProxy */;
+		};
+		D46A73A61CBC7CB60039F1EE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FB290CED19B2C406004C83CF /* Moonlight */;
+			targetProxy = D46A73A51CBC7CB60039F1EE /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency 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;
@@ -1000,11 +1145,12 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(PROJECT_DIR)/limelight-common-c/limelight-common",
+					"$(PROJECT_DIR)/moonlight-common/moonlight-common-c/src",
 					"$(SDKROOT)/usr/include/libxml2/**",
 					"$(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;
@@ -1030,11 +1180,12 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(PROJECT_DIR)/limelight-common-c/limelight-common",
+					"$(PROJECT_DIR)/moonlight-common/moonlight-common-c/src",
 					"$(SDKROOT)/usr/include/libxml2/**",
 					"$(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 = (

MoonlightUnitTests/Info.plist

@@ -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>

MoonlightUnitTests/Input/ControllerUnitTests.swift

@@ -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))
+    
+  }
+  
+}

MoonlightUnitTests/MoonlightUnitTests-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

README.md

@@ -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).

moonlight-common/moonlight-common.xcodeproj/project.pbxproj

@@ -0,0 +1,493 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 47;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		9857AEEA1EBE85A20084F99E /* RtpFecQueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 9857AEE91EBE85A20084F99E /* RtpFecQueue.c */; };
+		9857AEF01EBE85E10084F99E /* rs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9857AEEE1EBE85E10084F99E /* rs.c */; };
+		98AB2E401CAD425A0089BB98 /* AudioStream.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E1A1CAD423B0089BB98 /* AudioStream.c */; };
+		98AB2E411CAD425A0089BB98 /* ByteBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E1B1CAD423B0089BB98 /* ByteBuffer.c */; };
+		98AB2E421CAD425A0089BB98 /* Connection.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E1D1CAD423B0089BB98 /* Connection.c */; };
+		98AB2E431CAD425A0089BB98 /* ControlStream.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E1E1CAD423B0089BB98 /* ControlStream.c */; };
+		98AB2E441CAD425A0089BB98 /* FakeCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E1F1CAD423B0089BB98 /* FakeCallbacks.c */; };
+		98AB2E451CAD425A0089BB98 /* InputStream.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E211CAD423B0089BB98 /* InputStream.c */; };
+		98AB2E461CAD425A0089BB98 /* LinkedBlockingQueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E241CAD423B0089BB98 /* LinkedBlockingQueue.c */; };
+		98AB2E471CAD425A0089BB98 /* Misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E261CAD423B0089BB98 /* Misc.c */; };
+		98AB2E481CAD425A0089BB98 /* Platform.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E311CAD423B0089BB98 /* Platform.c */; };
+		98AB2E491CAD425A0089BB98 /* PlatformSockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E331CAD423B0089BB98 /* PlatformSockets.c */; };
+		98AB2E4A1CAD425A0089BB98 /* RtpReorderQueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E361CAD423B0089BB98 /* RtpReorderQueue.c */; };
+		98AB2E4B1CAD425A0089BB98 /* RtspConnection.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E391CAD423B0089BB98 /* RtspConnection.c */; };
+		98AB2E4C1CAD425A0089BB98 /* RtspParser.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E3A1CAD423B0089BB98 /* RtspParser.c */; };
+		98AB2E4D1CAD425A0089BB98 /* SdpGenerator.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E3B1CAD423B0089BB98 /* SdpGenerator.c */; };
+		98AB2E4E1CAD425A0089BB98 /* VideoDepacketizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E3D1CAD423B0089BB98 /* VideoDepacketizer.c */; };
+		98AB2E4F1CAD425A0089BB98 /* VideoStream.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E3E1CAD423B0089BB98 /* VideoStream.c */; };
+		98AB2E501CAD427A0089BB98 /* callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2DF01CAD422B0089BB98 /* callbacks.c */; };
+		98AB2E511CAD427A0089BB98 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2DF31CAD422B0089BB98 /* compress.c */; };
+		98AB2E521CAD427A0089BB98 /* host.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E001CAD422B0089BB98 /* host.c */; };
+		98AB2E531CAD427A0089BB98 /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E0E1CAD422B0089BB98 /* list.c */; };
+		98AB2E541CAD427A0089BB98 /* packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E121CAD422B0089BB98 /* packet.c */; };
+		98AB2E551CAD427A0089BB98 /* peer.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E131CAD422B0089BB98 /* peer.c */; };
+		98AB2E561CAD427A0089BB98 /* protocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E151CAD422B0089BB98 /* protocol.c */; };
+		98AB2E571CAD427A0089BB98 /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E171CAD422B0089BB98 /* unix.c */; };
+		98AB2E581CAD427A0089BB98 /* win32.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AB2E181CAD422B0089BB98 /* win32.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		9857AEE91EBE85A20084F99E /* RtpFecQueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = RtpFecQueue.c; sourceTree = "<group>"; };
+		9857AEEB1EBE85AB0084F99E /* RtpFecQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtpFecQueue.h; sourceTree = "<group>"; };
+		9857AEEE1EBE85E10084F99E /* rs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rs.c; path = "moonlight-common-c/reedsolomon/rs.c"; sourceTree = "<group>"; };
+		9857AEEF1EBE85E10084F99E /* rs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rs.h; path = "moonlight-common-c/reedsolomon/rs.h"; sourceTree = "<group>"; };
+		98AB2DF01CAD422B0089BB98 /* callbacks.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = callbacks.c; sourceTree = "<group>"; };
+		98AB2DF11CAD422B0089BB98 /* ChangeLog */ = {isa = PBXFileReference; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
+		98AB2DF21CAD422B0089BB98 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		98AB2DF31CAD422B0089BB98 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
+		98AB2DF41CAD422B0089BB98 /* configure.ac */ = {isa = PBXFileReference; lastKnownFileType = text; path = configure.ac; sourceTree = "<group>"; };
+		98AB2DF61CAD422B0089BB98 /* design.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = design.dox; sourceTree = "<group>"; };
+		98AB2DF71CAD422B0089BB98 /* FAQ.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = FAQ.dox; sourceTree = "<group>"; };
+		98AB2DF81CAD422B0089BB98 /* install.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = install.dox; sourceTree = "<group>"; };
+		98AB2DF91CAD422B0089BB98 /* license.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = license.dox; sourceTree = "<group>"; };
+		98AB2DFA1CAD422B0089BB98 /* mainpage.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = mainpage.dox; sourceTree = "<group>"; };
+		98AB2DFB1CAD422B0089BB98 /* tutorial.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = tutorial.dox; sourceTree = "<group>"; };
+		98AB2DFC1CAD422B0089BB98 /* Doxyfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; };
+		98AB2DFD1CAD422B0089BB98 /* DoxygenLayout.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = DoxygenLayout.xml; sourceTree = "<group>"; };
+		98AB2DFE1CAD422B0089BB98 /* enet.dsp */ = {isa = PBXFileReference; lastKnownFileType = text; path = enet.dsp; sourceTree = "<group>"; };
+		98AB2DFF1CAD422B0089BB98 /* enet_dll.cbp */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = enet_dll.cbp; sourceTree = "<group>"; };
+		98AB2E001CAD422B0089BB98 /* host.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = host.c; sourceTree = "<group>"; };
+		98AB2E031CAD422B0089BB98 /* callbacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = callbacks.h; sourceTree = "<group>"; };
+		98AB2E041CAD422B0089BB98 /* enet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = enet.h; sourceTree = "<group>"; };
+		98AB2E051CAD422B0089BB98 /* list.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
+		98AB2E061CAD422B0089BB98 /* protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = protocol.h; sourceTree = "<group>"; };
+		98AB2E071CAD422B0089BB98 /* time.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = time.h; sourceTree = "<group>"; };
+		98AB2E081CAD422B0089BB98 /* types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		98AB2E091CAD422B0089BB98 /* unix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = unix.h; sourceTree = "<group>"; };
+		98AB2E0A1CAD422B0089BB98 /* utility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utility.h; sourceTree = "<group>"; };
+		98AB2E0B1CAD422B0089BB98 /* win32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = win32.h; sourceTree = "<group>"; };
+		98AB2E0C1CAD422B0089BB98 /* libenet.pc.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = libenet.pc.in; sourceTree = "<group>"; };
+		98AB2E0D1CAD422B0089BB98 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+		98AB2E0E1CAD422B0089BB98 /* list.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
+		98AB2E101CAD422B0089BB98 /* .keep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .keep; sourceTree = "<group>"; };
+		98AB2E111CAD422B0089BB98 /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+		98AB2E121CAD422B0089BB98 /* packet.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = packet.c; sourceTree = "<group>"; };
+		98AB2E131CAD422B0089BB98 /* peer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = peer.c; sourceTree = "<group>"; };
+		98AB2E141CAD422B0089BB98 /* premake4.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = premake4.lua; sourceTree = "<group>"; };
+		98AB2E151CAD422B0089BB98 /* protocol.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = protocol.c; sourceTree = "<group>"; };
+		98AB2E161CAD422B0089BB98 /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+		98AB2E171CAD422B0089BB98 /* unix.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; };
+		98AB2E181CAD422B0089BB98 /* win32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = win32.c; sourceTree = "<group>"; };
+		98AB2E1A1CAD423B0089BB98 /* AudioStream.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = AudioStream.c; sourceTree = "<group>"; };
+		98AB2E1B1CAD423B0089BB98 /* ByteBuffer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ByteBuffer.c; sourceTree = "<group>"; };
+		98AB2E1C1CAD423B0089BB98 /* ByteBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ByteBuffer.h; sourceTree = "<group>"; };
+		98AB2E1D1CAD423B0089BB98 /* Connection.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Connection.c; sourceTree = "<group>"; };
+		98AB2E1E1CAD423B0089BB98 /* ControlStream.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ControlStream.c; sourceTree = "<group>"; };
+		98AB2E1F1CAD423B0089BB98 /* FakeCallbacks.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = FakeCallbacks.c; sourceTree = "<group>"; };
+		98AB2E201CAD423B0089BB98 /* Input.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Input.h; sourceTree = "<group>"; };
+		98AB2E211CAD423B0089BB98 /* InputStream.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = InputStream.c; sourceTree = "<group>"; };
+		98AB2E221CAD423B0089BB98 /* Limelight-internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Limelight-internal.h"; sourceTree = "<group>"; };
+		98AB2E231CAD423B0089BB98 /* Limelight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Limelight.h; sourceTree = "<group>"; };
+		98AB2E241CAD423B0089BB98 /* LinkedBlockingQueue.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = LinkedBlockingQueue.c; sourceTree = "<group>"; };
+		98AB2E251CAD423B0089BB98 /* LinkedBlockingQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LinkedBlockingQueue.h; sourceTree = "<group>"; };
+		98AB2E261CAD423B0089BB98 /* Misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Misc.c; sourceTree = "<group>"; };
+		98AB2E311CAD423B0089BB98 /* Platform.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Platform.c; sourceTree = "<group>"; };
+		98AB2E321CAD423B0089BB98 /* Platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
+		98AB2E331CAD423B0089BB98 /* PlatformSockets.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = PlatformSockets.c; sourceTree = "<group>"; };
+		98AB2E341CAD423B0089BB98 /* PlatformSockets.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformSockets.h; sourceTree = "<group>"; };
+		98AB2E351CAD423B0089BB98 /* PlatformThreads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformThreads.h; sourceTree = "<group>"; };
+		98AB2E361CAD423B0089BB98 /* RtpReorderQueue.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = RtpReorderQueue.c; sourceTree = "<group>"; };
+		98AB2E371CAD423B0089BB98 /* RtpReorderQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtpReorderQueue.h; sourceTree = "<group>"; };
+		98AB2E381CAD423B0089BB98 /* Rtsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rtsp.h; sourceTree = "<group>"; };
+		98AB2E391CAD423B0089BB98 /* RtspConnection.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = RtspConnection.c; sourceTree = "<group>"; };
+		98AB2E3A1CAD423B0089BB98 /* RtspParser.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = RtspParser.c; sourceTree = "<group>"; };
+		98AB2E3B1CAD423B0089BB98 /* SdpGenerator.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SdpGenerator.c; sourceTree = "<group>"; };
+		98AB2E3C1CAD423B0089BB98 /* Video.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
+		98AB2E3D1CAD423B0089BB98 /* VideoDepacketizer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = VideoDepacketizer.c; sourceTree = "<group>"; };
+		98AB2E3E1CAD423B0089BB98 /* VideoStream.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = VideoStream.c; sourceTree = "<group>"; };
+		FB290E2E19B37A4E004C83CF /* libmoonlight-common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmoonlight-common.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		FB290E2B19B37A4E004C83CF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		9857AEED1EBE85D50084F99E /* reedsolomon */ = {
+			isa = PBXGroup;
+			children = (
+				9857AEEE1EBE85E10084F99E /* rs.c */,
+				9857AEEF1EBE85E10084F99E /* rs.h */,
+			);
+			name = reedsolomon;
+			sourceTree = "<group>";
+		};
+		98AB2DEF1CAD422B0089BB98 /* enet */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2DF01CAD422B0089BB98 /* callbacks.c */,
+				98AB2DF11CAD422B0089BB98 /* ChangeLog */,
+				98AB2DF21CAD422B0089BB98 /* CMakeLists.txt */,
+				98AB2DF31CAD422B0089BB98 /* compress.c */,
+				98AB2DF41CAD422B0089BB98 /* configure.ac */,
+				98AB2DF51CAD422B0089BB98 /* docs */,
+				98AB2DFC1CAD422B0089BB98 /* Doxyfile */,
+				98AB2DFD1CAD422B0089BB98 /* DoxygenLayout.xml */,
+				98AB2DFE1CAD422B0089BB98 /* enet.dsp */,
+				98AB2DFF1CAD422B0089BB98 /* enet_dll.cbp */,
+				98AB2E001CAD422B0089BB98 /* host.c */,
+				98AB2E011CAD422B0089BB98 /* include */,
+				98AB2E0C1CAD422B0089BB98 /* libenet.pc.in */,
+				98AB2E0D1CAD422B0089BB98 /* LICENSE */,
+				98AB2E0E1CAD422B0089BB98 /* list.c */,
+				98AB2E0F1CAD422B0089BB98 /* m4 */,
+				98AB2E111CAD422B0089BB98 /* Makefile.am */,
+				98AB2E121CAD422B0089BB98 /* packet.c */,
+				98AB2E131CAD422B0089BB98 /* peer.c */,
+				98AB2E141CAD422B0089BB98 /* premake4.lua */,
+				98AB2E151CAD422B0089BB98 /* protocol.c */,
+				98AB2E161CAD422B0089BB98 /* README */,
+				98AB2E171CAD422B0089BB98 /* unix.c */,
+				98AB2E181CAD422B0089BB98 /* win32.c */,
+			);
+			name = enet;
+			path = "moonlight-common-c/enet";
+			sourceTree = "<group>";
+		};
+		98AB2DF51CAD422B0089BB98 /* docs */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2DF61CAD422B0089BB98 /* design.dox */,
+				98AB2DF71CAD422B0089BB98 /* FAQ.dox */,
+				98AB2DF81CAD422B0089BB98 /* install.dox */,
+				98AB2DF91CAD422B0089BB98 /* license.dox */,
+				98AB2DFA1CAD422B0089BB98 /* mainpage.dox */,
+				98AB2DFB1CAD422B0089BB98 /* tutorial.dox */,
+			);
+			path = docs;
+			sourceTree = "<group>";
+		};
+		98AB2E011CAD422B0089BB98 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2E021CAD422B0089BB98 /* enet */,
+			);
+			path = include;
+			sourceTree = "<group>";
+		};
+		98AB2E021CAD422B0089BB98 /* enet */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2E031CAD422B0089BB98 /* callbacks.h */,
+				98AB2E041CAD422B0089BB98 /* enet.h */,
+				98AB2E051CAD422B0089BB98 /* list.h */,
+				98AB2E061CAD422B0089BB98 /* protocol.h */,
+				98AB2E071CAD422B0089BB98 /* time.h */,
+				98AB2E081CAD422B0089BB98 /* types.h */,
+				98AB2E091CAD422B0089BB98 /* unix.h */,
+				98AB2E0A1CAD422B0089BB98 /* utility.h */,
+				98AB2E0B1CAD422B0089BB98 /* win32.h */,
+			);
+			path = enet;
+			sourceTree = "<group>";
+		};
+		98AB2E0F1CAD422B0089BB98 /* m4 */ = {
+			isa = PBXGroup;
+			children = (
+				98AB2E101CAD422B0089BB98 /* .keep */,
+			);
+			path = m4;
+			sourceTree = "<group>";
+		};
+		98AB2E191CAD423B0089BB98 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				9857AEEB1EBE85AB0084F99E /* RtpFecQueue.h */,
+				9857AEE91EBE85A20084F99E /* RtpFecQueue.c */,
+				98AB2E1A1CAD423B0089BB98 /* AudioStream.c */,
+				98AB2E1B1CAD423B0089BB98 /* ByteBuffer.c */,
+				98AB2E1C1CAD423B0089BB98 /* ByteBuffer.h */,
+				98AB2E1D1CAD423B0089BB98 /* Connection.c */,
+				98AB2E1E1CAD423B0089BB98 /* ControlStream.c */,
+				98AB2E1F1CAD423B0089BB98 /* FakeCallbacks.c */,
+				98AB2E201CAD423B0089BB98 /* Input.h */,
+				98AB2E211CAD423B0089BB98 /* InputStream.c */,
+				98AB2E221CAD423B0089BB98 /* Limelight-internal.h */,
+				98AB2E231CAD423B0089BB98 /* Limelight.h */,
+				98AB2E241CAD423B0089BB98 /* LinkedBlockingQueue.c */,
+				98AB2E251CAD423B0089BB98 /* LinkedBlockingQueue.h */,
+				98AB2E261CAD423B0089BB98 /* Misc.c */,
+				98AB2E311CAD423B0089BB98 /* Platform.c */,
+				98AB2E321CAD423B0089BB98 /* Platform.h */,
+				98AB2E331CAD423B0089BB98 /* PlatformSockets.c */,
+				98AB2E341CAD423B0089BB98 /* PlatformSockets.h */,
+				98AB2E351CAD423B0089BB98 /* PlatformThreads.h */,
+				98AB2E361CAD423B0089BB98 /* RtpReorderQueue.c */,
+				98AB2E371CAD423B0089BB98 /* RtpReorderQueue.h */,
+				98AB2E381CAD423B0089BB98 /* Rtsp.h */,
+				98AB2E391CAD423B0089BB98 /* RtspConnection.c */,
+				98AB2E3A1CAD423B0089BB98 /* RtspParser.c */,
+				98AB2E3B1CAD423B0089BB98 /* SdpGenerator.c */,
+				98AB2E3C1CAD423B0089BB98 /* Video.h */,
+				98AB2E3D1CAD423B0089BB98 /* VideoDepacketizer.c */,
+				98AB2E3E1CAD423B0089BB98 /* VideoStream.c */,
+			);
+			name = src;
+			path = "moonlight-common-c/src";
+			sourceTree = "<group>";
+		};
+		FB290E2519B37A4E004C83CF = {
+			isa = PBXGroup;
+			children = (
+				9857AEED1EBE85D50084F99E /* reedsolomon */,
+				98AB2E191CAD423B0089BB98 /* src */,
+				98AB2DEF1CAD422B0089BB98 /* enet */,
+				FB290E2F19B37A4E004C83CF /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		FB290E2F19B37A4E004C83CF /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				FB290E2E19B37A4E004C83CF /* libmoonlight-common.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		FB290E2D19B37A4E004C83CF /* moonlight-common */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FB290E3219B37A4E004C83CF /* Build configuration list for PBXNativeTarget "moonlight-common" */;
+			buildPhases = (
+				FB290E2A19B37A4E004C83CF /* Sources */,
+				FB290E2B19B37A4E004C83CF /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "moonlight-common";
+			productName = "limelight-common";
+			productReference = FB290E2E19B37A4E004C83CF /* libmoonlight-common.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		FB290E2619B37A4E004C83CF /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0810;
+				ORGANIZATIONNAME = "Moonlight Stream";
+			};
+			buildConfigurationList = FB290E2919B37A4E004C83CF /* Build configuration list for PBXProject "moonlight-common" */;
+			compatibilityVersion = "Xcode 6.3";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = FB290E2519B37A4E004C83CF;
+			productRefGroup = FB290E2F19B37A4E004C83CF /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				FB290E2D19B37A4E004C83CF /* moonlight-common */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		FB290E2A19B37A4E004C83CF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				98AB2E401CAD425A0089BB98 /* AudioStream.c in Sources */,
+				98AB2E411CAD425A0089BB98 /* ByteBuffer.c in Sources */,
+				98AB2E421CAD425A0089BB98 /* Connection.c in Sources */,
+				98AB2E431CAD425A0089BB98 /* ControlStream.c in Sources */,
+				98AB2E441CAD425A0089BB98 /* FakeCallbacks.c in Sources */,
+				98AB2E451CAD425A0089BB98 /* InputStream.c in Sources */,
+				98AB2E461CAD425A0089BB98 /* LinkedBlockingQueue.c in Sources */,
+				98AB2E471CAD425A0089BB98 /* Misc.c in Sources */,
+				98AB2E481CAD425A0089BB98 /* Platform.c in Sources */,
+				98AB2E491CAD425A0089BB98 /* PlatformSockets.c in Sources */,
+				98AB2E4A1CAD425A0089BB98 /* RtpReorderQueue.c in Sources */,
+				98AB2E4B1CAD425A0089BB98 /* RtspConnection.c in Sources */,
+				98AB2E4C1CAD425A0089BB98 /* RtspParser.c in Sources */,
+				98AB2E4D1CAD425A0089BB98 /* SdpGenerator.c in Sources */,
+				98AB2E4E1CAD425A0089BB98 /* VideoDepacketizer.c in Sources */,
+				9857AEEA1EBE85A20084F99E /* RtpFecQueue.c in Sources */,
+				98AB2E4F1CAD425A0089BB98 /* VideoStream.c in Sources */,
+				98AB2E501CAD427A0089BB98 /* callbacks.c in Sources */,
+				98AB2E511CAD427A0089BB98 /* compress.c in Sources */,
+				98AB2E521CAD427A0089BB98 /* host.c in Sources */,
+				98AB2E531CAD427A0089BB98 /* list.c in Sources */,
+				98AB2E541CAD427A0089BB98 /* packet.c in Sources */,
+				98AB2E551CAD427A0089BB98 /* peer.c in Sources */,
+				98AB2E561CAD427A0089BB98 /* protocol.c in Sources */,
+				9857AEF01EBE85E10084F99E /* rs.c in Sources */,
+				98AB2E571CAD427A0089BB98 /* unix.c in Sources */,
+				98AB2E581CAD427A0089BB98 /* win32.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		FB290E3019B37A4E004C83CF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				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 = "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,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		FB290E3119B37A4E004C83CF /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				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 = "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;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PROVISIONING_PROFILE = "";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		FB290E3319B37A4E004C83CF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = (
+					"moonlight-common-c/enet/include",
+					"../libs/**",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+			};
+			name = Debug;
+		};
+		FB290E3419B37A4E004C83CF /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = (
+					"moonlight-common-c/enet/include",
+					"../libs/**",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		FB290E2919B37A4E004C83CF /* Build configuration list for PBXProject "moonlight-common" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FB290E3019B37A4E004C83CF /* Debug */,
+				FB290E3119B37A4E004C83CF /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		FB290E3219B37A4E004C83CF /* Build configuration list for PBXNativeTarget "moonlight-common" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FB290E3319B37A4E004C83CF /* Debug */,
+				FB290E3419B37A4E004C83CF /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = FB290E2619B37A4E004C83CF /* Project object */;
+}

moonlight-common/moonlight-common.xcodeproj/project.xcworkspace/xcshareddata/limelight-common.xccheckout

@@ -0,0 +1,41 @@
+<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>662F3EBE-A540-4F33-A434-3BBB22ECCB12</string>
+	<key>IDESourceControlProjectName</key>
+	<string>limelight-common</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>151E8452-E928-4FE9-BF31-5F5C490B9DD4</key>
+		<string>ssh://github.com/limelight-stream/limelight-common-c.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>limelight-common.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>151E8452-E928-4FE9-BF31-5F5C490B9DD4</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/limelight-stream/limelight-common-c.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>151E8452-E928-4FE9-BF31-5F5C490B9DD4</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>151E8452-E928-4FE9-BF31-5F5C490B9DD4</string>
+			<key>IDESourceControlWCCName</key>
+			<string>limelight-common-c</string>
+		</dict>
+	</array>
+</dict>
+</plist>

moonlight-common/moonlight-common.xcodeproj/project.xcworkspace/xcshareddata/moonlight-common.xcscmblueprint

@@ -0,0 +1,37 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "A4B0849259F9566B0CBA84A6D3D4A0F895C03123",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "584110FE5ABD5BCB5065B76A98D3F8000D0644EC" : 0,
+    "A4B0849259F9566B0CBA84A6D3D4A0F895C03123" : 0,
+    "EB99D631D5149240E91F8D168F0F298D7A5BAA89" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "40250820-914C-4FB3-9CF1-3DB8A02E7012",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "584110FE5ABD5BCB5065B76A98D3F8000D0644EC" : "moonlight-ios\/moonlight-common\/moonlight-common-c\/enet\/",
+    "A4B0849259F9566B0CBA84A6D3D4A0F895C03123" : "moonlight-ios\/",
+    "EB99D631D5149240E91F8D168F0F298D7A5BAA89" : "moonlight-ios\/moonlight-common\/moonlight-common-c\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "moonlight-common",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "moonlight-common\/moonlight-common.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/cgutman\/enet.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "584110FE5ABD5BCB5065B76A98D3F8000D0644EC"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:moonlight-stream\/moonlight-ios.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "A4B0849259F9566B0CBA84A6D3D4A0F895C03123"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/moonlight-stream\/moonlight-common-c.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "EB99D631D5149240E91F8D168F0F298D7A5BAA89"
+    }
+  ]
+}