Implement GCMouse API for relative mouse support

This seems to be quite broken in iOS 14.0. The Microsoft Surface Precision mouse is detected as a GCKeyboard instead of a GCMouse.

.github/auto-comment.yml

@@ -0,0 +1,4 @@
+issuesOpened: >
+  If this is a question about Moonlight or you need help troubleshooting a streaming problem, please use the help channels on our [Discord server](https://moonlight-stream.org/discord) instead of GitHub issues. There are many more people available on Discord to help you and answer your questions.<br /><br />
+  This issue tracker should only be used for specific bugs or feature requests.<br /><br />
+  Thank you, and happy streaming!

.github/no-response.yml

@@ -0,0 +1,8 @@
+# ProBot No Response (https://probot.github.io/apps/no-response/)
+
+daysUntilClose: 7
+responseRequiredLabel: 'need more info'
+closeComment: >
+  This issue has been automatically closed because there was no response to a
+  request for more information from the issue opener. Please leave a comment or
+  open a new issue if you have additional information related to this issue.

.github/stale.yml

@@ -0,0 +1,14 @@
+# ProBot Stale (https://probot.github.io/apps/stale/)
+
+daysUntilStale: 90
+daysUntilClose: 7
+exemptLabels:
+  - accepted
+  - bug
+  - enhancement
+  - meta
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs.
+closeComment: false

.travis.yml

@@ -0,0 +1,25 @@
+language: objective-c
+
+git:
+  depth: 1
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode11.5
+      env:
+        - SCHEME="Moonlight"
+        - TARGET="platform=iOS Simulator,OS=13.5,name=iPhone 11 Pro"
+    - os: osx
+      osx_image: xcode11.5
+      env:
+        - SCHEME="Moonlight"
+        - TARGET="platform=iOS Simulator,OS=13.5,name=iPad Pro (9.7-inch)"
+    - os: osx
+      osx_image: xcode11.5
+      env:
+        - SCHEME="Moonlight TV"
+        - TARGET="platform=tvOS Simulator,OS=13.4,name=Apple TV 4K"
+
+script:
+  - set -o pipefail && xcodebuild -project Moonlight.xcodeproj -scheme "$SCHEME" -destination "$TARGET" build | xcpretty

Launch Screen.xib

@@ -1,51 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="landscape" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <navigationController id="vV9-32-ww6">
-            <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-            <navigationBar key="navigationBar" contentMode="scaleToFill" id="y2P-aE-Haa">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <animations/>
-                <color key="barTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-            </navigationBar>
-            <viewControllers>
-                <viewController id="l6V-ue-5Om">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="rEZ-vx-akr"/>
-                        <viewControllerLayoutGuide type="bottom" id="gBD-cy-cth"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="6lF-fc-kpK">
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                    </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">
-                                <rect key="frame" x="-23" y="-15" width="46" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <animations/>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                <state key="normal" title="Moonlight" image="Logo">
-                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                    <color key="titleShadowColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <variation key="widthClass=regular" preservesSuperviewLayoutMargins="NO"/>
-                            </button>
-                        </barButtonItem>
-                    </navigationItem>
-                </viewController>
-            </viewControllers>
-        </navigationController>
+        <view contentMode="scaleToFill" id="VWy-YH-qYj">
+            <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <point key="canvasLocation" x="33" y="187"/>
+        </view>
     </objects>
-    <resources>
-        <image name="Logo" width="32" height="32"/>
-    </resources>
 </document>

Limelight/AppDelegate.h

@@ -11,6 +11,8 @@
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
+@property (strong, nonatomic) NSString *pcUuidToLoad;
+@property (strong, nonatomic) void (^shortcutCompletionHandler)(BOOL);
 
 @property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
 @property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;

Limelight/AppDelegate.m

@@ -16,39 +16,31 @@
 
 static NSOperationQueue* mainQueue;
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    [[UILabel appearance] setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
-    [[UIButton appearance].titleLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+#if TARGET_OS_TV
+static NSString* DB_NAME = @"Moonlight_tvOS.bin";
+#else
+static NSString* DB_NAME = @"Limelight_iOS.sqlite";
+#endif
 
-
-    // Generate selected segment background image
-    CGSize borderImageSize = CGSizeMake(1.f, 100.f);
-    
-    UIGraphicsBeginImageContext(borderImageSize);
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    
-    CGContextSetStrokeColorWithColor(context, [UIColor whiteColor].CGColor);
-    CGContextFillRect(context, CGRectMake(0.f, borderImageSize.height * 0.8, borderImageSize.width, borderImageSize.height));
-    
-    UIImage *selectedSegmentBG = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    
-    // Clear default border and background color
-    [[UISegmentedControl appearance] setBackgroundImage:[[UIImage alloc] init] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    [[UISegmentedControl appearance] setDividerImage:[[UIImage alloc] init] forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    
-    // Set selected segment background image
-    [[UISegmentedControl appearance] setBackgroundImage:[selectedSegmentBG imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
-    
-    // Change font on UISegmentedControl
-    [[UISegmentedControl appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
-                                                             [UIColor whiteColor], NSForegroundColorAttributeName,
-                                                             [UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]], NSFontAttributeName, nil] forState:UIControlStateNormal];
-    
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+#if !TARGET_OS_TV
+    if (@available(iOS 9.0, *)) {
+        UIApplicationShortcutItem* shortcut = [launchOptions valueForKey:UIApplicationLaunchOptionsShortcutItemKey];
+        if (shortcut != nil) {
+            _pcUuidToLoad = (NSString*)[shortcut.userInfo objectForKey:@"UUID"];
+        }
+    }
+#endif
     return YES;
 }
 
+#if !TARGET_OS_TV
+- (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded))completionHandler {
+    _pcUuidToLoad = (NSString*)[shortcutItem.userInfo objectForKey:@"UUID"];
+    _shortcutCompletionHandler = completionHandler;
+}
+#endif
+
 - (void)applicationWillResignActive:(UIApplication *)application
 {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
@@ -57,7 +49,7 @@ static NSOperationQueue* mainQueue;
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 }
 
@@ -79,12 +71,22 @@ static NSOperationQueue* mainQueue;
 
 - (void)saveContext
 {
-    NSError *error = nil;
-    NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
+    NSManagedObjectContext *managedObjectContext = [self managedObjectContext];
     if (managedObjectContext != nil) {
-        if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
-            Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
-        } 
+        [managedObjectContext performBlock:^{
+            if (![managedObjectContext hasChanges]) {
+                return;
+            }
+            NSError *error = nil;
+            if (![managedObjectContext save:&error]) {
+                Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
+            }
+            
+#if TARGET_OS_TV
+            NSData* dbData = [NSData dataWithContentsOfURL:[[[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask] lastObject] URLByAppendingPathComponent:DB_NAME]];
+            [[NSUserDefaults standardUserDefaults] setObject:dbData forKey:DB_NAME];
+#endif
+        }];
     }
 }
 
@@ -125,19 +127,30 @@ static NSOperationQueue* mainQueue;
         return _persistentStoreCoordinator;
     }
     
-    NSURL *storeURL = [self getStoreURL];
-    
     NSError *error = nil;
     _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
     NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
                              [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
                              [NSNumber numberWithBool:YES], NSInferMappingModelAutomaticallyOption, nil];
-    if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:options error:&error]) {
+    NSString* storeType;
+    
+#if TARGET_OS_TV
+    // Use a binary store for tvOS since we will need exclusive access to the file
+    // to serialize into NSUserDefaults.
+    storeType = NSBinaryStoreType;
+#else
+    storeType = NSSQLiteStoreType;
+#endif
+    
+    // We must ensure the persistent store is ready to opened
+    [self preparePersistentStore];
+    
+    if (![_persistentStoreCoordinator addPersistentStoreWithType:storeType configuration:nil URL:[self getStoreURL] options:options error:&error]) {
         // Log the error
         Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
         
         // Drop the database
-        [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil];
+        [self dropDatabase];
         
         // Try again
         return [self persistentStoreCoordinator];
@@ -154,8 +167,50 @@ static NSOperationQueue* mainQueue;
     return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
 }
 
+- (void) dropDatabase
+{
+    // Delete the file on disk
+    [[NSFileManager defaultManager] removeItemAtURL:[self getStoreURL] error:nil];
+    
+#if TARGET_OS_TV
+    // Also delete the copy in the NSUserDefaults on tvOS
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:DB_NAME];
+#endif
+}
+
+- (void) preparePersistentStore
+{
+#if TARGET_OS_TV
+    // On tvOS, we may need to inflate the DB from NSUserDefaults
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+    NSString *cacheDirectory = [paths objectAtIndex:0];
+    NSString *dbPath = [cacheDirectory stringByAppendingPathComponent:DB_NAME];
+    
+    // Always prefer the on disk version
+    if (![[NSFileManager defaultManager] fileExistsAtPath:dbPath]) {
+        // If that is unavailable, inflate it from NSUserDefaults
+        NSData* data = [[NSUserDefaults standardUserDefaults] dataForKey:DB_NAME];
+        if (data != nil) {
+            Log(LOG_I, @"Inflating database from NSUserDefaults");
+            [data writeToFile:dbPath atomically:YES];
+        }
+        else {
+            Log(LOG_I, @"No database on disk or in NSUserDefaults");
+        }
+    }
+    else {
+        Log(LOG_I, @"Using cached database");
+    }
+#endif
+}
+
 - (NSURL*) getStoreURL {
-    return [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Limelight_iOS.sqlite"];
+#if TARGET_OS_TV
+    // We use the cache folder to store our database on tvOS
+    return [[[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask] lastObject] URLByAppendingPathComponent:DB_NAME];
+#else
+    return [[self applicationDocumentsDirectory] URLByAppendingPathComponent:DB_NAME];
+#endif
 }
 
 @end

Limelight/Crypto/CryptoManager.h

@@ -6,16 +6,14 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
 @interface CryptoManager : NSObject
 
-+ (void) generateKeyPairUsingSSl;
++ (void) generateKeyPairUsingSSL;
 + (NSData*) readCertFromFile;
 + (NSData*) readKeyFromFile;
 + (NSData*) readP12FromFile;
 + (NSData*) getSignatureFromCert:(NSData*)cert;
-+ (NSData*) nullTerminateString:(NSData*)data;
++ (NSData*) pemToDer:(NSData*)pemCertBytes;
 
 - (NSData*) createAESKeyFromSaltSHA1:(NSData*)saltedPIN;
 - (NSData*) createAESKeyFromSaltSHA256:(NSData*)saltedPIN;

Limelight/Crypto/CryptoManager.m

@@ -9,7 +9,6 @@
 #import "CryptoManager.h"
 #import "mkcert.h"
 
-#include <openssl/aes.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
@@ -45,59 +44,71 @@ static NSData* p12 = nil;
 }
 
 - (NSData*) aesEncrypt:(NSData*)data withKey:(NSData*)key {
-    AES_KEY aesKey;
-    AES_set_encrypt_key([key bytes], 128, &aesKey);
-    int size = [self getEncryptSize:data];
-    unsigned char* buffer = malloc(size);
-    unsigned char* blockRoundedBuffer = calloc(1, size);
-    memcpy(blockRoundedBuffer, [data bytes], [data length]);
+    EVP_CIPHER_CTX* cipher;
+    int ciphertextLen;
+
+    cipher = EVP_CIPHER_CTX_new();
+
+    EVP_EncryptInit(cipher, EVP_aes_128_ecb(), [key bytes], NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    NSMutableData* ciphertext = [NSMutableData dataWithLength:[data length]];
+    EVP_EncryptUpdate(cipher,
+                      [ciphertext mutableBytes],
+                      &ciphertextLen,
+                      [data bytes],
+                      (int)[data length]);
+    assert(ciphertextLen == [ciphertext length]);
+
+    EVP_CIPHER_CTX_free(cipher);
     
-    // AES_encrypt only encrypts the first 16 bytes so iterate the entire buffer
-    int blockOffset = 0;
-    while (blockOffset < size) {
-        AES_encrypt(blockRoundedBuffer + blockOffset, buffer + blockOffset, &aesKey);
-        blockOffset += 16;
-    }
-    
-    NSData* encryptedData = [NSData dataWithBytes:buffer length:size];
-    free(buffer);
-    free(blockRoundedBuffer);
-    return encryptedData;
+    return ciphertext;
 }
 
 - (NSData*) aesDecrypt:(NSData*)data withKey:(NSData*)key {
-    AES_KEY aesKey;
-    AES_set_decrypt_key([key bytes], 128, &aesKey);
-    unsigned char* buffer = malloc([data length]);
+    EVP_CIPHER_CTX* cipher;
+    int plaintextLen;
+
+    cipher = EVP_CIPHER_CTX_new();
+
+    EVP_DecryptInit(cipher, EVP_aes_128_ecb(), [key bytes], NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    NSMutableData* plaintext = [NSMutableData dataWithLength:[data length]];
+    EVP_DecryptUpdate(cipher,
+                      [plaintext mutableBytes],
+                      &plaintextLen,
+                      [data bytes],
+                      (int)[data length]);
+    assert(plaintextLen == [plaintext length]);
+
+    EVP_CIPHER_CTX_free(cipher);
     
-    // AES_decrypt only decrypts the first 16 bytes so iterate the entire buffer
-    int blockOffset = 0;
-    while (blockOffset < [data length]) {
-        AES_decrypt([data bytes] + blockOffset, buffer + blockOffset, &aesKey);
-        blockOffset += 16;
-    }
-    
-    NSData* decryptedData = [NSData dataWithBytes:buffer length:[data length]];
-    free(buffer);
-    return decryptedData;
+    return plaintext;
 }
 
-- (int) getEncryptSize:(NSData*)data {
-    // the size is the length of the data ceiling to the nearest 16 bytes
-    return (((int)[data length] + 15) / 16) * 16;
-}
++ (NSData*) pemToDer:(NSData*)pemCertBytes {
+    X509* x509;
+    
+    BIO* bio = BIO_new_mem_buf([pemCertBytes bytes], (int)[pemCertBytes length]);
+    x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+    BIO_free(bio);
+    
+    bio = BIO_new(BIO_s_mem());
+    i2d_X509_bio(bio, x509);
 
-+ (NSData*) nullTerminateString:(NSData*)data {
-    NSMutableData* mutData = [NSMutableData dataWithData:data];
-    [mutData appendBytes:"" length:1];
-    return mutData;
+    BUF_MEM* mem;
+    BIO_get_mem_ptr(bio, &mem);
+    
+    NSData* ret = [[NSData alloc] initWithBytes:mem->data length:mem->length];
+    BIO_free(bio);
+    
+    return ret;
 }
 
 - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert {
-    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
     X509* x509;
-    BIO* bio = BIO_new(BIO_s_mem());
-    BIO_puts(bio, buffer);
+    BIO* bio = BIO_new_mem_buf([cert bytes], (int)[cert length]);
     x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
     
     BIO_free(bio);
@@ -122,9 +133,7 @@ static NSData* p12 = nil;
 }
 
 - (NSData *)signData:(NSData *)data withKey:(NSData *)key {
-    const char* buffer = [[CryptoManager nullTerminateString:key] bytes];
-    BIO* bio = BIO_new(BIO_s_mem());
-    BIO_puts(bio, buffer);
+    BIO* bio = BIO_new_mem_buf([key bytes], (int)[key length]);
     
     EVP_PKEY* pkey;
     pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL);
@@ -159,82 +168,136 @@ static NSData* p12 = nil;
     return signedData;
 }
 
-// TODO: these three methods are almost identical, fix the copy-pasta
++ (NSData*) readCryptoObject:(NSString*)item {
+#if TARGET_OS_TV
+    return [[NSUserDefaults standardUserDefaults] dataForKey:item];
+#else
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsDirectory = [paths objectAtIndex:0];
+    NSString *file = [documentsDirectory stringByAppendingPathComponent:item];
+    return [NSData dataWithContentsOfFile:file];
+#endif
+}
+
++ (void) writeCryptoObject:(NSString*)item data:(NSData*)data {
+#if TARGET_OS_TV
+    [[NSUserDefaults standardUserDefaults] setObject:data forKey:item];
+#else
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsDirectory = [paths objectAtIndex:0];
+    NSString *file = [documentsDirectory stringByAppendingPathComponent:item];
+    [data writeToFile:file atomically:NO];
+#endif
+}
+
 + (NSData*) readCertFromFile {
     if (cert == nil) {
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString *documentsDirectory = [paths objectAtIndex:0];
-        NSString *certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
-        cert = [NSData dataWithContentsOfFile:certFile];
+        cert = [CryptoManager readCryptoObject:@"client.crt"];
     }
     return cert;
 }
 
 + (NSData*) readP12FromFile {
     if (p12 == nil) {
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString *documentsDirectory = [paths objectAtIndex:0];
-        NSString *p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
-        p12 = [NSData dataWithContentsOfFile:p12File];
+        p12 = [CryptoManager readCryptoObject:@"client.p12"];
     }
     return p12;
 }
 
 + (NSData*) readKeyFromFile {
     if (key == nil) {
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString *documentsDirectory = [paths objectAtIndex:0];
-        NSString *keyFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
-        key = [NSData dataWithContentsOfFile:keyFile];
+        key = [CryptoManager readCryptoObject:@"client.key"];
     }
     return key;
 }
 
 + (bool) keyPairExists {
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documentsDirectory = [paths objectAtIndex:0];
-    NSString *keyFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
-    NSString *p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
-    NSString *certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
-    
-    bool keyFileExists = [[NSFileManager defaultManager] fileExistsAtPath:keyFile];
-    bool p12FileExists = [[NSFileManager defaultManager] fileExistsAtPath:p12File];
-    bool certFileExists = [[NSFileManager defaultManager] fileExistsAtPath:certFile];
+    bool keyFileExists = [CryptoManager readCryptoObject:@"client.key"] != nil;
+    bool p12FileExists = [CryptoManager readCryptoObject:@"client.p12"] != nil;
+    bool certFileExists = [CryptoManager readCryptoObject:@"client.crt"] != nil;
     
     return keyFileExists && p12FileExists && certFileExists;
 }
 
 + (NSData *)getSignatureFromCert:(NSData *)cert {
-    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
-    X509* x509;
-    BIO* bio = BIO_new(BIO_s_mem());
-    BIO_puts(bio, buffer);
-    x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+    BIO* bio = BIO_new_mem_buf([cert bytes], (int)[cert length]);
+    X509* x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
     
     if (!x509) {
         Log(LOG_E, @"Unable to parse certificate in memory!");
         return NULL;
     }
-    return [NSData dataWithBytes:x509->signature->data length:x509->signature->length];
+    
+#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
+    ASN1_BIT_STRING *asnSignature = x509->signature;
+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, x509);
+#else
+    const ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, x509);
+#endif
+    
+    NSData* sig = [NSData dataWithBytes:asnSignature->data length:asnSignature->length];
+    
+    X509_free(x509);
+    
+    return sig;
 }
 
-+ (void) generateKeyPairUsingSSl {
++ (NSData*)getKeyFromCertKeyPair:(CertKeyPair*)certKeyPair {
+    BIO* bio = BIO_new(BIO_s_mem());
+    
+    PEM_write_bio_PrivateKey_traditional(bio, certKeyPair->pkey, NULL, NULL, 0, NULL, NULL);
+    
+    BUF_MEM* mem;
+    BIO_get_mem_ptr(bio, &mem);
+    NSData* data = [NSData dataWithBytes:mem->data length:mem->length];
+    BIO_free(bio);
+    return data;
+}
+
++ (NSData*)getP12FromCertKeyPair:(CertKeyPair*)certKeyPair {
+    BIO* bio = BIO_new(BIO_s_mem());
+    
+    i2d_PKCS12_bio(bio, certKeyPair->p12);
+    
+    BUF_MEM* mem;
+    BIO_get_mem_ptr(bio, &mem);
+    NSData* data = [NSData dataWithBytes:mem->data length:mem->length];
+    BIO_free(bio);
+    return data;
+}
+
++ (NSData*)getCertFromCertKeyPair:(CertKeyPair*)certKeyPair {
+    BIO* bio = BIO_new(BIO_s_mem());
+    
+    PEM_write_bio_X509(bio, certKeyPair->x509);
+    
+    BUF_MEM* mem;
+    BIO_get_mem_ptr(bio, &mem);
+    NSData* data = [NSData dataWithBytes:mem->data length:mem->length];
+    BIO_free(bio);
+    return data;
+}
+
++ (void) generateKeyPairUsingSSL {
     static dispatch_once_t pred;
     dispatch_once(&pred, ^{
         if (![CryptoManager keyPairExists]) {
-            
             Log(LOG_I, @"Generating Certificate... ");
             CertKeyPair certKeyPair = generateCertKeyPair();
             
-            NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-            NSString* documentsDirectory = [paths objectAtIndex:0];
-            NSString* certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
-            NSString* keyPairFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
-            NSString* p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
+            NSData* certData = [CryptoManager getCertFromCertKeyPair:&certKeyPair];
+            NSData* p12Data = [CryptoManager getP12FromCertKeyPair:&certKeyPair];
+            NSData* keyData = [CryptoManager getKeyFromCertKeyPair:&certKeyPair];
             
-            //Log(LOG_D, @"Writing cert and key to: \n%@\n%@", certFile, keyPairFile);
-            saveCertKeyPair([certFile UTF8String], [p12File UTF8String], [keyPairFile UTF8String], certKeyPair);
             freeCertKeyPair(certKeyPair);
+            
+            [CryptoManager writeCryptoObject:@"client.crt" data:certData];
+            [CryptoManager writeCryptoObject:@"client.p12" data:p12Data];
+            [CryptoManager writeCryptoObject:@"client.key" data:keyData];
+            
             Log(LOG_I, @"Certificate created");
         }
     });

Limelight/Crypto/IdManager.h

@@ -6,8 +6,6 @@
 //  Copyright © 2015 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
 @interface IdManager : NSObject
 
 + (NSString*) getUniqueId;

Limelight/Crypto/mkcert.c

@@ -5,52 +5,76 @@
 #include <stdlib.h>
 
 #include <openssl/pem.h>
-#include <openssl/conf.h>
-#include <openssl/pkcs12.h>
-
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
 
 static const int NUM_BITS = 2048;
 static const int SERIAL = 0;
-static const int NUM_YEARS = 10;
+static const int NUM_YEARS = 20;
 
-int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years);
-int add_ext(X509 *cert, int nid, char *value);
+void mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
+    X509* cert = X509_new();
+    
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
 
-struct CertKeyPair generateCertKeyPair() {
+    EVP_PKEY_keygen_init(ctx);
+    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits);
+
+    // pk must be initialized on input
+    EVP_PKEY* pk = NULL;
+    EVP_PKEY_keygen(ctx, &pk);
+
+    EVP_PKEY_CTX_free(ctx);
+    
+    X509_set_version(cert, 2);
+    ASN1_INTEGER_set(X509_get_serialNumber(cert), serial);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    X509_gmtime_adj(X509_get_notBefore(cert), 0);
+    X509_gmtime_adj(X509_get_notAfter(cert), 60 * 60 * 24 * 365 * years);
+#else
+    ASN1_TIME* before = ASN1_STRING_dup(X509_get0_notBefore(cert));
+    ASN1_TIME* after = ASN1_STRING_dup(X509_get0_notAfter(cert));
+
+    X509_gmtime_adj(before, 0);
+    X509_gmtime_adj(after, 60 * 60 * 24 * 365 * years);
+
+    X509_set1_notBefore(cert, before);
+    X509_set1_notAfter(cert, after);
+
+    ASN1_STRING_free(before);
+    ASN1_STRING_free(after);
+#endif
+
+    X509_set_pubkey(cert, pk);
+
+    X509_NAME* name = X509_get_subject_name(cert);
+    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
+                               (const unsigned char*)"NVIDIA GameStream Client",
+                               -1, -1, 0);
+    X509_set_issuer_name(cert, name);
+
+    X509_sign(cert, pk, EVP_sha256());
+    
+    *x509p = cert;
+    *pkeyp = pk;
+}
+
+struct CertKeyPair generateCertKeyPair(void) {
     BIO *bio_err;
     X509 *x509 = NULL;
     EVP_PKEY *pkey = NULL;
     PKCS12 *p12 = NULL;
    
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
     bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
     
-    SSLeay_add_all_algorithms();
-    ERR_load_crypto_strings();
-    
     mkcert(&x509, &pkey, NUM_BITS, SERIAL, NUM_YEARS);
 
     p12 = PKCS12_create("limelight", "GameStream", pkey, x509, NULL, 0, 0, 0, 0, 0);
     if (p12 == NULL) {
         printf("Error generating a valid PKCS12 certificate.\n");
     }
-
-    // Debug Print statements
-    //RSA_print_fp(stdout, pkey->pkey.rsa, 0);
-    //X509_print_fp(stdout, x509);
-    //PEM_write_PUBKEY(stdout, pkey);
-    //PEM_write_PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL);
-    //PEM_write_X509(stdout, x509);
     
-#ifndef OPENSSL_NO_ENGINE
-    ENGINE_cleanup();
-#endif
-    CRYPTO_cleanup_all_ex_data();
-    
-    CRYPTO_mem_leaks(bio_err);
     BIO_free(bio_err);
     
     return (CertKeyPair){x509, pkey, p12};
@@ -61,107 +85,3 @@ void freeCertKeyPair(struct CertKeyPair certKeyPair) {
     EVP_PKEY_free(certKeyPair.pkey);
     PKCS12_free(certKeyPair.p12);
 }
-
-void saveCertKeyPair(const char* certFile, const char* p12File, const char* keyPairFile, CertKeyPair certKeyPair) {
-    FILE* certFilePtr = fopen(certFile, "w");
-    FILE* keyPairFilePtr = fopen(keyPairFile, "w");
-    FILE* p12FilePtr = fopen(p12File, "wb");
-    
-    //TODO: error check
-    PEM_write_PrivateKey(keyPairFilePtr, certKeyPair.pkey, NULL, NULL, 0, NULL, NULL);
-    PEM_write_X509(certFilePtr, certKeyPair.x509);
-    i2d_PKCS12_fp(p12FilePtr, certKeyPair.p12);
-    
-    fclose(p12FilePtr);
-    fclose(certFilePtr);
-    fclose(keyPairFilePtr);
-}
-
-int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
-    X509 *x;
-    EVP_PKEY *pk;
-    RSA *rsa;
-    X509_NAME *name = NULL;
-    
-    if (*pkeyp == NULL) {
-        if ((pk=EVP_PKEY_new()) == NULL) {
-            return(0);
-        }
-    } else {
-        pk = *pkeyp;
-    }
-    
-    if (*x509p == NULL) {
-        if ((x = X509_new()) == NULL) {
-            goto err;
-        }
-    } else {
-        x = *x509p;
-    }
-    
-    rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
-    if (!EVP_PKEY_assign_RSA(pk, rsa)) {
-        goto err;
-    }
-    
-    X509_set_version(x, 2);
-    ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
-    X509_gmtime_adj(X509_get_notBefore(x), 0);
-    X509_gmtime_adj(X509_get_notAfter(x), (long)60*60*24*365*years);
-    X509_set_pubkey(x, pk);
-    
-    name = X509_get_subject_name(x);
-    
-    /* This function creates and adds the entry, working out the
-     * correct string type and performing checks on its length.
-     */
-    X509_NAME_add_entry_by_txt(name,"CN", MBSTRING_ASC, (unsigned char*)"NVIDIA GameStream Client", -1, -1, 0);
-    
-    /* Its self signed so set the issuer name to be the same as the
-     * subject.
-     */
-    X509_set_issuer_name(x, name);
-    
-    /* Add various extensions: standard extensions */
-    add_ext(x, NID_basic_constraints, "critical,CA:TRUE");
-    add_ext(x, NID_key_usage, "critical,keyCertSign,cRLSign");
-    
-    add_ext(x, NID_subject_key_identifier, "hash");
-    
-    if (!X509_sign(x, pk, EVP_sha1())) {
-        goto err;
-    }
-    
-    *x509p = x;
-    *pkeyp = pk;
-    
-    return(1);
-err:
-    return(0);
-}
-
-/* Add extension using V3 code: we can set the config file as NULL
- * because we wont reference any other sections.
- */
-
-int add_ext(X509 *cert, int nid, char *value)
-{
-    X509_EXTENSION *ex;
-    X509V3_CTX ctx;
-    /* This sets the 'context' of the extensions. */
-    /* No configuration database */
-    X509V3_set_ctx_nodb(&ctx);
-    /* Issuer and subject certs: both the target since it is self signed,
-     * no request and no CRL
-     */
-    X509V3_set_ctx(&ctx, cert, cert, NULL, NULL, 0);
-    ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value);
-    if (!ex) {
-        return 0;
-    }
-    
-    X509_add_ext(cert, ex, -1);
-    X509_EXTENSION_free(ex);
-    return 1;
-}
-

Limelight/Crypto/mkcert.h

@@ -18,8 +18,7 @@ typedef struct CertKeyPair {
     PKCS12 *p12;
 } CertKeyPair;
 
-struct CertKeyPair generateCertKeyPair();
+struct CertKeyPair generateCertKeyPair(void);
 void freeCertKeyPair(CertKeyPair);
-void saveCertKeyPair(const char* certFile, const char* p12File, const char* keyPairFile, CertKeyPair certKeyPair);
 #endif
 

Limelight/Database/App+CoreDataProperties.h

@@ -1,25 +0,0 @@
-//
-//  App+CoreDataProperties.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
-//  to keep your implementation up to date with your model.
-//
-
-#import "App.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface App (CoreDataProperties)
-
-@property (nullable, nonatomic, retain) NSString *id;
-@property (nullable, nonatomic, retain) NSData *image;
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) Host *host;
-
-@end
-
-NS_ASSUME_NONNULL_END

Limelight/Database/App.h

@@ -1,18 +0,0 @@
-//
-//  App.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class Host;
-
-@interface App : NSManagedObject
-
-@end
-
-#import "App+CoreDataProperties.h"

Limelight/Database/App.m

@@ -1,13 +0,0 @@
-//
-//  App.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import "App.h"
-
-@implementation App
-
-@end

Limelight/Database/DataManager.h

@@ -6,7 +6,6 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
 #import "AppDelegate.h"
 #import "TemporaryHost.h"
 #import "TemporaryApp.h"
@@ -14,12 +13,21 @@
 
 @interface DataManager : NSObject
 
-- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate
+                       framerate:(NSInteger)framerate
+                          height:(NSInteger)height
+                           width:(NSInteger)width
+                onscreenControls:(NSInteger)onscreenControls
+                   optimizeGames:(BOOL)optimizeGames
+                 multiController:(BOOL)multiController
+                       audioOnPC:(BOOL)audioOnPC
+                         useHevc:(BOOL)useHevc
+                       enableHdr:(BOOL)enableHdr
+               absoluteTouchMode:(BOOL)absoluteTouchMode;
 
 - (NSArray*) getHosts;
 - (void) updateHost:(TemporaryHost*)host;
 - (void) updateAppsForExistingHost:(TemporaryHost *)host;
-- (void) updateIconForExistingApp:(TemporaryApp*)app;
 - (void) removeHost:(TemporaryHost*)host;
 - (void) removeApp:(TemporaryApp*)app;
 

Limelight/Database/DataManager.m

@@ -9,7 +9,6 @@
 #import "DataManager.h"
 #import "TemporaryApp.h"
 #import "TemporarySettings.h"
-#import "Settings.h"
 
 @implementation DataManager {
     NSManagedObjectContext *_managedObjectContext;
@@ -19,9 +18,20 @@
 - (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 *)[[OSApplication sharedApplication] delegate];
+        
+    }
+    else {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            self->_appDelegate = (AppDelegate *)[[OSApplication sharedApplication] delegate];
+        });
+    }
+    
     _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
-    [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
+    [_managedObjectContext setParentContext:[_appDelegate managedObjectContext]];
     
     return self;
 }
@@ -43,16 +53,31 @@
     return uid;
 }
 
-- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate
+                       framerate:(NSInteger)framerate
+                          height:(NSInteger)height
+                           width:(NSInteger)width
+                onscreenControls:(NSInteger)onscreenControls
+                   optimizeGames:(BOOL)optimizeGames
+                 multiController:(BOOL)multiController
+                       audioOnPC:(BOOL)audioOnPC
+                         useHevc:(BOOL)useHevc
+                       enableHdr:(BOOL)enableHdr
+               absoluteTouchMode:(BOOL)absoluteTouchMode {
     
     [_managedObjectContext performBlockAndWait:^{
         Settings* settingsToSave = [self retrieveSettings];
         settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
-        // Bitrate is persisted in kbps
         settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
         settingsToSave.height = [NSNumber numberWithInteger:height];
         settingsToSave.width = [NSNumber numberWithInteger:width];
         settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+        settingsToSave.optimizeGames = optimizeGames;
+        settingsToSave.multiController = multiController;
+        settingsToSave.playAudioOnPC = audioOnPC;
+        settingsToSave.useHevc = useHevc;
+        settingsToSave.enableHdr = enableHdr;
+        settingsToSave.absoluteTouchMode = absoluteTouchMode;
         
         [self saveData];
     }];
@@ -63,8 +88,8 @@
         // Add a new persistent managed object if one doesn't exist
         Host* parent = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
         if (parent == nil) {
-            NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:_managedObjectContext];
-            parent = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
+            NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:self->_managedObjectContext];
+            parent = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:self->_managedObjectContext];
         }
         
         // Push changes from the temp host to the persistent one
@@ -88,8 +113,8 @@
             // Add a new persistent managed object if one doesn't exist
             App* parentApp = [self getAppForTemporaryApp:app withAppRecords:appRecords];
             if (parentApp == nil) {
-                NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:_managedObjectContext];
-                parentApp = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
+                NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:self->_managedObjectContext];
+                parentApp = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:self->_managedObjectContext];
             }
             
             [app propagateChangesToParent:parentApp withHost:parent];
@@ -103,20 +128,6 @@
     }];
 }
 
-- (void) updateIconForExistingApp:(TemporaryApp*)app {
-    [_managedObjectContext performBlockAndWait:^{
-        App* parentApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
-        if (parentApp == nil) {
-            // The app must exist to be updated
-            return;
-        }
-        
-        parentApp.image = app.image;
-        
-        [self saveData];
-    }];
-}
-
 - (TemporarySettings*) getSettings {
     __block TemporarySettings *tempSettings;
     
@@ -145,7 +156,7 @@
     [_managedObjectContext performBlockAndWait:^{
         App* managedApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
         if (managedApp != nil) {
-            [_managedObjectContext deleteObject:managedApp];
+            [self->_managedObjectContext deleteObject:managedApp];
             [self saveData];
         }
     }];
@@ -155,7 +166,7 @@
     [_managedObjectContext performBlockAndWait:^{
         Host* managedHost = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
         if (managedHost != nil) {
-            [_managedObjectContext deleteObject:managedHost];
+            [self->_managedObjectContext deleteObject:managedHost];
             [self saveData];
         }
     }];
@@ -163,7 +174,7 @@
 
 - (void) saveData {
     NSError* error;
-    if (![_managedObjectContext save:&error]) {
+    if ([_managedObjectContext hasChanges] && ![_managedObjectContext save:&error]) {
         Log(LOG_E, @"Unable to save hosts to database: %@", error);
     }
 
@@ -199,7 +210,7 @@
 - (App*) getAppForTemporaryApp:(TemporaryApp*)tempApp withAppRecords:(NSArray*)apps {
     for (App* app in apps) {
         if ([app.id isEqualToString:tempApp.id] &&
-            [app.host.uuid isEqualToString:app.host.uuid]) {
+            [app.host.uuid isEqualToString:tempApp.host.uuid]) {
             return app;
         }
     }

Limelight/Database/Host+CoreDataProperties.h

@@ -1,38 +0,0 @@
-//
-//  Host+CoreDataProperties.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
-//  to keep your implementation up to date with your model.
-//
-
-#import "Host.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface Host (CoreDataProperties)
-
-@property (nullable, nonatomic, retain) NSString *address;
-@property (nullable, nonatomic, retain) NSString *externalAddress;
-@property (nullable, nonatomic, retain) NSString *localAddress;
-@property (nullable, nonatomic, retain) NSString *mac;
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) NSNumber *pairState;
-@property (nullable, nonatomic, retain) NSString *uuid;
-@property (nullable, nonatomic, retain) NSSet *appList;
-
-@end
-
-@interface Host (CoreDataGeneratedAccessors)
-
-- (void)addAppListObject:(NSManagedObject *)value;
-- (void)removeAppListObject:(NSManagedObject *)value;
-- (void)addAppList:(NSSet *)values;
-- (void)removeAppList:(NSSet *)values;
-
-@end
-
-NS_ASSUME_NONNULL_END

Limelight/Database/Host.h

@@ -1,17 +0,0 @@
-//
-//  Host.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-#import "Utils.h"
-
-@interface Host : NSManagedObject
-
-@end
-
-#import "Host+CoreDataProperties.h"

Limelight/Database/Host.m

@@ -1,13 +0,0 @@
-//
-//  Host.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import "Host.h"
-
-@implementation Host
-
-@end

Limelight/Database/Settings.h

@@ -1,22 +0,0 @@
-//
-//  Settings.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-
-@interface Settings : NSManagedObject
-
-@property (nonatomic, retain) NSNumber * bitrate;
-@property (nonatomic, retain) NSNumber * framerate;
-@property (nonatomic, retain) NSNumber * height;
-@property (nonatomic, retain) NSNumber * width;
-@property (nonatomic, retain) NSNumber * onscreenControls;
-@property (nonatomic, retain) NSString * uniqueId;
-
-@end

Limelight/Database/Settings.m

@@ -1,21 +0,0 @@
-//
-//  Settings.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-#import "Settings.h"
-
-
-@implementation Settings
-
-@dynamic bitrate;
-@dynamic framerate;
-@dynamic height;
-@dynamic width;
-@dynamic onscreenControls;
-@dynamic uniqueId;
-
-@end

Limelight/Database/TemporaryApp.h

@@ -6,15 +6,15 @@
 //  Copyright © 2015 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
 #import "TemporaryHost.h"
-#import "App.h"
+#import "App+CoreDataClass.h"
 
 @interface TemporaryApp : NSObject
 
 @property (nullable, nonatomic, retain) NSString *id;
-@property (nullable, nonatomic, retain) NSData *image;
 @property (nullable, nonatomic, retain) NSString *name;
+@property (nullable, nonatomic, retain) NSString *installPath;
+@property (nonatomic)                   BOOL hdrSupported;
 @property (nullable, nonatomic, retain) TemporaryHost *host;
 
 NS_ASSUME_NONNULL_BEGIN

Limelight/Database/TemporaryApp.m

@@ -7,7 +7,6 @@
 //
 
 #import "TemporaryApp.h"
-#import "App.h"
 
 @implementation TemporaryApp
 
@@ -15,8 +14,8 @@
     self = [self init];
     
     self.id = app.id;
-    self.image = app.image;
     self.name = app.name;
+    self.hdrSupported = app.hdrSupported;
     self.host = tempHost;
     
     return self;
@@ -25,6 +24,7 @@
 - (void) propagateChangesToParent:(App*)parent withHost:(Host*)host {
     parent.id = self.id;
     parent.name = self.name;
+    parent.hdrSupported = self.hdrSupported;
     parent.host = host;
 }
 
@@ -41,7 +41,7 @@
         return YES;
     }
     
-    if (![object isKindOfClass:[App class]]) {
+    if (![object isKindOfClass:[self class]]) {
         return NO;
     }
     

Limelight/Database/TemporaryHost.h

@@ -6,26 +6,29 @@
 //  Copyright © 2015 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
 #import "Utils.h"
-#import "Host.h"
+#import "Host+CoreDataClass.h"
 
 @interface TemporaryHost : NSObject
 
-@property (nonatomic) BOOL online;
-@property (nonatomic) PairState pairState;
-@property (nonatomic, nullable) NSString * activeAddress;
-@property (nonatomic, nullable) NSString * currentGame;
+@property (atomic) State state;
+@property (atomic) PairState pairState;
+@property (atomic, nullable, retain) NSString * activeAddress;
+@property (atomic, nullable, retain) NSString * currentGame;
+
+@property (atomic, nullable, retain) NSData *serverCert;
+@property (atomic, nullable, retain) NSString *address;
+@property (atomic, nullable, retain) NSString *externalAddress;
+@property (atomic, nullable, retain) NSString *localAddress;
+@property (atomic, nullable, retain) NSString *ipv6Address;
+@property (atomic, nullable, retain) NSString *mac;
+@property (atomic)                   int serverCodecModeSupport;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@property (nonatomic, retain) NSString *address;
-@property (nonatomic, retain) NSString *externalAddress;
-@property (nonatomic, retain) NSString *localAddress;
-@property (nonatomic, retain) NSString *mac;
-@property (nonatomic, retain) NSString *name;
-@property (nonatomic, retain) NSString *uuid;
-@property (nonatomic, retain) NSMutableSet *appList;
+@property (atomic, retain) NSString *name;
+@property (atomic, retain) NSString *uuid;
+@property (atomic, retain) NSSet *appList;
 
 - (id) initFromHost:(Host*)host;
 

Limelight/Database/TemporaryHost.m

@@ -8,9 +8,7 @@
 
 #import "DataManager.h"
 #import "TemporaryHost.h"
-#import "Host.h"
 #import "TemporaryApp.h"
-#import "App.h"
 
 @implementation TemporaryHost
 
@@ -18,6 +16,7 @@
     self = [super init];
     self.appList = [[NSMutableSet alloc] init];
     self.currentGame = @"0";
+    self.state = StateUnknown;
     
     return self;
 }
@@ -28,10 +27,15 @@
     self.address = host.address;
     self.externalAddress = host.externalAddress;
     self.localAddress = host.localAddress;
+    self.ipv6Address = host.ipv6Address;
     self.mac = host.mac;
     self.name = host.name;
     self.uuid = host.uuid;
-    self.pairState = [host.pairState intValue];
+    self.serverCodecModeSupport = host.serverCodecModeSupport;
+    self.serverCert = host.serverCert;
+    
+    // Ensure we don't use a stale cached pair state if we haven't pinned the cert yet
+    self.pairState = host.serverCert ? [host.pairState intValue] : PairStateUnpaired;
     
     NSMutableSet *appList = [[NSMutableSet alloc] init];
 
@@ -46,12 +50,30 @@
 }
 
 - (void) propagateChangesToParent:(Host*)parentHost {
-    parentHost.address = self.address;
-    parentHost.externalAddress = self.externalAddress;
-    parentHost.localAddress = self.localAddress;
-    parentHost.mac = self.mac;
+    // Avoid overwriting existing data with nil if
+    // we don't have everything populated in the temporary
+    // host.
+    if (self.address != nil) {
+        parentHost.address = self.address;
+    }
+    if (self.externalAddress != nil) {
+        parentHost.externalAddress = self.externalAddress;
+    }
+    if (self.localAddress != nil) {
+        parentHost.localAddress = self.localAddress;
+    }
+    if (self.ipv6Address != nil) {
+        parentHost.ipv6Address = self.ipv6Address;
+    }
+    if (self.mac != nil) {
+        parentHost.mac = self.mac;
+    }
+    if (self.serverCert != nil) {
+        parentHost.serverCert = self.serverCert;
+    }
     parentHost.name = self.name;
     parentHost.uuid = self.uuid;
+    parentHost.serverCodecModeSupport = self.serverCodecModeSupport;
     parentHost.pairState = [NSNumber numberWithInt:self.pairState];
 }
 
@@ -68,7 +90,7 @@
         return YES;
     }
     
-    if (![object isKindOfClass:[Host class]]) {
+    if (![object isKindOfClass:[self class]]) {
         return NO;
     }
     

Limelight/Database/TemporarySettings.h

@@ -6,8 +6,7 @@
 //  Copyright © 2015 Moonlight Stream. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import "Settings.h"
+#import "Settings+CoreDataClass.h"
 
 @interface TemporarySettings : NSObject
 
@@ -19,6 +18,13 @@
 @property (nonatomic, retain) NSNumber * width;
 @property (nonatomic, retain) NSNumber * onscreenControls;
 @property (nonatomic, retain) NSString * uniqueId;
+@property (nonatomic) BOOL streamingRemotely;
+@property (nonatomic) BOOL useHevc;
+@property (nonatomic) BOOL multiController;
+@property (nonatomic) BOOL playAudioOnPC;
+@property (nonatomic) BOOL optimizeGames;
+@property (nonatomic) BOOL enableHdr;
+@property (nonatomic) BOOL absoluteTouchMode;
 
 - (id) initFromSettings:(Settings*)settings;
 

Limelight/Database/TemporarySettings.m

@@ -7,6 +7,7 @@
 //
 
 #import "TemporarySettings.h"
+#import "OnScreenControls.h"
 
 @implementation TemporarySettings
 
@@ -15,11 +16,61 @@
     
     self.parent = settings;
     
+#if TARGET_OS_TV
+    // Apply default values from our Root.plist
+    NSString* settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
+    NSDictionary* settingsData = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]];
+    NSArray* preferences = [settingsData objectForKey:@"PreferenceSpecifiers"];
+    NSMutableDictionary* defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]];
+    for (NSDictionary* prefSpecification in preferences) {
+        NSString* key = [prefSpecification objectForKey:@"Key"];
+        if (key != nil) {
+            [defaultsToRegister setObject:[prefSpecification objectForKey:@"DefaultValue"] forKey:key];
+        }
+    }
+    [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister];
+    
+    self.bitrate = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"bitrate"]];
+    assert([self.bitrate intValue] != 0);
+    self.framerate = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"framerate"]];
+    assert([self.framerate intValue] != 0);
+    self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc"];
+    self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"];
+    self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"];
+    self.optimizeGames = [[NSUserDefaults standardUserDefaults] boolForKey:@"optimizeGames"];
+    self.multiController = [[NSUserDefaults standardUserDefaults] boolForKey:@"multipleControllers"];
+    
+    NSInteger _screenSize = [[NSUserDefaults standardUserDefaults] integerForKey:@"streamResolution"];
+    switch (_screenSize) {
+        case 0:
+            self.height = [NSNumber numberWithInteger:720];
+            self.width = [NSNumber numberWithInteger:1280];
+            break;
+        case 1:
+            self.height = [NSNumber numberWithInteger:1080];
+            self.width = [NSNumber numberWithInteger:1920];
+            break;
+        case 2:
+            self.height = [NSNumber numberWithInteger:2160];
+            self.width = [NSNumber numberWithInteger:3840];
+            break;
+        default:
+            abort();
+    }
+    self.onscreenControls = [NSNumber numberWithInteger:OnScreenControlsLevelOff];
+#else
     self.bitrate = settings.bitrate;
     self.framerate = settings.framerate;
     self.height = settings.height;
     self.width = settings.width;
+    self.useHevc = settings.useHevc;
+    self.playAudioOnPC = settings.playAudioOnPC;
+    self.enableHdr = settings.enableHdr;
+    self.optimizeGames = settings.optimizeGames;
+    self.multiController = settings.multiController;
     self.onscreenControls = settings.onscreenControls;
+    self.absoluteTouchMode = settings.absoluteTouchMode;
+#endif
     self.uniqueId = settings.uniqueId;
     
     return self;

Limelight/Font/Roboto/Apache License.txt

@@ -1,203 +0,0 @@
-Font data copyright Google 2012
-
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

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

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "limelight_computer_add_icon_1x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "limelight_computer_add_icon_2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "limelight_computer_add_icon_3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

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

@@ -2,12 +2,12 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "add.pdf",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "logo_universal.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",

Limelight/Images.xcassets/AddOverlayIcon.imageset/add.pdf

@@ -0,0 +1,68 @@
+%PDF-1.5
+%µí®û
+4 0 obj
+<< /Length 5 0 R
+   /Filter /FlateDecode
+>>
+stream
+xœ]P[à ûÏ)r�1}°cìÒº�öcÛý¥AèZ!%q였°/ç"%Èè9oô&áz>_ž—/%qaä!ºyä�§T3ÐjqµîaÚ”t„,~Dû›ÖÚGHýôzQõ␍®î:xgµ†I6Âß:gP((	hñ¯-1Îü5綎n3»!&úÖ"˜B-Õ¨~1–@½ZÒ¹](¡¿d÷ë9ا-žt§å…aL
+endstream
+endobj
+5 0 obj
+   183
+endobj
+3 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+>>
+endobj
+2 0 obj
+<< /Type /Page % 1
+   /Parent 1 0 R
+   /MediaBox [ 0 0 150 150 ]
+   /Contents 4 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 3 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 2 0 R ]
+   /Count 1
+>>
+endobj
+6 0 obj
+<< /Producer (cairo 1.16.0 (https://cairographics.org))
+   /CreationDate (D:20190922201812-07'00)
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000587 00000 n 
+0000000369 00000 n 
+0000000297 00000 n 
+0000000015 00000 n 
+0000000275 00000 n 
+0000000652 00000 n 
+0000000768 00000 n 
+trailer
+<< /Size 8
+   /Root 7 0 R
+   /Info 6 0 R
+>>
+startxref
+820
+%%EOF

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-29x29@1x.png",
       "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-40x40@1x.png",
       "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-76x76@1x.png",
       "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/Computer.imageset/Computer.pdf

@@ -0,0 +1,71 @@
+%PDF-1.5
+%µí®û
+4 0 obj
+<< /Length 5 0 R
+   /Filter /FlateDecode
+>>
+stream
+xœ]‘[ƒ Eÿ³Šl )
y¸Œ.¡ÃTû¡µûŸi€ Õa9×›�ÑȺ±l.zÌ+|ÀTm›ñþ48a”ä_°äÑ&&ë‘SØ^8
cYÕÍÅíl"‹«Æ5ºá‚v¤�’"{
+ò<9¶�j�­7Ö!Db	×,Ú�–PÊbåÐjt¤•øzÅÚœÔ:ƒº,'á½â‚ýÒ‡ wRÁù‘Ê|µ8)’w
+-{GÍÑsµ™�æüÞG^’íosû»£MÅkäø
à=h_
+endstream
+endobj
+5 0 obj
+   214
+endobj
+3 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 0.3 /ca 0.3 >>
+      /a1 << /CA 1 /ca 1 >>
+   >>
+>>
+endobj
+2 0 obj
+<< /Type /Page % 1
+   /Parent 1 0 R
+   /MediaBox [ 0 0 375 375 ]
+   /Contents 4 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 3 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 2 0 R ]
+   /Count 1
+>>
+endobj
+6 0 obj
+<< /Producer (cairo 1.16.0 (https://cairographics.org))
+   /CreationDate (D:20190922201805-07'00)
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000650 00000 n 
+0000000432 00000 n 
+0000000328 00000 n 
+0000000015 00000 n 
+0000000306 00000 n 
+0000000715 00000 n 
+0000000831 00000 n 
+trailer
+<< /Size 8
+   /Root 7 0 R
+   /Info 6 0 R
+>>
+startxref
+883
+%%EOF

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

@@ -2,18 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "limelight_computer_1x.png"
+      "filename" : "Computer.pdf",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "limelight_computer_2x.png"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "limelight_computer_3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "pull-arrow-light-14x31@1x.png",
+      "filename" : "error.pdf",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "pull-arrow-light-28x61@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "pull-arrow-light-42x92@3x.png",
       "scale" : "3x"
     }
   ],

Limelight/Images.xcassets/ErrorOverlayIcon.imageset/error.pdf

@@ -0,0 +1,68 @@
+%PDF-1.5
+%µí®û
+4 0 obj
+<< /Length 5 0 R
+   /Filter /FlateDecode
+>>
+stream
+xœUMA€ »ïý€¸� ßð	ÆD=ÈAý"L4š&[»µ›€3ÉE<cJ´“ àXÐŽŒå¤`¬‡8)-A:gúWo(ÜšÂVŠ:Õ	!ª±n«bμú”?©ØB*žL¸ܶðÿUS3␍t
H(å
+endstream
+endobj
+5 0 obj
+   110
+endobj
+3 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+>>
+endobj
+2 0 obj
+<< /Type /Page % 1
+   /Parent 1 0 R
+   /MediaBox [ 0 0 150 150 ]
+   /Contents 4 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 3 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 2 0 R ]
+   /Count 1
+>>
+endobj
+6 0 obj
+<< /Producer (cairo 1.16.0 (https://cairographics.org))
+   /CreationDate (D:20190922201819-07'00)
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000514 00000 n 
+0000000296 00000 n 
+0000000224 00000 n 
+0000000015 00000 n 
+0000000202 00000 n 
+0000000579 00000 n 
+0000000695 00000 n 
+trailer
+<< /Size 8
+   /Root 7 0 R
+   /Info 6 0 R
+>>
+startxref
+747
+%%EOF

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "L2_60x60@1x.png"
+      "filename" : "L2_60x60@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "L2_120x120@2x.png"
+      "filename" : "L2_120x120@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "L2_180x180@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "lock.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "R2_60x60@1x.png"
+      "filename" : "R2_60x60@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "R2_120x120@2x.png"
+      "filename" : "R2_120x120@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "R2_120x120@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "up_arrow.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/UpIcon.imageset/up_arrow.pdf

@@ -0,0 +1,70 @@
+%PDF-1.5
+%µí®û
+4 0 obj
+<< /Length 5 0 R
+   /Filter /FlateDecode
+>>
+stream
+xœUŽQ
+ƒ@DÿsŠ¹€1ÙÍF=†G(…êÇú¡½?-e`ƒÌ$
+	5Ö¼ZIqh›Ð¾Ó—4qAî¨ó ÓsTdã¹dl>üØ�H…	{º‰n|–KÏâé,Ë}°?‡ê5ôª™ÿ^øÐH;U$}
+endstream
+endobj
+5 0 obj
+   114
+endobj
+3 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+>>
+endobj
+2 0 obj
+<< /Type /Page % 1
+   /Parent 1 0 R
+   /MediaBox [ 0 0 75 75 ]
+   /Contents 4 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 3 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 2 0 R ]
+   /Count 1
+>>
+endobj
+6 0 obj
+<< /Producer (cairo 1.16.0 (https://cairographics.org))
+   /CreationDate (D:20190830203401-07'00)
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000516 00000 n 
+0000000300 00000 n 
+0000000228 00000 n 
+0000000015 00000 n 
+0000000206 00000 n 
+0000000581 00000 n 
+0000000697 00000 n 
+trailer
+<< /Size 8
+   /Root 7 0 R
+   /Info 6 0 R
+>>
+startxref
+749
+%%EOF

Limelight/Input/Controller.h

@@ -0,0 +1,27 @@
+//
+//  Controller.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 2/11/19.
+//  Copyright © 2019 Moonlight Game Streaming Project. All rights reserved.
+//
+
+@import GameController;
+
+@interface Controller : NSObject
+
+@property (nullable, nonatomic, retain) GCController* gamepad;
+@property (nonatomic)                   int playerIndex;
+@property (nonatomic)                   int lastButtonFlags;
+@property (nonatomic)                   int emulatingButtonFlags;
+@property (nonatomic)                   int supportedEmulationFlags;
+@property (nonatomic)                   unsigned char lastLeftTrigger;
+@property (nonatomic)                   unsigned char lastRightTrigger;
+@property (nonatomic)                   short lastLeftStickX;
+@property (nonatomic)                   short lastLeftStickY;
+@property (nonatomic)                   short lastRightStickX;
+@property (nonatomic)                   short lastRightStickY;
+@property (nonatomic)                   unsigned short lowFreqMotor;
+@property (nonatomic)                   unsigned short highFreqMotor;
+
+@end