Override default SDL audio ducking option

Fixes #654

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or Android?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - iOS/tvOS version: [e.g. iOS 14.2]
+ - Device model: [e.g. iPhone 11 Pro]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/auto-comment.yml

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

.github/lock.yml

@@ -0,0 +1,25 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 60
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels:
+  - enhancement
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This issue has been automatically locked since there has not been
+  any recent activity after it was closed. If you experience an issue
+  that looks similar to this one, please open a new issue with details
+  about your specific streaming setup.
+
+# Don't lock PRs
+only: issues

.gitignore

@@ -1,4 +1,6 @@
 **/xcuserdata/
 **/Moonlight.xcscmblueprint
+**/xcschemes/*.xcscheme
+.DS_Store
 Build
 DerivedData

.gitmodules

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

.travis.yml

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

BuildScripts/Opus/build.sh

@@ -1,144 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source config.sh
-
-# Number of CPUs (for make -j)
-NCPU=`sysctl -n hw.ncpu`
-if test x$NJOB = x; then
-    NJOB=$NCPU
-fi
-
-PLATFORMBASE=$(xcode-select -print-path)"/Platforms"
-
-SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
-DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
-
-if [ ! -d opus ]
-then
-  echo "opus source directory does not exist, run sync.sh"
-fi
-
-# PATH=${SCRIPT_DIR}/gas-preprocessor/:$PATH
-
-for ARCH in $ARCHS
-do
-    OPUS_DIR=opus-$ARCH
-    if [ ! -d $OPUS_DIR ]
-    then
-      echo "Directory $OPUS_DIR does not exist, run sync.sh"
-      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 -miphoneos-version-min=7.1"
-            PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            IOSSDK=iPhoneOS
-            ;;
-        armv7s)
-            EXTRA_FLAGS="--with-pic --enable-fixed-point"
-            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=7.1"
-            PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
-            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
-          ;;
-        x86_64)
-            EXTRA_FLAGS="--with-pic"
-            EXTRA_CFLAGS="-miphoneos-version-min=7.1"
-            PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator
-          ;;
-        i386)
-            EXTRA_FLAGS="--with-pic"
-            EXTRA_CFLAGS="-miphoneos-version-min=7.1"
-            PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
-            IOSSDK=iPhoneSimulator
-            ;;
-        *)
-            echo "Unsupported architecture ${ARCH}"
-            exit 1
-            ;;
-    esac
-
-    echo "Configuring opus for $ARCH..."
-    echo "./autogen.sh"	
-	./autogen.sh
-	
-	CFLAGS="-g -O2 -pipe -arch ${CFLAGS_ARCH} \
-		-isysroot ${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
-		-I${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk/usr/include \
-		${EXTRA_CFLAGS}"
-    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
-	
-    export CXXCPP="/usr/bin/cpp"
-    export CPP="$CXXCPP"
-    export CXX="/usr/bin/gcc"
-    export CC="/usr/bin/gcc"
-    export LD="/usr/bin/ld"
-    export AR="/usr/bin/ar"
-    export AS="/usr/bin/ls"
-    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 \
-		--with-sysroot=${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
-		--enable-static=yes \
-		--enable-shared=no \
-	    --disable-doc \
-		${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 ]
-    then
-      rm -rf $DIST_DIR/bin
-    fi
-    if [ -d $DIST_DIR/share ]
-    then
-      rm -rf $DIST_DIR/share
-    fi
-done

BuildScripts/Opus/combine.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source config.sh
-
-for ARCH in $ARCHS
-do
-
-  if [ -d dist-$ARCH ]
-  then
-    MAIN_ARCH=$ARCH
-  fi
-done
-
-if [ -z "$MAIN_ARCH" ]
-then
-  echo "Please compile an architecture"
-  exit 1
-fi
-
-
-OUTPUT_DIR="dist-uarch"
-rm -rf $OUTPUT_DIR
-
-mkdir -p $OUTPUT_DIR/lib $OUTPUT_DIR/include
-
-for LIB in dist-$MAIN_ARCH/lib/*.a
-do
-  LIB=`basename $LIB`
-  LIPO_CREATE=""
-  for ARCH in $ARCHS
-  do
-    LIPO_ARCH=$ARCH
-    if [ "$ARCH" = "aarch64" ];
-    then
-      LIPO_ARCH="arm64"
-    fi
-    if [ -d dist-$ARCH ]
-    then
-      LIPO_CREATE="$LIPO_CREATE-arch $LIPO_ARCH dist-$ARCH/lib/$LIB "
-    fi
-  done
-  OUTPUT="$OUTPUT_DIR/lib/$LIB"
-  echo "Creating: $OUTPUT"
-  xcrun -sdk iphoneos lipo -create $LIPO_CREATE -output $OUTPUT
-  xcrun -sdk iphoneos lipo -info $OUTPUT
-done
-
-echo "Copying headers from dist-$MAIN_ARCH..."
-cp -R dist-$MAIN_ARCH/include/* $OUTPUT_DIR/include

BuildScripts/Opus/config.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-OPUS_DIR="opus"
-IOSSDK_VER=8.1
-ARCHS="armv7 armv7s aarch64 i386 x86_64"
-
-remove_arch() {
-	OLD_ARCHS="$ARCHS"
-	NEW_ARCHS=""
-	REMOVAL="$1"
-
-	for ARCH in $OLD_ARCHS; do
-		if [ "$ARCH" != "$REMOVAL" ] ; then
-			NEW_ARCHS="$NEW_ARCHS $ARCH"
-		fi
-	done
-	
-	ARCHS=$NEW_ARCHS
-}
-
-# armv7s is only supported in iOS 6.0+
-CHECK=`echo $IOSSDK_VER '>= 6.0' | bc -l`
-if [ "$CHECK" = "0" ] ; then
-	remove_arch "armv7s"
-fi
-
-# armv6 is not supported any more since iOS 6.0
-CHECK=`echo $IOSSDK_VER '< 6.0' | bc -l`
-if [ "$CHECK" = "0" ] ; then
-	remove_arch "armv6"
-fi
-
-echo 'Architectures to build:' $ARCHS
-    
-
-

BuildScripts/Opus/sync.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-source config.sh
-
-SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
-DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
-
-cd opus
-git checkout master 
-git pull origin master 
-cd ..
-
-for ARCH in $ARCHS
-do
-    OPUS_DIR=opus-$ARCH
-    echo "Syncing source for $ARCH to directory $OPUS_DIR"
-    rsync opus/ $OPUS_DIR/ --exclude '.*' -a --delete
-done

BuildScripts/build-ffmpeg.sh

@@ -1,104 +0,0 @@
-#!/bin/bash
-
-SYSROOT_iPHONE="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-SYSROOT_SIMULATOR="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
-CC_IPHONE="xcrun -sdk iphoneos clang"
-CC_SIMULATOR="xcrun -sdk iphonesimulator clang"
-function build_one {
-    ./configure \
-        --prefix=$PREFIX \
-        --disable-ffmpeg \
-        --disable-ffplay \
-        --disable-ffprobe \
-        --disable-ffserver \
-        --disable-armv5te \
-        --disable-armv6 \
-        --disable-doc \
-        --disable-everything \
-        --disable-debug \
-        --enable-decoder=h264 \
-        --enable-avresample \
-        --enable-cross-compile \
-        --sysroot=$SYSROOT \
-        --target-os=darwin \
-        --cc="$CC" \
-        --extra-cflags="$CFLAGS" \
-        --extra-ldflags="$LDFLAGS" \
-        --enable-pic \
-        $ADDI_FLAGS
-    make clean && make -j4 && make install
-}
-
-
-# armv7
-function build_armv7 {
-    PREFIX="armv7"
-    SYSROOT=$SYSROOT_iPHONE
-    CC=$CC_IPHONE
-    CFLAGS="-arch armv7 -mfpu=neon -miphoneos-version-min=7.1 -fpic"
-    LDFLAGS="-arch armv7 -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
-    ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
-    build_one
-}
-
-# armv7s
-function build_armv7s {
-    PREFIX="armv7s"
-    SYSROOT=$SYSROOT_iPHONE
-    CC=$CC_IPHONE
-    CFLAGS="-arch armv7s -mfpu=neon -miphoneos-version-min=7.1"
-    LDFLAGS="-arch armv7s -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
-    ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
-    build_one
-}
-
-# i386
-function build_i386 {
-    PREFIX="i386"
-    SYSROOT=$SYSROOT_SIMULATOR
-    CC=$CC_SIMULATOR
-    CFLAGS="-arch i386"
-    LDFLAGS="-arch i386 -isysroot $SYSROOT_SIMULATOR -mios-simulator-version-min=7.1"
-    ADDI_FLAGS="--arch=i386 --cpu=i386 --disable-asm"
-    build_one
-}
-
-
-# create fat library
-function build_universal {
-    cd armv7/lib
-    for file in *.a
-    do
-        cd ../..
-        xcrun -sdk iphoneos lipo -output universal/lib/$file  -create \
-        -arch armv7 armv7/lib/$file \
-        -arch armv7s armv7s/lib/$file \
-        -arch i386 i386/lib/$file
-        echo "Universal $file created."
-        cd -
-    done
-    cd ../..
-}
-
-echo "FFmpeg directory?"
-read SOURCE
-
-cd $SOURCE
-
-if [ "$1" = "clean" ]
-    then
-        rm -r armv7 armv7s i386 universal
-        make clean
-        exit 0
-fi
-mkdir armv7
-mkdir armv7s
-mkdir i386
-mkdir -p universal/lib
-
-build_armv7
-build_armv7s
-build_i386
-build_universal
-echo "Ouput files in $SOURCE/armv7 $SOURCE/armv7s $SOURCE/i386 $SOURCE/universal"
-

BuildScripts/build-libopus.sh

@@ -0,0 +1,180 @@
+#!/bin/bash
+#  Builds libopus for iOS or tvOS.
+#
+#  Copyright 2012 Mike Tigas <mike@tig.as>
+#
+#  Based on work by Felix Schulze on 16.12.10.
+#  Copyright 2010 Felix Schulze. All rights reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+###########################################################################
+#  Choose your libopus version and your currently-installed iOS SDK version:
+#
+TARGET="AppleTV" # "iPhone"
+VERSION="1.3.1"
+SDKVERSION="16.1"
+MINVERSIONDEF="-mtvos-version-min=12.0" # "-miphoneos-version-min=12.0"
+
+###########################################################################
+#
+# Don't change anything under this line!
+#
+###########################################################################
+
+# by default, we won't build for debugging purposes
+if [ "${DEBUG}" == "true" ]; then
+    echo "Compiling for debugging ..."
+    OPT_CFLAGS="-O0 -fno-inline -g"
+    OPT_LDFLAGS=""
+    OPT_CONFIG_ARGS="--enable-assertions --disable-asm"
+else
+    OPT_CFLAGS="-O3 -g"
+    OPT_LDFLAGS=""
+    OPT_CONFIG_ARGS=""
+fi
+
+
+# No need to change this since xcode build will only compile in the
+# necessary bits from the libraries we create
+ARCHS="x86_64 arm64"
+
+DEVELOPER=`xcode-select -print-path`
+#DEVELOPER="/Applications/Xcode.app/Contents/Developer"
+
+cd "`dirname \"$0\"`"
+REPOROOT=$(pwd)
+
+# Where we'll end up storing things in the end
+OUTPUTDIR="${REPOROOT}/dependencies"
+mkdir -p ${OUTPUTDIR}/include
+mkdir -p ${OUTPUTDIR}/lib
+
+
+BUILDDIR="${REPOROOT}/build"
+
+# where we will keep our sources and build from.
+SRCDIR="${BUILDDIR}/src"
+mkdir -p $SRCDIR
+# where we will store intermediary builds
+INTERDIR="${BUILDDIR}/built"
+mkdir -p $INTERDIR
+
+########################################
+
+cd $SRCDIR
+
+# Exit the script if an error happens
+set -e
+
+if [ ! -e "${SRCDIR}/opus-${VERSION}.tar.gz" ]; then
+	echo "Downloading opus-${VERSION}.tar.gz"
+	curl -LO http://downloads.xiph.org/releases/opus/opus-${VERSION}.tar.gz
+fi
+echo "Using opus-${VERSION}.tar.gz"
+
+tar zxf opus-${VERSION}.tar.gz -C $SRCDIR
+cd "${SRCDIR}/opus-${VERSION}"
+
+set +e # don't bail out of bash script if ccache doesn't exist
+CCACHE=`which ccache`
+if [ $? == "0" ]; then
+	echo "Building with ccache: $CCACHE"
+	CCACHE="${CCACHE} "
+else
+	echo "Building without ccache"
+	CCACHE=""
+fi
+set -e # back to regular "bail out on error" mode
+
+export ORIGINALPATH=$PATH
+
+for ARCH in ${ARCHS}
+do
+    if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ]; then
+        PLATFORM="${TARGET}Simulator"
+        EXTRA_CFLAGS="-arch ${ARCH}"
+        EXTRA_CONFIG="--host=x86_64-apple-darwin"
+    else
+        PLATFORM="${TARGET}OS"
+        EXTRA_CFLAGS="-arch ${ARCH}"
+        EXTRA_CONFIG="--host=arm-apple-darwin"
+    fi
+
+	mkdir -p "${INTERDIR}/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
+
+	./configure --disable-shared --enable-static --with-pic --disable-extra-programs --disable-doc ${EXTRA_CONFIG} \
+    --prefix="${INTERDIR}/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" \
+    LDFLAGS="$LDFLAGS ${OPT_LDFLAGS} -fPIE ${MINVERSIONDEF} -L${OUTPUTDIR}/lib" \
+    CFLAGS="$CFLAGS ${EXTRA_CFLAGS} ${OPT_CFLAGS} -fPIE ${MINVERSIONDEF} -I${OUTPUTDIR}/include -isysroot ${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer/SDKs/${PLATFORM}${SDKVERSION}.sdk" \
+
+    # Build the application and install it to the fake SDK intermediary dir
+    # we have set up. Make sure to clean up afterward because we will re-use
+    # this source tree to cross-compile other targets.
+	make -j$(nproc)
+	make install
+	make clean
+done
+
+########################################
+
+echo "Build library..."
+
+# These are the libs that comprise libopus.
+OUTPUT_LIBS="libopus.a"
+for OUTPUT_LIB in ${OUTPUT_LIBS}; do
+	INPUT_LIBS=""
+	for ARCH in ${ARCHS}; do
+		if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ];
+		then
+			PLATFORM="${TARGET}Simulator"
+		else
+			PLATFORM="${TARGET}OS"
+		fi
+		INPUT_ARCH_LIB="${INTERDIR}/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/lib/${OUTPUT_LIB}"
+		if [ -e $INPUT_ARCH_LIB ]; then
+			INPUT_LIBS="${INPUT_LIBS} ${INPUT_ARCH_LIB}"
+		fi
+	done
+	# Combine the three architectures into a universal library.
+	if [ -n "$INPUT_LIBS"  ]; then
+		lipo -create $INPUT_LIBS \
+		-output "${OUTPUTDIR}/lib/${OUTPUT_LIB}"
+	else
+		echo "$OUTPUT_LIB does not exist, skipping (are the dependencies installed?)"
+	fi
+done
+
+for ARCH in ${ARCHS}; do
+	if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ];
+	then
+		PLATFORM="${TARGET}Simulator"
+	else
+		PLATFORM="${TARGET}OS"
+	fi
+	cp -R ${INTERDIR}/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/include/* ${OUTPUTDIR}/include/
+	if [ $? == "0" ]; then
+		# We only need to copy the headers over once. (So break out of forloop
+		# once we get first success.)
+		break
+	fi
+done
+
+
+####################
+
+echo "Building done."
+echo "Cleaning up..."
+rm -fr ${INTERDIR}
+rm -fr "${SRCDIR}/opus-${VERSION}"
+echo "Done."

BuildScripts/build-openssl.sh

@@ -1,124 +0,0 @@
-#!/bin/bash
-
-# Yay shell scripting! This script builds a static version of
-# OpenSSL ${OPENSSL_VERSION} for iOS 7.0 that contains code for
-# armv6, armv7, arm7s and i386.
-
-#set -x
-
-# Setup paths to stuff we need
-
-OPENSSL_VERSION="1.0.1h"
-
-DEVELOPER="/Applications/Xcode.app/Contents/Developer"
-
-SDK_VERSION="7.1"
-MIN_VERSION="7.1"
-
-IPHONEOS_PLATFORM="${DEVELOPER}/Platforms/iPhoneOS.platform"
-IPHONEOS_SDK="${IPHONEOS_PLATFORM}/Developer/SDKs/iPhoneOS.sdk"
-IPHONEOS_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-
-IPHONESIMULATOR_PLATFORM="${DEVELOPER}/Platforms/iPhoneSimulator.platform"
-IPHONESIMULATOR_SDK="${IPHONESIMULATOR_PLATFORM}/Developer/SDKs/iPhoneSimulator.sdk"
-IPHONESIMULATOR_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-
-# Make sure things actually exist
-
-if [ ! -d "$IPHONEOS_PLATFORM" ]; then
-  echo "Cannot find $IPHONEOS_PLATFORM"
-  exit 1
-fi
-
-if [ ! -d "$IPHONEOS_SDK" ]; then
-  echo "Cannot find $IPHONEOS_SDK"
-  exit 1
-fi
-
-if [ ! -x "$IPHONEOS_GCC" ]; then
-  echo "Cannot find $IPHONEOS_GCC"
-  exit 1
-fi
-
-if [ ! -d "$IPHONESIMULATOR_PLATFORM" ]; then
-  echo "Cannot find $IPHONESIMULATOR_PLATFORM"
-  exit 1
-fi
-
-if [ ! -d "$IPHONESIMULATOR_SDK" ]; then
-  echo "Cannot find $IPHONESIMULATOR_SDK"
-  exit 1
-fi
-
-if [ ! -x "$IPHONESIMULATOR_GCC" ]; then
-  echo "Cannot find $IPHONESIMULATOR_GCC"
-  exit 1
-fi
-
-# Clean up whatever was left from our previous build
-
-rm -rf include lib
-rm -rf /tmp/openssl-${OPENSSL_VERSION}-*
-rm -rf /tmp/openssl-${OPENSSL_VERSION}-*.*-log
-
-build()
-{
-   TARGET=$1
-   ARCH=$2
-   GCC=$3
-   SDK=$4
-   EXTRA=$5
-   rm -rf "openssl-${OPENSSL_VERSION}"
-   tar xfz "openssl-${OPENSSL_VERSION}.tar.gz"
-   pushd .
-   cd "openssl-${OPENSSL_VERSION}"
-   ./Configure ${TARGET} --openssldir="/tmp/openssl-${OPENSSL_VERSION}-${ARCH}" ${EXTRA} &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.log"
-   perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
-   perl -i -pe "s|^CC= gcc|CC= ${GCC} -arch ${ARCH} -miphoneos-version-min=${MIN_VERSION}|g" Makefile
-   perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDK} \$1|g" Makefile
-   make &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.build-log"
-   make install &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.install-log"
-   popd
-   rm -rf "openssl-${OPENSSL_VERSION}"
-}
-
-mkdir openssl
-cd openssl
-if [ ! -e ${OPENSSL_VERSION}.tar.gz ]; then
-echo "Downloading ${OPENSSL_VERSION}.tar.gz"
-curl -O http://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
-else
-echo "Using ${OPENSSL_VERSION}.tar.gz"
-fi
-
-
-build "BSD-generic32" "armv7" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
-build "BSD-generic32" "armv7s" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
-build "BSD-generic64" "arm64" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
-build "BSD-generic32" "i386" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" ""
-build "BSD-generic64" "x86_64" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" "-DOPENSSL_NO_ASM"
-
-#
-
-mkdir include
-cp -r /tmp/openssl-${OPENSSL_VERSION}-i386/include/openssl include/
-
-mkdir lib
-lipo \
-	"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libcrypto.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libcrypto.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libcrypto.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libcrypto.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libcrypto.a" \
-	-create -output lib/libcrypto.a
-lipo \
-	"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libssl.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libssl.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libssl.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libssl.a" \
-	"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libssl.a" \
-	-create -output lib/libssl.a
-
-rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*"
-rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*.*-log"
-

Launch Screen.xib

@@ -1,35 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="landscape" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <navigationController id="vV9-32-ww6">
-            <navigationBar key="navigationBar" contentMode="scaleToFill" id="y2P-aE-Haa">
-                <rect key="frame" x="0.0" y="0.0" width="896" height="44"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <color key="barTintColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            </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">
-                        <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.3333333432674408" green="0.3333333432674408" blue="0.3333333432674408" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="rW0-BH-s7l"/>
-                </viewController>
-            </viewControllers>
-            <point key="canvasLocation" x="34" y="149"/>
-        </navigationController>
+        <view contentMode="scaleToFill" id="VWy-YH-qYj">
+            <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <point key="canvasLocation" x="33" y="187"/>
+        </view>
     </objects>
 </document>

Limelight/AppDelegate.h

@@ -6,19 +6,13 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
-#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
-#else
-#import <Cocoa/Cocoa.h>
-@interface AppDelegate : NSObject <NSApplicationDelegate>
-
-@property (readonly, strong) NSPersistentContainer *persistentContainer;
-@property (strong, nonatomic) NSWindow *window;
-#endif
+@property (strong, nonatomic) NSString *pcUuidToLoad;
+@property (strong, nonatomic) void (^shortcutCompletionHandler)(BOOL);
 
 @property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
 @property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;

Limelight/AppDelegate.m

@@ -18,19 +18,27 @@ static NSOperationQueue* mainQueue;
 
 #if TARGET_OS_TV
 static NSString* DB_NAME = @"Moonlight_tvOS.bin";
-#elif TARGET_OS_IPHONE
-static NSString* DB_NAME = @"Limelight_iOS.sqlite";
 #else
-static NSString* DB_NAME = @"moonlight_mac.sqlite";
+static NSString* DB_NAME = @"Limelight_iOS.sqlite";
 #endif
 
-#if TARGET_OS_IPHONE
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+#if !TARGET_OS_TV
+    UIApplicationShortcutItem* shortcut = [launchOptions valueForKey:UIApplicationLaunchOptionsShortcutItemKey];
+    if (shortcut != nil) {
+        _pcUuidToLoad = (NSString*)[shortcut.userInfo objectForKey:@"UUID"];
+    }
+#endif
     return YES;
 }
 
+#if !TARGET_OS_TV
+- (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded))completionHandler {
+    _pcUuidToLoad = (NSString*)[shortcutItem.userInfo objectForKey:@"UUID"];
+    _shortcutCompletionHandler = completionHandler;
+}
+#endif
+
 - (void)applicationWillResignActive:(UIApplication *)application
 {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
@@ -58,17 +66,6 @@ static NSString* DB_NAME = @"moonlight_mac.sqlite";
     // Saves changes in the application's managed object context before the application terminates.
     [self saveContext];
 }
-#else
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-    // Insert code here to initialize your application
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification {
-    // Insert code here to tear down your application
-    [self saveContext];
-}
-
-#endif
 
 - (void)saveContext
 {

Limelight/Crypto/CryptoManager.m

@@ -9,7 +9,6 @@
 #import "CryptoManager.h"
 #import "mkcert.h"
 
-#include <openssl/aes.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
@@ -45,46 +44,47 @@ static NSData* p12 = nil;
 }
 
 - (NSData*) aesEncrypt:(NSData*)data withKey:(NSData*)key {
-    AES_KEY aesKey;
-    AES_set_encrypt_key([key bytes], 128, &aesKey);
-    int size = [self getEncryptSize:data];
-    unsigned char* buffer = malloc(size);
-    unsigned char* blockRoundedBuffer = calloc(1, size);
-    memcpy(blockRoundedBuffer, [data bytes], [data length]);
+    EVP_CIPHER_CTX* cipher;
+    int ciphertextLen;
+
+    cipher = EVP_CIPHER_CTX_new();
+
+    EVP_EncryptInit(cipher, EVP_aes_128_ecb(), [key bytes], NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    NSMutableData* ciphertext = [NSMutableData dataWithLength:[data length]];
+    EVP_EncryptUpdate(cipher,
+                      [ciphertext mutableBytes],
+                      &ciphertextLen,
+                      [data bytes],
+                      (int)[data length]);
+    assert(ciphertextLen == [ciphertext length]);
+
+    EVP_CIPHER_CTX_free(cipher);
     
-    // AES_encrypt only encrypts the first 16 bytes so iterate the entire buffer
-    int blockOffset = 0;
-    while (blockOffset < size) {
-        AES_encrypt(blockRoundedBuffer + blockOffset, buffer + blockOffset, &aesKey);
-        blockOffset += 16;
-    }
-    
-    NSData* encryptedData = [NSData dataWithBytes:buffer length:size];
-    free(buffer);
-    free(blockRoundedBuffer);
-    return encryptedData;
+    return ciphertext;
 }
 
 - (NSData*) aesDecrypt:(NSData*)data withKey:(NSData*)key {
-    AES_KEY aesKey;
-    AES_set_decrypt_key([key bytes], 128, &aesKey);
-    unsigned char* buffer = malloc([data length]);
-    
-    // AES_decrypt only decrypts the first 16 bytes so iterate the entire buffer
-    int blockOffset = 0;
-    while (blockOffset < [data length]) {
-        AES_decrypt([data bytes] + blockOffset, buffer + blockOffset, &aesKey);
-        blockOffset += 16;
-    }
-    
-    NSData* decryptedData = [NSData dataWithBytes:buffer length:[data length]];
-    free(buffer);
-    return decryptedData;
-}
+    EVP_CIPHER_CTX* cipher;
+    int plaintextLen;
 
-- (int) getEncryptSize:(NSData*)data {
-    // the size is the length of the data ceiling to the nearest 16 bytes
-    return (((int)[data length] + 15) / 16) * 16;
+    cipher = EVP_CIPHER_CTX_new();
+
+    EVP_DecryptInit(cipher, EVP_aes_128_ecb(), [key bytes], NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    NSMutableData* plaintext = [NSMutableData dataWithLength:[data length]];
+    EVP_DecryptUpdate(cipher,
+                      [plaintext mutableBytes],
+                      &plaintextLen,
+                      [data bytes],
+                      (int)[data length]);
+    assert(plaintextLen == [plaintext length]);
+
+    EVP_CIPHER_CTX_free(cipher);
+    
+    return plaintext;
 }
 
 + (NSData*) pemToDer:(NSData*)pemCertBytes {
@@ -96,6 +96,7 @@ static NSData* p12 = nil;
     
     bio = BIO_new(BIO_s_mem());
     i2d_X509_bio(bio, x509);
+    X509_free(x509);
 
     BUF_MEM* mem;
     BIO_get_mem_ptr(bio, &mem);
@@ -222,18 +223,34 @@ static NSData* p12 = nil;
 + (NSData *)getSignatureFromCert:(NSData *)cert {
     BIO* bio = BIO_new_mem_buf([cert bytes], (int)[cert length]);
     X509* x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+    BIO_free(bio);
     
     if (!x509) {
         Log(LOG_E, @"Unable to parse certificate in memory!");
         return NULL;
     }
-    return [NSData dataWithBytes:x509->signature->data length:x509->signature->length];
+    
+#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
+    ASN1_BIT_STRING *asnSignature = x509->signature;
+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, x509);
+#else
+    const ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, x509);
+#endif
+    
+    NSData* sig = [NSData dataWithBytes:asnSignature->data length:asnSignature->length];
+    
+    X509_free(x509);
+    
+    return sig;
 }
 
 + (NSData*)getKeyFromCertKeyPair:(CertKeyPair*)certKeyPair {
     BIO* bio = BIO_new(BIO_s_mem());
     
-    PEM_write_bio_PrivateKey(bio, certKeyPair->pkey, NULL, NULL, 0, NULL, NULL);
+    PEM_write_bio_PrivateKey_traditional(bio, certKeyPair->pkey, NULL, NULL, 0, NULL, NULL);
     
     BUF_MEM* mem;
     BIO_get_mem_ptr(bio, &mem);

Limelight/Crypto/mkcert.c

@@ -4,54 +4,88 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <openssl/evp.h>
 #include <openssl/pem.h>
-#include <openssl/conf.h>
-#include <openssl/pkcs12.h>
-
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
+#include <OpenSSL/provider.h>
+#include <OpenSSL/rsa.h>
+#include <openssl/x509.h>
+#include <OpenSSL/rand.h>
 
 static const int NUM_BITS = 2048;
 static const int SERIAL = 0;
-static const int NUM_YEARS = 10;
+static const int NUM_YEARS = 20;
 
-int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years);
-int add_ext(X509 *cert, int nid, char *value);
+void mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
+    X509* cert = X509_new();
+    
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+
+    EVP_PKEY_keygen_init(ctx);
+    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits);
+
+    // pk must be initialized on input
+    EVP_PKEY* pk = NULL;
+    EVP_PKEY_keygen(ctx, &pk);
+
+    EVP_PKEY_CTX_free(ctx);
+    
+    X509_set_version(cert, 2);
+    ASN1_INTEGER_set(X509_get_serialNumber(cert), serial);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    X509_gmtime_adj(X509_get_notBefore(cert), 0);
+    X509_gmtime_adj(X509_get_notAfter(cert), 60 * 60 * 24 * 365 * years);
+#else
+    ASN1_TIME* before = ASN1_STRING_dup(X509_get0_notBefore(cert));
+    ASN1_TIME* after = ASN1_STRING_dup(X509_get0_notAfter(cert));
+
+    X509_gmtime_adj(before, 0);
+    X509_gmtime_adj(after, 60 * 60 * 24 * 365 * years);
+
+    X509_set1_notBefore(cert, before);
+    X509_set1_notAfter(cert, after);
+
+    ASN1_STRING_free(before);
+    ASN1_STRING_free(after);
+#endif
+
+    X509_set_pubkey(cert, pk);
+
+    X509_NAME* name = X509_get_subject_name(cert);
+    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
+                               (const unsigned char*)"NVIDIA GameStream Client",
+                               -1, -1, 0);
+    X509_set_issuer_name(cert, name);
+
+    X509_sign(cert, pk, EVP_sha256());
+    
+    *x509p = cert;
+    *pkeyp = pk;
+}
 
 struct CertKeyPair generateCertKeyPair(void) {
-    BIO *bio_err;
     X509 *x509 = NULL;
     EVP_PKEY *pkey = NULL;
     PKCS12 *p12 = NULL;
-   
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-    
-    SSLeay_add_all_algorithms();
-    ERR_load_crypto_strings();
     
     mkcert(&x509, &pkey, NUM_BITS, SERIAL, NUM_YEARS);
-
-    p12 = PKCS12_create("limelight", "GameStream", pkey, x509, NULL, 0, 0, 0, 0, 0);
+    
+    char* pass = "limelight";
+    p12 = PKCS12_create(pass,
+                        "GameStream",
+                        pkey,
+                        x509,
+                        NULL,
+                        NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+                        -1, // disable certificate encryption
+                        2048,
+                        -1, // disable the automatic MAC
+                        0);
+    // MAC it ourselves with SHA1 since iOS refuses to load anything else.
+    PKCS12_set_mac(p12, pass, -1, NULL, 0, 1, EVP_sha1());
+    
     if (p12 == NULL) {
         printf("Error generating a valid PKCS12 certificate.\n");
     }
-
-    // Debug Print statements
-    //RSA_print_fp(stdout, pkey->pkey.rsa, 0);
-    //X509_print_fp(stdout, x509);
-    //PEM_write_PUBKEY(stdout, pkey);
-    //PEM_write_PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL);
-    //PEM_write_X509(stdout, x509);
-    
-#ifndef OPENSSL_NO_ENGINE
-    ENGINE_cleanup();
-#endif
-    CRYPTO_cleanup_all_ex_data();
-    
-    CRYPTO_mem_leaks(bio_err);
-    BIO_free(bio_err);
     
     return (CertKeyPair){x509, pkey, p12};
 }
@@ -61,60 +95,3 @@ void freeCertKeyPair(struct CertKeyPair certKeyPair) {
     EVP_PKEY_free(certKeyPair.pkey);
     PKCS12_free(certKeyPair.p12);
 }
-
-int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int years) {
-    X509 *x;
-    EVP_PKEY *pk;
-    RSA *rsa;
-    X509_NAME *name = NULL;
-    
-    if (*pkeyp == NULL) {
-        if ((pk=EVP_PKEY_new()) == NULL) {
-            return(0);
-        }
-    } else {
-        pk = *pkeyp;
-    }
-    
-    if (*x509p == NULL) {
-        if ((x = X509_new()) == NULL) {
-            goto err;
-        }
-    } else {
-        x = *x509p;
-    }
-    
-    rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
-    if (!EVP_PKEY_assign_RSA(pk, rsa)) {
-        goto err;
-    }
-    
-    X509_set_version(x, 2);
-    ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
-    X509_gmtime_adj(X509_get_notBefore(x), 0);
-    X509_gmtime_adj(X509_get_notAfter(x), (long)60*60*24*365*years);
-    X509_set_pubkey(x, pk);
-    
-    name = X509_get_subject_name(x);
-    
-    /* This function creates and adds the entry, working out the
-     * correct string type and performing checks on its length.
-     */
-    X509_NAME_add_entry_by_txt(name,"CN", MBSTRING_ASC, (unsigned char*)"NVIDIA GameStream Client", -1, -1, 0);
-    
-    /* Its self signed so set the issuer name to be the same as the
-     * subject.
-     */
-    X509_set_issuer_name(x, name);
-    
-    if (!X509_sign(x, pk, EVP_sha256())) {
-        goto err;
-    }
-    
-    *x509p = x;
-    *pkeyp = pk;
-    
-    return(1);
-err:
-    return(0);
-}

Limelight/Database/DataManager.h

@@ -17,13 +17,18 @@
                        framerate:(NSInteger)framerate
                           height:(NSInteger)height
                            width:(NSInteger)width
+                audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
-                          remote:(BOOL)streamingRemotely
                    optimizeGames:(BOOL)optimizeGames
                  multiController:(BOOL)multiController
+                 swapABXYButtons:(BOOL)swapABXYButtons
                        audioOnPC:(BOOL)audioOnPC
-                         useHevc:(BOOL)useHevc
-                       enableHdr:(BOOL)enableHdr;
+                  preferredCodec:(uint32_t)preferredCodec
+                  useFramePacing:(BOOL)useFramePacing
+                       enableHdr:(BOOL)enableHdr
+                  btMouseSupport:(BOOL)btMouseSupport
+               absoluteTouchMode:(BOOL)absoluteTouchMode
+                    statsOverlay:(BOOL)statsOverlay;
 
 - (NSArray*) getHosts;
 - (void) updateHost:(TemporaryHost*)host;

Limelight/Database/DataManager.m

@@ -21,12 +21,11 @@
     // HACK: Avoid calling [UIApplication delegate] off the UI thread to keep
     // Main Thread Checker happy.
     if ([NSThread isMainThread]) {
-        _appDelegate = (AppDelegate *)[[OSApplication sharedApplication] delegate];
-        
+        _appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
     }
     else {
         dispatch_sync(dispatch_get_main_queue(), ^{
-            self->_appDelegate = (AppDelegate *)[[OSApplication sharedApplication] delegate];
+            self->_appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
         });
     }
     
@@ -57,13 +56,18 @@
                        framerate:(NSInteger)framerate
                           height:(NSInteger)height
                            width:(NSInteger)width
+                     audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
-                          remote:(BOOL)streamingRemotely
                    optimizeGames:(BOOL)optimizeGames
                  multiController:(BOOL)multiController
+                 swapABXYButtons:(BOOL)swapABXYButtons
                        audioOnPC:(BOOL)audioOnPC
-                         useHevc:(BOOL)useHevc
-                       enableHdr:(BOOL)enableHdr {
+                  preferredCodec:(uint32_t)preferredCodec
+                  useFramePacing:(BOOL)useFramePacing
+                       enableHdr:(BOOL)enableHdr
+                  btMouseSupport:(BOOL)btMouseSupport
+               absoluteTouchMode:(BOOL)absoluteTouchMode
+                    statsOverlay:(BOOL)statsOverlay {
     
     [_managedObjectContext performBlockAndWait:^{
         Settings* settingsToSave = [self retrieveSettings];
@@ -71,13 +75,18 @@
         settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
         settingsToSave.height = [NSNumber numberWithInteger:height];
         settingsToSave.width = [NSNumber numberWithInteger:width];
+        settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig];
         settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
-        settingsToSave.streamingRemotely = streamingRemotely;
         settingsToSave.optimizeGames = optimizeGames;
         settingsToSave.multiController = multiController;
+        settingsToSave.swapABXYButtons = swapABXYButtons;
         settingsToSave.playAudioOnPC = audioOnPC;
-        settingsToSave.useHevc = useHevc;
+        settingsToSave.preferredCodec = preferredCodec;
+        settingsToSave.useFramePacing = useFramePacing;
         settingsToSave.enableHdr = enableHdr;
+        settingsToSave.btMouseSupport = btMouseSupport;
+        settingsToSave.absoluteTouchMode = absoluteTouchMode;
+        settingsToSave.statsOverlay = statsOverlay;
         
         [self saveData];
     }];

Limelight/Database/TemporaryApp.h

@@ -15,6 +15,7 @@
 @property (nullable, nonatomic, retain) NSString *name;
 @property (nullable, nonatomic, retain) NSString *installPath;
 @property (nonatomic)                   BOOL hdrSupported;
+@property (nonatomic)                   BOOL hidden;
 @property (nullable, nonatomic, retain) TemporaryHost *host;
 
 NS_ASSUME_NONNULL_BEGIN

Limelight/Database/TemporaryApp.m

@@ -16,6 +16,7 @@
     self.id = app.id;
     self.name = app.name;
     self.hdrSupported = app.hdrSupported;
+    self.hidden = app.hidden;
     self.host = tempHost;
     
     return self;
@@ -25,6 +26,7 @@
     parent.id = self.id;
     parent.name = self.name;
     parent.hdrSupported = self.hdrSupported;
+    parent.hidden = self.hidden;
     parent.host = host;
 }
 
@@ -41,7 +43,7 @@
         return YES;
     }
     
-    if (![object isKindOfClass:[App class]]) {
+    if (![object isKindOfClass:[self class]]) {
         return NO;
     }
     

Limelight/Database/TemporaryHost.h

@@ -11,24 +11,26 @@
 
 @interface TemporaryHost : NSObject
 
-@property (nonatomic) State state;
-@property (nonatomic) PairState pairState;
-@property (nonatomic, nullable) NSString * activeAddress;
-@property (nonatomic, nullable) NSString * currentGame;
+@property (atomic) State state;
+@property (atomic) PairState pairState;
+@property (atomic, nullable, retain) NSString * activeAddress;
+@property (atomic, nullable, retain) NSString * currentGame;
+@property (atomic) unsigned short httpsPort;
+@property (atomic) BOOL isNvidiaServerSoftware;
 
-@property (nonatomic, nullable, retain) NSData *serverCert;
-@property (nonatomic, nullable, retain) NSString *address;
-@property (nonatomic, nullable, retain) NSString *externalAddress;
-@property (nonatomic, nullable, retain) NSString *localAddress;
-@property (nonatomic, nullable, retain) NSString *ipv6Address;
-@property (nonatomic, nullable, retain) NSString *mac;
-@property (nonatomic)         int serverCodecModeSupport;
+@property (atomic, nullable, retain) NSData *serverCert;
+@property (atomic, nullable, retain) NSString *address;
+@property (atomic, nullable, retain) NSString *externalAddress;
+@property (atomic, nullable, retain) NSString *localAddress;
+@property (atomic, nullable, retain) NSString *ipv6Address;
+@property (atomic, nullable, retain) NSString *mac;
+@property (atomic)                   int serverCodecModeSupport;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@property (nonatomic, retain) NSString *name;
-@property (nonatomic, retain) NSString *uuid;
-@property (nonatomic, retain) NSMutableSet *appList;
+@property (atomic, retain) NSString *name;
+@property (atomic, retain) NSString *uuid;
+@property (atomic, retain) NSSet *appList;
 
 - (id) initFromHost:(Host*)host;
 

Limelight/Database/TemporaryHost.m

@@ -34,6 +34,11 @@
     self.serverCodecModeSupport = host.serverCodecModeSupport;
     self.serverCert = host.serverCert;
     
+    // Older clients stored a non-URL-escaped IPv6 string. Try to detect that and fix it up.
+    if (![self.ipv6Address containsString:@"["]) {
+        self.ipv6Address = [Utils addressAndPortToAddressPortString:self.ipv6Address port:47989];
+    }
+    
     // Ensure we don't use a stale cached pair state if we haven't pinned the cert yet
     self.pairState = host.serverCert ? [host.pairState intValue] : PairStateUnpaired;
     
@@ -90,7 +95,7 @@
         return YES;
     }
     
-    if (![object isKindOfClass:[Host class]]) {
+    if (![object isKindOfClass:[self class]]) {
         return NO;
     }
     

Limelight/Database/TemporarySettings.h

@@ -16,14 +16,24 @@
 @property (nonatomic, retain) NSNumber * framerate;
 @property (nonatomic, retain) NSNumber * height;
 @property (nonatomic, retain) NSNumber * width;
+@property (nonatomic, retain) NSNumber * audioConfig;
 @property (nonatomic, retain) NSNumber * onscreenControls;
 @property (nonatomic, retain) NSString * uniqueId;
-@property (nonatomic) BOOL streamingRemotely;
-@property (nonatomic) BOOL useHevc;
+@property (nonatomic) enum {
+    CODEC_PREF_AUTO,
+    CODEC_PREF_H264,
+    CODEC_PREF_HEVC,
+    CODEC_PREF_AV1,
+} preferredCodec;
+@property (nonatomic) BOOL useFramePacing;
 @property (nonatomic) BOOL multiController;
+@property (nonatomic) BOOL swapABXYButtons;
 @property (nonatomic) BOOL playAudioOnPC;
 @property (nonatomic) BOOL optimizeGames;
 @property (nonatomic) BOOL enableHdr;
+@property (nonatomic) BOOL btMouseSupport;
+@property (nonatomic) BOOL absoluteTouchMode;
+@property (nonatomic) BOOL statsOverlay;
 
 - (id) initFromSettings:(Settings*)settings;
 

Limelight/Database/TemporarySettings.m

@@ -17,26 +17,34 @@
     self.parent = settings;
     
 #if TARGET_OS_TV
-    NSInteger _bitrate = [[NSUserDefaults standardUserDefaults] integerForKey:@"bitrate"];
-    NSInteger _framerate = [[NSUserDefaults standardUserDefaults] integerForKey:@"framerate"];
-
-    if (_bitrate) {
-        self.bitrate = [NSNumber numberWithInteger:_bitrate];
-    } else {
-        self.bitrate = [NSNumber numberWithInteger:20000];
+    // Apply default values from our Root.plist
+    NSString* settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
+    NSDictionary* settingsData = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]];
+    NSArray* preferences = [settingsData objectForKey:@"PreferenceSpecifiers"];
+    NSMutableDictionary* defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]];
+    for (NSDictionary* prefSpecification in preferences) {
+        NSString* key = [prefSpecification objectForKey:@"Key"];
+        if (key != nil) {
+            [defaultsToRegister setObject:[prefSpecification objectForKey:@"DefaultValue"] forKey:key];
+        }
     }
-
-    if (_framerate) {
-        self.framerate = [NSNumber numberWithInteger:_framerate];
-    } else {
-        self.framerate = [NSNumber numberWithInteger:60];
-    }
-
-    self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc"] || NO;
-    self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"] || NO;
-    self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"] || NO;
-    self.optimizeGames = [[NSUserDefaults standardUserDefaults] boolForKey:@"optimizeGames"] || YES;
-    self.multiController = [[NSUserDefaults standardUserDefaults] boolForKey:@"multipleControllers"] || YES;
+    [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister];
+    
+    self.bitrate = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"bitrate"]];
+    assert([self.bitrate intValue] != 0);
+    self.framerate = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"framerate"]];
+    assert([self.framerate intValue] != 0);
+    self.audioConfig = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"audioConfig"]];
+    assert([self.audioConfig intValue] != 0);
+    self.preferredCodec = (typeof(self.preferredCodec))[[NSUserDefaults standardUserDefaults] integerForKey:@"preferredCodec"];
+    self.useFramePacing = [[NSUserDefaults standardUserDefaults] integerForKey:@"useFramePacing"] != 0;
+    self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"];
+    self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"];
+    self.optimizeGames = [[NSUserDefaults standardUserDefaults] boolForKey:@"optimizeGames"];
+    self.multiController = [[NSUserDefaults standardUserDefaults] boolForKey:@"multipleControllers"];
+    self.swapABXYButtons = [[NSUserDefaults standardUserDefaults] boolForKey:@"swapABXYButtons"];
+    self.btMouseSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"btMouseSupport"];
+    self.statsOverlay = [[NSUserDefaults standardUserDefaults] boolForKey:@"statsOverlay"];
     
     NSInteger _screenSize = [[NSUserDefaults standardUserDefaults] integerForKey:@"streamResolution"];
     switch (_screenSize) {
@@ -44,15 +52,20 @@
             self.height = [NSNumber numberWithInteger:720];
             self.width = [NSNumber numberWithInteger:1280];
             break;
+        case 1:
+            self.height = [NSNumber numberWithInteger:1080];
+            self.width = [NSNumber numberWithInteger:1920];
+            break;
         case 2:
             self.height = [NSNumber numberWithInteger:2160];
             self.width = [NSNumber numberWithInteger:3840];
             break;
-        case 1:
-        default:
-            self.height = [NSNumber numberWithInteger:1080];
-            self.width = [NSNumber numberWithInteger:1920];
+        case 3:
+            self.height = [NSNumber numberWithInteger:1440];
+            self.width = [NSNumber numberWithInteger:2560];
             break;
+        default:
+            abort();
     }
     self.onscreenControls = [NSNumber numberWithInteger:OnScreenControlsLevelOff];
 #else
@@ -60,15 +73,20 @@
     self.framerate = settings.framerate;
     self.height = settings.height;
     self.width = settings.width;
-    self.useHevc = settings.useHevc;
+    self.audioConfig = settings.audioConfig;
+    self.preferredCodec = settings.preferredCodec;
+    self.useFramePacing = settings.useFramePacing;
     self.playAudioOnPC = settings.playAudioOnPC;
     self.enableHdr = settings.enableHdr;
     self.optimizeGames = settings.optimizeGames;
     self.multiController = settings.multiController;
+    self.swapABXYButtons = settings.swapABXYButtons;
     self.onscreenControls = settings.onscreenControls;
+    self.btMouseSupport = settings.btMouseSupport;
+    self.absoluteTouchMode = settings.absoluteTouchMode;
+    self.statsOverlay = settings.statsOverlay;
 #endif
     self.uniqueId = settings.uniqueId;
-    self.streamingRemotely = settings.streamingRemotely;
     
     return self;
 }

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

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
+      "filename" : "AltIcon.png",
       "idiom" : "universal",
-      "filename" : "settings.pdf",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Limelight/Images.xcassets/Computer.imageset/Computer.pdf

@@ -5,11 +5,13 @@
    /Filter /FlateDecode
 >>
 stream
-xœ]‘]!„ß{Š^ÀÊ”Àâ1<‚Ùøó êý…E
	»ÛN‡Yp°µƒmª‰×=)´³×•÷§À×7iØ·¸Hbä"‹= ¯3_\W«F­Æ!K©%­ðÁ½ÛñÎX¤@;$Ú®‹ ”mÊê@Œ¬Ç¿ ‰µµ+¸“!ïd<C3AF>±ùË}œ#¡TÙ;7_Û«†,ÚLÙ˜EˆMHS~»ì8Ðà—î<>$ëô¾±ÍX™F—ØÙ´<òŸ\W¾Í¤MlæÜûþeÓeÇÿÎé¦Lg7
+xœ]‘[ƒ Eÿ³Šl )
y¸Œ.¡ÃTû¡µûŸi€ Õa9×›<07>ÑȺ±l.zÌ+|ÀTm›ñþ48a”ä_°äÑ&&ë‘SØ^8
cYÕÍÅíl"‹«Æ5ºá‚v¤<76>’"{
+ò<9¶<39>j<EFBFBD>­7Ö!Db	×,Ú<>–PÊbåÐjt¤•øzÅÚœÔ:ƒº,'á½â‚ýÒ‡ wRÁù‘Ê|µ8)’w
+-{GÍÑsµ™<C2B5>æüÞG^’íosû»£MÅkäø
à=h_
 endstream
 endobj
 5 0 obj
-   212
+   214
 endobj
 3 0 obj
 <<
@@ -22,7 +24,7 @@ endobj
 2 0 obj
 << /Type /Page % 1
    /Parent 1 0 R
-   /MediaBox [ 0 0 225 225 ]
+   /MediaBox [ 0 0 375 375 ]
    /Contents 4 0 R
    /Group <<
       /Type /Group
@@ -41,7 +43,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (D:20190830180928-07'00)
+   /CreationDate (D:20190922201805-07'00)
 >>
 endobj
 7 0 obj
@@ -52,18 +54,18 @@ endobj
 xref
 0 8
 0000000000 65535 f 
-0000000648 00000 n 
-0000000430 00000 n 
-0000000326 00000 n 
+0000000650 00000 n 
+0000000432 00000 n 
+0000000328 00000 n 
 0000000015 00000 n 
-0000000304 00000 n 
-0000000713 00000 n 
-0000000829 00000 n 
+0000000306 00000 n 
+0000000715 00000 n 
+0000000831 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-881
+883
 %%EOF

Limelight/Images.xcassets/Contents.json

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

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

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

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

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

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

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

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

@@ -5,11 +5,11 @@
    /Filter /FlateDecode
 >>
 stream
-xœeŒÑ	Ã0Dÿ5Å-Uªì(kt„Rhò¤Ýª8µ	<04>t︓Bb<06>å¯B)öù̸=ó—Œõž1fã¸òä<C3B2>W˜sW½P’jçjXbó†kG	Ý’rî%c?õì=ÓãÍ?ÜðÒ~Óƒ~®L+·
+xœUMA€ »ïý€¸<E282AC> ßð	ÆD=ÈAý"L4š&[»µ›€3ÉE<cJ´“ àXÐŽŒå¤`¬‡8)-A:gúWo(ÜšÂVŠ:Õ	!ª±n«bμú”?©ØB*žL¸ܶðÿUS3
t
H(å
 endstream
 endobj
 5 0 obj
-   115
+   110
 endobj
 3 0 obj
 <<
@@ -21,7 +21,7 @@ endobj
 2 0 obj
 << /Type /Page % 1
    /Parent 1 0 R
-   /MediaBox [ 0 0 75 75 ]
+   /MediaBox [ 0 0 150 150 ]
    /Contents 4 0 R
    /Group <<
       /Type /Group
@@ -40,7 +40,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (D:20190830180932-07'00)
+   /CreationDate (D:20190922201819-07'00)
 >>
 endobj
 7 0 obj
@@ -51,18 +51,18 @@ endobj
 xref
 0 8
 0000000000 65535 f 
-0000000517 00000 n 
-0000000301 00000 n 
-0000000229 00000 n 
+0000000514 00000 n 
+0000000296 00000 n 
+0000000224 00000 n 
 0000000015 00000 n 
-0000000207 00000 n 
-0000000582 00000 n 
-0000000698 00000 n 
+0000000202 00000 n 
+0000000579 00000 n 
+0000000695 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-750
+747
 %%EOF

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

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

Limelight/Images.xcassets/SettingsButton.imageset/settings.pdf

@@ -1,70 +0,0 @@
-%PDF-1.5
-%µí®û
-4 0 obj
-<< /Length 5 0 R
-   /Filter /FlateDecode
->>
-stream
-xœeTIŽÜ0¼óú@‰Z,=#OÌÌA}Hò ,.==	°»d®Å¢j*òûVåq<C3A5>t?èÕ„ßï÷ôýgIï¨]y¤V3<56>ôH­ç2Ù¡?¿ÁøvÐKÞm¹
¥Þòåö÷ƒþ|=òp,EØÏ„ö÷N4vnbjÏGª#OxRå\ÇL¯68Z+€™ß‰<0C>p´÷ä¼*G”iÆî3ÃÕ}ÓQ¯Þã ^Ê‘ûÜÿÄ<O¬ER„úR\¸Jï-ï2<C3AF>‘G
-´2×
OA nŸ;J^CXFR¾V»!PïJ” 8	šÂ<C5A1>øv8
Ö,G³Î
<Q°À.¾×¥VÛ<56>|ÄX¯Üa\2zí37)qT+fä‚䌗iGJ‚«¦ílyVîÒÏ
ÖK<>iZã¦Wû¦ˆ Î–+¿L·±5jX<6A>~µP‚J«šH<C5A1>)»~6xïè
^¼´@i°ŒÎE_wbŽ¦.e‹«%V^PsÙg.ÙâêŒê´^ºrw€J0Ê„—°$Ã!@’ti^[•­µiZØÅ€¬»‡PADt?áTúÃqê"zÔáô¤B<C2A4>íš•Ô”	Šz[±²naä·÷*ô Ë	"·ÊÁ+Ã$úÇ;Hæ®*ò
°2<C2B0>á@qlÂóÙÁ³w‚
WªÒωѣV9vYø2ºhžW„«Ê0™1s7pAz(—+©\ÎÞÃ<C39E>ÚU=êD±
-lèk"
š}<7D>Ę•-_²—m }%ßO0ë›®½Ïë»-X·Ëö¾Ùú­€yÖ
¶üÖZÛy^)&†¸nL(¯WÑÿWÓý ¿¾?1
-endstream
-endobj
-5 0 obj
-   608
-endobj
-3 0 obj
-<<
-   /ExtGState <<
-      /a0 << /CA 1 /ca 1 >>
-   >>
->>
-endobj
-2 0 obj
-<< /Type /Page % 1
-   /Parent 1 0 R
-   /MediaBox [ 0 0 75 75 ]
-   /Contents 4 0 R
-   /Group <<
-      /Type /Group
-      /S /Transparency
-      /I true
-      /CS /DeviceRGB
-   >>
-   /Resources 3 0 R
->>
-endobj
-1 0 obj
-<< /Type /Pages
-   /Kids [ 2 0 R ]
-   /Count 1
->>
-endobj
-6 0 obj
-<< /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (D:20190830202122-07'00)
->>
-endobj
-7 0 obj
-<< /Type /Catalog
-   /Pages 1 0 R
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000001010 00000 n 
-0000000794 00000 n 
-0000000722 00000 n 
-0000000015 00000 n 
-0000000700 00000 n 
-0000001075 00000 n 
-0000001191 00000 n 
-trailer
-<< /Size 8
-   /Root 7 0 R
-   /Info 6 0 R
->>
-startxref
-1243
-%%EOF

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

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

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

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

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

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

Limelight/Input/AbsoluteTouchHandler.h

@@ -0,0 +1,19 @@
+//
+//  AbsoluteTouchHandler.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 11/1/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "StreamView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AbsoluteTouchHandler : UIResponder
+
+-(id)initWithView:(StreamView*)view;
+
+@end
+
+NS_ASSUME_NONNULL_END

Limelight/Input/AbsoluteTouchHandler.m

@@ -0,0 +1,120 @@
+//
+//  AbsoluteTouchHandler.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 11/1/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "AbsoluteTouchHandler.h"
+
+#include <Limelight.h>
+
+// How long the fingers must be stationary to start a right click
+#define LONG_PRESS_ACTIVATION_DELAY 0.650f
+
+// How far the finger can move before it cancels a right click
+#define LONG_PRESS_ACTIVATION_DELTA 0.01f
+
+// How long the double tap deadzone stays in effect between touch up and touch down
+#define DOUBLE_TAP_DEAD_ZONE_DELAY 0.250f
+
+// How far the finger can move before it can override the double tap deadzone
+#define DOUBLE_TAP_DEAD_ZONE_DELTA 0.025f
+
+@implementation AbsoluteTouchHandler {
+    StreamView* view;
+    
+    NSTimer* longPressTimer;
+    UITouch* lastTouchDown;
+    CGPoint lastTouchDownLocation;
+    UITouch* lastTouchUp;
+    CGPoint lastTouchUpLocation;
+}
+
+- (id)initWithView:(StreamView*)view {
+    self = [self init];
+    self->view = view;
+    return self;
+}
+
+- (void)onLongPressStart:(NSTimer*)timer {
+    // Raise the left click and start a right click
+    LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    // Ignore touch down events with more than one finger
+    if ([[event allTouches] count] > 1) {
+        return;
+    }
+    
+    UITouch* touch = [touches anyObject];
+    CGPoint touchLocation = [touch locationInView:view];
+    
+    // Don't reposition for finger down events within the deadzone. This makes double-clicking easier.
+    if (touch.timestamp - lastTouchUp.timestamp > DOUBLE_TAP_DEAD_ZONE_DELAY ||
+        sqrt(pow((touchLocation.x / view.bounds.size.width) - (lastTouchUpLocation.x / view.bounds.size.width), 2) +
+             pow((touchLocation.y / view.bounds.size.height) - (lastTouchUpLocation.y / view.bounds.size.height), 2)) > DOUBLE_TAP_DEAD_ZONE_DELTA) {
+        [view updateCursorLocation:touchLocation isMouse:NO];
+    }
+    
+    // Press the left button down
+    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+    
+    // Start the long press timer
+    longPressTimer = [NSTimer scheduledTimerWithTimeInterval:LONG_PRESS_ACTIVATION_DELAY
+                                                      target:self
+                                                    selector:@selector(onLongPressStart:)
+                                                    userInfo:nil
+                                                     repeats:NO];
+    
+    lastTouchDown = touch;
+    lastTouchDownLocation = touchLocation;
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+    // Ignore touch move events with more than one finger
+    if ([[event allTouches] count] > 1) {
+        return;
+    }
+    
+    UITouch* touch = [touches anyObject];
+    CGPoint touchLocation = [touch locationInView:view];
+    
+    if (sqrt(pow((touchLocation.x / view.bounds.size.width) - (lastTouchDownLocation.x / view.bounds.size.width), 2) +
+             pow((touchLocation.y / view.bounds.size.height) - (lastTouchDownLocation.y / view.bounds.size.height), 2)) > LONG_PRESS_ACTIVATION_DELTA) {
+        // Moved too far since touch down. Cancel the long press timer.
+        [longPressTimer invalidate];
+        longPressTimer = nil;
+    }
+    
+    [view updateCursorLocation:[[touches anyObject] locationInView:view] isMouse:NO];
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+    // Only fire this logic if all touches have ended
+    if ([[event allTouches] count] == [touches count]) {
+        // Cancel the long press timer
+        [longPressTimer invalidate];
+        longPressTimer = nil;
+
+        // Left button up on finger up
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+
+        // Raise right button too in case we triggered a long press gesture
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+        
+        // Remember this last touch for touch-down deadzoning
+        lastTouchUp = [touches anyObject];
+        lastTouchUpLocation = [lastTouchUp locationInView:view];
+    }
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
+    // Treat this as a normal touchesEnded event
+    [self touchesEnded:touches withEvent:event];
+}
+
+@end

Limelight/Input/Controller.h

@@ -6,21 +6,48 @@
 //  Copyright © 2019 Moonlight Game Streaming Project. All rights reserved.
 //
 
+#import "HapticContext.h"
+
 @import GameController;
+@import CoreHaptics;
 
 @interface Controller : NSObject
 
+typedef struct {
+    float lastX;
+    float lastY;
+} controller_touch_context_t;
+
 @property (nullable, nonatomic, retain) GCController* gamepad;
 @property (nonatomic)                   int playerIndex;
 @property (nonatomic)                   int lastButtonFlags;
 @property (nonatomic)                   int emulatingButtonFlags;
+@property (nonatomic)                   int supportedEmulationFlags;
 @property (nonatomic)                   unsigned char lastLeftTrigger;
 @property (nonatomic)                   unsigned char lastRightTrigger;
 @property (nonatomic)                   short lastLeftStickX;
 @property (nonatomic)                   short lastLeftStickY;
 @property (nonatomic)                   short lastRightStickX;
 @property (nonatomic)                   short lastRightStickY;
-@property (nonatomic)                   unsigned short lowFreqMotor;
-@property (nonatomic)                   unsigned short highFreqMotor;
+
+@property (nonatomic)                   controller_touch_context_t primaryTouch;
+@property (nonatomic)                   controller_touch_context_t secondaryTouch;
+
+@property (nonatomic)                   HapticContext* _Nullable lowFreqMotor;
+@property (nonatomic)                   HapticContext* _Nullable highFreqMotor;
+@property (nonatomic)                   HapticContext* _Nullable leftTriggerMotor;
+@property (nonatomic)                   HapticContext* _Nullable rightTriggerMotor;
+
+@property (nonatomic)                   NSTimer* _Nullable accelTimer;
+@property (nonatomic)                   GCAcceleration lastAccelSample;
+@property (nonatomic)                   NSTimer* _Nullable gyroTimer;
+@property (nonatomic)                   GCRotationRate lastGyroSample;
+
+@property (nonatomic)                   NSTimer* _Nullable batteryTimer;
+@property (nonatomic)                   GCDeviceBatteryState lastBatteryState;
+@property (nonatomic)                   float lastBatteryLevel;
+
+@property (nonatomic)                   BOOL reportedArrival;
+@property (nonatomic)                   Controller* _Nullable mergedWithController;
 
 @end

Limelight/Input/ControllerSupport.h

@@ -6,35 +6,34 @@
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
 
-// Swift
-#if !TARGET_OS_IPHONE
-#import "Gamepad.h"
-#endif
 #import "StreamConfiguration.h"
 #import "Controller.h"
 
 @class OnScreenControls;
 
+@protocol ControllerSupportDelegate <NSObject>
+
+- (void) gamepadPresenceChanged;
+- (void) mousePresenceChanged;
+- (void) streamExitRequested;
+
+@end
+
 @interface ControllerSupport : NSObject
 
--(id) initWithConfig:(StreamConfiguration*)streamConfig;
+-(id) initWithConfig:(StreamConfiguration*)streamConfig delegate:(id<ControllerSupportDelegate>)delegate;
+-(void) connectionEstablished;
 
-#if TARGET_OS_IPHONE
 -(void) initAutoOnScreenControlMode:(OnScreenControls*)osc;
 -(void) cleanup;
 -(Controller*) getOscController;
-#else
--(void) assignGamepad:(struct Gamepad_device *)gamepad;
--(void) removeGamepad:(struct Gamepad_device *)gamepad;
--(NSMutableDictionary*) getControllers;
-#endif
 
 -(void) updateLeftStick:(Controller*)controller x:(short)x y:(short)y;
 -(void) updateRightStick:(Controller*)controller x:(short)x y:(short)y;
 
--(void) updateLeftTrigger:(Controller*)controller left:(char)left;
--(void) updateRightTrigger:(Controller*)controller right:(char)right;
--(void) updateTriggers:(Controller*)controller left:(char)left right:(char)right;
+-(void) updateLeftTrigger:(Controller*)controller left:(unsigned char)left;
+-(void) updateRightTrigger:(Controller*)controller right:(unsigned char)right;
+-(void) updateTriggers:(Controller*)controller left:(unsigned char)left right:(unsigned char)right;
 
 -(void) updateButtonFlags:(Controller*)controller flags:(int)flags;
 -(void) setButtonFlag:(Controller*)controller flags:(int)flags;
@@ -43,10 +42,12 @@
 -(void) updateFinished:(Controller*)controller;
 
 -(void) rumble:(unsigned short)controllerNumber lowFreqMotor:(unsigned short)lowFreqMotor highFreqMotor:(unsigned short)highFreqMotor;
+-(void) rumbleTriggers:(uint16_t)controllerNumber leftTrigger:(uint16_t)leftTrigger rightTrigger:(uint16_t)rightTrigger;
+-(void) setMotionEventState:(uint16_t)controllerNumber motionType:(uint8_t)motionType reportRateHz:(uint16_t)reportRateHz;
+-(void) setControllerLed:(uint16_t)controllerNumber r:(uint8_t)r g:(uint8_t)g b:(uint8_t)b;
 
 +(int) getConnectedGamepadMask:(StreamConfiguration*)streamConfig;
 
-@property (nonatomic, strong) id connectObserver;
-@property (nonatomic, strong) id disconnectObserver;
+-(NSUInteger) getConnectedGamepadCount;
 
 @end

Limelight/Input/HapticContext.h

@@ -0,0 +1,22 @@
+//
+//  HapticContext.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/17/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+@import CoreHaptics;
+@import GameController;
+
+@interface HapticContext : NSObject
+
+-(void)setMotorAmplitude:(unsigned short)amplitude;
+-(void)cleanup;
+
++(HapticContext*) createContextForHighFreqMotor:(GCController*)gamepad;
++(HapticContext*) createContextForLowFreqMotor:(GCController*)gamepad;
++(HapticContext*) createContextForLeftTrigger:(GCController*)gamepad;
++(HapticContext*) createContextForRightTrigger:(GCController*)gamepad;
+
+@end

Limelight/Input/HapticContext.m

@@ -0,0 +1,170 @@
+//
+//  HapticContext.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 9/17/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "HapticContext.h"
+
+@import CoreHaptics;
+@import GameController;
+
+@implementation HapticContext {
+    GCControllerPlayerIndex _playerIndex;
+    CHHapticEngine* _hapticEngine API_AVAILABLE(ios(13.0), tvos(14.0));
+    id<CHHapticPatternPlayer> _hapticPlayer API_AVAILABLE(ios(13.0), tvos(14.0));
+    BOOL _playing;
+}
+
+-(void)cleanup API_AVAILABLE(ios(14.0), tvos(14.0)) {
+    if (_hapticPlayer != nil) {
+        [_hapticPlayer cancelAndReturnError:nil];
+        _hapticPlayer = nil;
+    }
+    if (_hapticEngine != nil) {
+        [_hapticEngine stopWithCompletionHandler:nil];
+        _hapticEngine = nil;
+    }
+}
+
+-(void)setMotorAmplitude:(unsigned short)amplitude API_AVAILABLE(ios(14.0), tvos(14.0)) {
+    NSError* error;
+
+    // Check if the haptic engine died
+    if (_hapticEngine == nil) {
+        return;
+    }
+    
+    // Stop the effect entirely if the amplitude is 0
+    if (amplitude == 0) {
+        if (_playing) {
+            [_hapticPlayer stopAtTime:0 error:&error];
+            _playing = NO;
+        }
+        
+        return;
+    }
+
+    if (_hapticPlayer == nil) {
+        // We must initialize the intensity to 1.0f because the dynamic parameters are multiplied by this value before being applied
+        CHHapticEventParameter* intensityParameter = [[CHHapticEventParameter alloc] initWithParameterID:CHHapticEventParameterIDHapticIntensity value:1.0f];
+        CHHapticEvent* hapticEvent = [[CHHapticEvent alloc] initWithEventType:CHHapticEventTypeHapticContinuous parameters:[NSArray arrayWithObject:intensityParameter] relativeTime:0 duration:GCHapticDurationInfinite];
+        CHHapticPattern* hapticPattern = [[CHHapticPattern alloc] initWithEvents:[NSArray arrayWithObject:hapticEvent] parameters:[[NSArray alloc] init] error:&error];
+        if (error != nil) {
+            Log(LOG_W, @"Controller %d: Haptic pattern creation failed: %@", _playerIndex, error);
+            return;
+        }
+        
+        _hapticPlayer = [_hapticEngine createPlayerWithPattern:hapticPattern error:&error];
+        if (error != nil) {
+            Log(LOG_W, @"Controller %d: Haptic player creation failed: %@", _playerIndex, error);
+            return;
+        }
+    }
+
+    CHHapticDynamicParameter* intensityParameter = [[CHHapticDynamicParameter alloc] initWithParameterID:CHHapticDynamicParameterIDHapticIntensityControl value:amplitude / 65535.0f relativeTime:0];
+    [_hapticPlayer sendParameters:[NSArray arrayWithObject:intensityParameter] atTime:CHHapticTimeImmediate error:&error];
+    if (error != nil) {
+        Log(LOG_W, @"Controller %d: Haptic player parameter update failed: %@", _playerIndex, error);
+        return;
+    }
+    
+    if (!_playing) {
+        [_hapticPlayer startAtTime:0 error:&error];
+        if (error != nil) {
+            _hapticPlayer = nil;
+            Log(LOG_W, @"Controller %d: Haptic playback start failed: %@", _playerIndex, error);
+            return;
+        }
+        
+        _playing = YES;
+    }
+}
+
+-(id) initWithGamepad:(GCController*)gamepad locality:(GCHapticsLocality)locality API_AVAILABLE(ios(14.0), tvos(14.0)) {
+    if (gamepad.haptics == nil) {
+        Log(LOG_W, @"Controller %d does not support haptics", gamepad.playerIndex);
+        return nil;
+    }
+    
+    if (![[gamepad.haptics supportedLocalities] containsObject:locality]) {
+        Log(LOG_W, @"Controller %d does not support haptic locality: %@", gamepad.playerIndex, locality);
+        return nil;
+    }
+    
+    _playerIndex = gamepad.playerIndex;
+    _hapticEngine = [gamepad.haptics createEngineWithLocality:locality];
+    
+    NSError* error;
+    [_hapticEngine startAndReturnError:&error];
+    if (error != nil) {
+        Log(LOG_W, @"Controller %d: Haptic engine failed to start: %@", gamepad.playerIndex, error);
+        return nil;
+    }
+    
+    __weak typeof(self) weakSelf = self;
+    _hapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason stoppedReason) {
+        HapticContext* me = weakSelf;
+        if (me == nil) {
+            return;
+        }
+        
+        Log(LOG_W, @"Controller %d: Haptic engine stopped: %p", me->_playerIndex, stoppedReason);
+        me->_hapticPlayer = nil;
+        me->_hapticEngine = nil;
+        me->_playing = NO;
+    };
+    _hapticEngine.resetHandler = ^{
+        HapticContext* me = weakSelf;
+        if (me == nil) {
+            return;
+        }
+        
+        Log(LOG_W, @"Controller %d: Haptic engine reset", me->_playerIndex);
+        me->_hapticPlayer = nil;
+        me->_playing = NO;
+        [me->_hapticEngine startAndReturnError:nil];
+    };
+    
+    return self;
+}
+
++(HapticContext*) createContextForHighFreqMotor:(GCController*)gamepad {
+    if (@available(iOS 14.0, tvOS 14.0, *)) {
+        return [[HapticContext alloc] initWithGamepad:gamepad locality:GCHapticsLocalityRightHandle];
+    }
+    else {
+        return nil;
+    }
+}
+
++(HapticContext*) createContextForLowFreqMotor:(GCController*)gamepad {
+    if (@available(iOS 14.0, tvOS 14.0, *)) {
+        return [[HapticContext alloc] initWithGamepad:gamepad locality:GCHapticsLocalityLeftHandle];
+    }
+    else {
+        return nil;
+    }
+}
+
++(HapticContext*) createContextForLeftTrigger:(GCController*)gamepad {
+    if (@available(iOS 14.0, tvOS 14.0, *)) {
+        return [[HapticContext alloc] initWithGamepad:gamepad locality:GCHapticsLocalityLeftTrigger];
+    }
+    else {
+        return nil;
+    }
+}
+
++(HapticContext*) createContextForRightTrigger:(GCController*)gamepad {
+    if (@available(iOS 14.0, tvOS 14.0, *)) {
+        return [[HapticContext alloc] initWithGamepad:gamepad locality:GCHapticsLocalityRightTrigger];
+    }
+    else {
+        return nil;
+    }
+}
+
+@end

Limelight/Input/KeyboardInputField.h

@@ -0,0 +1,18 @@
+//
+//  KeyboardInputField.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/2/22.
+//  Copyright © 2022 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KeyboardInputField : UITextField
+
+
+@end
+
+NS_ASSUME_NONNULL_END

Limelight/Input/KeyboardInputField.m

@@ -0,0 +1,18 @@
+//
+//  KeyboardInputField.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/2/22.
+//  Copyright © 2022 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "KeyboardInputField.h"
+
+@implementation KeyboardInputField
+
+- (UIEditingInteractionConfiguration) editingInteractionConfiguration {
+    // Suppress the Undo menu that appears with a 3 finger tap
+    return UIEditingInteractionConfigurationNone;
+}
+
+@end

Limelight/Input/KeyboardSupport.h

@@ -16,6 +16,8 @@ struct KeyEvent {
     u_char modifier;
 };
 
++ (BOOL)sendKeyEventForPress:(UIPress*)press down:(BOOL)down API_AVAILABLE(ios(13.4));
++ (BOOL)sendKeyEvent:(UIKey*)key down:(BOOL)down API_AVAILABLE(ios(13.4));
 + (struct KeyEvent) translateKeyEvent:(unichar) inputChar withModifierFlags:(UIKeyModifierFlags)modifierFlags;
 
 @end

Limelight/Input/KeyboardSupport.m

@@ -11,6 +11,259 @@
 
 @implementation KeyboardSupport
 
++ (BOOL)sendKeyEventForPress:(UIPress*)press down:(BOOL)down API_AVAILABLE(ios(13.4)) {
+    if (press.key != nil) {
+        return [KeyboardSupport sendKeyEvent:press.key down:down];
+    }
+    else {
+        short keyCode;
+
+        switch (press.type) {
+            case UIPressTypeUpArrow:
+                keyCode = 0x26;
+                break;
+            case UIPressTypeDownArrow:
+                keyCode = 0x28;
+                break;
+            case UIPressTypeLeftArrow:
+                keyCode = 0x25;
+                break;
+            case UIPressTypeRightArrow:
+                keyCode = 0x27;
+                break;
+            default:
+                // Unhandled press type
+                return NO;
+        }
+        
+        LiSendKeyboardEvent(0x8000 | keyCode,
+                            down ? KEY_ACTION_DOWN : KEY_ACTION_UP,
+                            0);
+        
+        return YES;
+    }
+}
+
++ (BOOL)sendKeyEvent:(UIKey*)key down:(BOOL)down API_AVAILABLE(ios(13.4)) {
+    char modifierFlags = 0;
+    short keyCode = 0;
+    
+    if (key.modifierFlags & UIKeyModifierShift) {
+        modifierFlags |= MODIFIER_SHIFT;
+    }
+    if (key.modifierFlags & UIKeyModifierAlternate) {
+        modifierFlags |= MODIFIER_ALT;
+    }
+    if (key.modifierFlags & UIKeyModifierControl) {
+        modifierFlags |= MODIFIER_CTRL;
+    }
+    if (key.modifierFlags & UIKeyModifierCommand) {
+        modifierFlags |= MODIFIER_META;
+    }
+    
+    // This converts UIKeyboardHIDUsage values to Win32 VK_* values
+    // https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
+    if (key.keyCode >= UIKeyboardHIDUsageKeyboardA &&
+        key.keyCode <= UIKeyboardHIDUsageKeyboardZ) {
+        keyCode = (key.keyCode - UIKeyboardHIDUsageKeyboardA) + 0x41;
+    }
+    else if (key.keyCode == UIKeyboardHIDUsageKeyboard0) {
+        // This key is at the beginning of the VK_ range but the end
+        // of the UIKeyboardHIDUsageKeyboard range.
+        keyCode = 0x30;
+    }
+    else if (key.keyCode >= UIKeyboardHIDUsageKeyboard1 &&
+             key.keyCode <= UIKeyboardHIDUsageKeyboard9) {
+        keyCode = (key.keyCode - UIKeyboardHIDUsageKeyboard1) + 0x31;
+    }
+    else if (key.keyCode == UIKeyboardHIDUsageKeypad0) {
+        // This key is at the beginning of the VK_ range but the end
+        // of the UIKeyboardHIDUsageKeypad range.
+        keyCode = 0x60;
+    }
+    else if (key.keyCode >= UIKeyboardHIDUsageKeypad1 &&
+             key.keyCode <= UIKeyboardHIDUsageKeypad9) {
+        keyCode = (key.keyCode - UIKeyboardHIDUsageKeypad1) + 0x61;
+    }
+    else if (key.keyCode >= UIKeyboardHIDUsageKeyboardF1 &&
+             key.keyCode <= UIKeyboardHIDUsageKeyboardF12) {
+        keyCode = (key.keyCode - UIKeyboardHIDUsageKeyboardF1) + 0x70;
+    }
+    else if (key.keyCode >= UIKeyboardHIDUsageKeyboardF13 &&
+             key.keyCode <= UIKeyboardHIDUsageKeyboardF24) {
+        keyCode = (key.keyCode - UIKeyboardHIDUsageKeyboardF13) + 0x7C;
+    }
+    else {
+        switch (key.keyCode) {
+            case UIKeyboardHIDUsageKeyboardReturnOrEnter:
+                keyCode = 0x0D;
+                break;
+            case UIKeyboardHIDUsageKeyboardEscape:
+                keyCode = 0x1B;
+                break;
+            case UIKeyboardHIDUsageKeyboardDeleteOrBackspace:
+                keyCode = 0x08;
+                break;
+            case UIKeyboardHIDUsageKeyboardTab:
+                keyCode = 0x09;
+                break;
+            case UIKeyboardHIDUsageKeyboardSpacebar:
+                keyCode = 0x20;
+                break;
+            case UIKeyboardHIDUsageKeyboardHyphen:
+                keyCode = 0xBD;
+                break;
+            case UIKeyboardHIDUsageKeyboardEqualSign:
+                keyCode = 0xBB;
+                break;
+            case UIKeyboardHIDUsageKeyboardOpenBracket:
+                keyCode = 0xDB;
+                break;
+            case UIKeyboardHIDUsageKeyboardCloseBracket:
+                keyCode = 0xDD;
+                break;
+            case UIKeyboardHIDUsageKeyboardBackslash:
+                keyCode = 0xDC;
+                break;
+            case UIKeyboardHIDUsageKeyboardSemicolon:
+                keyCode = 0xBA;
+                break;
+            case UIKeyboardHIDUsageKeyboardQuote:
+                keyCode = 0xDE;
+                break;
+            case UIKeyboardHIDUsageKeyboardGraveAccentAndTilde:
+                keyCode = 0xC0;
+                break;
+            case UIKeyboardHIDUsageKeyboardComma:
+                keyCode = 0xBC;
+                break;
+            case UIKeyboardHIDUsageKeyboardPeriod:
+                keyCode = 0xBE;
+                break;
+            case UIKeyboardHIDUsageKeyboardSlash:
+                keyCode = 0xBF;
+                break;
+            case UIKeyboardHIDUsageKeyboardCapsLock:
+                keyCode = 0x14;
+                break;
+            case UIKeyboardHIDUsageKeyboardPrintScreen:
+                keyCode = 0x2A;
+                break;
+            case UIKeyboardHIDUsageKeyboardScrollLock:
+                keyCode = 0x91;
+                break;
+            case UIKeyboardHIDUsageKeyboardPause:
+                keyCode = 0x13;
+                break;
+            case UIKeyboardHIDUsageKeyboardInsert:
+                keyCode = 0x2D;
+                break;
+            case UIKeyboardHIDUsageKeyboardHome:
+                keyCode = 0x24;
+                break;
+            case UIKeyboardHIDUsageKeyboardPageUp:
+                keyCode = 0x21;
+                break;
+            case UIKeyboardHIDUsageKeyboardDeleteForward:
+                keyCode = 0x2E;
+                break;
+            case UIKeyboardHIDUsageKeyboardEnd:
+                keyCode = 0x23;
+                break;
+            case UIKeyboardHIDUsageKeyboardPageDown:
+                keyCode = 0x22;
+                break;
+            case UIKeyboardHIDUsageKeyboardRightArrow:
+                keyCode = 0x27;
+                break;
+            case UIKeyboardHIDUsageKeyboardLeftArrow:
+                keyCode = 0x25;
+                break;
+            case UIKeyboardHIDUsageKeyboardDownArrow:
+                keyCode = 0x28;
+                break;
+            case UIKeyboardHIDUsageKeyboardUpArrow:
+                keyCode = 0x26;
+                break;
+            case UIKeyboardHIDUsageKeypadNumLock:
+                keyCode = 0x90;
+                break;
+            case UIKeyboardHIDUsageKeypadSlash:
+                keyCode = 0x6F;
+                break;
+            case UIKeyboardHIDUsageKeypadAsterisk:
+                keyCode = 0x6A;
+                break;
+            case UIKeyboardHIDUsageKeypadHyphen:
+                keyCode = 0x6D;
+                break;
+            case UIKeyboardHIDUsageKeypadPlus:
+                keyCode = 0x6B;
+                break;
+            case UIKeyboardHIDUsageKeypadEnter:
+                keyCode = 0x0D;
+                break;
+            case UIKeyboardHIDUsageKeypadPeriod:
+                keyCode = 0x6E;
+                break;
+            case UIKeyboardHIDUsageKeyboardNonUSBackslash:
+                keyCode = 0xE2;
+                break;
+            case UIKeyboardHIDUsageKeypadComma:
+                keyCode = 0x6C;
+                break;
+            case UIKeyboardHIDUsageKeyboardCancel:
+                keyCode = 0x03;
+                break;
+            case UIKeyboardHIDUsageKeyboardClear:
+                keyCode = 0x0C;
+                break;
+            case UIKeyboardHIDUsageKeyboardCrSelOrProps:
+                keyCode = 0xF7;
+                break;
+            case UIKeyboardHIDUsageKeyboardExSel:
+                keyCode = 0xF8;
+                break;
+            case UIKeyboardHIDUsageKeyboardLeftGUI:
+                keyCode = 0x5B;
+                break;
+            case UIKeyboardHIDUsageKeyboardLeftControl:
+                keyCode = 0xA2;
+                break;
+            case UIKeyboardHIDUsageKeyboardLeftShift:
+                keyCode = 0xA0;
+                break;
+            case UIKeyboardHIDUsageKeyboardLeftAlt:
+                keyCode = 0xA4;
+                break;
+            case UIKeyboardHIDUsageKeyboardRightGUI:
+                keyCode = 0x5C;
+                break;
+            case UIKeyboardHIDUsageKeyboardRightControl:
+                keyCode = 0xA3;
+                break;
+            case UIKeyboardHIDUsageKeyboardRightShift:
+                keyCode = 0xA1;
+                break;
+            case UIKeyboardHIDUsageKeyboardRightAlt:
+                keyCode = 0xA5;
+                break;
+            case 669: // This value corresponds to the "Globe" or "Language" key on most Apple branded iPad keyboards.
+                keyCode = 0x1B; // This value corresponds to "Escape", which is missing from most Apple branded iPad keyboards.
+                break;
+            default:
+                NSLog(@"Unhandled HID usage: %lu", (unsigned long)key.keyCode);
+                assert(0);
+                return false;
+        }
+    }
+    
+    LiSendKeyboardEvent(0x8000 | keyCode,
+                        down ? KEY_ACTION_DOWN : KEY_ACTION_UP,
+                        modifierFlags);
+    return true;
+}
+
 + (struct KeyEvent)translateKeyEvent:(unichar)inputChar withModifierFlags:(UIKeyModifierFlags)modifierFlags {
     struct KeyEvent event;
     event.keycode = 0;
@@ -25,10 +278,12 @@
         case UIKeyModifierControl:
             [KeyboardSupport addControlModifier:&event];
             break;
+        case UIKeyModifierCommand:
+            [KeyboardSupport addMetaModifier:&event];
+            break;
         case UIKeyModifierAlternate:
             [KeyboardSupport addAltModifier:&event];
             break;
-        case UIKeyModifierCommand:
         case UIKeyModifierNumericPad:
             break;
     }
@@ -183,6 +438,11 @@
     event->modifierKeycode = 0x11;
 }
 
++ (void) addMetaModifier:(struct KeyEvent*)event {
+    event->modifier = MODIFIER_META;
+    event->modifierKeycode = 0x5B;
+}
+
 + (void) addAltModifier:(struct KeyEvent*)event {
     event->modifier = MODIFIER_ALT;
     event->modifierKeycode = 0x12;

Limelight/Input/OnScreenControls.h

@@ -7,9 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "StreamView.h"
 
 @class ControllerSupport;
+@class StreamConfiguration;
 
 @interface OnScreenControls : NSObject
 
@@ -25,12 +25,12 @@ typedef NS_ENUM(NSInteger, OnScreenControlsLevel) {
     OnScreenControlsLevelAutoGCExtendedGamepadWithStickButtons
 };
 
-#if TARGET_OS_IPHONE
-- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport swipeDelegate:(id<EdgeDetectionDelegate>)edgeDelegate;
+- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport streamConfig:(StreamConfiguration*)streamConfig;
 - (BOOL) handleTouchDownEvent:(NSSet*)touches;
 - (BOOL) handleTouchUpEvent:(NSSet*)touches;
 - (BOOL) handleTouchMovedEvent:(NSSet*)touches;
 - (void) setLevel:(OnScreenControlsLevel)level;
-#endif
+- (OnScreenControlsLevel) getLevel;
+- (void) show;
 
 @end

Limelight/Input/OnScreenControls.m

@@ -7,6 +7,7 @@
 //
 
 #import "OnScreenControls.h"
+#import "StreamView.h"
 #import "ControllerSupport.h"
 #import "Controller.h"
 #include "Limelight.h"
@@ -35,7 +36,6 @@
     CALayer* _l1Button;
     CALayer* _l2Button;
     CALayer* _l3Button;
-    CALayer* _edge;
     
     UITouch* _aTouch;
     UITouch* _bTouch;
@@ -52,7 +52,6 @@
     UITouch* _l1Touch;
     UITouch* _l2Touch;
     UITouch* _l3Touch;
-    UITouch* _edgeTouch;
     
     NSDate* l3TouchStart;
     NSDate* r3TouchStart;
@@ -64,11 +63,12 @@
     CGRect _controlArea;
     UIView* _view;
     OnScreenControlsLevel _level;
+    BOOL _visible;
     
     ControllerSupport *_controllerSupport;
     Controller *_controller;
-    id<EdgeDetectionDelegate> _edgeDelegate;
     NSMutableArray* _deadTouches;
+    BOOL _swapABXY;
 }
 
 static const float EDGE_WIDTH = .05;
@@ -112,13 +112,13 @@ static float L2_Y;
 static float L3_X;
 static float L3_Y;
 
-- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport swipeDelegate:(id<EdgeDetectionDelegate>)swipeDelegate {
+- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport streamConfig:(StreamConfiguration*)streamConfig {
     self = [self init];
     _view = view;
     _controllerSupport = controllerSupport;
     _controller = [controllerSupport getOscController];
-    _edgeDelegate = swipeDelegate;
     _deadTouches = [[NSMutableArray alloc] init];
+    _swapABXY = streamConfig.swapABXYButtons;
     
     _iPad = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad);
     _controlArea = CGRectMake(0, 0, _view.frame.size.width, _view.frame.size.height);
@@ -154,16 +154,28 @@ static float L3_Y;
     _rightStickBackground = [CALayer layer];
     _leftStick = [CALayer layer];
     _rightStick = [CALayer layer];
-    _edge = [CALayer layer];
-    
-    [self setupEdgeDetection];
     
     return self;
 }
 
+- (void) show {
+    _visible = YES;
+        
+    [self updateControls];
+}
+
 - (void) setLevel:(OnScreenControlsLevel)level {
     _level = level;
-    [self updateControls];
+    
+    // Only update controls if we're showing, otherwise
+    // show will do it for us.
+    if (_visible) {
+        [self updateControls];
+    }
+}
+
+- (OnScreenControlsLevel) getLevel {
+    return _level;
 }
 
 - (void) updateControls {
@@ -237,11 +249,6 @@ static float L3_Y;
     }
 }
 
-- (void) setupEdgeDetection {
-    _edge.frame = CGRectMake(0, 0, _view.frame.size.width * EDGE_WIDTH, _view.frame.size.height);
-    [_view.layer addSublayer:_edge];
-}
-
 // For GCExtendedGamepad controls we move start, select, L3, and R3 to the button
 - (void) setupExtendedGamepadControls {
     // Start with the default complex layout
@@ -367,27 +374,33 @@ static float L3_Y;
 }
 
 - (void) drawButtons {
-    // create A button
     UIImage* aButtonImage = [UIImage imageNamed:@"AButton"];
+    UIImage* bButtonImage = [UIImage imageNamed:@"BButton"];
+    UIImage* xButtonImage = [UIImage imageNamed:@"XButton"];
+    UIImage* yButtonImage = [UIImage imageNamed:@"YButton"];
+    
+    CGRect aButtonFrame = CGRectMake(BUTTON_CENTER_X - aButtonImage.size.width / 2, BUTTON_CENTER_Y + BUTTON_DIST, aButtonImage.size.width, aButtonImage.size.height);
+    CGRect bButtonFrame = CGRectMake(BUTTON_CENTER_X + BUTTON_DIST, BUTTON_CENTER_Y - bButtonImage.size.height / 2, bButtonImage.size.width, bButtonImage.size.height);
+    CGRect xButtonFrame = CGRectMake(BUTTON_CENTER_X - BUTTON_DIST - xButtonImage.size.width, BUTTON_CENTER_Y - xButtonImage.size.height/ 2, xButtonImage.size.width, xButtonImage.size.height);
+    CGRect yButtonFrame = CGRectMake(BUTTON_CENTER_X - yButtonImage.size.width / 2, BUTTON_CENTER_Y - BUTTON_DIST - yButtonImage.size.height, yButtonImage.size.width, yButtonImage.size.height);
+    
+    // create A button
     _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);
+    _aButton.frame = _swapABXY ? bButtonFrame : aButtonFrame;
     [_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.frame = _swapABXY ? aButtonFrame : bButtonFrame;
     _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.frame = _swapABXY ? yButtonFrame : xButtonFrame;
     _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.frame = _swapABXY ? xButtonFrame : yButtonFrame;
     _yButton.contents = (id) yButtonImage.CGImage;
     [_view.layer addSublayer:_yButton];
     
@@ -641,7 +654,7 @@ static float L3_Y;
     if (updated) {
         [_controllerSupport updateFinished:_controller];
     }
-        return updated || buttonTouch;
+    return updated || buttonTouch;
 }
 
 - (BOOL)handleTouchDownEvent:touches {
@@ -650,63 +663,63 @@ static float L3_Y;
     for (UITouch* touch in touches) {
         CGPoint touchLocation = [touch locationInView:_view];
         
-        if ([_aButton.presentationLayer hitTest:touchLocation]) {
+        if (_aButton.superlayer != nil && [_aButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:A_FLAG];
             _aTouch = touch;
             updated = true;
-        } else if ([_bButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_bButton.superlayer != nil && [_bButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:B_FLAG];
             _bTouch = touch;
             updated = true;
-        } else if ([_xButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_xButton.superlayer != nil && [_xButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:X_FLAG];
             _xTouch = touch;
             updated = true;
-        } else if ([_yButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_yButton.superlayer != nil && [_yButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:Y_FLAG];
             _yTouch = touch;
             updated = true;
-        } else if ([_upButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_upButton.superlayer != nil && [_upButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:UP_FLAG];
             _dpadTouch = touch;
             updated = true;
-        } else if ([_downButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_downButton.superlayer != nil && [_downButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:DOWN_FLAG];
             _dpadTouch = touch;
             updated = true;
-        } else if ([_leftButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_leftButton.superlayer != nil && [_leftButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:LEFT_FLAG];
             _dpadTouch = touch;
             updated = true;
-        } else if ([_rightButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_rightButton.superlayer != nil && [_rightButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:RIGHT_FLAG];
             _dpadTouch = touch;
             updated = true;
-        } else if ([_startButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_startButton.superlayer != nil && [_startButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:PLAY_FLAG];
             _startTouch = touch;
             updated = true;
-        } else if ([_selectButton.presentationLayer hitTest:touchLocation]) {
+        } else if (_selectButton.superlayer != nil && [_selectButton.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:BACK_FLAG];
             _selectTouch = touch;
             updated = true;
-        } else if ([_l1Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_l1Button.superlayer != nil && [_l1Button.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:LB_FLAG];
             _l1Touch = touch;
             updated = true;
-        } else if ([_r1Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_r1Button.superlayer != nil && [_r1Button.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport setButtonFlag:_controller flags:RB_FLAG];
             _r1Touch = touch;
             updated = true;
-        } else if ([_l2Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_l2Button.superlayer != nil && [_l2Button.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport updateLeftTrigger:_controller left:0xFF];
             _l2Touch = touch;
             updated = true;
-        } else if ([_r2Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_r2Button.superlayer != nil && [_r2Button.presentationLayer hitTest:touchLocation]) {
             [_controllerSupport updateRightTrigger:_controller right:0xFF];
             _r2Touch = touch;
             updated = true;
-        } else if ([_l3Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_l3Button.superlayer != nil && [_l3Button.presentationLayer hitTest:touchLocation]) {
             if (l3Set) {
                 [_controllerSupport clearButtonFlag:_controller flags:LS_CLK_FLAG];
                 _l3Button.borderWidth = 0.0f;
@@ -717,7 +730,7 @@ static float L3_Y;
             l3Set = !l3Set;
             _l3Touch = touch;
             updated = true;
-        } else if ([_r3Button.presentationLayer hitTest:touchLocation]) {
+        } else if (_r3Button.superlayer != nil && [_r3Button.presentationLayer hitTest:touchLocation]) {
             if (r3Set) {
                 [_controllerSupport clearButtonFlag:_controller flags:RS_CLK_FLAG];
                 _r3Button.borderWidth = 0.0f;
@@ -728,7 +741,7 @@ static float L3_Y;
             r3Set = !r3Set;
             _r3Touch = touch;
             updated = true;
-        } else if ([_leftStick.presentationLayer hitTest:touchLocation]) {
+        } else if (_leftStick.superlayer != nil && [_leftStick.presentationLayer hitTest:touchLocation]) {
             if (l3TouchStart != nil) {
                 // Find elapsed time and convert to milliseconds
                 // Use (-) modifier to conversion since receiver is earlier than now
@@ -740,7 +753,7 @@ static float L3_Y;
             }
             _lsTouch = touch;
             stickTouch = true;
-        } else if ([_rightStick.presentationLayer hitTest:touchLocation]) {
+        } else if (_rightStick.superlayer != nil && [_rightStick.presentationLayer hitTest:touchLocation]) {
             if (r3TouchStart != nil) {
                 // Find elapsed time and convert to milliseconds
                 // Use (-) modifier to conversion since receiver is earlier than now
@@ -752,8 +765,6 @@ static float L3_Y;
             }
             _rsTouch = touch;
             stickTouch = true;
-        } else if ([_edge.presentationLayer hitTest:touchLocation]) {
-            _edgeTouch = touch;
         }
         if (!updated && !stickTouch && [self isInDeadZone:touch]) {
             [_deadTouches addObject:touch];
@@ -837,11 +848,6 @@ static float L3_Y;
         else if (touch == _r3Touch) {
             _r3Touch = nil;
             touched = true;
-        } else if (touch == _edgeTouch) {
-            _edgeTouch = nil;
-            if ([touch locationInView:_view].x >= _view.frame.size.width / 4) {
-                [_edgeDelegate edgeSwiped];
-            }
         }
         if ([_deadTouches containsObject:touch]) {
             [_deadTouches removeObject:touch];

Limelight/Input/RelativeTouchHandler.h

@@ -0,0 +1,19 @@
+//
+//  RelativeTouchHandler.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 11/1/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "StreamView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RelativeTouchHandler : UIResponder
+
+-(id)initWithView:(StreamView*)view;
+
+@end
+
+NS_ASSUME_NONNULL_END

Limelight/Input/RelativeTouchHandler.m

@@ -0,0 +1,207 @@
+//
+//  RelativeTouchHandler.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 11/1/20.
+//  Copyright © 2020 Moonlight Game Streaming Project. All rights reserved.
+//
+
+#import "RelativeTouchHandler.h"
+
+#include <Limelight.h>
+
+static const int REFERENCE_WIDTH = 1280;
+static const int REFERENCE_HEIGHT = 720;
+
+@implementation RelativeTouchHandler {
+    CGPoint touchLocation, originalLocation;
+    BOOL touchMoved;
+    BOOL isDragging;
+    NSTimer* dragTimer;
+    NSUInteger peakTouchCount;
+    
+#if TARGET_OS_TV
+    UIGestureRecognizer* remotePressRecognizer;
+    UIGestureRecognizer* remoteLongPressRecognizer;
+#endif
+    
+    UIView* view;
+}
+
+- (id)initWithView:(StreamView*)view {
+    self = [self init];
+    self->view = view;
+    
+#if TARGET_OS_TV
+    remotePressRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(remoteButtonPressed:)];
+    remotePressRecognizer.allowedPressTypes = @[@(UIPressTypeSelect)];
+    
+    remoteLongPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(remoteButtonLongPressed:)];
+    remoteLongPressRecognizer.allowedPressTypes = @[@(UIPressTypeSelect)];
+    
+    [self->view addGestureRecognizer:remotePressRecognizer];
+    [self->view addGestureRecognizer:remoteLongPressRecognizer];
+#endif
+    
+    return self;
+}
+
+- (BOOL)isConfirmedMove:(CGPoint)currentPoint from:(CGPoint)originalPoint {
+    // Movements of greater than 5 pixels are considered confirmed
+    return hypotf(originalPoint.x - currentPoint.x, originalPoint.y - currentPoint.y) >= 5;
+}
+
+- (void)onDragStart:(NSTimer*)timer {
+    if (!touchMoved && !isDragging){
+        isDragging = true;
+        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+    }
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    touchMoved = false;
+    peakTouchCount = [[event allTouches] count];
+    if ([[event allTouches] count] == 1) {
+        UITouch *touch = [[event allTouches] anyObject];
+        originalLocation = touchLocation = [touch locationInView:view];
+        if (!isDragging) {
+            dragTimer = [NSTimer scheduledTimerWithTimeInterval:0.650
+                                                     target:self
+                                                   selector:@selector(onDragStart:)
+                                                   userInfo:nil
+                                                    repeats:NO];
+        }
+    }
+    else if ([[event allTouches] count] == 2) {
+        CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:view];
+        CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:view];
+        
+        originalLocation = touchLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
+    }
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+    if ([[event allTouches] count] == 1) {
+        UITouch *touch = [[event allTouches] anyObject];
+        CGPoint currentLocation = [touch locationInView:view];
+        
+        if (touchLocation.x != currentLocation.x ||
+            touchLocation.y != currentLocation.y)
+        {
+            int deltaX = (currentLocation.x - touchLocation.x) * (REFERENCE_WIDTH / view.bounds.size.width);
+            int deltaY = (currentLocation.y - touchLocation.y) * (REFERENCE_HEIGHT / view.bounds.size.height);
+            
+            if (deltaX != 0 || deltaY != 0) {
+                LiSendMouseMoveEvent(deltaX, deltaY);
+                touchLocation = currentLocation;
+                
+                // If we've moved far enough to confirm this wasn't just human/machine error,
+                // mark it as such.
+                if ([self isConfirmedMove:touchLocation from:originalLocation]) {
+                    touchMoved = true;
+                }
+            }
+        }
+    } else if ([[event allTouches] count] == 2) {
+        CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:view];
+        CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:view];
+        
+        CGPoint avgLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
+        if (touchLocation.y != avgLocation.y) {
+            LiSendHighResScrollEvent((avgLocation.y - touchLocation.y) * 10);
+        }
+
+        // If we've moved far enough to confirm this wasn't just human/machine error,
+        // mark it as such.
+        if ([self isConfirmedMove:firstLocation from:originalLocation]) {
+            touchMoved = true;
+        }
+        
+        touchLocation = avgLocation;
+    }
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+    [dragTimer invalidate];
+    dragTimer = nil;
+    if (isDragging) {
+        isDragging = false;
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    } else if (!touchMoved) {
+        if (peakTouchCount == 2) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                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 if (peakTouchCount == 1) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                if (!self->isDragging){
+                    Log(LOG_D, @"Sending left mouse button press");
+                    
+                    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+                    
+                    // Wait 100 ms to simulate a real button press
+                    usleep(100 * 1000);
+                }
+                self->isDragging = false;
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+            });
+        }
+    }
+    
+    // We we're moving from 2+ touches to 1. Synchronize the current position
+    // of the active finger so we don't jump unexpectedly on the next touchesMoved
+    // callback when finger 1 switches on us.
+    if ([[event allTouches] count] - [touches count] == 1) {
+        NSMutableSet *activeSet = [[NSMutableSet alloc] initWithCapacity:[[event allTouches] count]];
+        [activeSet unionSet:[event allTouches]];
+        [activeSet minusSet:touches];
+        touchLocation = [[activeSet anyObject] locationInView:view];
+        
+        // Mark this touch as moved so we don't send a left mouse click if the user
+        // right clicks without moving their other finger.
+        touchMoved = true;
+    }
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
+    [dragTimer invalidate];
+    dragTimer = nil;
+    if (isDragging) {
+        isDragging = false;
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    }
+    peakTouchCount = 0;
+}
+
+#if TARGET_OS_TV
+- (void)remoteButtonPressed:(id)sender {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        Log(LOG_D, @"Sending left mouse button press");
+        
+        // Mark this as touchMoved to avoid a duplicate press on touch up
+        self->touchMoved = true;
+        
+        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+        
+        // Wait 100 ms to simulate a real button press
+        usleep(100 * 1000);
+            
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    });
+}
+- (void)remoteButtonLongPressed:(id)sender {
+    Log(LOG_D, @"Holding left mouse button");
+    
+    isDragging = true;
+    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+}
+#endif
+
+@end

Limelight/Input/StreamView.h

@@ -7,19 +7,31 @@
 //
 
 #import "ControllerSupport.h"
+#import "OnScreenControls.h"
+#import "Moonlight-Swift.h"
+#import "StreamConfiguration.h"
 
-@protocol EdgeDetectionDelegate <NSObject>
+@protocol UserInteractionDelegate <NSObject>
 
-- (void) edgeSwiped;
+- (void) userInteractionBegan;
+- (void) userInteractionEnded;
 
 @end
 
-@interface StreamView : OSView <UITextFieldDelegate>
+#if TARGET_OS_TV
+@interface StreamView : UIView <X1KitMouseDelegate, UITextFieldDelegate>
+#else
+@interface StreamView : UIView <X1KitMouseDelegate, UITextFieldDelegate, UIPointerInteractionDelegate>
+#endif
 
-@property (nonatomic, retain) IBOutlet UITextField* keyInputField;
+- (void) setupStreamView:(ControllerSupport*)controllerSupport
+     interactionDelegate:(id<UserInteractionDelegate>)interactionDelegate
+                  config:(StreamConfiguration*)streamConfig;
+- (void) showOnScreenControls;
+- (OnScreenControlsLevel) getCurrentOscState;
 
-- (void) setupStreamView;
-- (void) setupOnScreenControls:(ControllerSupport*)controllerSupport swipeDelegate:(id<EdgeDetectionDelegate>)swipeDelegate;
-- (void) setMouseDeltaFactors:(float)x y:(float)y;
+#if !TARGET_OS_TV
+- (void) updateCursorLocation:(CGPoint)location isMouse:(BOOL)isMouse;
+#endif
 
 @end

Limelight/Limelight-Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CADisableMinimumFrameDuration</key>
 	<true/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -30,13 +32,11 @@
 			<key>ProfileName</key>
 			<string>ExtendedGamepad</string>
 		</dict>
-		<dict>
-			<key>ProfileName</key>
-			<string>Gamepad</string>
-		</dict>
 	</array>
 	<key>GCSupportsControllerUserInteraction</key>
 	<true/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -46,6 +46,18 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Bluetooth access allows Moonlight to connect to Citrix X1 mice.</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>Bluetooth access allows Moonlight to connect to Citrix X1 mice.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_nvstream._tcp</string>
+	</array>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Moonlight uses the local network to connect to your gaming PC for streaming.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>

Limelight/Limelight-Prefix.pch

@@ -21,5 +21,4 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 #import "Logger.h"
-#include "OSPortabilityDefs.h"
 #endif

Limelight/Limelight.xcdatamodeld/.xccurrentversion

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

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22225" systemVersion="23A344" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="deviceGyroMode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="preferredCodec" attributeType="Integer 32" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="swapABXYButtons" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useFramePacing" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+</model>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19E266" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="streamingRemotely" attributeType="Boolean" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useHevc" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" 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="210"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="238"/>
+    </elements>
+</model>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17192" systemVersion="19H2" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useHevc" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="118"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="210"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="268"/>
+    </elements>
+</model>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="20G224" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useFramePacing" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="useHevc" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="118"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="210"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="254"/>
+    </elements>
+</model>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21G72" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="swapABXYButtons" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useFramePacing" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="useHevc" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="118"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="210"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="298"/>
+    </elements>
+</model>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21G72" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
+        <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
+        <attribute name="name" 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" codeGenerationType="class">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="ipv6Address" 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" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCert" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" 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" codeGenerationType="class">
+        <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="multiController" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="swapABXYButtons" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="uniqueId" attributeType="String" syncable="YES"/>
+        <attribute name="useFramePacing" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="useHevc2" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="App" positionX="0" positionY="54" width="128" height="118"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="210"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="298"/>
+    </elements>
+</model>

Limelight/Network/AppAssetResponse.m

@@ -16,13 +16,8 @@
     self.statusMessage = @"App asset has no status message";
     self.statusCode = -1;
 }
-- (OSImage*) getImage {
-#if TARGET_OS_IPHONE
-    OSImage* appImage = [[OSImage alloc] initWithData:self.data];
-#else
-    OSImage* appImage = nil;
-#endif
-    return appImage;
+- (UIImage*) getImage {
+    return [[UIImage alloc] initWithData:self.data];
 }
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -20,20 +20,16 @@ static const int MAX_ATTEMPTS = 5;
 - (void) main {
     int attempts = 0;
     while (![self isCancelled] && attempts++ < MAX_ATTEMPTS) {
-        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[IdManager getUniqueId] serverCert:_host.serverCert];
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:_host];
         AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
         [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.id]]];
 
-#if TARGET_OS_IPHONE
         if (appAssetResp.data != nil) {
             NSString* boxArtPath = [AppAssetManager boxArtPathForApp:self.app];
             [[NSFileManager defaultManager] createDirectoryAtPath:[boxArtPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:nil];
             [appAssetResp.data writeToFile:boxArtPath atomically:NO];
             break;
         }
-#else
-        
-#endif
         
         if (![self isCancelled]) {
             [NSThread sleepForTimeInterval:RETRY_DELAY];

Limelight/Network/AppListResponse.m

@@ -44,7 +44,7 @@ static const char* TAG_APP_INSTALL_PATH = "AppInstallPath";
     
     xmlChar* statusStr = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_CODE UTF8String]);
     if (statusStr != NULL) {
-        int status = [[NSString stringWithUTF8String:(const char*)statusStr] intValue];
+        int status = (int)[[NSString stringWithUTF8String:(const char*)statusStr] longLongValue];
         xmlFree(statusStr);
         self.statusCode = status;
     }
@@ -113,6 +113,7 @@ static const char* TAG_APP_INSTALL_PATH = "AppInstallPath";
     
     xmlFreeDoc(docPtr);
     
+#ifdef ENABLE_APP_STORE_RESTRICTIONS
     // APP STORE REVIEW COMPLIANCE
     //
     // Remove default Steam entry from the app list to comply with Apple App Store Guideline 4.2.7d:
@@ -146,6 +147,7 @@ static const char* TAG_APP_INSTALL_PATH = "AppInstallPath";
             [_appList removeObject:manuallyAddedSteamApp];
         }
     }
+#endif
 }
 
 - (NSSet*) getAppList {

Limelight/Network/ConnectionHelper.h

@@ -7,14 +7,14 @@
 //
 
 #import "AppListResponse.h"
+#import "TemporaryHost.h"
 
 #ifndef ConnectionHelper_h
 #define ConnectionHelper_h
 
-
 @interface ConnectionHelper : NSObject
 
-+(AppListResponse*) getAppListForHostWithHostIP:(NSString*) hostIP serverCert:(NSData*) serverCert uniqueID:(NSString*) uniqueId;
++(AppListResponse*) getAppListForHost:(TemporaryHost*)host;
 
 @end
 

Limelight/Network/ConnectionHelper.m

@@ -14,15 +14,15 @@
 
 @implementation ConnectionHelper
 
-+(AppListResponse*) getAppListForHostWithHostIP:(NSString*) hostIP serverCert:(NSData*) cert uniqueID:(NSString*) uniqueId {
-    HttpManager* hMan = [[HttpManager alloc] initWithHost:hostIP uniqueId:uniqueId serverCert:cert];
++(AppListResponse*) getAppListForHost:(TemporaryHost*)host {
+    HttpManager* hMan = [[HttpManager alloc] initWithHost:host];
     
     // Try up to 5 times to get the app list
-    AppListResponse* appListResp;
+    AppListResponse* appListResp = nil;
     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) {
+        if (![appListResp isStatusOk] || [appListResp getAppList] == nil) {
             Log(LOG_W, @"Failed to get applist on try %d: %@", i, appListResp.statusMessage);
             
             // Wait for one second then retry
@@ -30,10 +30,11 @@
         }
         else {
             Log(LOG_I, @"App list successfully retreived - took %d tries", i);
-            return appListResp;
+            break;
         }
     }
-    return nil;
+    
+    return appListResp;
 }
 
 @end

Limelight/Network/DiscoveryManager.h

@@ -21,8 +21,11 @@
 - (void) startDiscovery;
 - (void) stopDiscovery;
 - (void) stopDiscoveryBlocking;
+- (void) resetDiscoveryState;
 - (BOOL) addHostToDiscovery:(TemporaryHost*)host;
 - (void) removeHostFromDiscovery:(TemporaryHost*)host;
+- (void) pauseDiscoveryForHost:(TemporaryHost *)host;
+- (void) resumeDiscoveryForHost:(TemporaryHost *)host;
 - (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(TemporaryHost*, NSString*))callback;
 
 @end

Limelight/Network/DiscoveryManager.m

@@ -15,8 +15,14 @@
 #import "ServerInfoResponse.h"
 #import "IdManager.h"
 
+#include <Limelight.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
 @implementation DiscoveryManager {
     NSMutableArray* _hostQueue;
+    NSMutableSet* _pausedHosts;
     id<DiscoveryCallback> _callback;
     MDNSManager* _mdnsMan;
     NSOperationQueue* _opQueue;
@@ -33,6 +39,7 @@
     _callback = callback;
     shouldDiscover = NO;
     _hostQueue = [NSMutableArray array];
+    _pausedHosts = [NSMutableSet set];
     for (TemporaryHost* host in hosts)
     {
         [self addHostToDiscovery:host];
@@ -47,10 +54,88 @@
     return self;
 }
 
-- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(TemporaryHost *, NSString*))callback {
-    HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddress uniqueId:_uniqueId serverCert:nil];
++ (BOOL) isAddressLAN:(in_addr_t)addr {
+    addr = htonl(addr);
+    
+    // 10.0.0.0/8
+    if ((addr & 0xFF000000) == 0x0A000000) {
+        return YES;
+    }
+    // 172.16.0.0/12
+    else if ((addr & 0xFFF00000) == 0xAC100000) {
+        return YES;
+    }
+    // 192.168.0.0/16
+    else if ((addr & 0xFFFF0000) == 0xC0A80000) {
+        return YES;
+    }
+    // 169.254.0.0/16
+    else if ((addr & 0xFFFF0000) == 0xA9FE0000) {
+        return YES;
+    }
+    // 100.64.0.0/10 - RFC6598 official CGN address (shouldn't see this in a LAN)
+    else if ((addr & 0xFFC00000) == 0x64400000) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+// This ensures that only RFC 1918 IPv4 addresses can be passed to
+// the Add PC dialog. This is required to comply with Apple App Store
+// Guideline 4.2.7a.
++ (BOOL) isProhibitedAddress:(NSString*)address {
+#ifdef ENABLE_APP_STORE_RESTRICTIONS
+    struct addrinfo hints;
+    struct addrinfo* result;
+    int err;
+    
+    // We're explicitly using AF_INET here because we don't want to
+    // ever receive a synthesized IPv6 address here, even on NAT64.
+    // IPv6 addresses are not restricted here because we cannot easily
+    // tell whether they are local or not.
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET;
+    err = getaddrinfo([address UTF8String], NULL, &hints, &result);
+    if (err != 0 || result == NULL) {
+        Log(LOG_W, @"getaddrinfo(%@) failed: %d", address, err);
+        return NO;
+    }
+    
+    if (result->ai_family != AF_INET) {
+        // This should never happen due to our hints
+        assert(result->ai_family == AF_INET);
+        Log(LOG_W, @"Unexpected address family: %d", result->ai_family);
+        freeaddrinfo(result);
+        return NO;
+    }
+    
+    BOOL ret = ![DiscoveryManager isAddressLAN:((struct sockaddr_in*)result->ai_addr)->sin_addr.s_addr];
+    freeaddrinfo(result);
+
+    return ret;
+#else
+    return NO;
+#endif
+}
+
+- (ServerInfoResponse*) getServerInfoResponseForAddress:(NSString*)address {
+    HttpManager* hMan = [[HttpManager alloc] initWithAddress:address httpsPort:0 serverCert:nil];
     ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[hMan newServerInfoRequest:false] fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
+    return serverInfoResponse;
+}
+
+- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(TemporaryHost *, NSString*))callback {
+    BOOL prohibitedAddress = [DiscoveryManager isProhibitedAddress:hostAddress];
+    NSString* prohibitedAddressMessage = [NSString stringWithFormat: @"Moonlight only supports adding PCs on your local network on %s.",
+    #if TARGET_OS_TV
+                                   "tvOS"
+    #else
+                                   "iOS"
+    #endif
+                             ];
+    ServerInfoResponse* serverInfoResponse = [self getServerInfoResponseForAddress:hostAddress];
     
     TemporaryHost* host = nil;
     if ([serverInfoResponse isStatusOk]) {
@@ -58,15 +143,74 @@
         host.activeAddress = host.address = hostAddress;
         host.state = StateOnline;
         [serverInfoResponse populateHost:host];
+        
+        // Check if this is a new PC
+        if (![self getHostInDiscovery:host.uuid]) {
+            // Enforce LAN restriction for App Store Guideline 4.2.7a
+            if ([DiscoveryManager isProhibitedAddress:hostAddress]) {
+                // We have a prohibited address. This might be because the user specified their WAN address
+                // instead of their LAN address. If that's the case, we'll try their LAN address and if we
+                // can reach it through that address, we'll allow it.
+                ServerInfoResponse* lanInfo = [self getServerInfoResponseForAddress:host.localAddress];
+                if ([lanInfo isStatusOk]) {
+                    TemporaryHost* lanHost = [[TemporaryHost alloc] init];
+                    [lanInfo populateHost:lanHost];
+                    
+                    if (![lanHost.uuid isEqualToString:host.uuid]) {
+                        // This is a different host, so it's prohibited
+                        prohibitedAddress = YES;
+                    }
+                    else {
+                        // This is the same host that is reachable on the LAN
+                        prohibitedAddress = NO;
+                    }
+                }
+                else {
+                    // LAN request failed, so it's a prohibited address
+                    prohibitedAddress = YES;
+                }
+            }
+            else {
+                // It's an RFC 1918 IPv4 address or IPv6 address which counts as LAN
+                prohibitedAddress = NO;
+            }
+            
+            if (prohibitedAddress) {
+                callback(nil, prohibitedAddressMessage);
+                return;
+            }
+            else if ([DiscoveryManager isAddressLAN:inet_addr([hostAddress UTF8String])]) {
+                // Don't send a STUN request if we're connected to a VPN. We'll likely get the VPN
+                // gateway's external address rather than the external address of the LAN.
+                if (![Utils isActiveNetworkVPN]) {
+                    // This host was discovered over a permissible LAN address, so we can update our
+                    // external address for this host.
+                    struct in_addr wanAddr;
+                    int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &wanAddr.s_addr);
+                    if (err == 0) {
+                        char addrStr[INET_ADDRSTRLEN];
+                        inet_ntop(AF_INET, &wanAddr, addrStr, sizeof(addrStr));
+                        host.externalAddress = [NSString stringWithFormat: @"%s", addrStr];
+                    }
+                }
+            }
+        }
+        
         if (![self addHostToDiscovery:host]) {
             callback(nil, @"Host information updated");
         } else {
             callback(host, nil);
         }
+    } else if (!prohibitedAddress) {
+        callback(nil, @"Could not connect to host.\n\nIf you're hosting using GeForce Experience, make sure you've enabled the toggle on the SHIELD tab.\n\nIf you're hosting using Sunshine, ensure it is running properly. If you're using a non-default port, you will need to include that here.");
     } else {
-        callback(nil, @"Could not connect to host. Ensure GameStream is enabled in GeForce Experience on your PC.");
+        callback(nil, prohibitedAddressMessage);
     }
-    
+}
+
+- (void) resetDiscoveryState {
+    // Allow us to rediscover hosts that were already found before
+    [_mdnsMan forgetHosts];
 }
 
 - (void) startDiscovery {
@@ -77,8 +221,13 @@
     Log(LOG_I, @"Starting discovery");
     shouldDiscover = YES;
     [_mdnsMan searchForHosts];
-    for (TemporaryHost* host in _hostQueue) {
-        [_opQueue addOperation:[self createWorkerForHost:host]];
+    
+    @synchronized (_hostQueue) {
+        for (TemporaryHost* host in _hostQueue) {
+            if (![_pausedHosts containsObject:host]) {
+                [_opQueue addOperation:[self createWorkerForHost:host]];
+            }
+        }
     }
 }
 
@@ -141,21 +290,53 @@
         return NO;
     }
     else {
-        [_hostQueue addObject:host];
-        if (shouldDiscover) {
-            [_opQueue addOperation:[self createWorkerForHost:host]];
+        @synchronized (_hostQueue) {
+            [_hostQueue addObject:host];
+            if (shouldDiscover) {
+                [_opQueue addOperation:[self createWorkerForHost:host]];
+            }
         }
         return YES;
     }
 }
 
 - (void) removeHostFromDiscovery:(TemporaryHost *)host {
-    for (DiscoveryWorker* worker in [_opQueue operations]) {
-        if ([worker getHost] == host) {
-            [worker cancel];
+    @synchronized (_hostQueue) {
+        for (DiscoveryWorker* worker in [_opQueue operations]) {
+            if ([worker getHost] == host) {
+                [worker cancel];
+            }
+        }
+        
+        [_hostQueue removeObject:host];
+        [_pausedHosts removeObject:host];
+    }
+}
+
+- (void) pauseDiscoveryForHost:(TemporaryHost *)host {
+    @synchronized (_hostQueue) {
+        // Stop any worker for the host
+        for (DiscoveryWorker* worker in [_opQueue operations]) {
+            if ([worker getHost] == host) {
+                [worker cancel];
+            }
+        }
+        
+        // Add it to the paused hosts list
+        [_pausedHosts addObject:host];
+    }
+}
+
+- (void) resumeDiscoveryForHost:(TemporaryHost *)host {
+    @synchronized (_hostQueue) {
+        // Remove it from the paused hosts list
+        [_pausedHosts removeObject:host];
+        
+        // Start discovery again
+        if (shouldDiscover) {
+            [_opQueue addOperation:[self createWorkerForHost:host]];
         }
     }
-    [_hostQueue removeObject:host];
 }
 
 // Override from MDNSCallback - called in a worker thread
@@ -167,16 +348,20 @@
     [worker discoverHost];
     if ([self addHostToDiscovery:host]) {
         Log(LOG_I, @"Found new host through MDNS: %@:", host.name);
-        [self->_callback updateAllHosts:self->_hostQueue];
+        @synchronized (_hostQueue) {
+            [_callback updateAllHosts:_hostQueue];
+        }
     } else {
         Log(LOG_D, @"Found existing host through MDNS: %@", host.name);
     }
 }
 
 - (TemporaryHost*) getHostInDiscovery:(NSString*)uuidString {
-    for (TemporaryHost* discoveredHost in _hostQueue) {
-        if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:uuidString]) {
-            return discoveredHost;
+    @synchronized (_hostQueue) {
+        for (TemporaryHost* discoveredHost in _hostQueue) {
+            if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:uuidString]) {
+                return discoveredHost;
+            }
         }
     }
     return nil;

Limelight/Network/DiscoveryWorker.m

@@ -89,8 +89,9 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
     
     Log(LOG_D, @"%@ has %d unique addresses", _host.name, [addresses count]);
     
-    // Give the PC 2 tries to respond before declaring it offline
-    for (int i = 0; i < 2; i++) {
+    // Give the PC 2 tries to respond before declaring it offline if we've seen it before.
+    // If this is an unknown PC, update the status after 1 attempt to get the UI refreshed quickly.
+    for (int i = 0; i < (_host.state == StateUnknown ? 1 : 2); i++) {
         for (NSString *address in addresses) {
             if (self.cancelled) {
                 // Get out without updating the status because
@@ -102,8 +103,8 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
             ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:address cert:_host.serverCert];
             receivedResponse = [self checkResponse:serverInfoResp];
             if (receivedResponse) {
-                [serverInfoResp populateHost:_host];
                 _host.activeAddress = address;
+                [serverInfoResp populateHost:_host];
                 
                 // Update the database using the response
                 DataManager *dataManager = [[DataManager alloc] init];
@@ -125,9 +126,7 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
 }
 
 - (ServerInfoResponse*) requestInfoAtAddress:(NSString*)address cert:(NSData*)cert {
-    HttpManager* hMan = [[HttpManager alloc] initWithHost:address
-                                                 uniqueId:_uniqueId
-                                                     serverCert:cert];
+    HttpManager* hMan = [[HttpManager alloc] initWithAddress:address httpsPort:0 serverCert:cert];
     ServerInfoResponse* response = [[ServerInfoResponse alloc] init];
     [hMan executeRequestSynchronously:[HttpRequest requestForResponse:response
                                                        withUrlRequest:[hMan newServerInfoRequest:true]

Limelight/Network/HttpManager.h

@@ -9,10 +9,12 @@
 #import "HttpResponse.h"
 #import "HttpRequest.h"
 #import "StreamConfiguration.h"
+#import "TemporaryHost.h"
 
 @interface HttpManager : NSObject <NSURLSessionDelegate>
 
-- (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId serverCert:(NSData*) serverCert;
+- (id) initWithHost:(TemporaryHost*) host;
+- (id) initWithAddress:(NSString*) hostAddressPortString httpsPort:(unsigned short) httpsPort serverCert:(NSData*) serverCert;
 - (void) setServerCert:(NSData*) serverCert;
 - (NSURLRequest*) newPairRequest:(NSData*)salt clientCert:(NSData*)clientCert;
 - (NSURLRequest*) newUnpairRequest;
@@ -24,8 +26,7 @@
 - (NSURLRequest*) newServerInfoRequest:(bool)fastFail;
 - (NSURLRequest*) newHttpServerInfoRequest:(bool)fastFail;
 - (NSURLRequest*) newHttpServerInfoRequest;
-- (NSURLRequest*) newLaunchRequest:(StreamConfiguration*)config;
-- (NSURLRequest*) newResumeRequest:(StreamConfiguration*)config;
+- (NSURLRequest*) newLaunchOrResumeRequest:(NSString*)verb config:(StreamConfiguration*)config;
 - (NSURLRequest*) newQuitAppRequest;
 - (NSURLRequest*) newAppAssetRequestWithAppId:(NSString*)appId;
 - (void) executeRequestSynchronously:(HttpRequest*)request;

Limelight/Network/HttpManager.m

@@ -10,32 +10,29 @@
 #import "HttpRequest.h"
 #import "CryptoManager.h"
 #import "TemporaryApp.h"
+#import "ServerInfoResponse.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>
 
+#include <Limelight.h>
+
 #define SHORT_TIMEOUT_SEC 2
 #define NORMAL_TIMEOUT_SEC 5
 #define LONG_TIMEOUT_SEC 60
 #define EXTRA_LONG_TIMEOUT_SEC 180
 
 @implementation HttpManager {
-    NSURLSession* _urlSession;
+    NSString* _urlSafeHostName;
     NSString* _baseHTTPURL;
-    NSString* _baseHTTPSURL;
     NSString* _uniqueId;
     NSString* _deviceName;
     NSData* _serverCert;
-    NSMutableData* _respData;
-    NSData* _requestResp;
-    dispatch_semaphore_t _requestLock;
     
-    NSError* _error;
+    TemporaryHost *_host; // May be nil
+    NSString* _baseHTTPSURL;
 }
 
-static const NSString* HTTP_PORT = @"47989";
-static const NSString* HTTPS_PORT = @"47984";
-
 + (NSData*) fixXmlVersion:(NSData*) xmlData {
     NSString* dataString = [[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding];
     NSString* xmlString = [dataString stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [dataString length])];
@@ -47,63 +44,111 @@ static const NSString* HTTPS_PORT = @"47984";
     _serverCert = serverCert;
 }
 
-- (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId serverCert:(NSData*) serverCert {
+- (id) initWithHost:(TemporaryHost*) host {
+    self = [self initWithAddress:host.activeAddress httpsPort:host.httpsPort serverCert:host.serverCert];
+    _host = host;
+    return self;
+}
+
+- (id) initWithAddress:(NSString*) hostAddressPortString httpsPort:(unsigned short)httpsPort serverCert:(NSData*) serverCert {
     self = [super init];
     // Use the same UID for all Moonlight clients to allow them
     // quit games started on another Moonlight client.
     _uniqueId = @"0123456789ABCDEF";
     _deviceName = deviceName;
     _serverCert = serverCert;
-    _requestLock = dispatch_semaphore_create(0);
-    _respData = [[NSMutableData alloc] init];
-    NSURLSessionConfiguration* config = [NSURLSessionConfiguration ephemeralSessionConfiguration];
-    _urlSession = [NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil];
+    
+    NSString* address = [Utils addressPortStringToAddress:hostAddressPortString];
+    unsigned short port = [Utils addressPortStringToPort:hostAddressPortString];
     
     // If this is an IPv6 literal, we must properly enclose it in brackets
-    NSString* urlSafeHost;
-    if ([host containsString:@":"]) {
-        urlSafeHost = [NSString stringWithFormat:@"[%@]", host];
+    if ([address containsString:@":"]) {
+        _urlSafeHostName = [NSString stringWithFormat:@"[%@]", address];
     } else {
-        urlSafeHost = host;
+        _urlSafeHostName = address;
     }
     
-    _baseHTTPURL = [NSString stringWithFormat:@"http://%@:%@", urlSafeHost, HTTP_PORT];
-    _baseHTTPSURL = [NSString stringWithFormat:@"https://%@:%@", urlSafeHost, HTTPS_PORT];
+    _baseHTTPURL = [NSString stringWithFormat:@"http://%@:%u", _urlSafeHostName, port];
+    
+    if (httpsPort) {
+        _baseHTTPSURL = [NSString stringWithFormat:@"https://%@:%u", _urlSafeHostName, httpsPort];
+    }
     
     return self;
 }
 
+- (BOOL) ensureHttpsUrlPopulated:(bool)fastFail {
+    if (!_baseHTTPSURL) {
+        // Use the caller's provided port if one was specified
+        if (_host && _host.httpsPort != 0) {
+            _baseHTTPSURL = [NSString stringWithFormat:@"https://%@:%u", _urlSafeHostName, _host.httpsPort];
+        }
+        else {
+            // Query the host to retrieve the HTTPS port
+            ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
+            [self executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[self newHttpServerInfoRequest:false]]];
+            TemporaryHost* dummyHost = [[TemporaryHost alloc] init];
+            if (![serverInfoResponse isStatusOk]) {
+                return NO;
+            }
+            [serverInfoResponse populateHost:dummyHost];
+            
+            // Pass the port back if the caller provided storage for it
+            if (_host) {
+                _host.httpsPort = dummyHost.httpsPort;
+            }
+            
+            _baseHTTPSURL = [NSString stringWithFormat:@"https://%@:%u", _urlSafeHostName, dummyHost.httpsPort];
+        }
+    }
+    
+    return YES;
+}
+
 - (void) executeRequestSynchronously:(HttpRequest*)request {
-    [_respData setLength:0];
-    _error = nil;
+    // This is a special case to handle failure of HTTPS port fetching
+    if (!request.request) {
+        if (request.response) {
+            request.response.statusCode = EHOSTDOWN;
+            request.response.statusMessage = @"Host is unreachable";
+        }
+        
+        return;
+    }
+
+    __block NSData* requestResp = nil;
+    __block NSError* respError = nil;
+    __block dispatch_semaphore_t requestLock = dispatch_semaphore_create(0);
     
     Log(LOG_D, @"Making Request: %@", request);
-    [[_urlSession dataTaskWithRequest:request.request completionHandler:^(NSData * __nullable data, NSURLResponse * __nullable response, NSError * __nullable error) {
+    NSURLSession* urlSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration] delegate:self delegateQueue:nil];
+    [[urlSession dataTaskWithRequest:request.request completionHandler:^(NSData * __nullable data, NSURLResponse * __nullable response, NSError * __nullable error) {
         
         if (error != NULL) {
             Log(LOG_D, @"Connection error: %@", error);
-            self->_error = error;
+            respError = error;
         }
         else {
             Log(LOG_D, @"Received response: %@", response);
 
             if (data != NULL) {
                 Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
-                [self->_respData appendData:data];
-                if ([[NSString alloc] initWithData:self->_respData encoding:NSUTF8StringEncoding] != nil) {
-                    self->_requestResp = [HttpManager fixXmlVersion:self->_respData];
+                if ([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] != nil) {
+                    requestResp = [HttpManager fixXmlVersion:data];
                 } else {
-                    self->_requestResp = self->_respData;
+                    requestResp = data;
                 }
             }
         }
         
-        dispatch_semaphore_signal(self->_requestLock);
+        dispatch_semaphore_signal(requestLock);
     }] resume];
-    dispatch_semaphore_wait(_requestLock, DISPATCH_TIME_FOREVER);
     
-    if (!_error && request.response) {
-        [request.response populateWithData:_requestResp];
+    dispatch_semaphore_wait(requestLock, DISPATCH_TIME_FOREVER);
+    [urlSession invalidateAndCancel];
+    
+    if (!respError && request.response) {
+        [request.response populateWithData:requestResp];
         
         // If the fallback error code was detected, issue the fallback request
         if (request.response.statusCode == request.fallbackError && request.fallbackRequest != NULL) {
@@ -114,7 +159,7 @@ static const NSString* HTTPS_PORT = @"47984";
             [self executeRequestSynchronously:request];
         }
     }
-    else if (_error && [_error code] == NSURLErrorServerCertificateUntrusted) {
+    else if (respError && [respError code] == NSURLErrorServerCertificateUntrusted) {
         // We must have a pinned cert for HTTPS. If we fail, it must be due to
         // a non-matching cert, not because we had no cert at all.
         assert(_serverCert != nil);
@@ -129,6 +174,10 @@ static const NSString* HTTPS_PORT = @"47984";
             [self executeRequestSynchronously:request];
         }
     }
+    else if (respError && request.response) {
+        request.response.statusCode = [respError code];
+        request.response.statusMessage = [respError localizedDescription];
+    }
 }
 
 - (NSURLRequest*) createRequestFromString:(NSString*) urlString timeout:(int)timeout {
@@ -168,11 +217,19 @@ static const NSString* HTTPS_PORT = @"47984";
 }
 
 - (NSURLRequest*) newPairChallenge {
+    if (![self ensureHttpsUrlPopulated:NO]) {
+        return nil;
+    }
+    
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=pairchallenge", _baseHTTPSURL, _uniqueId, _deviceName];
     return [self createRequestFromString:urlString timeout:NORMAL_TIMEOUT_SEC];
 }
 
 - (NSURLRequest *)newAppListRequest {
+    if (![self ensureHttpsUrlPopulated:NO]) {
+        return nil;
+    }
+    
     NSString* urlString = [NSString stringWithFormat:@"%@/applist?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString timeout:NORMAL_TIMEOUT_SEC];
 }
@@ -183,6 +240,10 @@ static const NSString* HTTPS_PORT = @"47984";
         return [self newHttpServerInfoRequest:fastFail];
     }
     
+    if (![self ensureHttpsUrlPopulated:fastFail]) {
+        return nil;
+    }
+    
     NSString* urlString = [NSString stringWithFormat:@"%@/serverinfo?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString timeout:(fastFail ? SHORT_TIMEOUT_SEC : NORMAL_TIMEOUT_SEC)];
 }
@@ -196,43 +257,49 @@ static const NSString* HTTPS_PORT = @"47984";
     return [self newHttpServerInfoRequest:false];
 }
 
-- (NSURLRequest*) newLaunchRequest:(StreamConfiguration*)config {
-    // Using an FPS value over 60 causes SOPS to default to 720p60,
-    // so force it to 60 when starting. This won't impact our ability
-    // to get > 60 FPS while actually streaming though.
-    int fps = config.frameRate > 60 ? 60 : config.frameRate;
+- (NSURLRequest*) newLaunchOrResumeRequest:(NSString*)verb config:(StreamConfiguration*)config {
+    if (![self ensureHttpsUrlPopulated:NO]) {
+        return nil;
+    }
     
-    NSString* urlString = [NSString stringWithFormat:@"%@/launch?uniqueid=%@&appid=%@&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%@&rikeyid=%d%@&localAudioPlayMode=%d&surroundAudioInfo=%d&remoteControllersBitmap=%d&gcmap=%d",
-                           _baseHTTPSURL, _uniqueId,
+    // Using an FPS value over 60 causes SOPS to default to 720p60,
+    // so force it to 0 to ensure the correct resolution is set. We
+    // used to use 60 here but that locked the frame rate to 60 FPS
+    // on GFE 3.20.3. We do not do this hack for Sunshine (which is
+    // indicated by a negative version in the last field.
+    int fps = (config.frameRate > 60 && ![config.appVersion containsString:@".-"]) ? 0 : config.frameRate;
+    
+    NSString* urlString = [NSString stringWithFormat:@"%@/%@?uniqueid=%@&appid=%@&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%@&rikeyid=%d%@&localAudioPlayMode=%d&surroundAudioInfo=%d&remoteControllersBitmap=%d&gcmap=%d&gcpersist=%d%s",
+                           _baseHTTPSURL, verb, _uniqueId,
                            config.appID,
                            config.width, config.height, fps,
                            config.optimizeGameSettings ? 1 : 0,
                            [Utils bytesToHex:config.riKey], config.riKeyId,
-                           config.enableHdr ? @"&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0": @"",
+                           (config.supportedVideoFormats & VIDEO_FORMAT_MASK_10BIT) ? @"&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0": @"",
                            config.playAudioOnPC ? 1 : 0,
-                           (config.audioChannelMask << 16) | config.audioChannelCount,
-                           config.gamepadMask, config.gamepadMask];
+                           SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(config.audioConfiguration),
+                           config.gamepadMask, config.gamepadMask,
+                           !config.multiController ? 1 : 0,
+                           LiGetLaunchUrlQueryParameters()];
     Log(LOG_I, @"Requesting: %@", urlString);
     // This blocks while the app is launching
     return [self createRequestFromString:urlString timeout:LONG_TIMEOUT_SEC];
 }
 
-- (NSURLRequest*) newResumeRequest:(StreamConfiguration*)config {
-    NSString* urlString = [NSString stringWithFormat:@"%@/resume?uniqueid=%@&rikey=%@&rikeyid=%d&surroundAudioInfo=%d",
-                           _baseHTTPSURL, _uniqueId,
-                           [Utils bytesToHex:config.riKey], config.riKeyId,
-                           (config.audioChannelMask << 16) | config.audioChannelCount];
-    Log(LOG_I, @"Requesting: %@", urlString);
-    // This blocks while the app is resuming
-    return [self createRequestFromString:urlString timeout:LONG_TIMEOUT_SEC];
-}
-
 - (NSURLRequest*) newQuitAppRequest {
+    if (![self ensureHttpsUrlPopulated:NO]) {
+        return nil;
+    }
+    
     NSString* urlString = [NSString stringWithFormat:@"%@/cancel?uniqueid=%@", _baseHTTPSURL, _uniqueId];
     return [self createRequestFromString:urlString timeout:LONG_TIMEOUT_SEC];
 }
 
 - (NSURLRequest*) newAppAssetRequestWithAppId:(NSString *)appId {
+    if (![self ensureHttpsUrlPopulated:NO]) {
+        return nil;
+    }
+    
     NSString* urlString = [NSString stringWithFormat:@"%@/appasset?uniqueid=%@&appid=%@&AssetType=2&AssetIdx=0", _baseHTTPSURL, _uniqueId, appId];
     return [self createRequestFromString:urlString timeout:NORMAL_TIMEOUT_SEC];
 }
@@ -252,7 +319,7 @@ static const NSString* HTTPS_PORT = @"47984";
     
     SecIdentityCopyCertificate(identity, &certificate);
     
-    return [[NSArray alloc] initWithObjects:(__bridge id)certificate, nil];
+    return [[NSArray alloc] initWithObjects:(__bridge_transfer id)certificate, nil];
 }
 
 // Returns the identity
@@ -264,13 +331,14 @@ static const NSString* HTTPS_PORT = @"47984";
     const void *keys[] = { kSecImportExportPassphrase };
     const void *values[] = { password };
     CFDictionaryRef options = CFDictionaryCreate(NULL, keys, values, 1, NULL, NULL);
-    CFArrayRef items = CFArrayCreate(NULL, 0, 0, NULL);
+    CFArrayRef items = nil;
     OSStatus securityError = SecPKCS12Import(p12Data, options, &items);
 
     if (securityError == errSecSuccess) {
         //Log(LOG_D, @"Success opening p12 certificate. Items: %ld", CFArrayGetCount(items));
         CFDictionaryRef identityDict = CFArrayGetValueAtIndex(items, 0);
-        identityApp = (SecIdentityRef)CFDictionaryGetValue(identityDict, kSecImportItemIdentity);
+        identityApp = (SecIdentityRef)CFRetain(CFDictionaryGetValue(identityDict, kSecImportItemIdentity));
+        CFRelease(items);
     } else {
         Log(LOG_E, @"Error opening Certificate.");
     }
@@ -324,6 +392,7 @@ static const NSString* HTTPS_PORT = @"47984";
         SecIdentityRef identity = [self getClientCertificate];
         NSArray* certArray = [self getCertificate:identity];
         NSURLCredential* newCredential = [NSURLCredential credentialWithIdentity:identity certificates:certArray persistence:NSURLCredentialPersistencePermanent];
+        CFRelease(identity);
         completionHandler(NSURLSessionAuthChallengeUseCredential, newCredential);
     }
     else

Limelight/Network/HttpResponse.m

@@ -55,21 +55,26 @@
 
     xmlChar* statusStr = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_CODE UTF8String]);
     if (statusStr != NULL) {
-        int status = [[NSString stringWithUTF8String:(const char*)statusStr] intValue];
+        int status = (int)[[NSString stringWithUTF8String:(const char*)statusStr] longLongValue];
         xmlFree(statusStr);
         self.statusCode = status;
     }
     
     xmlChar* statusMsgXml = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_MESSAGE UTF8String]);
-    NSString* statusMsg;
     if (statusMsgXml != NULL) {
-        statusMsg = [NSString stringWithUTF8String:(const char*)statusMsgXml];
+        self.statusMessage = [NSString stringWithUTF8String:(const char*)statusMsgXml];
         xmlFree(statusMsgXml);
     }
     else {
-        statusMsg = @"Server Error";
+        self.statusMessage = @"Server Error";
+    }
+    
+    if (self.statusCode == -1 && [self.statusMessage isEqualToString:@"Invalid"]) {
+        // Special case handling an audio capture error which GFE doesn't
+        // provide any useful status message for.
+        self.statusCode = 418;
+        self.statusMessage = @"Missing audio capture device. Reinstalling GeForce Experience should resolve this error.";
     }
-    self.statusMessage = statusMsg;
 
     node = node->children;
     

Limelight/Network/MDNSManager.h

@@ -21,6 +21,7 @@
 - (id) initWithCallback:(id<MDNSCallback>) callback;
 - (void) searchForHosts;
 - (void) stopSearching;
+- (void) forgetHosts;
 
 @end
 

Limelight/Network/MDNSManager.m

@@ -63,21 +63,30 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
     [mDNSBrowser stop];
 }
 
+- (void) forgetHosts {
+    [services removeAllObjects];
+}
+
 + (NSString*)sockAddrToString:(NSData*)addrData {
     char addrStr[INET6_ADDRSTRLEN];
     struct sockaddr* addr = (struct sockaddr*)[addrData bytes];
     if (addr->sa_family == AF_INET) {
         inet_ntop(addr->sa_family, &((struct sockaddr_in*)addr)->sin_addr, addrStr, sizeof(addrStr));
+        unsigned short port = ntohs(((struct sockaddr_in*)addr)->sin_port);
+        return [NSString stringWithFormat: @"%s:%u", addrStr, port];
     }
     else {
         struct sockaddr_in6* sin6 = (struct sockaddr_in6*)addr;
         inet_ntop(addr->sa_family, &sin6->sin6_addr, addrStr, sizeof(addrStr));
+        unsigned short port = ntohs(((struct sockaddr_in6*)addr)->sin6_port);
         if (sin6->sin6_scope_id != 0) {
             // Link-local addresses with scope IDs are special
-            return [NSString stringWithFormat: @"%s%%%u", addrStr, sin6->sin6_scope_id];
+            return [NSString stringWithFormat: @"[%s%%%u]:%u", addrStr, sin6->sin6_scope_id, port];
+        }
+        else {
+            return [NSString stringWithFormat: @"[%s]:%u", addrStr, port];
         }
     }
-    return [NSString stringWithFormat: @"%s", addrStr];
 }
 
 + (BOOL)isAddress:(uint8_t*)address inSubnet:(uint8_t*)subnet netmask:(int)bits {
@@ -180,19 +189,23 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
                 continue;
             }
             
-            // Since we discovered this host over IPv4 mDNS, we know we're on the same network
-            // as the PC and we can use our current WAN address as a likely candidate
-            // for our PC's external address.
-            struct in_addr wanAddr;
-            int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &wanAddr.s_addr);
-            if (err == 0) {
-                char addrStr[INET_ADDRSTRLEN];
-                inet_ntop(AF_INET, &wanAddr, addrStr, sizeof(addrStr));
-                host.externalAddress = [NSString stringWithFormat: @"%s", addrStr];
-                Log(LOG_I, @"External IPv4 address (STUN): %@ -> %@", [service hostName], host.externalAddress);
-            }
-            else {
-                Log(LOG_E, @"STUN failed to get WAN address: %d", err);
+            // Don't send a STUN request if we're connected to a VPN. We'll likely get the VPN
+            // gateway's external address rather than the external address of the LAN.
+            if (![Utils isActiveNetworkVPN]) {
+                // Since we discovered this host over IPv4 mDNS, we know we're on the same network
+                // as the PC and we can use our current WAN address as a likely candidate
+                // for our PC's external address.
+                struct in_addr wanAddr;
+                int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &wanAddr.s_addr);
+                if (err == 0) {
+                    char addrStr[INET_ADDRSTRLEN];
+                    inet_ntop(AF_INET, &wanAddr, addrStr, sizeof(addrStr));
+                    host.externalAddress = [NSString stringWithFormat: @"%s", addrStr];
+                    Log(LOG_I, @"External IPv4 address (STUN): %@ -> %@", [service hostName], host.externalAddress);
+                }
+                else {
+                    Log(LOG_E, @"STUN failed to get WAN address: %d", err);
+                }
             }
             
             host.localAddress = [MDNSManager sockAddrToString:addrData];
@@ -227,7 +240,7 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
     [NSTimer scheduledTimerWithTimeInterval:2.0
                                      target:self
                                    selector:@selector(retryResolveTimerCallback:)
-                                   userInfo:nil
+                                   userInfo:sender
                                     repeats:NO];
 }
 
@@ -281,12 +294,12 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
         return;
     }
     
-    Log(LOG_I, @"Retrying mDNS resolution");
-    for (NSNetService* service in services) {
-        if (service.hostName == nil) {
-            [service setDelegate:self];
-            [service resolveWithTimeout:5];
-        }
+    NSNetService* service = timer.userInfo;
+    Log(LOG_I, @"Retrying mDNS resolution for %@", service);
+    
+    if (service.hostName == nil) {
+        [service setDelegate:self];
+        [service resolveWithTimeout:5];
     }
 }