Adding build 0.9.2

Conflicts:
	limelight-common-c

BuildScripts/Opus/build.sh

@@ -31,43 +31,44 @@ do
       exit 1
     fi
     echo "Compiling source for $ARCH in directory $OPUS_DIR"
-
+    echo "cd $OPUS_DIR"
     cd $OPUS_DIR
 
     DIST_DIR=$DIST_DIR_BASE-$ARCH
+    echo "mkdir -p $DIST_DIR"
     mkdir -p $DIST_DIR
     CFLAGS_ARCH=$ARCH
     case $ARCH in
         armv7)
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
-            EXTRA_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
+            EXTRA_CFLAGS="-mcpu=cortex-a8 -mfpu=neon -miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
             ;;
         armv7s)
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
-            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=6.0"
+            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
             ;;
         aarch64)
             CFLAGS_ARCH="arm64"
             EXTRA_FLAGS="--with-pic --enable-fixed-point"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS${IOSSDK_VER}
+            IOSSDK=iPhoneOS
           ;;
         x86_64)
             EXTRA_FLAGS="--with-pic"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+            IOSSDK=iPhoneSimulator
           ;;
         i386)
             EXTRA_FLAGS="--with-pic"
             EXTRA_CFLAGS="-miphoneos-version-min=7.1"
             PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+            IOSSDK=iPhoneSimulator
             ;;
         *)
             echo "Unsupported architecture ${ARCH}"
@@ -76,7 +77,7 @@ do
     esac
 
     echo "Configuring opus for $ARCH..."
-	
+    echo "./autogen.sh"	
 	./autogen.sh
 	
 	CFLAGS="-g -O2 -pipe -arch ${CFLAGS_ARCH} \
@@ -86,7 +87,10 @@ do
     LDFLAGS="-arch ${CFLAGS_ARCH} \
 		-isysroot ${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
 		-L${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk/usr/lib"
-	
+
+    echo "CFLAGS=$CFLAGS"
+    echo "LDFLAGS=$LDFLAGS"
+
 	export CFLAGS
 	export LDFLAGS
 	
@@ -100,7 +104,15 @@ do
     export NM="/usr/bin/nm"
     export RANLIB="/usr/bin/ranlib"
     export STRIP="/usr/bin/strip"
-	
+    echo "./configure \
+    	--prefix=$DIST_DIR \
+		--host=${ARCH}-apple-darwin \
+		--with-sysroot=${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
+		--enable-static=yes \
+		--enable-shared=no \
+	    --disable-doc \
+		${EXTRA_FLAGS}"
+
     ./configure \
     	--prefix=$DIST_DIR \
 		--host=${ARCH}-apple-darwin \
@@ -111,10 +123,14 @@ do
 		${EXTRA_FLAGS}
 
     echo "Installing opus for $ARCH..."
+    echo "make clean"
     make clean
+    echo "make -j$NJOB V=1"
     make -j$NJOB V=1
+    echo "make install"
     make install
 
+    echo "cd $SCRIPT_DIR"
     cd $SCRIPT_DIR
 
     if [ -d $DIST_DIR/bin ]

BuildScripts/Opus/sync.sh

@@ -7,7 +7,6 @@ source config.sh
 SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
 DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
 
-git submodule update --init opus
 cd opus
 git checkout master 
 git pull origin master 

Launch Screen.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C81f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<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">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.14"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,24 +11,21 @@
             <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) 2014 Limelight Stream. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="22" y="439" width="437" height="21"/>
+                <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.070588235294117646" green="0.45490196078431372" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/>
+                    <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>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Limelight Flat Design Banner" translatesAutoresizingMaskIntoConstraints="NO" id="lr8-1h-ydW">
-                    <rect key="frame" x="-8" y="115" width="496" height="251"/>
-                </imageView>
             </subviews>
+            <animations/>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="lr8-1h-ydW" secondAttribute="centerY" id="C8A-9E-cM6"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Gnz-uJ-CDw"/>
-                <constraint firstAttribute="centerX" secondItem="lr8-1h-ydW" secondAttribute="centerX" id="WCv-Cd-TyR"/>
                 <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
@@ -35,7 +33,4 @@
             <point key="canvasLocation" x="404" y="445"/>
         </view>
     </objects>
-    <resources>
-        <image name="Limelight Flat Design Banner" width="496" height="251"/>
-    </resources>
 </document>

Limelight/App.h

@@ -1,18 +0,0 @@
-//
-//  App.h
-//  Limelight
-//
-//  Created by Diego Waxemberg on 10/22/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface App : NSObject
-
-@property NSString* appId;
-@property NSString* appName;
-@property UIImage* appImage;
-@property BOOL isRunning;
-
-@end

Limelight/App.m

@@ -1,15 +0,0 @@
-//
-//  App.m
-//  Limelight
-//
-//  Created by Diego Waxemberg on 10/22/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
-//
-
-#import "App.h"
-#import "HttpManager.h"
-
-@implementation App
-@synthesize appId, appName, appImage, isRunning;
-
-@end

Limelight/AppDelegate.h

@@ -1,9 +1,9 @@
 //
 //  AppDelegate.h
-//  Limelight-iOS
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 1/17/14.
-//  Copyright (c) 2014 Diego Waxemberg. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Limelight/AppDelegate.m

@@ -1,9 +1,9 @@
 //
 //  AppDelegate.m
-//  Limelight-iOS
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 1/17/14.
-//  Copyright (c) 2014 Diego Waxemberg. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import "AppDelegate.h"
@@ -85,7 +85,7 @@ static NSOperationQueue* mainQueue;
         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.
-            NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+            Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
             abort();
         } 
     }
@@ -103,7 +103,7 @@ static NSOperationQueue* mainQueue;
     
     NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
     if (coordinator != nil) {
-        _managedObjectContext = [[NSManagedObjectContext alloc] init];
+        _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
         [_managedObjectContext setPersistentStoreCoordinator:coordinator];
     }
     return _managedObjectContext;
@@ -159,7 +159,7 @@ static NSOperationQueue* mainQueue;
          Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
          
          */
-        NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+        Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
         abort();
     }    
     

Limelight/Crypto/CryptoManager.h

@@ -1,9 +1,9 @@
 //
 //  CryptoManager.h
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/14/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -16,6 +16,7 @@
 + (NSData*) readKeyFromFile;
 + (NSData*) readP12FromFile;
 + (NSData*) getSignatureFromCert:(NSData*)cert;
++ (NSData*) nullTerminateString:(NSData*)data;
 
 - (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN;
 - (NSData*) SHA1HashData:(NSData*)data;

Limelight/Crypto/CryptoManager.m

@@ -1,9 +1,9 @@
 //
 //  CryptoManager.m
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/14/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import "CryptoManager.h"
@@ -76,8 +76,14 @@ static NSData* p12 = nil;
     return (((int)[data length] + 15) / 16) * 16;
 }
 
++ (NSData*) nullTerminateString:(NSData*)data {
+    NSMutableData* mutData = [NSMutableData dataWithData:data];
+    [mutData appendBytes:"" length:1];
+    return mutData;
+}
+
 - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert {
-    const char* buffer = [cert bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
     X509* x509;
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
@@ -86,7 +92,7 @@ static NSData* p12 = nil;
     BIO_free(bio);
     
     if (!x509) {
-        NSLog(@"ERROR: unable to parse certificate in memory");
+        Log(LOG_E, @"Unable to parse certificate in memory");
         return NULL;
     }
     
@@ -105,7 +111,7 @@ static NSData* p12 = nil;
 }
 
 - (NSData *)signData:(NSData *)data withKey:(NSData *)key {
-    const char* buffer = [key bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:key] bytes];
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
     
@@ -115,7 +121,7 @@ static NSData* p12 = nil;
     BIO_free(bio);
     
     if (!pkey) {
-        NSLog(@"ERROR: unable to parse private key in memory!");
+        Log(LOG_E, @"Unable to parse private key in memory!");
         return NULL;
     }
     
@@ -188,14 +194,14 @@ static NSData* p12 = nil;
 }
 
 + (NSData *)getSignatureFromCert:(NSData *)cert {
-    const char* buffer = [cert bytes];
+    const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
     X509* x509;
     BIO* bio = BIO_new(BIO_s_mem());
     BIO_puts(bio, buffer);
     x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
     
     if (!x509) {
-        NSLog(@"ERROR: unable to parse certificate in memory!");
+        Log(LOG_E, @"Unable to parse certificate in memory!");
         return NULL;
     }
     return [NSData dataWithBytes:x509->signature->data length:x509->signature->length];
@@ -206,7 +212,7 @@ static NSData* p12 = nil;
     dispatch_once(&pred, ^{
         if (![CryptoManager keyPairExists]) {
             
-            NSLog(@"Generating Certificate... ");
+            Log(LOG_I, @"Generating Certificate... ");
             CertKeyPair certKeyPair = generateCertKeyPair();
             
             NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
@@ -215,10 +221,10 @@ static NSData* p12 = nil;
             NSString* keyPairFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
             NSString* p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
             
-            //NSLog(@"Writing cert and key to: \n%@\n%@", certFile, keyPairFile);
+            //Log(LOG_D, @"Writing cert and key to: \n%@\n%@", certFile, keyPairFile);
             saveCertKeyPair([certFile UTF8String], [p12File UTF8String], [keyPairFile UTF8String], certKeyPair);
             freeCertKeyPair(certKeyPair);
-            NSLog(@"Certificate created");
+            Log(LOG_I, @"Certificate created");
         }
     });
 }
@@ -233,7 +239,7 @@ static NSData* p12 = nil;
     NSMutableString* uniqueId = [NSMutableString stringWithString:[idString substringFromIndex:19]];
     [uniqueId deleteCharactersInRange:NSMakeRange(4, 1)];
     
-    //NSLog(@"Unique ID: %@", uniqueId);
+    //Log(LOG_D, @"Unique ID: %@", uniqueId);
     return [NSString stringWithString:uniqueId];
 }
 

Limelight/Crypto/mkcert.h

@@ -1,9 +1,9 @@
 //
 //  mkcert.h
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/16/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #ifndef Limelight_mkcert_h

Limelight/Database/App+CoreDataProperties.h

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

Limelight/Database/App.h

@@ -0,0 +1,26 @@
+//
+//  App.h
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class Host;
+
+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

@@ -0,0 +1,20 @@
+//
+//  App.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
+//
+
+#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

@@ -1,15 +1,16 @@
 //
 //  DataManager.h
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import "Settings.h"
 #import "AppDelegate.h"
 #import "Host.h"
+#import "App.h"
 
 @interface DataManager : NSObject
 
@@ -18,8 +19,10 @@
 - (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
 - (Settings*) retrieveSettings;
 - (NSArray*) retrieveHosts;
-- (void) saveHosts;
+- (void) saveData;
 - (Host*) createHost;
 - (void) removeHost:(Host*)host;
+- (App*) createApp;
+- (void) removeApp:(App*)app;
 
 @end

Limelight/Database/DataManager.m

@@ -1,9 +1,9 @@
 //
 //  DataManager.m
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import "DataManager.h"
@@ -20,14 +20,14 @@
     Settings* settingsToSave = [self retrieveSettings];
     settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
     // Bitrate is persisted in kbps
-    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate * 1000];
+    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
     settingsToSave.height = [NSNumber numberWithInteger:height];
     settingsToSave.width = [NSNumber numberWithInteger:width];
     settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
 
     NSError* error;
     if (![[self.appDelegate managedObjectContext] save:&error]) {
-        NSLog(@"ERROR: Unable to save settings to database");
+        Log(LOG_E, @"Unable to save settings to database: %@", error);
     }
     [self.appDelegate saveContext];
 }
@@ -48,18 +48,18 @@
 
 - (Host*) createHost {
     NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-    Host* host = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
-    return host;
+    return [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
 }
 
 - (void) removeHost:(Host*)host {
     [[self.appDelegate managedObjectContext] deleteObject:host];
+    [self saveData];
 }
 
-- (void) saveHosts {
+- (void) saveData {
     NSError* error;
     if (![[self.appDelegate managedObjectContext] save:&error]) {
-        NSLog(@"ERROR: Unable to save hosts to database");
+        Log(LOG_E, @"Unable to save hosts to database: %@", error);
     }
     [self.appDelegate saveContext];
 }
@@ -68,6 +68,15 @@
     return [self fetchRecords:@"Host"];
 }
 
+- (App*) createApp {
+    NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    return [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+}
+
+- (void) removeApp:(App*)app {
+    [[self.appDelegate managedObjectContext] deleteObject:app];
+}
+
 - (NSArray*) fetchRecords:(NSString*)entityName {
     NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
     NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];

Limelight/Database/Host+CoreDataProperties.h

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

Limelight/Database/Host.h

@@ -1,24 +1,25 @@
 //
 //  Host.h
-//  Limelight
+//  Moonlight
 //
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 #import "Utils.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface Host : NSManagedObject
 
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSString * address;
-@property (nonatomic, retain) NSString * localAddress;
-@property (nonatomic, retain) NSString * externalAddress;
-@property (nonatomic, retain) NSString * uuid;
-@property (nonatomic, retain) NSString * mac;
 @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

@@ -1,23 +1,17 @@
 //
 //  Host.m
-//  Limelight
+//  Moonlight
 //
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Created by Diego Waxemberg on 7/10/15.
+//  Copyright © 2015 Limelight Stream. All rights reserved.
 //
 
 #import "Host.h"
 
-
 @implementation Host
 
-@dynamic name;
-@dynamic address;
-@dynamic localAddress;
-@dynamic externalAddress;
-@dynamic uuid;
-@dynamic mac;
 @dynamic pairState;
 @synthesize online;
+@synthesize activeAddress;
 
 @end

Limelight/Database/Settings.h

@@ -1,9 +1,9 @@
 //
 //  Settings.h
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

Limelight/Database/Settings.m

@@ -1,9 +1,9 @@
 //
 //  Settings.m
-//  Limelight
+//  Moonlight
 //
 //  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
 #import "Settings.h"

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "a_button.png"
+      "filename" : "a_button_40x40@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "a_button-1.png"
+      "filename" : "a_button_80x80@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "a_button-2.png"
+      "filename" : "a_button_120x120@3x.png"
     }
   ],
   "info" : {

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

@@ -1,80 +1,80 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "2x",
-      "filename" : "Icon-Small@2x.png"
+      "idiom" : "iphone",
+      "filename" : "app_icon_settings_58x58_@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "3x",
-      "filename" : "Icon-Small@3x.png"
+      "idiom" : "iphone",
+      "filename" : "app_icon_settings_87x87_@3x.png",
+      "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
-      "scale" : "2x",
-      "filename" : "Icon-40@2x.png"
+      "idiom" : "iphone",
+      "filename" : "app_icon_spotlight_80x80_@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
-      "scale" : "3x",
-      "filename" : "Icon-40@3x.png"
+      "idiom" : "iphone",
+      "filename" : "app_icon_spotlight_120x120_@3x.png",
+      "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
-      "scale" : "2x",
-      "filename" : "Icon-60@2x.png"
-    },
-    {
       "idiom" : "iphone",
+      "filename" : "app_icon_120x120_@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
-      "scale" : "3x",
-      "filename" : "Icon-60@3x.png"
+      "idiom" : "iphone",
+      "filename" : "app_icon_180x180_@3x.png",
+      "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
-      "scale" : "1x",
-      "filename" : "Icon-Small.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_settings_29x29_@1x.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
-      "scale" : "2x",
-      "filename" : "Icon-Small@2x.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_settings_58x58_@2x.png",
+      "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
-      "scale" : "1x",
-      "filename" : "Icon-40.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_spotlight_40x40_@1x.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
-      "scale" : "2x",
-      "filename" : "Icon-40@2x.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_spotlight_80x80_@2x.png",
+      "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
-      "scale" : "1x",
-      "filename" : "Icon-76.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_76x76_@1x.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
-      "scale" : "2x",
-      "filename" : "Icon-76@2x.png"
+      "idiom" : "ipad",
+      "filename" : "app_icon_152x152_@2x.png",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
-    "author" : "makeappicon"
+    "author" : "xcode"
   }
 }

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "b_button.png"
+      "filename" : "b_button_40x40@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "b_button-1.png"
+      "filename" : "b_button_80x80@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "b_button-2.png"
+      "filename" : "b_button_120x120@3x.png"
     }
   ],
   "info" : {

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "down.png"
+      "filename" : "down_31x38@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "down-1.png"
+      "filename" : "down_61x75@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "down-2.png"
+      "filename" : "down_93x114@3x.png"
     }
   ],
   "info" : {

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "L1-1.png"
+      "filename" : "L1_40x40@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "L1.png"
+      "filename" : "L1_80x80@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "L1-2.png"
+      "filename" : "L1_120x120@3x.png"
     }
   ],
   "info" : {

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

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

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "L3.png"
+      "filename" : "L3_80x80@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "L3-1.png"
+      "filename" : "L3_160x160@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "L3-2.png"
+      "filename" : "L3_240x240@3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,51 +0,0 @@
-{
-  "images" : [
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

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

@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "left.png"
+      "filename" : "left_38x31@1x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "left-1.png"
+      "filename" : "left_76x61@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "left-2.png"
+      "filename" : "left_114x92@3x.png"
     }
   ],
   "info" : {

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

@@ -2,7 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Limelight-logo.pdf"
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "logo_universal.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -7,7 +7,7 @@
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "Limelight Flat Design Banner.png"
+      "filename" : "play.png"
     },
     {
       "idiom" : "universal",