Removed "Headers" build phase from common and created v1.0.4

This reverts commit ad0705d126.

.gitignore

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

.gitmodules

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

Launch Screen.xib

@@ -1,36 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8121.17" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<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">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Moonlight Stream. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="18" y="439.5" width="444" height="20.5"/>
-                    <animations/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.72941176470000002" green="0.69411764710000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <nil key="highlightedColor"/>
-                    <variation key="widthClass=compact">
-                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                    </variation>
-                </label>
-            </subviews>
-            <animations/>
-            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-            <constraints>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Gnz-uJ-CDw"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="404" y="445"/>
-        </view>
+        <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>
     </objects>
+    <resources>
+        <image name="Logo" width="32" height="32"/>
+    </resources>
 </document>

Limelight/AppCollectionView.h

@@ -0,0 +1,13 @@
+//
+//  AppCollectionView.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppCollectionView : UICollectionView
+
+@end

Limelight/AppCollectionView.m

@@ -0,0 +1,28 @@
+//
+//  AppCollectionView.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "AppCollectionView.h"
+
+@implementation AppCollectionView
+
+- (BOOL)touchesShouldCancelInContentView:(UIView *)view {
+    if ([view isKindOfClass:[UIButton class]]) {
+        return YES;
+    }
+    return [super touchesShouldCancelInContentView:view];
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

Limelight/AppDelegate.m

@@ -83,10 +83,7 @@ static NSOperationQueue* mainQueue;
     NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
     if (managedObjectContext != nil) {
         if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
-             // Replace this implementation with code to handle the error appropriately.
-             // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-            Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
-            abort();
+            Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
         } 
     }
 }
@@ -136,32 +133,15 @@ static NSOperationQueue* mainQueue;
                              [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
                              [NSNumber numberWithBool:YES], NSInferMappingModelAutomaticallyOption, nil];
     if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:options error:&error]) {
-        /*
-         Replace this implementation with code to handle the error appropriately.
-         
-         abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. 
-         
-         Typical reasons for an error here include:
-         * The persistent store is not accessible;
-         * The schema for the persistent store is incompatible with current managed object model.
-         Check the error message to determine what the actual problem was.
-         
-         
-         If the persistent store is not accessible, there is typically something wrong with the file path. Often, a file URL is pointing into the application's resources directory instead of a writeable directory.
-         
-         If you encounter schema incompatibility errors during development, you can reduce their frequency by:
-         * Simply deleting the existing store:
-         [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil]
-         
-         * Performing automatic lightweight migration by passing the following dictionary as the options parameter:
-         @{NSMigratePersistentStoresAutomaticallyOption:@YES, NSInferMappingModelAutomaticallyOption:@YES}
-         
-         Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
-         
-         */
-        Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
-        abort();
-    }    
+        // Log the error
+        Log(LOG_E, @"Critical database error: %@, %@", error, [error userInfo]);
+        
+        // Drop the database
+        [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil];
+        
+        // Try again
+        return [self persistentStoreCoordinator];
+    }
     
     return _persistentStoreCoordinator;
 }

Limelight/ComputerScrollView.h

@@ -0,0 +1,13 @@
+//
+//  ComputerScrollView.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ComputerScrollView : UIScrollView
+
+@end

Limelight/ComputerScrollView.m

@@ -0,0 +1,28 @@
+//
+//  ComputerScrollView.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "ComputerScrollView.h"
+
+@implementation ComputerScrollView
+
+- (BOOL)touchesShouldCancelInContentView:(UIView *)view {
+    if ([view isKindOfClass:[UIButton class]]) {
+        return YES;
+    }
+    return [super touchesShouldCancelInContentView:view];
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

Limelight/Crypto/CryptoManager.h

@@ -11,15 +11,16 @@
 @interface CryptoManager : NSObject
 
 + (void) generateKeyPairUsingSSl;
-+ (NSString*) getUniqueID;
 + (NSData*) readCertFromFile;
 + (NSData*) readKeyFromFile;
 + (NSData*) readP12FromFile;
 + (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

@@ -8,7 +8,6 @@
 
 #import "CryptoManager.h"
 #import "mkcert.h"
-#import <AdSupport/ASIdentifierManager.h>
 
 #include <openssl/aes.h>
 #include <openssl/sha.h>
@@ -17,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;
 }
 
@@ -229,18 +240,4 @@ static NSData* p12 = nil;
     });
 }
 
-+ (NSString*) getUniqueID {
-    // generate a UUID
-    NSUUID* uuid = [ASIdentifierManager sharedManager].advertisingIdentifier;
-    NSString* idString = [NSString stringWithString:[uuid UUIDString]];
-    
-    // we need a 16byte hex-string so we take the last 17 characters
-    // and remove the '-' to get a 16 character string
-    NSMutableString* uniqueId = [NSMutableString stringWithString:[idString substringFromIndex:19]];
-    [uniqueId deleteCharactersInRange:NSMakeRange(4, 1)];
-    
-    //Log(LOG_D, @"Unique ID: %@", uniqueId);
-    return [NSString stringWithString:uniqueId];
-}
-
 @end

Limelight/Crypto/IdManager.h

@@ -0,0 +1,15 @@
+//
+//  IdManager.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 10/31/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IdManager : NSObject
+
++ (NSString*) getUniqueId;
+
+@end

Limelight/Crypto/IdManager.m

@@ -0,0 +1,32 @@
+//
+//  IdManager.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 10/31/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "IdManager.h"
+#import "DataManager.h"
+
+@implementation IdManager
+
++ (NSString*) getUniqueId {
+    DataManager* dataMan = [[DataManager alloc] init];
+
+    NSString* uniqueId = [dataMan getUniqueId];
+    if (uniqueId == nil) {
+        uniqueId = [IdManager generateUniqueId];
+        [dataMan updateUniqueId:uniqueId];
+        Log(LOG_I, @"No UUID found. Generated new UUID: %@", uniqueId);
+    }
+    
+    return uniqueId;
+}
+
++ (NSString*) generateUniqueId {
+    UInt64 uuidLong = ((UInt64) arc4random() << 32) | arc4random();
+    return [NSString stringWithFormat:@"%016llx", uuidLong];
+}
+
+@end

Limelight/Crypto/mkcert.c

@@ -85,7 +85,6 @@ int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
     
     if (*pkeyp == NULL) {
         if ((pk=EVP_PKEY_new()) == NULL) {
-            abort();
             return(0);
         }
     } else {
@@ -102,7 +101,6 @@ int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
     
     rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
     if (!EVP_PKEY_assign_RSA(pk, rsa)) {
-        abort();
         goto err;
     }
     

Limelight/Database/App.h

@@ -11,16 +11,8 @@
 
 @class Host;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface App : NSManagedObject
 
-@property BOOL isRunning;
-
-- (NSComparisonResult)compareName:(App *)other;
-
 @end
 
-NS_ASSUME_NONNULL_END
-
 #import "App+CoreDataProperties.h"

Limelight/Database/App.m

@@ -7,14 +7,7 @@
 //
 
 #import "App.h"
-#import "Host.h"
 
 @implementation App
 
-@synthesize isRunning;
-
-- (NSComparisonResult)compareName:(App *)other {
-    return [self.name caseInsensitiveCompare:other.name];
-}
-
 @end

Limelight/Database/DataManager.h

@@ -7,22 +7,25 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Settings.h"
 #import "AppDelegate.h"
-#import "Host.h"
-#import "App.h"
+#import "TemporaryHost.h"
+#import "TemporaryApp.h"
+#import "TemporarySettings.h"
 
 @interface DataManager : NSObject
 
-@property (strong, nonatomic) AppDelegate* appDelegate;
-
 - (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
-- (Settings*) retrieveSettings;
-- (NSArray*) retrieveHosts;
-- (void) saveData;
-- (Host*) createHost;
-- (void) removeHost:(Host*)host;
-- (App*) createApp;
-- (void) removeApp:(App*)app;
+
+- (NSArray*) getHosts;
+- (void) updateHost:(TemporaryHost*)host;
+- (void) updateAppsForExistingHost:(TemporaryHost *)host;
+- (void) updateIconForExistingApp:(TemporaryApp*)app;
+- (void) removeHost:(TemporaryHost*)host;
+- (void) removeApp:(TemporaryApp*)app;
+
+- (TemporarySettings*) getSettings;
+
+- (void) updateUniqueId:(NSString*)uniqueId;
+- (NSString*) getUniqueId;
 
 @end

Limelight/Database/DataManager.m

@@ -7,37 +7,132 @@
 //
 
 #import "DataManager.h"
+#import "TemporaryApp.h"
+#import "TemporarySettings.h"
+#import "Settings.h"
 
-@implementation DataManager
+@implementation DataManager {
+    NSManagedObjectContext *_managedObjectContext;
+    AppDelegate *_appDelegate;
+}
 
 - (id) init {
     self = [super init];
-    self.appDelegate = [[UIApplication sharedApplication] delegate];
+    
+    _appDelegate = [[UIApplication sharedApplication] delegate];
+    _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+    [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
+    
     return self;
 }
 
-- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
-    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];
+- (void) updateUniqueId:(NSString*)uniqueId {
+    [_managedObjectContext performBlockAndWait:^{
+        [self retrieveSettings].uniqueId = uniqueId;
+        [self saveData];
+    }];
+}
 
-    NSError* error;
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
-        Log(LOG_E, @"Unable to save settings to database: %@", error);
-    }
-    [self.appDelegate saveContext];
+- (NSString*) getUniqueId {
+    __block NSString *uid;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        uid = [self retrieveSettings].uniqueId;
+    }];
+
+    return uid;
+}
+
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
+    
+    [_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];
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateHost:(TemporaryHost *)host {
+    [_managedObjectContext performBlockAndWait:^{
+        // 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];
+        }
+        
+        // Push changes from the temp host to the persistent one
+        [host propagateChangesToParent:parent];
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateAppsForExistingHost:(TemporaryHost *)host {
+    [_managedObjectContext performBlockAndWait:^{
+        Host* parent = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (parent == nil) {
+            // The host must exist to be updated
+            return;
+        }
+        
+        NSMutableSet *applist = [[NSMutableSet alloc] init];
+        NSArray *appRecords = [self fetchRecords:@"App"];
+        for (TemporaryApp* app in host.appList) {
+            // 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];
+            }
+            
+            [app propagateChangesToParent:parentApp withHost:parent];
+            
+            [applist addObject:parentApp];
+        }
+        
+        parent.appList = applist;
+        
+        [self saveData];
+    }];
+}
+
+- (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;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        tempSettings = [[TemporarySettings alloc] initFromSettings:[self retrieveSettings]];
+    }];
+    
+    return tempSettings;
 }
 
 - (Settings*) retrieveSettings {
     NSArray* fetchedRecords = [self fetchRecords:@"Settings"];
     if (fetchedRecords.count == 0) {
         // create a new settings object with the default values
-        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:_managedObjectContext];
+        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
         
         return settings;
     } else {
@@ -46,49 +141,84 @@
     }
 }
 
-- (Host*) createHost {
-    NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-    return [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+- (void) removeApp:(TemporaryApp*)app {
+    [_managedObjectContext performBlockAndWait:^{
+        App* managedApp = [self getAppForTemporaryApp:app withAppRecords:[self fetchRecords:@"App"]];
+        if (managedApp != nil) {
+            [_managedObjectContext deleteObject:managedApp];
+            [self saveData];
+        }
+    }];
 }
 
-- (void) removeHost:(Host*)host {
-    [[self.appDelegate managedObjectContext] deleteObject:host];
-    [self saveData];
+- (void) removeHost:(TemporaryHost*)host {
+    [_managedObjectContext performBlockAndWait:^{
+        Host* managedHost = [self getHostForTemporaryHost:host withHostRecords:[self fetchRecords:@"Host"]];
+        if (managedHost != nil) {
+            [_managedObjectContext deleteObject:managedHost];
+            [self saveData];
+        }
+    }];
 }
 
 - (void) saveData {
     NSError* error;
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
+    if (![_managedObjectContext save:&error]) {
         Log(LOG_E, @"Unable to save hosts to database: %@", error);
     }
-    [self.appDelegate saveContext];
+
+    [_appDelegate saveContext];
 }
 
-- (NSArray*) retrieveHosts {
-    return [self fetchRecords:@"Host"];
+- (NSArray*) getHosts {
+    __block NSMutableArray *tempHosts = [[NSMutableArray alloc] init];
+    
+    [_managedObjectContext performBlockAndWait:^{
+        NSArray *hosts = [self fetchRecords:@"Host"];
+        
+        for (Host* host in hosts) {
+            [tempHosts addObject:[[TemporaryHost alloc] initFromHost:host]];
+        }
+    }];
+    
+    return tempHosts;
 }
 
-- (App*) createApp {
-    NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-    return [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+// Only call from within performBlockAndWait!!!
+- (Host*) getHostForTemporaryHost:(TemporaryHost*)tempHost withHostRecords:(NSArray*)hosts {
+    for (Host* host in hosts) {
+        if ([tempHost.uuid isEqualToString:host.uuid]) {
+            return host;
+        }
+    }
+    
+    return nil;
 }
 
-- (void) removeApp:(App*)app {
-    [[self.appDelegate managedObjectContext] deleteObject:app];
+// Only call from within performBlockAndWait!!!
+- (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]) {
+            return app;
+        }
+    }
+    
+    return nil;
 }
 
 - (NSArray*) fetchRecords:(NSString*)entityName {
+    NSArray* fetchedRecords;
+    
     NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
-    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:_managedObjectContext];
     [fetchRequest setEntity:entity];
-    [fetchRequest setAffectedStores:[NSArray arrayWithObjects:[[self.appDelegate persistentStoreCoordinator] persistentStoreForURL:[self.appDelegate getStoreURL]], nil]];
     
     NSError* error;
-    NSArray* fetchedRecords = [[self.appDelegate managedObjectContext] executeFetchRequest:fetchRequest error:&error];
+    fetchedRecords = [_managedObjectContext executeFetchRequest:fetchRequest error:&error];
     //TODO: handle errors
     
     return fetchedRecords;
-    
 }
 
 @end

Limelight/Database/Host.h

@@ -10,16 +10,8 @@
 #import <CoreData/CoreData.h>
 #import "Utils.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface Host : NSManagedObject
 
-@property (nonatomic) BOOL online;
-@property (nonatomic) PairState pairState;
-@property (nonatomic) NSString * activeAddress;
-
 @end
 
-NS_ASSUME_NONNULL_END
-
 #import "Host+CoreDataProperties.h"

Limelight/Database/Host.m

@@ -10,8 +10,4 @@
 
 @implementation Host
 
-@dynamic pairState;
-@synthesize online;
-@synthesize activeAddress;
-
 @end

Limelight/Database/Settings.h

@@ -17,5 +17,6 @@
 @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

@@ -16,5 +16,6 @@
 @dynamic height;
 @dynamic width;
 @dynamic onscreenControls;
+@dynamic uniqueId;
 
 @end

Limelight/Database/TemporaryApp.h

@@ -0,0 +1,31 @@
+//
+//  TemporaryApp.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "TemporaryHost.h"
+#import "App.h"
+
+@interface TemporaryApp : NSObject
+
+@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
+
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost;
+
+- (NSComparisonResult)compareName:(TemporaryApp *)other;
+
+- (void) propagateChangesToParent:(App*)parent withHost:(Host*)host;
+
+NS_ASSUME_NONNULL_END
+
+@end

Limelight/Database/TemporaryApp.m

@@ -0,0 +1,52 @@
+//
+//  TemporaryApp.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/30/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "TemporaryApp.h"
+#import "App.h"
+
+@implementation TemporaryApp
+
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost {
+    self = [self init];
+    
+    self.id = app.id;
+    self.image = app.image;
+    self.name = app.name;
+    self.host = tempHost;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent:(App*)parent withHost:(Host*)host {
+    parent.id = self.id;
+    parent.name = self.name;
+    parent.host = host;
+}
+
+- (NSComparisonResult)compareName:(TemporaryApp *)other {
+    return [self.name caseInsensitiveCompare:other.name];
+}
+
+- (NSUInteger)hash {
+    return [self.host.uuid hash] * 31 + [self.id intValue];
+}
+
+- (BOOL)isEqual:(id)object {
+    if (self == object) {
+        return YES;
+    }
+    
+    if (![object isKindOfClass:[App class]]) {
+        return NO;
+    }
+    
+    return [self.host.uuid isEqualToString:((App*)object).host.uuid] &&
+    [self.id isEqualToString:((App*)object).id];
+}
+
+@end

Limelight/Database/TemporaryHost.h

@@ -0,0 +1,37 @@
+//
+//  TemporaryHost.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Utils.h"
+#import "Host.h"
+
+@interface TemporaryHost : NSObject
+
+@property (nonatomic) BOOL online;
+@property (nonatomic) PairState pairState;
+@property (nonatomic, nullable) NSString * activeAddress;
+
+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;
+
+- (id) initFromHost:(Host*)host;
+
+- (NSComparisonResult)compareName:(TemporaryHost *)other;
+
+- (void) propagateChangesToParent:(Host*)host;
+
+NS_ASSUME_NONNULL_END
+
+@end

Limelight/Database/TemporaryHost.m

@@ -0,0 +1,77 @@
+//
+//  TemporaryHost.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "DataManager.h"
+#import "TemporaryHost.h"
+#import "Host.h"
+#import "TemporaryApp.h"
+#import "App.h"
+
+@implementation TemporaryHost
+
+- (id) init {
+    self = [super init];
+    self.appList = [[NSMutableSet alloc] init];
+    
+    return self;
+}
+
+- (id) initFromHost:(Host*)host {
+    self = [self init];
+    
+    self.address = host.address;
+    self.externalAddress = host.externalAddress;
+    self.localAddress = host.localAddress;
+    self.mac = host.mac;
+    self.name = host.name;
+    self.uuid = host.uuid;
+    self.pairState = [host.pairState intValue];
+    
+    NSMutableSet *appList = [[NSMutableSet alloc] init];
+
+    for (App* app in host.appList) {
+        TemporaryApp *tempApp = [[TemporaryApp alloc] initFromApp:app withTempHost:self];
+        [appList addObject:tempApp];
+    }
+    
+    self.appList = appList;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent:(Host*)parentHost {
+    parentHost.address = self.address;
+    parentHost.externalAddress = self.externalAddress;
+    parentHost.localAddress = self.localAddress;
+    parentHost.mac = self.mac;
+    parentHost.name = self.name;
+    parentHost.uuid = self.uuid;
+    parentHost.pairState = [NSNumber numberWithInt:self.pairState];
+}
+
+- (NSComparisonResult)compareName:(TemporaryHost *)other {
+    return [self.name caseInsensitiveCompare:other.name];
+}
+
+- (NSUInteger)hash {
+    return [self.uuid hash];
+}
+
+- (BOOL)isEqual:(id)object {
+    if (self == object) {
+        return YES;
+    }
+    
+    if (![object isKindOfClass:[Host class]]) {
+        return NO;
+    }
+    
+    return [self.uuid isEqualToString:((Host*)object).uuid];
+}
+
+@end

Limelight/Database/TemporarySettings.h

@@ -0,0 +1,25 @@
+//
+//  TemporarySettings.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Settings.h"
+
+@interface TemporarySettings : NSObject
+
+@property (nonatomic, retain) Settings * parent;
+
+@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;
+
+- (id) initFromSettings:(Settings*)settings;
+
+@end

Limelight/Database/TemporarySettings.m

@@ -0,0 +1,28 @@
+//
+//  TemporarySettings.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "TemporarySettings.h"
+
+@implementation TemporarySettings
+
+- (id) initFromSettings:(Settings*)settings {
+    self = [self init];
+    
+    self.parent = settings;
+    
+    self.bitrate = settings.bitrate;
+    self.framerate = settings.framerate;
+    self.height = settings.height;
+    self.width = settings.width;
+    self.onscreenControls = settings.onscreenControls;
+    self.uniqueId = settings.uniqueId;
+    
+    return self;
+}
+
+@end

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -71,6 +71,12 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     }
   ],
   "info" : {

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

Limelight/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "x[email protected]"
+      "filename" : "x[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "x[email protected]"
+      "filename" : "x[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,18 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

Limelight/Input/OnScreenControls.m

@@ -63,25 +63,30 @@
     BOOL l3Set;
     BOOL r3Set;
     
+    BOOL _iPad;
+    CGRect _controlArea;
     UIView* _view;
     OnScreenControlsLevel _level;
     
     ControllerSupport *_controllerSupport;
     Controller *_controller;
     id<EdgeDetectionDelegate> _edgeDelegate;
+    NSMutableArray* _deadTouches;
 }
 
-static const float EDGE_WIDTH = .1;
+static const float EDGE_WIDTH = .05;
 
 //static const float BUTTON_SIZE = 50;
 static const float BUTTON_DIST = 20;
 static float BUTTON_CENTER_X;
 static float BUTTON_CENTER_Y;
 
-static const float D_PAD_DIST = 15;
+static const float D_PAD_DIST = 10;
 static float D_PAD_CENTER_X;
 static float D_PAD_CENTER_Y;
 
+static const float DEAD_ZONE_PADDING = 15;
+
 static const double STICK_CLICK_RATE = 100;
 static const float STICK_DEAD_ZONE = .1;
 static float STICK_INNER_SIZE;
@@ -117,6 +122,21 @@ static float L3_Y;
     _controller = [[Controller alloc] init];
     _controller.playerIndex = 0;
     _edgeDelegate = swipeDelegate;
+    _deadTouches = [[NSMutableArray alloc] init];
+    
+    _iPad = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad);
+    _controlArea = CGRectMake(0, 0, _view.frame.size.width, _view.frame.size.height);
+    if (_iPad)
+    {
+        // Cut down the control area on an iPad so the controls are more reachable
+        _controlArea.size.height = _view.frame.size.height / 2.0;
+        _controlArea.origin.y = _view.frame.size.height - _controlArea.size.height;
+    }
+    else
+    {
+        _controlArea.origin.x = _controlArea.size.width * EDGE_WIDTH;
+        _controlArea.size.width -= _controlArea.origin.x * 2;
+    }
     
     _aButton = [CALayer layer];
     _bButton = [CALayer layer];
@@ -139,7 +159,7 @@ static float L3_Y;
     _leftStick = [CALayer layer];
     _rightStick = [CALayer layer];
     _edge = [CALayer layer];
-
+    
     [self setupEdgeDetection];
     
     return self;
@@ -167,10 +187,10 @@ static float L3_Y;
             
             [self hideButtons];
             [self hideBumpers];
+            [self hideL3R3];
             [self drawTriggers];
             [self drawStartSelect];
             [self drawSticks];
-            [self drawL3R3];
             break;
         case OnScreenControlsLevelAutoGCExtendedGamepad:
             // GCExtendedGamepad is missing R3, L3, and select
@@ -219,8 +239,8 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    START_Y = _view.frame.size.height * .9;
-    SELECT_Y = _view.frame.size.height * .9;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
 }
 
 // For GCGamepad controls we move triggers, start, and select
@@ -229,7 +249,42 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    // TODO
+    START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    L2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    
+    R2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    
+    if (_iPad) {
+        START_X = _controlArea.size.width * .75 + _controlArea.origin.x;
+        START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        SELECT_X = _controlArea.size.width * .25 + _controlArea.origin.x;
+        SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        // The analog sticks are kept closer to the sides on iPad
+        LS_CENTER_X = _controlArea.size.width * .18 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .82 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    } else {
+        START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
+        START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
+        SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+        
+        LS_CENTER_X = _controlArea.size.width * .25 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .75 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
 }
 
 // For simple controls we move the triggers and buttons to the bottom
@@ -237,46 +292,59 @@ static float L3_Y;
     // Start with the default complex layout
     [self setupComplexControls];
     
-    START_Y = _view.frame.size.height * .9;
-    SELECT_Y = _view.frame.size.height * .9;
+    START_X = _controlArea.size.width * .6 + _controlArea.origin.x;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    SELECT_X = _controlArea.size.width * .4 + _controlArea.origin.x;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    
+    L2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
 
-    L1_Y = _view.frame.size.height * .7;
-    L2_Y = _view.frame.size.height * .9;
-    L2_X = _view.frame.size.width * .1;
-    R1_Y = _view.frame.size.height * .7;
-    R2_Y = _view.frame.size.height * .9;
-    R2_X = _view.frame.size.width * .9;
+    R2_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
 }
 
 - (void) setupComplexControls
 {
-    D_PAD_CENTER_X = _view.frame.size.width * .15;
-    D_PAD_CENTER_Y = _view.frame.size.height * .55;
-    BUTTON_CENTER_X = _view.frame.size.width * .85;
-    BUTTON_CENTER_Y = _view.frame.size.height * .55;
+    D_PAD_CENTER_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    D_PAD_CENTER_Y = _controlArea.size.height * .60 + _controlArea.origin.y;
+    BUTTON_CENTER_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    BUTTON_CENTER_Y = _controlArea.size.height * .60 + _controlArea.origin.y;
     
-    LS_CENTER_X = _view.frame.size.width * .35;
-    LS_CENTER_Y = _view.frame.size.height * .75;
-    RS_CENTER_X = _view.frame.size.width * .65;
-    RS_CENTER_Y = _view.frame.size.height * .75;
+    if (_iPad)
+    {
+        // The analog sticks are kept closer to the sides on iPad
+        LS_CENTER_X = _controlArea.size.width * .22 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .77 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
+    else
+    {
+        LS_CENTER_X = _controlArea.size.width * .35 + _controlArea.origin.x;
+        LS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+        RS_CENTER_X = _controlArea.size.width * .65 + _controlArea.origin.x;
+        RS_CENTER_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    }
     
-    START_X = _view.frame.size.width * .6;
-    START_Y = _view.frame.size.height * .1;
-    SELECT_X = _view.frame.size.width * .4;
-    SELECT_Y = _view.frame.size.height * .1;
+    START_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    START_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
+    SELECT_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    SELECT_Y = _controlArea.size.height * .9 + _controlArea.origin.y;
     
-    L1_X = _view.frame.size.width * .15;
-    L1_Y = _view.frame.size.height * .27;
-    L2_X = _view.frame.size.width * .15;
-    L2_Y = _view.frame.size.height * .1;
-    R1_X = _view.frame.size.width * .85;
-    R1_Y = _view.frame.size.height * .27;
-    R2_X = _view.frame.size.width * .85;
-    R2_Y = _view.frame.size.height * .1;
-    L3_X = _view.frame.size.width * .25;
-    L3_Y = _view.frame.size.height * .75;
-    R3_X = _view.frame.size.width * .75;
-    R3_Y = _view.frame.size.height * .75;
+    L1_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    L1_Y = _controlArea.size.height * .27 + _controlArea.origin.y;
+    L2_X = _controlArea.size.width * .1 + _controlArea.origin.x;
+    L2_Y = _controlArea.size.height * .1 + _controlArea.origin.y;
+    R1_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    R1_Y = _controlArea.size.height * .27 + _controlArea.origin.y;
+    R2_X = _controlArea.size.width * .9 + _controlArea.origin.x;
+    R2_Y = _controlArea.size.height * .1 + _controlArea.origin.y;
+    L3_X = _controlArea.size.width * .25 + _controlArea.origin.x;
+    L3_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
+    R3_X = _controlArea.size.width * .75 + _controlArea.origin.x;
+    R3_Y = _controlArea.size.height * .75 + _controlArea.origin.y;
 }
 
 - (void) drawButtons {
@@ -285,43 +353,43 @@ static float L3_Y;
     _aButton.contents = (id) aButtonImage.CGImage;
     _aButton.frame = CGRectMake(BUTTON_CENTER_X - aButtonImage.size.width / 2, BUTTON_CENTER_Y + BUTTON_DIST, aButtonImage.size.width, aButtonImage.size.height);
     [_view.layer addSublayer:_aButton];
-
+    
     // create B button
     UIImage* bButtonImage = [UIImage imageNamed:@"BButton"];
     _bButton.frame = CGRectMake(BUTTON_CENTER_X + BUTTON_DIST, BUTTON_CENTER_Y - bButtonImage.size.height / 2, bButtonImage.size.width, bButtonImage.size.height);
     _bButton.contents = (id) bButtonImage.CGImage;
     [_view.layer addSublayer:_bButton];
-
+    
     // create X Button
     UIImage* xButtonImage = [UIImage imageNamed:@"XButton"];
     _xButton.frame = CGRectMake(BUTTON_CENTER_X - BUTTON_DIST - xButtonImage.size.width, BUTTON_CENTER_Y - xButtonImage.size.height/ 2, xButtonImage.size.width, xButtonImage.size.height);
     _xButton.contents = (id) xButtonImage.CGImage;
     [_view.layer addSublayer:_xButton];
-
+    
     // create Y Button
     UIImage* yButtonImage = [UIImage imageNamed:@"YButton"];
     _yButton.frame = CGRectMake(BUTTON_CENTER_X - yButtonImage.size.width / 2, BUTTON_CENTER_Y - BUTTON_DIST - yButtonImage.size.height, yButtonImage.size.width, yButtonImage.size.height);
     _yButton.contents = (id) yButtonImage.CGImage;
     [_view.layer addSublayer:_yButton];
-
+    
     // create Down button
     UIImage* downButtonImage = [UIImage imageNamed:@"DownButton"];
     _downButton.frame = CGRectMake(D_PAD_CENTER_X - downButtonImage.size.width / 2, D_PAD_CENTER_Y + D_PAD_DIST, downButtonImage.size.width, downButtonImage.size.height);
     _downButton.contents = (id) downButtonImage.CGImage;
     [_view.layer addSublayer:_downButton];
-
+    
     // create Right button
     UIImage* rightButtonImage = [UIImage imageNamed:@"RightButton"];
     _rightButton.frame = CGRectMake(D_PAD_CENTER_X + D_PAD_DIST, D_PAD_CENTER_Y - rightButtonImage.size.height / 2, rightButtonImage.size.width, rightButtonImage.size.height);
     _rightButton.contents = (id) rightButtonImage.CGImage;
     [_view.layer addSublayer:_rightButton];
-
+    
     // create Up button
     UIImage* upButtonImage = [UIImage imageNamed:@"UpButton"];
     _upButton.frame = CGRectMake(D_PAD_CENTER_X - upButtonImage.size.width / 2, D_PAD_CENTER_Y - D_PAD_DIST - upButtonImage.size.height, upButtonImage.size.width, upButtonImage.size.height);
     _upButton.contents = (id) upButtonImage.CGImage;
     [_view.layer addSublayer:_upButton];
-
+    
     // create Left button
     UIImage* leftButtonImage = [UIImage imageNamed:@"LeftButton"];
     _leftButton.frame = CGRectMake(D_PAD_CENTER_X - D_PAD_DIST - leftButtonImage.size.width, D_PAD_CENTER_Y - leftButtonImage.size.height / 2, leftButtonImage.size.width, leftButtonImage.size.height);
@@ -335,7 +403,7 @@ static float L3_Y;
     _startButton.frame = CGRectMake(START_X - startButtonImage.size.width / 2, START_Y - startButtonImage.size.height / 2, startButtonImage.size.width, startButtonImage.size.height);
     _startButton.contents = (id) startButtonImage.CGImage;
     [_view.layer addSublayer:_startButton];
-
+    
     // create Select button
     UIImage* selectButtonImage = [UIImage imageNamed:@"SelectButton"];
     _selectButton.frame = CGRectMake(SELECT_X - selectButtonImage.size.width / 2, SELECT_Y - selectButtonImage.size.height / 2, selectButtonImage.size.width, selectButtonImage.size.height);
@@ -382,7 +450,7 @@ static float L3_Y;
     _leftStick.frame = CGRectMake(LS_CENTER_X - leftStickImage.size.width / 2, LS_CENTER_Y - leftStickImage.size.height / 2, leftStickImage.size.width, leftStickImage.size.height);
     _leftStick.contents = (id) leftStickImage.CGImage;
     [_view.layer addSublayer:_leftStick];
-
+    
     // create right analog stick
     UIImage* rightStickBgImage = [UIImage imageNamed:@"StickOuter"];
     _rightStickBackground.frame = CGRectMake(RS_CENTER_X - rightStickBgImage.size.width / 2, RS_CENTER_Y - rightStickBgImage.size.height / 2, rightStickBgImage.size.width, rightStickBgImage.size.height);
@@ -463,7 +531,7 @@ static float L3_Y;
     float lsMaxY = LS_CENTER_Y + STICK_OUTER_SIZE / 2;
     float lsMinX = LS_CENTER_X - STICK_OUTER_SIZE / 2;
     float lsMinY = LS_CENTER_Y - STICK_OUTER_SIZE / 2;
-
+    
     for (UITouch* touch in touches) {
         CGPoint touchLocation = [touch locationInView:_view];
         float xLoc = touchLocation.x;
@@ -473,34 +541,34 @@ static float L3_Y;
             if (xLoc < lsMinX) xLoc = lsMinX;
             if (yLoc > lsMaxY) yLoc = lsMaxY;
             if (yLoc < lsMinY) yLoc = lsMinY;
-
+            
             _leftStick.frame = CGRectMake(xLoc - STICK_INNER_SIZE / 2, yLoc - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
-
+            
             float xStickVal = (xLoc - LS_CENTER_X) / (lsMaxX - LS_CENTER_X);
             float yStickVal = (yLoc - LS_CENTER_Y) / (lsMaxY - LS_CENTER_Y);
-
+            
             if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
             if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
-
+            
             [_controllerSupport updateLeftStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
-
+            
             updated = true;
         } else if (touch == _rsTouch) {
             if (xLoc > rsMaxX) xLoc = rsMaxX;
             if (xLoc < rsMinX) xLoc = rsMinX;
             if (yLoc > rsMaxY) yLoc = rsMaxY;
             if (yLoc < rsMinY) yLoc = rsMinY;
-
+            
             _rightStick.frame = CGRectMake(xLoc - STICK_INNER_SIZE / 2, yLoc - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
-
+            
             float xStickVal = (xLoc - RS_CENTER_X) / (rsMaxX - RS_CENTER_X);
             float yStickVal = (yLoc - RS_CENTER_Y) / (rsMaxY - RS_CENTER_Y);
-
+            
             if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
             if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
-
+            
             [_controllerSupport updateRightStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
-
+            
             updated = true;
         } else if (touch == _aTouch) {
             buttonTouch = true;
@@ -535,11 +603,14 @@ static float L3_Y;
         } else if (touch == _r3Touch) {
             buttonTouch = true;
         }
+        if ([_deadTouches containsObject:touch]) {
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
     }
-    return updated || buttonTouch;
+        return updated || buttonTouch;
 }
 
 - (BOOL)handleTouchDownEvent:touches {
@@ -653,6 +724,10 @@ static float L3_Y;
         } else if ([_edge.presentationLayer hitTest:touchLocation]) {
             _edgeTouch = touch;
         }
+        if (!updated && !stickTouch && [self isInDeadZone:touch]) {
+            [_deadTouches addObject:touch];
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
@@ -744,15 +819,123 @@ static float L3_Y;
             touched = true;
         } else if (touch == _edgeTouch) {
             _edgeTouch = nil;
-            if (![_edge.presentationLayer hitTest:[touch locationInView:_view]]) {
+            if ([touch locationInView:_view].x >= _view.frame.size.width / 4) {
                 [_edgeDelegate edgeSwiped];
             }
         }
+        if ([_deadTouches containsObject:touch]) {
+            [_deadTouches removeObject:touch];
+            updated = true;
+        }
     }
     if (updated) {
         [_controllerSupport updateFinished:_controller];
     }
+    
     return updated || touched;
 }
 
+- (BOOL) isInDeadZone:(UITouch*) touch {
+    switch (_level) {
+        case OnScreenControlsLevelFull:
+            return [self isDpadDeadZone:touch]
+            || [self isAbxyDeadZone:touch]
+            || [self isTriggerDeadZone:touch]
+            || [self isBumperDeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        case OnScreenControlsLevelSimple:
+            return [self isTriggerDeadZone:touch]
+            || [self isStartSelectDeadZone:touch]
+            || [self isL3R3DeadZone:touch];
+        case OnScreenControlsLevelAutoGCExtendedGamepad:
+            return [self isL3R3DeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        case OnScreenControlsLevelAutoGCGamepad:
+            return [self isTriggerDeadZone:touch]
+            || [self isStartSelectDeadZone:touch];
+        default:
+            return false;
+    }
+}
+
+- (BOOL) isDpadDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_upButton.frame.origin.y
+                       endX:_rightButton.frame.origin.x + _rightButton.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isAbxyDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_xButton.frame.origin.x
+                     startY:_yButton.frame.origin.y
+                       endX:_view.frame.origin.x + _view.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isBumperDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l2Button.frame.origin.y + _l2Button.frame.size.height
+                       endX:_l1Button.frame.origin.x + _l1Button.frame.size.width
+                       endY:_upButton.frame.origin.y]
+    || [self isDeadZone:touch
+                 startX:_r2Button.frame.origin.x
+                 startY:_r2Button.frame.origin.y + _r2Button.frame.size.height
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_yButton.frame.origin.y];
+}
+
+- (BOOL) isTriggerDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l2Button.frame.origin.y
+                       endX:_l2Button.frame.origin.x + _l2Button.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_r2Button.frame.origin.x
+                 startY:_r2Button.frame.origin.y
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isL3R3DeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_view.frame.origin.x
+                     startY:_l3Button.frame.origin.y
+                       endX:_view.frame.origin.x
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_r3Button.frame.origin.x
+                 startY:_r3Button.frame.origin.y
+                   endX:_view.frame.origin.x + _view.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isStartSelectDeadZone:(UITouch*) touch {
+    return [self isDeadZone:touch
+                     startX:_startButton.frame.origin.x
+                     startY:_startButton.frame.origin.y
+                       endX:_view.frame.origin.x + _view.frame.size.width
+                       endY:_view.frame.origin.y + _view.frame.size.height]
+    || [self isDeadZone:touch
+                 startX:_view.frame.origin.x
+                 startY:_selectButton.frame.origin.y
+                   endX:_selectButton.frame.origin.x + _selectButton.frame.size.width
+                   endY:_view.frame.origin.y + _view.frame.size.height];
+}
+
+- (BOOL) isDeadZone:(UITouch*) touch startX:(float)deadZoneStartX startY:(float)deadZoneStartY endX:(float)deadZoneEndX endY:(float)deadZoneEndY {
+    deadZoneStartX -= DEAD_ZONE_PADDING;
+    deadZoneStartY -= DEAD_ZONE_PADDING;
+    deadZoneEndX += DEAD_ZONE_PADDING;
+    deadZoneEndY += DEAD_ZONE_PADDING;
+    
+    CGPoint touchLocation = [touch locationInView:_view];
+    return (touchLocation.x > deadZoneStartX && touchLocation.x < deadZoneEndX
+            && touchLocation.y > deadZoneStartY && touchLocation.y < deadZoneEndY);
+    
+}
+
 @end

Limelight/Input/StreamView.m

@@ -32,7 +32,7 @@
 - (void) setupOnScreenControls:(ControllerSupport*)controllerSupport swipeDelegate:(id<EdgeDetectionDelegate>)swipeDelegate {
     onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport swipeDelegate:swipeDelegate];
     DataManager* dataMan = [[DataManager alloc] init];
-    OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan retrieveSettings].onscreenControls integerValue];
+    OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan getSettings].onscreenControls integerValue];
     
     if (level == OnScreenControlsLevelAuto) {
         [controllerSupport initAutoOnScreenControlMode:onScreenControls];
@@ -67,15 +67,16 @@
                 deltaX *= xDeltaFactor * screenFactor;
                 deltaY *= yDeltaFactor * screenFactor;
                 
-                LiSendMouseMoveEvent(deltaX, deltaY);
-
-                touchMoved = true;
-                touchLocation = currentLocation;
+                if (deltaX != 0 || deltaY != 0) {
+                    LiSendMouseMoveEvent(deltaX, deltaY);
+                    touchMoved = true;
+                    touchLocation = currentLocation;
+                }
             }
         } else if ([[event allTouches] count] == 2) {
             CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:self];
             CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:self];
-
+            
             CGPoint avgLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
             if (touchLocation.y != avgLocation.y) {
                 LiSendScrollEvent(avgLocation.y - touchLocation.y);
@@ -93,23 +94,23 @@
         if (!touchMoved) {
             if ([[event allTouches] count]  == 2) {
                 Log(LOG_D, @"Sending right mouse button press");
-
+                
                 LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
-
+                
                 // Wait 100 ms to simulate a real button press
                 usleep(100 * 1000);
-
+                
                 LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
-
-
+                
+                
             } else {
                 Log(LOG_D, @"Sending left mouse button press");
-
+                
                 LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-
+                
                 // Wait 100 ms to simulate a real button press
                 usleep(100 * 1000);
-
+                
                 LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
             }
         }

Limelight/Limelight-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.2</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -50,9 +50,9 @@
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIStatusBarHidden</key>
+	<key>UIRequiresFullScreen</key>
 	<true/>
-	<key>UIStatusBarHidden~ipad</key>
+	<key>UIStatusBarHidden</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
@@ -64,5 +64,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

Limelight/Limelight.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Moonlight v1.0.xcdatamodel</string>
+	<string>Moonlight v1.0-2.xcdatamodel</string>
 </dict>
 </plist>

Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Automatic">
+    <entity name="App" representedClassName="App" syncable="YES">
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="host" maxCount="1" deletionRule="Nullify" destinationEntity="Host" inverseName="appList" inverseEntity="Host" syncable="YES"/>
+    </entity>
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="105"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="163"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="135"/>
+    </elements>
+</model>

Limelight/Limelight.xcdatamodeld/Moonlight v1.0.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="8118.17" systemVersion="15A204h" minimumToolsVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Automatic">
     <entity name="App" representedClassName="App" syncable="YES">
         <attribute name="id" attributeType="String" syncable="YES"/>
         <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
@@ -21,11 +21,12 @@
         <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
         <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
         <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="uniqueId" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
     </entity>
     <elements>
         <element name="App" positionX="0" positionY="54" width="128" height="105"/>
         <element name="Host" positionX="0" positionY="0" width="128" height="163"/>
-        <element name="Settings" positionX="0" positionY="0" width="128" height="120"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="135"/>
     </elements>
 </model>

Limelight/Network/AppAssetManager.h

@@ -7,20 +7,20 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "App.h"
+#import "TemporaryApp.h"
 #import "HttpManager.h"
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol AppAssetCallback <NSObject>
 
-- (void) receivedAssetForApp:(App*)app;
+- (void) receivedAssetForApp:(TemporaryApp*)app;
 
 @end
 
 @interface AppAssetManager : NSObject
 
 - (id) initWithCallback:(id<AppAssetCallback>)callback;
-- (void) retrieveAssetsFromHost:(Host*)host;
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host;
 - (void) stopRetrieving;
 
 @end

Limelight/Network/AppAssetManager.m

@@ -28,8 +28,8 @@ static const int MAX_REQUEST_COUNT = 4;
     return self;
 }
 
-- (void) retrieveAssetsFromHost:(Host*)host {
-    for (App* app in host.appList) {
+- (void) retrieveAssetsFromHost:(TemporaryHost*)host {
+    for (TemporaryApp* app in host.appList) {
         if (app.image == nil) {
             AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
             retriever.app = app;
@@ -45,7 +45,7 @@ static const int MAX_REQUEST_COUNT = 4;
     [_opQueue cancelAllOperations];
 }
 
-- (void) sendCallBackForApp:(App*)app {
+- (void) sendCallBackForApp:(TemporaryApp*)app {
     [_callback receivedAssetForApp:app];
 }
 

Limelight/Network/AppAssetRetriever.h

@@ -7,14 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
-#import "App.h"
+#import "TemporaryHost.h"
+#import "TemporaryApp.h"
 #import "AppAssetManager.h"
 
 @interface AppAssetRetriever : NSOperation
 
-@property (nonatomic) Host* host;
-@property (nonatomic) App* app;
+@property (nonatomic) TemporaryHost* host;
+@property (nonatomic) TemporaryApp* app;
 @property (nonatomic) id<AppAssetCallback> callback;
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -11,6 +11,7 @@
 #import "CryptoManager.h"
 #import "AppAssetResponse.h"
 #import "HttpRequest.h"
+#import "IdManager.h"
 
 @implementation AppAssetRetriever
 static const double RETRY_DELAY = 2; // seconds
@@ -21,7 +22,7 @@ static const int MAX_ATTEMPTS = 5;
     int attempts = 0;
     while (![self isCancelled] && appImage == nil && attempts++ < MAX_ATTEMPTS) {
         
-        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[CryptoManager getUniqueID] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[IdManager getUniqueId] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
         AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
         [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.id]]];
         
@@ -35,7 +36,7 @@ static const int MAX_ATTEMPTS = 5;
     [self performSelectorOnMainThread:@selector(sendCallbackForApp:) withObject:self.app waitUntilDone:NO];
 }
 
-- (void) sendCallbackForApp:(App*)app {
+- (void) sendCallbackForApp:(TemporaryApp*)app {
     [self.callback receivedAssetForApp:app];
 }
 

Limelight/Network/AppListResponse.h

@@ -11,7 +11,7 @@
 @interface AppListResponse : NSObject <Response>
 
 - (void)populateWithData:(NSData *)data;
-- (NSArray*) getAppList;
+- (NSSet*) getAppList;
 - (BOOL) isStatusOk;
 
 @end

Limelight/Network/AppListResponse.m

@@ -7,12 +7,12 @@
 //
 
 #import "AppListResponse.h"
-#import "App.h"
+#import "TemporaryApp.h"
 #import "DataManager.h"
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation AppListResponse {
-    NSMutableArray* _appList;
+    NSMutableSet* _appList;
 }
 @synthesize data, statusCode, statusMessage;
 
@@ -23,7 +23,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
 
 - (void)populateWithData:(NSData *)xml {
     self.data = xml;
-    _appList = [[NSMutableArray alloc] init];
+    _appList = [[NSMutableSet alloc] init];
     [self parseData];
 }
 
@@ -60,7 +60,6 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
     self.statusMessage = statusMsg;
     
     node = node->children;
-    DataManager* dataMan = [[DataManager alloc] init];
     
     while (node != NULL) {
         //Log(LOG_D, @"node: %s", node->name);
@@ -96,7 +95,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
                 appInfoNode = appInfoNode->next;
             }
             if (appId != nil) {
-                App* app = [dataMan createApp];
+                TemporaryApp* app = [[TemporaryApp alloc] init];
                 app.name = appName;
                 app.id = appId;
                 app.isRunning = appIsRunning;
@@ -109,7 +108,7 @@ static const char* TAG_APP_IS_RUNNING = "IsRunning";
     xmlFreeDoc(docPtr);
 }
 
-- (NSArray*) getAppList {
+- (NSSet*) getAppList {
     return _appList;
 }
 

Limelight/Network/DiscoveryManager.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "MDNSManager.h"
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol DiscoveryCallback <NSObject>
 
@@ -22,8 +22,8 @@
 - (void) startDiscovery;
 - (void) stopDiscovery;
 - (void) stopDiscoveryBlocking;
-- (BOOL) addHostToDiscovery:(Host*)host;
-- (void) removeHostFromDiscovery:(Host*)host;
-- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*, NSString*))callback;
+- (BOOL) addHostToDiscovery:(TemporaryHost*)host;
+- (void) removeHostFromDiscovery:(TemporaryHost*)host;
+- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(TemporaryHost*, NSString*))callback;
 
 @end

Limelight/Network/DiscoveryManager.m

@@ -13,10 +13,10 @@
 #import "DataManager.h"
 #import "DiscoveryWorker.h"
 #import "ServerInfoResponse.h"
+#import "IdManager.h"
 
 @implementation DiscoveryManager {
     NSMutableArray* _hostQueue;
-    NSMutableArray* _discoveredHosts;
     id<DiscoveryCallback> _callback;
     MDNSManager* _mdnsMan;
     NSOperationQueue* _opQueue;
@@ -27,31 +27,38 @@
 
 - (id)initWithHosts:(NSArray *)hosts andCallback:(id<DiscoveryCallback>)callback {
     self = [super init];
-    _hostQueue = [NSMutableArray arrayWithArray:hosts];
+    
+    // Using addHostToDiscovery ensures no duplicates
+    // will make it into the list from the database
     _callback = callback;
+    shouldDiscover = NO;
+    _hostQueue = [NSMutableArray array];
+    for (TemporaryHost* host in hosts)
+    {
+        [self addHostToDiscovery:host];
+    }
+    [_callback updateAllHosts:_hostQueue];
+    
     _opQueue = [[NSOperationQueue alloc] init];
     _mdnsMan = [[MDNSManager alloc] initWithCallback:self];
     [CryptoManager generateKeyPairUsingSSl];
-    _uniqueId = [CryptoManager getUniqueID];
+    _uniqueId = [IdManager getUniqueId];
     _cert = [CryptoManager readCertFromFile];
-    shouldDiscover = NO;
     return self;
 }
 
-- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(Host *, NSString*))callback {
+- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(TemporaryHost *, NSString*))callback {
     HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
     ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[hMan newServerInfoRequest] fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
     
-    Host* host = nil;
+    TemporaryHost* host = nil;
     if ([serverInfoResponse isStatusOk]) {
-        DataManager* dataMan = [[DataManager alloc] init];
-        host = [dataMan createHost];
+        host = [[TemporaryHost alloc] init];
         host.activeAddress = host.address = hostAddress;
         host.online = YES;
         [serverInfoResponse populateHost:host];
         if (![self addHostToDiscovery:host]) {
-            [dataMan removeHost:host];
             callback(nil, @"Host already added");
         } else {
             callback(host, nil);
@@ -66,7 +73,7 @@
     Log(LOG_I, @"Starting discovery");
     shouldDiscover = YES;
     [_mdnsMan searchForHosts];
-    for (Host* host in _hostQueue) {
+    for (TemporaryHost* host in _hostQueue) {
         [_opQueue addOperation:[self createWorkerForHost:host]];
     }
 }
@@ -87,7 +94,7 @@
     Log(LOG_I, @"All discovery workers stopped");
 }
 
-- (BOOL) addHostToDiscovery:(Host *)host {
+- (BOOL) addHostToDiscovery:(TemporaryHost *)host {
     if (host.uuid.length > 0 && ![self isHostInDiscovery:host]) {
         [_hostQueue addObject:host];
         if (shouldDiscover) {
@@ -98,7 +105,7 @@
     return NO;
 }
 
-- (void) removeHostFromDiscovery:(Host *)host {
+- (void) removeHostFromDiscovery:(TemporaryHost *)host {
     for (DiscoveryWorker* worker in [_opQueue operations]) {
         if ([worker getHost] == host) {
             [worker cancel];
@@ -110,9 +117,8 @@
 // Override from MDNSCallback
 - (void)updateHosts:(NSArray *)hosts {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        DataManager* dataMan = [[DataManager alloc] init];
         // Discover the hosts before adding to eliminate duplicates
-        for (Host* host in hosts) {
+        for (TemporaryHost* host in hosts) {
             Log(LOG_I, @"Found host through MDNS: %@:", host.name);
             // Since this is on a background thread, we do not need to use the opQueue
             DiscoveryWorker* worker = (DiscoveryWorker*)[self createWorkerForHost:host];
@@ -122,16 +128,14 @@
                 [_callback updateAllHosts:_hostQueue];
             } else {
                 Log(LOG_I, @"Not adding host to discovery: %@", host.name);
-                [dataMan removeHost:host];
             }
         }
-        [dataMan saveData];
     });
 }
 
-- (BOOL) isHostInDiscovery:(Host*)host {
+- (BOOL) isHostInDiscovery:(TemporaryHost*)host {
     for (int i = 0; i < _hostQueue.count; i++) {
-        Host* discoveredHost = [_hostQueue objectAtIndex:i];
+        TemporaryHost* discoveredHost = [_hostQueue objectAtIndex:i];
         if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:host.uuid]) {
             return YES;
         }
@@ -139,7 +143,7 @@
     return NO;
 }
 
-- (NSOperation*) createWorkerForHost:(Host*)host {
+- (NSOperation*) createWorkerForHost:(TemporaryHost*)host {
     DiscoveryWorker* worker = [[DiscoveryWorker alloc] initWithHost:host uniqueId:_uniqueId cert:_cert];
     return worker;
 }

Limelight/Network/DiscoveryWorker.h

@@ -7,12 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @interface DiscoveryWorker : NSOperation
 
-- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
+- (id) initWithHost:(TemporaryHost*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
 - (void) discoverHost;
-- (Host*) getHost;
+- (TemporaryHost*) getHost;
 
 @end

Limelight/Network/DiscoveryWorker.m

@@ -11,16 +11,17 @@
 #import "HttpManager.h"
 #import "ServerInfoResponse.h"
 #import "HttpRequest.h"
+#import "DataManager.h"
 
 @implementation DiscoveryWorker {
-    Host* _host;
+    TemporaryHost* _host;
     NSString* _uniqueId;
     NSData* _cert;
 }
 
 static const float POLL_RATE = 2.0f; // Poll every 2 seconds
 
-- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert {
+- (id) initWithHost:(TemporaryHost*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert {
     self = [super init];
     _host = host;
     _uniqueId = uniqueId;
@@ -28,7 +29,7 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     return self;
 }
 
-- (Host*) getHost {
+- (TemporaryHost*) getHost {
     return _host;
 }
 
@@ -87,20 +88,37 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     
     Log(LOG_D, @"%@ has %d unique addresses", _host.name, [addresses count]);
     
-    for (NSString *address in addresses) {
-        if (self.cancelled) {
-            // Get out without updating the status because
-            // it might not have finished checking the various
-            // addresses
-            return;
+    // Give the PC 3 tries to respond before declaring it offline
+    for (int i = 0; i < 3; i++) {
+        for (NSString *address in addresses) {
+            if (self.cancelled) {
+                // Get out without updating the status because
+                // it might not have finished checking the various
+                // addresses
+                return;
+            }
+            
+            ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:address];
+            receivedResponse = [self checkResponse:serverInfoResp];
+            if (receivedResponse) {
+                [serverInfoResp populateHost:_host];
+                _host.activeAddress = address;
+                
+                // Update the database using the response
+                DataManager *dataManager = [[DataManager alloc] init];
+                [dataManager updateHost:_host];
+                break;
+            }
         }
         
-        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:address];
-        receivedResponse = [self checkResponse:serverInfoResp];
         if (receivedResponse) {
-            _host.activeAddress = address;
+            Log(LOG_I, @"Received serverinfo response on try %d", i);
             break;
         }
+        else {
+            // Wait for one second then retry
+            [NSThread sleepForTimeInterval:1];
+        }
     }
 
     _host.online = receivedResponse;
@@ -125,7 +143,6 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     if ([response isStatusOk]) {
         // If the response is from a different host then do not update this host
         if ((_host.uuid == nil || [[response getStringTag:TAG_UNIQUE_ID] isEqualToString:_host.uuid])) {
-            [response populateHost:_host];
             return YES;
         } else {
             Log(LOG_I, @"Received response from incorrect host: %@ expected: %@", [response getStringTag:TAG_UNIQUE_ID], _host.uuid);

Limelight/Network/HttpManager.h

@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
 #import "HttpResponse.h"
 #import "HttpRequest.h"
 

Limelight/Network/HttpManager.m

@@ -9,7 +9,7 @@
 #import "HttpManager.h"
 #import "HttpRequest.h"
 #import "CryptoManager.h"
-#import "App.h"
+#import "TemporaryApp.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>
@@ -100,8 +100,8 @@ static const NSString* HTTPS_PORT = @"47984";
     NSURL* url = [[NSURL alloc] initWithString:urlString];
     NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:url];
     if (normalTimeout) {
-        // Timeout the request after 5 seconds
-        [request setTimeoutInterval:5];
+        // Timeout the request after 7 seconds
+        [request setTimeoutInterval:7];
     }
     else {
         // Timeout the request after 60 seconds

Limelight/Network/HttpResponse.h

@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
 
 static NSString* TAG_STATUS_CODE = @"status_code";
 static NSString* TAG_STATUS_MESSAGE = @"status_message";

Limelight/Network/HttpResponse.m

@@ -7,7 +7,7 @@
 //
 
 #import "HttpResponse.h"
-#import "App.h"
+#import "TemporaryApp.h"
 #import <libxml2/libxml/xmlreader.h>
 
 @implementation HttpResponse {

Limelight/Network/MDNSManager.m

@@ -7,8 +7,7 @@
 //
 
 #import "MDNSManager.h"
-#import "Host.h"
-#import "DataManager.h"
+#import "TemporaryHost.h"
 
 @implementation MDNSManager {
     NSNetServiceBrowser* mDNSBrowser;
@@ -47,10 +46,9 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
 
 - (NSArray*) getFoundHosts {
     NSMutableArray* hosts = [[NSMutableArray alloc] init];
-    DataManager* dataMan = [[DataManager alloc] init];
     for (NSNetService* service in services) {
         if (service.hostName != nil) {
-            Host* host = [dataMan createHost];
+            TemporaryHost* host = [[TemporaryHost alloc] init];
             host.activeAddress = host.address = service.hostName;
             host.name = host.address;
             [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

@@ -38,17 +38,24 @@
         return;
     }
     if ([serverInfoResp isStatusOk]) {
-        if (![[serverInfoResp getStringTag:@"currentgame"] isEqual:@"0"]) {
+        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);
@@ -69,7 +76,18 @@
     NSString* plainCert = [pairResp getStringTag:@"plaincert"];
     
     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 +106,18 @@
     NSData* encServerChallengeResp = [Utils hexToBytes:[challengeResp getStringTag:@"challengeresponse"]];
     NSData* decServerChallengeResp = [cryptoMan aesDecrypt:encServerChallengeResp withKey:aesKey];
     
-    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, 20)];
-    NSData* serverChallenge = [decServerChallengeResp subdataWithRange:NSMakeRange(20, 16)];
+    NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, hashLength)];
+    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 +141,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

@@ -7,6 +7,7 @@
 //
 
 #import "HttpResponse.h"
+#import "TemporaryHost.h"
 
 #define TAG_HOSTNAME @"hostname"
 #define TAG_EXTERNAL_IP @"ExternalIP"
@@ -18,7 +19,7 @@
 @interface ServerInfoResponse : HttpResponse <Response>
 
 - (void) populateWithData:(NSData *)data;
-- (void) populateHost:(Host*)host;
+- (void) populateHost:(TemporaryHost*)host;
 
 @end
 

Limelight/Network/ServerInfoResponse.m

@@ -17,7 +17,7 @@
     [super parseData];
 }
 
-- (void) populateHost:(Host*)host {
+- (void) populateHost:(TemporaryHost*)host {
     host.name = [[self getStringTag:TAG_HOSTNAME] trim];
     host.externalAddress = [[self getStringTag:TAG_EXTERNAL_IP] trim];
     host.localAddress = [[self getStringTag:TAG_LOCAL_IP] trim];

Limelight/Network/WakeOnLanManager.h

@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @interface WakeOnLanManager : NSObject
 
-+ (void) wakeHost:(Host*)host;
++ (void) wakeHost:(TemporaryHost*)host;
 
 @end

Limelight/Network/WakeOnLanManager.m

@@ -18,7 +18,7 @@
 static const int numPorts = 5;
 static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};
 
-+ (void) wakeHost:(Host*)host {
++ (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);
@@ -56,7 +56,7 @@ static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};
     CFRelease(dataPayload);
 }
 
-+ (NSData*) createPayload:(Host*)host {
++ (NSData*) createPayload:(TemporaryHost*)host {
     NSMutableData* payload = [[NSMutableData alloc] initWithCapacity:102];
     
     // 6 bytes of FF

Limelight/Stream/Connection.m

@@ -65,11 +65,16 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
     return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
 }
 
-void ArInit(void)
+void ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig)
 {
     int err;
     
-    opusDecoder = opus_decoder_create(48000, 2, &err);
+    // We only support stereo for now
+    assert(audioConfiguration == AUDIO_CONFIGURATION_STEREO);
+    
+    opusDecoder = opus_decoder_create(opusConfig->sampleRate,
+                                      opusConfig->channelCount,
+                                      &err);
     
     audioLock = [[NSLock alloc] init];
     
@@ -77,9 +82,9 @@ void ArInit(void)
     NSError *audioSessionError = nil;
     AVAudioSession* audioSession = [AVAudioSession sharedInstance];
     
-    [audioSession setPreferredSampleRate:48000.0 error:&audioSessionError];
+    [audioSession setPreferredSampleRate:opusConfig->sampleRate error:&audioSessionError];
     [audioSession setCategory: AVAudioSessionCategoryPlayback error: &audioSessionError];
-    [audioSession setPreferredOutputNumberOfChannels:2 error:&audioSessionError];
+    [audioSession setPreferredOutputNumberOfChannels:opusConfig->channelCount error:&audioSessionError];
     [audioSession setPreferredIOBufferDuration:0.005 error:&audioSessionError];
     [audioSession setActive: YES error: &audioSessionError];
     
@@ -99,11 +104,11 @@ void ArInit(void)
     }
     
     AudioStreamBasicDescription audioFormat = {0};
-    audioFormat.mSampleRate = 48000;
+    audioFormat.mSampleRate = opusConfig->sampleRate;
     audioFormat.mBitsPerChannel = 16;
     audioFormat.mFormatID = kAudioFormatLinearPCM;
     audioFormat.mFormatFlags = kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
-    audioFormat.mChannelsPerFrame = 2;
+    audioFormat.mChannelsPerFrame = opusConfig->channelCount;
     audioFormat.mBytesPerFrame = audioFormat.mChannelsPerFrame * (audioFormat.mBitsPerChannel / 8);
     audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame;
     audioFormat.mFramesPerPacket = audioFormat.mBytesPerPacket / audioFormat.mBytesPerFrame;
@@ -280,6 +285,8 @@ void ClDisplayTransientMessage(char* message)
     renderer = myRenderer;
     _callbacks = callbacks;
     _serverMajorVersion = serverMajorVersion;
+    
+    LiInitializeStreamConfiguration(&_streamConfig);
     _streamConfig.width = config.width;
     _streamConfig.height = config.height;
     _streamConfig.fps = config.frameRate;
@@ -293,13 +300,15 @@ void ClDisplayTransientMessage(char* message)
     int riKeyId = htonl(config.riKeyId);
     memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId));
     
-    memset(&_drCallbacks, 0, sizeof(_drCallbacks));
+    LiInitializeVideoCallbacks(&_drCallbacks);
     _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
     
+    LiInitializeAudioCallbacks(&_arCallbacks);
     _arCallbacks.init = ArInit;
     _arCallbacks.cleanup = ArCleanup;
     _arCallbacks.decodeAndPlaySample = ArDecodeAndPlaySample;
     
+    LiInitializeConnectionCallbacks(&_clCallbacks);
     _clCallbacks.stageStarting = ClStageStarting;
     _clCallbacks.stageComplete = ClStageComplete;
     _clCallbacks.stageFailed = ClStageFailed;

Limelight/Stream/StreamManager.m

@@ -15,6 +15,7 @@
 #import "ServerInfoResponse.h"
 #import "HttpResponse.h"
 #import "HttpRequest.h"
+#import "IdManager.h"
 
 @implementation StreamManager {
     StreamConfiguration* _config;
@@ -36,7 +37,7 @@
 
 - (void)main {
     [CryptoManager generateKeyPairUsingSSl];
-    NSString* uniqueId = [CryptoManager getUniqueID];
+    NSString* uniqueId = [IdManager getUniqueId];
     NSData* cert = [CryptoManager readCertFromFile];
     
     HttpManager* hMan = [[HttpManager alloc] initWithHost:_config.host
@@ -47,11 +48,10 @@
     ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
                                        fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
-    NSString* currentGame = [serverInfoResp getStringTag:@"currentgame"];
     NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
-    NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"];
     NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
-    if (![serverInfoResp isStatusOk] || currentGame == NULL || pairStatus == NULL || appversion == NULL) {
+    NSString* serverState = [serverInfoResp getStringTag:@"state"];
+    if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) {
         [_callbacks launchFailed:@"Failed to connect to PC"];
         return;
     }
@@ -63,12 +63,7 @@
     }
     
     // resumeApp and launchApp handle calling launchFailed
-    if (![currentGame isEqualToString:@"0"]) {
-        if (![currentClient isEqualToString:@"1"]) {
-            // The server is streaming to someone else
-            [_callbacks launchFailed:@"There is another stream in progress"];
-            return;
-        }
+    if ([serverState hasSuffix:@"_SERVER_BUSY"]) {
         // App already running, resume it
         if (![self resumeApp:hMan]) {
             return;

Limelight/UIAppView.h

@@ -7,17 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "App.h"
+#import "TemporaryApp.h"
 
 @protocol AppCallback <NSObject>
 
-- (void) appClicked:(App*) app;
+- (void) appClicked:(TemporaryApp*) app;
 
 @end
 
 @interface UIAppView : UIView
 
-- (id) initWithApp:(App*)app andCallback:(id<AppCallback>)callback;
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback;
 - (void) updateAppImage;
 
 @end

Limelight/UIAppView.m

@@ -9,40 +9,43 @@
 #import "UIAppView.h"
 
 @implementation UIAppView {
-    App* _app;
+    TemporaryApp* _app;
     UIButton* _appButton;
     UILabel* _appLabel;
     UIImageView* _appOverlay;
+    NSCache* _artCache;
     id<AppCallback> _callback;
 }
 
-- (id) initWithApp:(App*)app andCallback:(id<AppCallback>)callback {
+static UIImage* noImage;
+
+- (id) initWithApp:(TemporaryApp*)app cache:(NSCache*)cache andCallback:(id<AppCallback>)callback {
     self = [super init];
     _app = app;
     _callback = callback;
+    _artCache = cache;
+    
+    // Cache the NoAppImage ourselves to avoid
+    // having to load it each time
+    if (noImage == nil) {
+        noImage = [UIImage imageNamed:@"NoAppImage"];
+    }
     
     _appButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    UIImage* noImage = [UIImage imageNamed:@"NoAppImage"];
     [_appButton setBackgroundImage:noImage forState:UIControlStateNormal];
     [_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
     [_appButton sizeToFit];
     [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventTouchUpInside];
     
-    _appOverlay = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Play"]];
-    _appOverlay.layer.shadowColor = [UIColor blackColor].CGColor;
-    _appOverlay.layer.shadowOffset = CGSizeMake(0, 0);
-    _appOverlay.layer.shadowOpacity = 1;
-    _appOverlay.layer.shadowRadius = 2.0;
-    [_appOverlay setHidden: YES];
-    
     [self addSubview:_appButton];
-    [self addSubview:_appOverlay];
     [self sizeToFit];
     
     _appButton.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
-    _appOverlay.frame = CGRectMake(0, 0, noImage.size.width / 2.f, noImage.size.height / 4.f);
     self.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
-    [_appOverlay setCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/6)];
+    
+    // Rasterizing the cell layer increases rendering performance by quite a bit
+    self.layer.shouldRasterize = YES;
+    self.layer.rasterizationScale = [UIScreen mainScreen].scale;
     
     return self;
 }
@@ -52,13 +55,37 @@
 }
 
 - (void) updateAppImage {
-    [_appOverlay setHidden:!_app.isRunning];
+    if (_appOverlay != nil) {
+        [_appOverlay removeFromSuperview];
+        _appOverlay = nil;
+    }
+    
+    if (_app.isRunning) {
+        // Only create the app overlay if needed
+        _appOverlay = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Play"]];
+        _appOverlay.layer.shadowColor = [UIColor blackColor].CGColor;
+        _appOverlay.layer.shadowOffset = CGSizeMake(0, 0);
+        _appOverlay.layer.shadowOpacity = 1;
+        _appOverlay.layer.shadowRadius = 2.0;
+        
+        [self addSubview:_appOverlay];
+        
+        _appOverlay.frame = CGRectMake(0, 0, noImage.size.width / 2.f, noImage.size.height / 4.f);
+        [_appOverlay setCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/6)];
+    }
     
     // TODO: Improve no-app image detection
     BOOL noAppImage = false;
     
     if (_app.image != nil) {
-        UIImage* appImage = [UIImage imageWithData:_app.image];
+        // Load the decoded image from the cache
+        UIImage* appImage = [_artCache objectForKey:_app];
+        if (appImage == nil) {
+            // Not cached; we have to decode this now
+            appImage = [UIImage imageWithData:_app.image];
+            [_artCache setObject:appImage forKey:_app];
+        }
+        
         // This size of image might be blank image received from GameStream.
         if (!(appImage.size.width == 130.f && appImage.size.height == 180.f)) {
             _appButton.frame = CGRectMake(0, 0, appImage.size.width / 2, appImage.size.height / 2);

Limelight/UIComputerView.h

@@ -7,19 +7,19 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Host.h"
+#import "TemporaryHost.h"
 
 @protocol HostCallback <NSObject>
 
-- (void) hostClicked:(Host*)host view:(UIView*)view;
-- (void) hostLongClicked:(Host*)host view:(UIView*)view;
+- (void) hostClicked:(TemporaryHost*)host view:(UIView*)view;
+- (void) hostLongClicked:(TemporaryHost*)host view:(UIView*)view;
 - (void) addHostClicked;
 
 @end
 
 @interface UIComputerView : UIView
 
-- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback;
+- (id) initWithComputer:(TemporaryHost*)host andCallback:(id<HostCallback>)callback;
 - (id) initForAddWithCallback:(id<HostCallback>)callback;
 
 @end

Limelight/UIComputerView.m

@@ -9,7 +9,7 @@
 #import "UIComputerView.h"
 
 @implementation UIComputerView {
-    Host* _host;
+    TemporaryHost* _host;
     UIButton* _hostButton;
     UILabel* _hostLabel;
     UILabel* _hostStatus;
@@ -72,7 +72,7 @@ static const int LABEL_DY = 20;
     return self;
 }
 
-- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback {
+- (id) initWithComputer:(TemporaryHost*)host andCallback:(id<HostCallback>)callback {
     self = [self init];
     _host = host;
     _callback = callback;
@@ -123,7 +123,7 @@ static const int LABEL_DY = 20;
     self.frame = CGRectMake(x, y, width, height);
 }
 
-- (void) updateContentsForHost:(Host*)host {
+- (void) updateContentsForHost:(TemporaryHost*)host {
     _hostLabel.text = _host.name;
     _hostLabel.textColor = [UIColor whiteColor];
     [_hostLabel sizeToFit];

Limelight/ViewControllers/MainFrameViewController.m

@@ -5,6 +5,8 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
+@import ImageIO;
+
 #import "MainFrameViewController.h"
 #import "CryptoManager.h"
 #import "HttpManager.h"
@@ -13,19 +15,21 @@
 #import "Utils.h"
 #import "UIComputerView.h"
 #import "UIAppView.h"
-#import "App.h"
 #import "SettingsViewController.h"
 #import "DataManager.h"
-#import "Settings.h"
+#import "TemporarySettings.h"
 #import "WakeOnLanManager.h"
 #import "AppListResponse.h"
 #import "ServerInfoResponse.h"
 #import "StreamFrameViewController.h"
 #import "LoadingFrameViewController.h"
+#import "ComputerScrollView.h"
+#import "TemporaryApp.h"
+#import "IdManager.h"
 
 @implementation MainFrameViewController {
     NSOperationQueue* _opQueue;
-    Host* _selectedHost;
+    TemporaryHost* _selectedHost;
     NSString* _uniqueId;
     NSData* _cert;
     DiscoveryManager* _discMan;
@@ -35,6 +39,7 @@
     UIScrollView* hostScrollView;
     int currentPosition;
     NSArray* _sortedAppList;
+    NSCache* _boxArtCache;
 }
 static NSMutableSet* hostList;
 
@@ -74,7 +79,7 @@ static NSMutableSet* hostList;
     
     // Capture the host here because it can change once we
     // leave the main thread
-    Host* host = _selectedHost;
+    TemporaryHost* host = _selectedHost;
     
     if ([host.appList count] > 0) {
         usingCachedAppList = true;
@@ -94,11 +99,26 @@ static NSMutableSet* hostList;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         HttpManager* hMan = [[HttpManager alloc] initWithHost:host.activeAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
         
-        AppListResponse* appListResp = [[AppListResponse alloc] init];
-        
         // Exempt this host from discovery while handling the applist query
         [_discMan removeHostFromDiscovery:host];
-        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+        
+        // Try up to 5 times to get the app list
+        AppListResponse* appListResp;
+        for (int i = 0; i < 5; i++) {
+            appListResp = [[AppListResponse alloc] init];
+            [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+            if (appListResp == nil || ![appListResp isStatusOk] || [appListResp getAppList] == nil) {
+                Log(LOG_W, @"Failed to get applist on try %d: %@", i, appListResp.statusMessage);
+                
+                // Wait for one second then retry
+                [NSThread sleepForTimeInterval:1];
+            }
+            else {
+                Log(LOG_I, @"App list successfully retreived - took %d tries", i);
+                break;
+            }
+        }
+        
         [_discMan addHostToDiscovery:host];
 
         if (appListResp == nil || ![appListResp isStatusOk] || [appListResp getAppList] == nil) {
@@ -120,7 +140,7 @@ static NSMutableSet* hostList;
             });
         } else {
             dispatch_async(dispatch_get_main_queue(), ^{
-                [self mergeAppLists:[appListResp getAppList] forHost:host];
+                [self updateApplist:[appListResp getAppList] forHost:host];
 
                 if (host != _selectedHost) {
                     return;
@@ -138,12 +158,14 @@ static NSMutableSet* hostList;
     });
 }
 
-- (void) mergeAppLists:(NSArray*) newList forHost:(Host*)host {
+- (void) updateApplist:(NSSet*) newList forHost:(TemporaryHost*)host {
     DataManager* database = [[DataManager alloc] init];
-    for (App* app in newList) {
-        BOOL appAlreadyInList = NO; 
-        for (App* savedApp in host.appList) {
+    
+    for (TemporaryApp* app in newList) {
+        BOOL appAlreadyInList = NO;
+        for (TemporaryApp* savedApp in host.appList) {
             if ([app.id isEqualToString:savedApp.id]) {
+                savedApp.name = app.name;
                 savedApp.isRunning = app.isRunning;
                 appAlreadyInList = YES;
                 break;
@@ -151,38 +173,59 @@ static NSMutableSet* hostList;
         }
         if (!appAlreadyInList) {
             app.host = host;
-            [host addAppListObject:app];
-        } else {
-            [database removeApp:app];
+            [host.appList addObject:app];
         }
     }
     
-    for (App* app in host.appList) {
-        BOOL appWasRemoved = YES;
-        for (App* mergedApp in newList) {
-            if ([mergedApp.id isEqualToString:app.id]) {
-                appWasRemoved = NO;
+    BOOL appWasRemoved;
+    do {
+        appWasRemoved = NO;
+        
+        for (TemporaryApp* app in host.appList) {
+            appWasRemoved = YES;
+            for (TemporaryApp* mergedApp in newList) {
+                if ([mergedApp.id isEqualToString:app.id]) {
+                    appWasRemoved = NO;
+                    break;
+                }
+            }
+            if (appWasRemoved) {
+                // Removing the app mutates the list we're iterating (which isn't legal).
+                // We need to jump out of this loop and restart enumeration.
+                
+                [host.appList removeObject:app];
+                
+                // It's important to remove the app record from the database
+                // since we'll have a constraint violation now that appList
+                // doesn't have this app in it.
+                [database removeApp:app];
+                
                 break;
             }
         }
-        if (appWasRemoved) {
-            [host removeAppListObject:app];
-            [database removeApp:app];
-        }
-    }
-    [database saveData];
+        
+        // Keep looping until the list is no longer being mutated
+    } while (appWasRemoved);
+
+    [database updateAppsForExistingHost:host];
 }
 
 - (void)showHostSelectionView {
     [_appManager stopRetrieving];
-    [[[DataManager alloc] init] saveData];
     _selectedHost = nil;
     _computerNameButton.title = @"No Host Selected";
     [self.collectionView reloadData];
     [self.view addSubview:hostScrollView];
 }
 
-- (void) receivedAssetForApp:(App*)app {
+- (void) receivedAssetForApp:(TemporaryApp*)app {
+    // Update the box art cache now so we don't have to do it
+    // on the main thread
+    [self updateBoxArtCacheForApp:app];
+    
+    DataManager* dataManager = [[DataManager alloc] init];
+    [dataManager updateIconForExistingApp: app];
+    
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.collectionView reloadData];
     });
@@ -196,7 +239,7 @@ static NSMutableSet* hostList;
     [self presentViewController:alert animated:YES completion:nil];
 }
 
-- (void) hostClicked:(Host *)host view:(UIView *)view {
+- (void) hostClicked:(TemporaryHost *)host view:(UIView *)view {
     // Treat clicks on offline hosts to be long clicks
     // This shows the context menu with wake, delete, etc. rather
     // than just hanging for a while and failing as we would in this
@@ -262,7 +305,7 @@ static NSMutableSet* hostList;
     });
 }
 
-- (void)hostLongClicked:(Host *)host view:(UIView *)view {
+- (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view {
     Log(LOG_D, @"Long clicked host: %@", host.name);
     UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet];
     if (!host.online) {
@@ -288,8 +331,8 @@ static NSMutableSet* hostList;
         [dataMan removeHost:host];
         @synchronized(hostList) {
             [hostList removeObject:host];
+            [self updateAllHosts:[hostList allObjects]];
         }
-        [self updateAllHosts:[hostList allObjects]];
         
     }]];
     [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
@@ -311,10 +354,8 @@ static NSMutableSet* hostList;
     [alertController addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
         NSString* hostAddress = ((UITextField*)[[alertController textFields] objectAtIndex:0]).text;
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-            [_discMan discoverHost:hostAddress withCallback:^(Host* host, NSString* error){
+            [_discMan discoverHost:hostAddress withCallback:^(TemporaryHost* host, NSString* error){
                 if (host != nil) {
-                    DataManager* dataMan = [[DataManager alloc] init];
-                    [dataMan saveData];
                     dispatch_async(dispatch_get_main_queue(), ^{
                         @synchronized(hostList) {
                             [hostList addObject:host];
@@ -335,14 +376,14 @@ static NSMutableSet* hostList;
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void) appClicked:(App *)app {
+- (void) appClicked:(TemporaryApp *)app {
     Log(LOG_D, @"Clicked app: %@", app.name);
     _streamConfig = [[StreamConfiguration alloc] init];
     _streamConfig.host = app.host.activeAddress;
     _streamConfig.appID = app.id;
     
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* streamSettings = [dataMan retrieveSettings];
+    TemporarySettings* streamSettings = [dataMan getSettings];
     
     _streamConfig.frameRate = [streamSettings.framerate intValue];
     _streamConfig.bitRate = [streamSettings.bitrate intValue];
@@ -355,7 +396,7 @@ static NSMutableSet* hostList;
         [[self revealViewController] revealToggle:self];
     }
     
-    App* currentApp = [self findRunningApp:app.host];
+    TemporaryApp* currentApp = [self findRunningApp:app.host];
     if (currentApp != nil) {
         UIAlertController* alertController = [UIAlertController
                                               alertControllerWithTitle: app.name
@@ -421,8 +462,8 @@ static NSMutableSet* hostList;
     }
 }
 
-- (App*) findRunningApp:(Host*)host {
-    for (App* app in host.appList) {
+- (TemporaryApp*) findRunningApp:(TemporaryHost*)host {
+    for (TemporaryApp* app in host.appList) {
         if (app.isRunning) {
             return app;
         }
@@ -477,7 +518,7 @@ static NSMutableSet* hostList;
     
     // Set up crypto
     [CryptoManager generateKeyPairUsingSSl];
-    _uniqueId = [CryptoManager getUniqueID];
+    _uniqueId = [IdManager getUniqueId];
     _cert = [CryptoManager readCertFromFile];
 
     _appManager = [[AppAssetManager alloc] initWithCallback:self];
@@ -488,19 +529,54 @@ static NSMutableSet* hostList;
         hostList = [[NSMutableSet alloc] init];
     }
     
+    _boxArtCache = [[NSCache alloc] init];
+    
     [self setAutomaticallyAdjustsScrollViewInsets:NO];
     
-    hostScrollView = [[UIScrollView alloc] init];
+    hostScrollView = [[ComputerScrollView alloc] init];
     hostScrollView.frame = CGRectMake(0, self.navigationController.navigationBar.frame.origin.y + self.navigationController.navigationBar.frame.size.height, self.view.frame.size.width, self.view.frame.size.height / 2);
     [hostScrollView setShowsHorizontalScrollIndicator:NO];
+    hostScrollView.delaysContentTouches = NO;
+    
+    UIButton* pullArrow = [[UIButton alloc] init];
+    [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,
+                                 pullArrow.frame.size.width,
+                                 pullArrow.frame.size.height);
+    [self.view addSubview:pullArrow];
+    
+    
+    self.collectionView.delaysContentTouches = NO;
+    self.collectionView.allowsMultipleSelection = NO;
+    self.collectionView.multipleTouchEnabled = NO;
     
     [self retrieveSavedHosts];
     _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
     
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(handleReturnToForeground)
+                                                 name: UIApplicationWillEnterForegroundNotification
+                                               object: nil];
+    
     [self updateHosts];
     [self.view addSubview:hostScrollView];
 }
 
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+-(void)handleReturnToForeground
+{
+    // This will refresh the applist
+    if (_selectedHost != nil) {
+        [self hostClicked:_selectedHost view:nil];
+    }
+}
+
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
@@ -513,10 +589,7 @@ static NSMutableSet* hostList;
     
     [_discMan startDiscovery];
     
-    // This will refresh the applist
-    if (_selectedHost != nil) {
-        [self hostClicked:_selectedHost view:nil];
-    }
+    [self handleReturnToForeground];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -525,18 +598,18 @@ static NSMutableSet* hostList;
     // when discovery stops, we must create a new instance because you cannot restart an NSOperation when it is finished
     [_discMan stopDiscovery];
     
-    // In case the host objects were updated in the background
-    [[[DataManager alloc] init] saveData];
+    // Purge the box art cache
+    [_boxArtCache removeAllObjects];
 }
 
 - (void) retrieveSavedHosts {
     DataManager* dataMan = [[DataManager alloc] init];
-    NSArray* hosts = [dataMan retrieveHosts];
+    NSArray* hosts = [dataMan getHosts];
     @synchronized(hostList) {
         [hostList addObjectsFromArray:hosts];
         
         // Initialize the non-persistent host state
-        for (Host* host in hostList) {
+        for (TemporaryHost* host in hostList) {
             if (host.activeAddress == nil) {
                 host.activeAddress = host.localAddress;
             }
@@ -553,7 +626,7 @@ static NSMutableSet* hostList;
 - (void) updateAllHosts:(NSArray *)hosts {
     dispatch_async(dispatch_get_main_queue(), ^{
         Log(LOG_D, @"New host list:");
-        for (Host* host in hosts) {
+        for (TemporaryHost* host in hosts) {
             Log(LOG_D, @"Host: \n{\n\t name:%@ \n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n\t activeAddress:%@ \n}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online, host.activeAddress);
         }
         @synchronized(hostList) {
@@ -571,13 +644,16 @@ static NSMutableSet* hostList;
     UIComputerView* compView;
     float prevEdge = -1;
     @synchronized (hostList) {
-        for (Host* comp in hostList) {
+        // Sort the host list in alphabetical order
+        NSArray* sortedHostList = [[hostList allObjects] sortedArrayUsingSelector:@selector(compareName:)];
+        for (TemporaryHost* comp in sortedHostList) {
             compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self];
             compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2);
             prevEdge = compView.frame.origin.x + compView.frame.size.width;
             [hostScrollView addSubview:compView];
         }
     }
+    
     prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge];
     addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2);
     
@@ -593,7 +669,31 @@ static NSMutableSet* hostList;
     }
 }
 
-- (void) updateAppsForHost:(Host*)host {
+// This function forces immediate decoding of the UIImage, rather
+// than the default lazy decoding that results in janky scrolling.
++ (UIImage*) loadBoxArtForCaching:(TemporaryApp*)app {
+    
+    CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)app.image, NULL);
+    CGImageRef cgImage = CGImageSourceCreateImageAtIndex(source, 0, (__bridge CFDictionaryRef)@{(id)kCGImageSourceShouldCacheImmediately: (id)kCFBooleanTrue});
+    
+    UIImage *boxArt = [UIImage imageWithCGImage:cgImage];
+    
+    CGImageRelease(cgImage);
+    CFRelease(source);
+    
+    return boxArt;
+}
+
+- (void) updateBoxArtCacheForApp:(TemporaryApp*)app {
+    if (app.image == nil) {
+        [_boxArtCache removeObjectForKey:app];
+    }
+    else if ([_boxArtCache objectForKey:app] == nil) {
+        [_boxArtCache setObject:[MainFrameViewController loadBoxArtForCaching:app] forKey:app];
+    }
+}
+
+- (void) updateAppsForHost:(TemporaryHost*)host {
     if (host != _selectedHost) {
         Log(LOG_W, @"Mismatched host during app update");
         return;
@@ -602,6 +702,33 @@ static NSMutableSet* hostList;
     _sortedAppList = [host.appList allObjects];
     _sortedAppList = [_sortedAppList sortedArrayUsingSelector:@selector(compareName:)];
     
+    // Split the sorted array in half to allow 2 jobs to process app assets at once
+    NSArray *firstHalf;
+    NSArray *secondHalf;
+    NSRange range;
+    
+    range.location = 0;
+    range.length = [_sortedAppList count] / 2;
+    
+    firstHalf = [_sortedAppList subarrayWithRange:range];
+    
+    range.location = range.length;
+    range.length = [_sortedAppList count] - range.length;
+    
+    secondHalf = [_sortedAppList subarrayWithRange:range];
+    
+    // Start 2 jobs
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        for (TemporaryApp* app in firstHalf) {
+            [self updateBoxArtCacheForApp:app];
+        }
+    });
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        for (TemporaryApp* app in secondHalf) {
+            [self updateBoxArtCacheForApp:app];
+        }
+    });
+    
     [hostScrollView removeFromSuperview];
     [self.collectionView reloadData];
 }
@@ -609,8 +736,8 @@ static NSMutableSet* hostList;
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     UICollectionViewCell* cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AppCell" forIndexPath:indexPath];
     
-    App* app = _sortedAppList[indexPath.row];
-    UIAppView* appView = [[UIAppView alloc] initWithApp:app andCallback:self];
+    TemporaryApp* app = _sortedAppList[indexPath.row];
+    UIAppView* appView = [[UIAppView alloc] initWithApp:app cache:_boxArtCache andCallback:self];
     [appView updateAppImage];
     
     if (appView.bounds.size.width > 10.0) {
@@ -621,7 +748,19 @@ static NSMutableSet* hostList;
     
     [cell.subviews.firstObject removeFromSuperview]; // Remove a view that was previously added
     [cell addSubview:appView];
+
     
+    UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:cell.bounds];
+    cell.layer.masksToBounds = NO;
+    cell.layer.shadowColor = [UIColor blackColor].CGColor;
+    cell.layer.shadowOffset = CGSizeMake(1.0f, 5.0f);
+    cell.layer.shadowOpacity = 0.5f;
+    cell.layer.shadowPath = shadowPath.CGPath;
+    
+    cell.layer.borderColor = [[UIColor colorWithRed:0 green:0 blue:0 alpha:0.3f] CGColor];
+    cell.layer.borderWidth = 1;
+    cell.exclusiveTouch = YES;
+
     return cell;
 }
 

Limelight/ViewControllers/SettingsViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "SettingsViewController.h"
-#import "Settings.h"
+#import "TemporarySettings.h"
 #import "DataManager.h"
 
 #define BITRATE_INTERVAL 500 // in kbps
@@ -22,7 +22,7 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
     [super viewDidLoad];
     
     DataManager* dataMan = [[DataManager alloc] init];
-    Settings* currentSettings = [dataMan retrieveSettings];
+    TemporarySettings* currentSettings = [dataMan getSettings];
     
     // Bitrate is persisted in kbps
     _bitrate = [currentSettings.bitrate integerValue];
@@ -33,18 +33,44 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
     } else if ([currentSettings.height integerValue] == 1080) {
         resolution = 1;
     } else {
-        resolution = 2;
+        resolution = 0;
     }
     NSInteger onscreenControls = [currentSettings.onscreenControls integerValue];
     
     [self.resolutionSelector setSelectedSegmentIndex:resolution];
+    [self.resolutionSelector addTarget:self action:@selector(newResolutionFpsChosen) forControlEvents:UIControlEventValueChanged];
     [self.framerateSelector setSelectedSegmentIndex:framerate];
+    [self.framerateSelector addTarget:self action:@selector(newResolutionFpsChosen) forControlEvents:UIControlEventValueChanged];
     [self.onscreenControlSelector setSelectedSegmentIndex:onscreenControls];
     [self.bitrateSlider setValue:(_bitrate / BITRATE_INTERVAL) animated:YES];
     [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
     [self updateBitrateText];
 }
 
+- (void) newResolutionFpsChosen {
+    NSInteger frameRate = [self getChosenFrameRate];
+    NSInteger resHeight = [self getChosenStreamHeight];
+    NSInteger defaultBitrate;
+    
+    // 1080p60 is 20 Mbps
+    if (frameRate == 60 && resHeight == 1080) {
+        defaultBitrate = 20000;
+    }
+    // 720p60 and 1080p30 are 10 Mbps
+    else if (frameRate == 60 || resHeight == 1080) {
+        defaultBitrate = 10000;
+    }
+    // 720p30 is 5 Mbps
+    else {
+        defaultBitrate = 5000;
+    }
+    
+    _bitrate = defaultBitrate;
+    [self.bitrateSlider setValue:defaultBitrate / BITRATE_INTERVAL animated:YES];
+    
+    [self updateBitrateText];
+}
+
 - (void) bitrateSliderMoved {
     _bitrate = BITRATE_INTERVAL * (int)self.bitrateSlider.value;
     [self updateBitrateText];
@@ -55,25 +81,23 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
     [self.bitrateLabel setText:[NSString stringWithFormat:bitrateFormat, _bitrate / 1000.]];
 }
 
+- (NSInteger) getChosenFrameRate {
+    return [self.framerateSelector selectedSegmentIndex] == 0 ? 30 : 60;
+}
+
+- (NSInteger) getChosenStreamHeight {
+    return [self.resolutionSelector selectedSegmentIndex] == 0 ? 720 : 1080;
+}
+
+- (NSInteger) getChosenStreamWidth {
+    return [self getChosenStreamHeight] == 720 ? 1280 : 1920;
+}
+
 - (void) saveSettings {
     DataManager* dataMan = [[DataManager alloc] init];
-    NSInteger framerate = [self.framerateSelector selectedSegmentIndex] == 0 ? 30 : 60;
-    NSInteger height;
-    NSInteger width;
-    if ([self.resolutionSelector selectedSegmentIndex] == 2) {
-        // Get screen native resolution
-        height = [UIScreen mainScreen].bounds.size.height * [UIScreen mainScreen].scale;
-        width = [UIScreen mainScreen].bounds.size.width * [UIScreen mainScreen].scale;
-        
-        UIAlertController *alertResolution = [UIAlertController alertControllerWithTitle:@"Native resolution" message:[NSString stringWithFormat:@"You must select the following resolution in the game settings: %lix%li", (long)width, (long)height] preferredStyle:UIAlertControllerStyleAlert];
-        [alertResolution addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:nil]];
-        [self presentViewController:alertResolution animated:YES completion:nil];
-    }
-    else
-    {
-        height = [self.resolutionSelector selectedSegmentIndex] == 0 ? 720 : 1080;
-        width = height == 720 ? 1280 : 1920;
-    }
+    NSInteger framerate = [self getChosenFrameRate];
+    NSInteger height = [self getChosenStreamHeight];
+    NSInteger width = [self getChosenStreamWidth];
     NSInteger onscreenControls = [self.onscreenControlSelector selectedSegmentIndex];
     [dataMan saveSettingsWithBitrate:_bitrate framerate:framerate height:height width:width onscreenControls:onscreenControls];
 }

Limelight/ViewControllers/StreamFrameViewController.m

@@ -114,6 +114,8 @@
         }]];
         [self presentViewController:alert animated:YES completion:nil];
     });
+    
+    [_streamMan stopStreamInternal];
 }
 
 - (void) launchFailed:(NSString*)message {

Moonlight.xcodeproj/project.pbxproj

@@ -3,11 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 47;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		987140041B04542F00AB57D5 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */; };
+		9832D1361BBCD5C50036EF48 /* TemporaryApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 9832D1351BBCD5C50036EF48 /* TemporaryApp.m */; };
+		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 */; };
 		9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */; };
 		9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */; };
@@ -15,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 */; };
+		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 */; };
 		FB290CF419B2C406004C83CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF319B2C406004C83CF /* CoreGraphics.framework */; };
 		FB290CF619B2C406004C83CF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF519B2C406004C83CF /* UIKit.framework */; };
@@ -34,6 +39,7 @@
 		FB4678FF1A565DAC00377732 /* WakeOnLanManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4678FE1A565DAC00377732 /* WakeOnLanManager.m */; };
 		FB4679011A57048000377732 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB4679001A57048000377732 /* CoreFoundation.framework */; };
 		FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */; };
+		FB53E1431BE5DC4400CD6ECE /* IdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB53E1421BE5DC4400CD6ECE /* IdManager.m */; };
 		FB6549561A57907E001C8F39 /* DiscoveryWorker.m in Sources */ = {isa = PBXBuildFile; fileRef = FB6549551A57907E001C8F39 /* DiscoveryWorker.m */; };
 		FB7E794419C8B71B00A15F68 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB7E794319C8B71B00A15F68 /* libiconv.dylib */; };
 		FB89462819F646E200339C8A /* CryptoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89460619F646E200339C8A /* CryptoManager.m */; };
@@ -74,24 +80,30 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		987140011B04541A00AB57D5 /* PBXContainerItemProxy */ = {
+		98AB2E831CAD46840089BB98 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = FB290E2D19B37A4E004C83CF;
-			remoteInfo = "moonlight-common";
-		};
-		FB1E430F1AE8B0F200AFF679 /* 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";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "limelight-common-c/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
+		98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporarySettings.m; path = Database/TemporarySettings.m; sourceTree = "<group>"; };
 		9E5D5FF81A5A5A3900689918 /* Apache License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Apache License.txt"; sourceTree = "<group>"; };
 		9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Black.ttf"; sourceTree = "<group>"; };
 		9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
@@ -99,6 +111,10 @@
 		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>"; };
+		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>"; };
+		FB1D59991BBCCD7E00F482CA /* AppCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppCollectionView.m; sourceTree = "<group>"; };
 		FB290CEE19B2C406004C83CF /* Moonlight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Moonlight.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FB290CF119B2C406004C83CF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		FB290CF319B2C406004C83CF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -127,6 +143,9 @@
 		FB4679001A57048000377732 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		FB4A23B61A9D3637004D2EF2 /* LoadingFrameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadingFrameViewController.h; sourceTree = "<group>"; };
 		FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoadingFrameViewController.m; sourceTree = "<group>"; };
+		FB53E1411BE5DC4400CD6ECE /* IdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdManager.h; sourceTree = "<group>"; };
+		FB53E1421BE5DC4400CD6ECE /* IdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdManager.m; sourceTree = "<group>"; };
+		FB53E1441BE5DCBC00CD6ECE /* Moonlight v1.0-2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Moonlight v1.0-2.xcdatamodel"; sourceTree = "<group>"; };
 		FB6549541A57907E001C8F39 /* DiscoveryWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiscoveryWorker.h; sourceTree = "<group>"; };
 		FB6549551A57907E001C8F39 /* DiscoveryWorker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiscoveryWorker.m; sourceTree = "<group>"; };
 		FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Limelight 0.3.1.xcdatamodel"; sourceTree = "<group>"; };
@@ -288,7 +307,7 @@
 			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 */,
@@ -307,6 +326,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 = (
@@ -329,18 +356,10 @@
 			path = Roboto;
 			sourceTree = "<group>";
 		};
-		FB1E430C1AE8B0F200AFF679 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				FB1E43101AE8B0F200AFF679 /* libmoonlight-common.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		FB290CE519B2C406004C83CF = {
 			isa = PBXGroup;
 			children = (
-				98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */,
+				98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */,
 				FB290CF919B2C406004C83CF /* Limelight */,
 				FB290CF019B2C406004C83CF /* Frameworks */,
 				FB290CEF19B2C406004C83CF /* Products */,
@@ -397,6 +416,10 @@
 				FB89463719F6473800339C8A /* Launch Screen.xib */,
 				FB290D0819B2C406004C83CF /* Images.xcassets */,
 				FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */,
+				FB1D59951BBCCB6400F482CA /* ComputerScrollView.h */,
+				FB1D59961BBCCB6400F482CA /* ComputerScrollView.m */,
+				FB1D59981BBCCD7E00F482CA /* AppCollectionView.h */,
+				FB1D59991BBCCD7E00F482CA /* AppCollectionView.m */,
 			);
 			path = Limelight;
 			sourceTree = "<group>";
@@ -419,6 +442,8 @@
 				FB89460619F646E200339C8A /* CryptoManager.m */,
 				FB89460719F646E200339C8A /* mkcert.c */,
 				FB89460819F646E200339C8A /* mkcert.h */,
+				FB53E1411BE5DC4400CD6ECE /* IdManager.h */,
+				FB53E1421BE5DC4400CD6ECE /* IdManager.m */,
 			);
 			path = Crypto;
 			sourceTree = "<group>";
@@ -712,6 +737,12 @@
 				FBD3495D1A004412002D2A60 /* Settings.m */,
 				FBD349601A0089F6002D2A60 /* DataManager.h */,
 				FBD349611A0089F6002D2A60 /* DataManager.m */,
+				9832D1341BBCD5C50036EF48 /* TemporaryApp.h */,
+				9832D1351BBCD5C50036EF48 /* TemporaryApp.m */,
+				98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */,
+				98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */,
+				98D5856E1C0ED0E800F6CC00 /* TemporarySettings.h */,
+				98D5856F1C0ED0E800F6CC00 /* TemporarySettings.m */,
 			);
 			name = Database;
 			sourceTree = "<group>";
@@ -730,7 +761,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				987140021B04541A00AB57D5 /* PBXTargetDependency */,
+				98AB2E861CAD468B0089BB98 /* PBXTargetDependency */,
 			);
 			name = Moonlight;
 			productName = Limelight;
@@ -744,7 +775,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0700;
-				ORGANIZATIONNAME = "Limelight Stream";
+				ORGANIZATIONNAME = "Moonlight Stream";
 				TargetAttributes = {
 					FB290CED19B2C406004C83CF = {
 						DevelopmentTeam = DM46QST4M7;
@@ -752,7 +783,7 @@
 				};
 			};
 			buildConfigurationList = FB290CE919B2C406004C83CF /* Build configuration list for PBXProject "Moonlight" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -763,8 +794,8 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = FB1E430C1AE8B0F200AFF679 /* Products */;
-					ProjectRef = 98A03B4519F3514B00861ACA /* moonlight-common.xcodeproj */;
+					ProductGroup = 98AB2E801CAD46830089BB98 /* Products */;
+					ProjectRef = 98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -775,11 +806,11 @@
 /* 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 */
@@ -821,20 +852,26 @@
 				FB89462F19F646E200339C8A /* Connection.m in Sources */,
 				FB9AFD321A7D867C00872C98 /* AppAssetRetriever.m in Sources */,
 				FB4678FF1A565DAC00377732 /* WakeOnLanManager.m in Sources */,
+				FB53E1431BE5DC4400CD6ECE /* IdManager.m in Sources */,
 				FB89462919F646E200339C8A /* mkcert.c in Sources */,
 				FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */,
 				FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */,
 				FB89463019F646E200339C8A /* StreamConfiguration.m in Sources */,
 				FBFCB3311B50B29400089F8A /* Host.m in Sources */,
 				FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */,
+				FB1D59971BBCCB6400F482CA /* ComputerScrollView.m in Sources */,
 				FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */,
 				FB89462C19F646E200339C8A /* HttpManager.m in Sources */,
 				FB89462D19F646E200339C8A /* MDNSManager.m in Sources */,
 				FB89462B19F646E200339C8A /* StreamView.m in Sources */,
 				FB4678FA1A55FFAD00377732 /* DiscoveryManager.m in Sources */,
+				98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */,
 				FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */,
 				FBD1C8E21A8AD71400C6703C /* Logger.m in Sources */,
+				FB1D599A1BBCCD7E00F482CA /* AppCollectionView.m in Sources */,
 				FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */,
+				9832D1361BBCD5C50036EF48 /* TemporaryApp.m in Sources */,
+				98D585701C0ED0E800F6CC00 /* TemporarySettings.m in Sources */,
 				FB89462819F646E200339C8A /* CryptoManager.m in Sources */,
 				FB89462E19F646E200339C8A /* PairManager.m in Sources */,
 				FB9AFD371A7E02DB00872C98 /* HttpRequest.m in Sources */,
@@ -856,10 +893,10 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		987140021B04541A00AB57D5 /* PBXTargetDependency */ = {
+		98AB2E861CAD468B0089BB98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "moonlight-common";
-			targetProxy = 987140011B04541A00AB57D5 /* PBXContainerItemProxy */;
+			targetProxy = 98AB2E851CAD468B0089BB98 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -963,7 +1000,7 @@
 				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/**",
 				);
@@ -986,14 +1023,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Limelight/Limelight-Prefix.pch";
 				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/**",
 				);
@@ -1038,12 +1075,13 @@
 		FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				FB53E1441BE5DCBC00CD6ECE /* Moonlight v1.0-2.xcdatamodel */,
 				FBB460391B50ACE400F3099C /* Moonlight v1.0.xcdatamodel */,
 				FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */,
 				FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */,
 				FB290D0619B2C406004C83CF /* Limelight.xcdatamodel */,
 			);
-			currentVersion = FBB460391B50ACE400F3099C /* Moonlight v1.0.xcdatamodel */;
+			currentVersion = FB53E1441BE5DCBC00CD6ECE /* Moonlight v1.0-2.xcdatamodel */;
 			path = Limelight.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

README.md

@@ -1,12 +1,14 @@
 #Moonlight iOS
 
-[Moonlight](https://github.com/moonlight-stream) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Moonlight iOS allows you to stream your full collection of Steam games from
+#### Now available on the [App Store](https://itunes.apple.com/us/app/moonlight-game-streaming/id1000551566?mt=8) 
+
+[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Moonlight iOS allows you to stream your full collection of Steam games from
 your powerful desktop computer to your iOS Device.
 
-This is actively being developed and will be available on the App Store soon - check back here or on [our website](http://moonlight-stream.com) for updates.
+There are also versions for [Android](https://github.com/moonlight-stream/moonlight-android) and [PC](https://github.com/moonlight-stream/moonlight-pc). 
 
-We understand that Moonlight users are eager for the opportunity to stream their Steam collection to their iOS devices. Moonlight for iOS is in the testing stage and preliminary versions are available for beta testers.
+##### 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). 
 
-In the meantime, check out the existing versions for [Android](https://github.com/moonlight-stream/moonlight-android) and [PC](https://github.com/moonlight-stream/moonlight-pc). Also, a client for [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) is in the works and actively being developed.
-
-Please be patient as we work to bring Moonlight to more platforms.
+##### Questions?
+Check out our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki).

iPad.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="EVd-wq-ego">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B38b" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="EVd-wq-ego">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <customFonts key="customFonts">
         <mutableArray key="Roboto-Regular.ttf">
@@ -13,9 +14,11 @@
         <scene sceneID="Me4-Nr-liz">
             <objects>
                 <viewController id="wb7-af-jn8" customClass="MainFrameViewController" sceneMemberID="viewController">
-                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="black" dataMode="prototypes" id="TZj-Lc-M9d">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="black" dataMode="prototypes" id="TZj-Lc-M9d" customClass="AppCollectionView">
                         <rect key="frame" x="0.0" y="64" width="1024" height="704"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                         <inset key="contentInset" minX="40" minY="20" maxX="40" maxY="20"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="20" id="f7l-kG-hJc">
                             <size key="itemSize" width="150" height="200"/>
@@ -24,14 +27,16 @@
                             <inset key="sectionInset" minX="20" minY="20" maxX="20" maxY="20"/>
                         </collectionViewFlowLayout>
                         <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="fv6-NS-qsK">
-                                <rect key="frame" x="20" y="20" width="150" height="200"/>
+                            <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="fv6-NS-qsK">
+                                <rect key="frame" x="20" y="40" width="150" height="200"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                     <rect key="frame" x="0.0" y="0.0" width="150" height="200"/>
                                     <autoresizingMask key="autoresizingMask"/>
+                                    <animations/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
+                                <animations/>
                             </collectionViewCell>
                         </cells>
                         <connections>
@@ -42,14 +47,15 @@
                     <navigationItem key="navigationItem" id="pSu-bl-gL9">
                         <barButtonItem key="leftBarButtonItem" style="done" id="mSL-ru-nRm">
                             <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Tiq-VS-Ua5">
-                                <rect key="frame" x="101" y="236" width="109" height="46"/>
+                                <rect key="frame" x="20" y="-1" width="109" height="46"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
                                 <state key="normal" title="Moonlight" image="Logo">
-                                    <color key="titleColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                             </button>
+                            <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </barButtonItem>
                         <barButtonItem key="rightBarButtonItem" title="No Host Selected" id="KDy-JC-2sU">
                             <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -77,6 +83,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bitrate: 10 Mbps" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lMt-4H-fkV">
                                 <rect key="frame" x="16" y="39" width="151" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -85,11 +92,13 @@
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="20" minValue="1" maxValue="100" id="JAY-nj-UNz">
                                 <rect key="frame" x="14" y="68" width="213" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.72941176470000002" green="0.69411764710000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </slider>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Framerate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Aiv-r8-9k2">
                                 <rect key="frame" x="16" y="106" width="79" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -98,6 +107,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Resolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pYZ-GR-EwO">
                                 <rect key="frame" x="16" y="171" width="82" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -106,16 +116,17 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="ckc-Dm-8ex">
                                 <rect key="frame" x="16" y="200" width="209" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="720p"/>
                                     <segment title="1080p"/>
-                                    <segment title="Native"/>
                                 </segments>
                                 <color key="tintColor" red="0.72941176470000002" green="0.69411764710000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </segmentedControl>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On-Screen Controls" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LGV-5y-piG">
                                 <rect key="frame" x="16" y="236" width="153" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -124,6 +135,7 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="qSU-wh-tqA">
                                 <rect key="frame" x="16" y="265" width="209" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="Off"/>
                                     <segment title="Auto"/>
@@ -135,6 +147,7 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="lGK-vl-pdw">
                                 <rect key="frame" x="16" y="135" width="209" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="30 Hz"/>
                                     <segment title="60 Hz"/>
@@ -142,6 +155,7 @@
                                 <color key="tintColor" red="0.72941176470000002" green="0.69411764710000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </segmentedControl>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
@@ -164,6 +178,7 @@
                     <view key="view" contentMode="scaleToFill" id="hGs-BR-t4b">
                         <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
@@ -184,6 +199,8 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="RUe-14-4Ya">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
+                        <color key="barTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     </navigationBar>
                     <connections>
                         <segue destination="wb7-af-jn8" kind="relationship" relationship="rootViewController" id="nkY-JG-Wki"/>
@@ -204,16 +221,19 @@
                             <activityIndicatorView opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="iOs-1X-mSU">
                                 <rect key="frame" x="502" y="374" width="20" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                             </activityIndicatorView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dDs-kT-po6">
                                 <rect key="frame" x="491" y="402" width="42" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        <animations/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <navigationItem key="navigationItem" id="iUf-9X-GeA"/>
                     <nil key="simulatedStatusBarMetrics"/>
@@ -241,8 +261,10 @@
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" id="N0D-dj-EuF">
                                 <rect key="frame" x="494" y="365" width="37" height="37"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                             </activityIndicatorView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>

iPhone.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="DL0-L5-LOv">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B38b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="DL0-L5-LOv">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <customFonts key="customFonts">
         <mutableArray key="Roboto-Regular.ttf">
@@ -13,9 +14,11 @@
         <scene sceneID="emz-kO-L7q">
             <objects>
                 <viewController id="dgh-JZ-Q7z" customClass="MainFrameViewController" sceneMemberID="viewController">
-                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="black" dataMode="prototypes" id="Rtu-AT-Alw">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="Rtu-AT-Alw" customClass="AppCollectionView">
                         <rect key="frame" x="0.0" y="64" width="568" height="256"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                         <inset key="contentInset" minX="40" minY="20" maxX="40" maxY="20"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="20" id="YcZ-cR-3tK">
                             <size key="itemSize" width="90" height="120"/>
@@ -24,14 +27,16 @@
                             <inset key="sectionInset" minX="20" minY="20" maxX="20" maxY="20"/>
                         </collectionViewFlowLayout>
                         <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="Uqv-Di-fzX">
-                                <rect key="frame" x="20" y="20" width="90" height="120"/>
+                            <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="Uqv-Di-fzX">
+                                <rect key="frame" x="20" y="40" width="90" height="120"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                     <rect key="frame" x="0.0" y="0.0" width="90" height="120"/>
                                     <autoresizingMask key="autoresizingMask"/>
+                                    <animations/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
+                                <animations/>
                             </collectionViewCell>
                         </cells>
                         <connections>
@@ -43,8 +48,9 @@
                     <navigationItem key="navigationItem" id="1jn-Sf-Xky">
                         <barButtonItem key="leftBarButtonItem" style="done" id="zAn-CM-7Yz">
                             <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pZ9-ft-T24">
-                                <rect key="frame" x="0.0" y="0.0" width="109" height="46"/>
+                                <rect key="frame" x="20" y="-1" width="109" height="46"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
                                 <state key="normal" title="Moonlight" image="Logo">
                                     <color key="titleColor" red="0.96078431372549022" green="0.98039215686274506" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -74,6 +80,7 @@
                     <view key="view" contentMode="scaleToFill" id="Usg-e0-g4a">
                         <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
@@ -97,11 +104,13 @@
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="20" minValue="1" maxValue="100" id="3nn-MI-9Xu">
                                 <rect key="frame" x="14" y="49" width="204" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <color key="tintColor" red="0.72941176470588232" green="0.69411764705882351" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </slider>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bitrate: 10 Mbps" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SBv-Wn-LB7">
                                 <rect key="frame" x="16" y="20" width="151" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.96078431372549022" green="0.98039215686274506" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -109,6 +118,7 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="dLF-qJ-2nY">
                                 <rect key="frame" x="16" y="116" width="200" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="30 Hz"/>
                                     <segment title="60 Hz"/>
@@ -118,6 +128,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Framerate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Kkv-DF-MAl">
                                 <rect key="frame" x="16" y="87" width="79" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.96078431372549022" green="0.98039215686274506" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -125,6 +136,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Resolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8zy-ri-Dqc">
                                 <rect key="frame" x="16" y="152" width="82" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.96078431372549022" green="0.98039215686274506" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -132,16 +144,17 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="PCM-t4-Sha">
                                 <rect key="frame" x="16" y="181" width="200" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="720p"/>
                                     <segment title="1080p"/>
-                                    <segment title="Native"/>
                                 </segments>
                                 <color key="tintColor" red="0.72941176470588232" green="0.69411764705882351" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </segmentedControl>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On-Screen Controls" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HZT-dd-DuQ">
                                 <rect key="frame" x="16" y="217" width="153" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.96078431372549022" green="0.98039215686274506" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -149,6 +162,7 @@
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="WGf-9d-eAm">
                                 <rect key="frame" x="16" y="246" width="200" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <segments>
                                     <segment title="Off"/>
                                     <segment title="Auto"/>
@@ -158,6 +172,7 @@
                                 <color key="tintColor" red="0.72941176470588232" green="0.69411764705882351" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </segmentedControl>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" red="0.12156862745098039" green="0.12941176470588237" blue="0.14117647058823529" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
@@ -181,6 +196,8 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="0ZA-Ec-QgD">
                         <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"/>
                         <textAttributes key="titleTextAttributes">
                             <offsetWrapper key="textShadowOffset" horizontal="0.0" vertical="0.0"/>
                         </textAttributes>
@@ -204,6 +221,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HK-Z5-4Ch">
                                 <rect key="frame" x="262" y="149" width="45" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -211,9 +229,11 @@
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="0vm-Iv-K4b">
                                 <rect key="frame" x="274" y="121" width="20" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                <animations/>
                             </activityIndicatorView>
                         </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        <animations/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <navigationItem key="navigationItem" id="8uX-4T-BiC"/>
                     <nil key="simulatedStatusBarMetrics"/>
@@ -239,8 +259,10 @@
                         <subviews>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="oNu-Gu-QeM">
                                 <rect key="frame" x="266" y="141" width="37" height="37"/>
+                                <animations/>
                             </activityIndicatorView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
                     </view>
                     <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
@@ -256,9 +278,4 @@
     <resources>
         <image name="Logo" width="32" height="32"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>

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

@@ -0,0 +1,461 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 47;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		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 */
+		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 */
+		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 = (
+				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 = (
+				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 = 0700;
+				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 */,
+				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 */,
+				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_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = 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_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = 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"
+    }
+  ]
+}