Temporarily switch to gamecontrollerdb to fix build after DMCA takedown of SDL_GameControllerDB

2026-10-12 03:24:00 +00:00 · 2020-03-10 19:14:14 -07:00
958 changed files with 217400 additions and 70602 deletions
@@ -1,12 +1,10 @@
 ---
 name: Bug report
-about: Follow the troubleshooting guide before reporting a bug
+about: Create a report to help us address issues in Moonlight

 ---
 **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
+This issue tracker is not the right place to ask for troubleshooting help if you're not able to connect or stream at all. For those requests, please use the #pc-help channel on our Discord server where there are many more people who can help (or direct you back here if it looks like a Moonlight bug after all). https://discord.gg/MySTSdq

 **Describe the bug**
 A clear and concise description of what the bug is.
@@ -28,22 +26,14 @@ List the games you've tried that exhibit the issue. To see if the issue is game-
 - 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?
- 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
-
 **Client PC details (please complete the following information)**
 - OS: [e.g. Windows 10 1809]
 - Moonlight Version: [e.g. v0.9.0]
- - GPU: [e.g. Intel HD Graphics 520]
- - Linux package type (if applicable): [e.g. Flatpak]

 **Server PC details (please complete the following information)**
 - OS: [e.g. Windows 10 1809]
- - Sunshine or GeForce Experience version: [e.g. Sunshine v0.21.0]
- - GPU: [e.g. AMD Radeon RX 7900 XT]
- - GPU driver: [e.g. 24.1.1]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]

 **Moonlight Logs (please attach)**
 - On Windows, `Moonlight-###.log` files can be found in `%TEMP%`. Simply type that into the File Explorer path field to navigate there.
@@ -1 +0,0 @@
-blank_issues_enabled: false
@@ -1,4 +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 />
+  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://discord.gg/MySTSdq) 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!
@@ -1,9 +0,0 @@
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"
-    schedule:
-      interval: "daily"
@@ -1,164 +0,0 @@
---
-name: Build - Linux AppImage
-permissions:
-  contents: read
-
-on:
-  workflow_call:
-    inputs:
-      ci_version:
-        required: true
-        type: string
-
-jobs:
-  build:
-    env:
-      CI_VERSION: ${{ inputs.ci_version }}
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: 'recursive'
-          fetch-depth: 1
-
-      - name: Setup environment
-        run: |
-          wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.4.313-jammy.list https://packages.lunarg.com/vulkan/1.4.313/lunarg-vulkan-1.4.313-jammy.list
-          sudo apt update
-          sudo apt install -y qt6-base-dev qt6-declarative-dev libqt6svg6-dev qt6-wayland qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-layouts \
-            qml6-module-qtqml-workerscript qml6-module-qtquick-window qml6-module-qtquick python3-pip nasm libgbm-dev libdrm-dev libfreetype-dev libasound2-dev \
-            libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev \
-            libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev libxcb-dri3-dev libx11-xcb-dev \
-            libxfixes-dev libxtst-dev wayland-protocols libopus-dev libvdpau-dev libgl-dev libpipewire-0.3-dev liburing-dev vulkan-sdk cmake
-          sudo pip3 install meson
-          mkdir -p dep_root/{bin,include,lib}
-          echo "DEP_ROOT=$PWD/dep_root" >> "${GITHUB_ENV}"
-          echo "$PWD/dep_root/bin" >> "${GITHUB_PATH}"
-
-      - name: Checkout SDL3
-        uses: actions/checkout@v5
-        with:
-          repository: libsdl-org/SDL
-          ref: release-3.4.8
-          path: deps/SDL
-
-      - name: Build SDL3
-        working-directory: deps/SDL
-        run: |
-          cmake -DSDL_TEST_LIBRARY=OFF -DSDL_INSTALL_DOCS=OFF -S . -B build
-          cmake --build build -j
-          sudo cmake --install build
-
-      - name: Checkout sdl2-compat
-        uses: actions/checkout@v5
-        with:
-          repository: libsdl-org/sdl2-compat
-          ref: release-2.32.68
-          path: deps/sdl2-compat
-
-      - name: Build sdl2-compat
-        working-directory: deps/sdl2-compat
-        run: |
-          cmake -DSDL2COMPAT_TESTS=OFF -S . -B build
-          cmake --build build -j
-          sudo cmake --install build
-
-      - name: Checkout SDL_ttf
-        uses: actions/checkout@v5
-        with:
-          repository: libsdl-org/SDL_ttf
-          ref: a883e490e30fb44a5336ea3dcb990c6982c5216f
-          path: deps/SDL_ttf
-          submodules: 'recursive'
-
-      - name: Build SDL_ttf
-        working-directory: deps/SDL_ttf
-        run: |
-          ./autogen.sh
-          ./configure
-          make -j$(nproc)
-          sudo make install
-
-      - name: Checkout libva
-        uses: actions/checkout@v5
-        with:
-          repository: intel/libva
-          ref: 2.23.0
-          path: deps/libva
-
-      - name: Build libva
-        working-directory: deps/libva
-        run: |
-          ./autogen.sh
-          ./configure --enable-x11
-          make -j$(nproc)
-          sudo make install
-
-      - name: Checkout libplacebo
-        uses: actions/checkout@v5
-        with:
-          repository: haasn/libplacebo
-          ref: v7.360.1
-          path: deps/libplacebo
-          submodules: 'recursive'
-
-      - name: Build libplacebo
-        working-directory: deps/libplacebo
-        run: |
-          meson setup build -Dvulkan=enabled -Dopengl=disabled -Ddemos=false
-          ninja -C build
-          sudo ninja install -C build
-
-      - name: Build dav1d
-        working-directory: deps
-        env:
-          DAV1D_VER: 1.5.3
-        run: |
-          git clone --branch $DAV1D_VER --depth 1 https://code.videolan.org/videolan/dav1d.git
-          pushd dav1d
-          meson setup build -Ddefault_library=static -Dbuildtype=release -Denable_tools=false -Denable_tests=false
-          ninja -C build
-          sudo ninja install -C build
-          popd
-
-      - name: Checkout FFmpeg
-        uses: actions/checkout@v5
-        with:
-          repository: FFmpeg/FFmpeg
-          ref: n8.1.1
-          path: deps/FFmpeg
-
-      - name: Build FFmpeg
-        working-directory: deps/FFmpeg
-        run: |
-          ./configure --enable-pic --disable-static --enable-shared --disable-all --disable-autodetect --enable-avcodec --enable-avformat --enable-swscale \
-            --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 \
-            --enable-vaapi --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi \
-            --enable-vdpau --enable-hwaccel=h264_vdpau  --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau \
-            --enable-libdrm --enable-vulkan --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --enable-hwaccel=av1_vulkan \
-            --enable-libdav1d --enable-decoder=libdav1d
-          make -j$(nproc)
-          sudo make install
-
-      - name: Install linuxdeploy
-        working-directory: dep_root/bin
-        run: |
-          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-          wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-          chmod +x linuxdeploy*.AppImage
-
-      - name: Build Binaries
-        run: |
-          sudo ldconfig
-          scripts/build-appimage.sh
-
-      - name: Upload Binaries
-        uses: actions/upload-artifact@v6
-        with:
-          name: Moonlight-LinuxAppImage-${{ env.CI_VERSION }}
-          path: build/installer-release/Moonlight-${{ env.CI_VERSION }}-x86_64.AppImage
-          compression-level: 0
-          if-no-files-found: error
@@ -1,41 +0,0 @@
---
-name: Build - Steam Link
-permissions:
-  contents: read
-
-on:
-  workflow_call:
-    inputs:
-      ci_version:
-        required: true
-        type: string
-
-jobs:
-  build:
-    env:
-      CI_VERSION: ${{ inputs.ci_version }}
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: 'recursive'
-          fetch-depth: 1
-
-      - name: Checkout Steam Link SDK
-        uses: actions/checkout@v5
-        with:
-          repository: ValveSoftware/steamlink-sdk
-          path: steamlink-sdk
-          fetch-depth: 1
-
-      - name: Build binaries
-        run: STEAMLINK_SDK_PATH=$PWD/steamlink-sdk scripts/build-steamlink-app.sh
-
-      - name: Upload Binaries
-        uses: actions/upload-artifact@v6
-        with:
-          name: Moonlight-SteamLink-${{ env.CI_VERSION }}
-          path: build/deploy-release/*
-          if-no-files-found: error
@@ -1,125 +0,0 @@
---
-name: Build - Windows and macOS
-permissions:
-  contents: read
-
-on:
-  workflow_call:
-    inputs:
-      ci_version:
-        required: true
-        type: string
-
-jobs:
-  build:
-    env:
-      CI_VERSION: ${{ inputs.ci_version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # Windows
-          - os: windows-2025
-            qt_version: 6.11.0
-          # macOS
-          - os: macos-15
-            qt_version: 6.11.0
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: 'recursive'
-          fetch-depth: 1
-
-      - name: Download dependencies (Windows)
-        if: runner.os == 'Windows'
-        run: powershell ./setup-deps.ps1
-
-      - name: Install create-dmg (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          brew install node
-          npm install --global create-dmg
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          cache: true
-          set-env: ${{ runner.os != 'Windows' }}
-          add-tools-to-path: ${{ runner.os != 'Windows' }}
-          version: ${{ matrix.qt_version }}
-          aqtsource: 'git+https://github.com/miurahr/aqtinstall.git@073e34d7c2ab4ae6961ed7cca690b3abd5ba5a7e'
-
-      - name: Install Qt ARM64 (Windows)
-        if: runner.os == 'Windows'
-        uses: jurplel/install-qt-action@v4
-        with:
-          cache: true
-          set-env: false
-          add-tools-to-path: false
-          arch: win64_msvc2022_arm64_cross_compiled
-          version: ${{ matrix.qt_version }}
-
-      - name: Build x64 binaries (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: |
-          set "PATH=%QT_PATH%;%PATH%"
-          scripts\build-arch.bat Release x64
-        env:
-          QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2022_64\bin
-
-      - name: Build ARM64 binaries (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: |
-          set "PATH=%QT_PATH%;%PATH%"
-          scripts\build-arch.bat Release arm64
-        env:
-          QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2022_arm64\bin
-
-      - name: Build Package
-        shell: pwsh
-        run: |
-          if ($Env:RUNNER_OS -eq "Windows") {
-            cmd /c scripts\generate-bundle.bat Release
-          } else {
-            bash scripts/generate-dmg.sh Release
-          }
-
-      - name: Upload Binaries (Windows x64)
-        uses: actions/upload-artifact@v6
-        if: runner.os == 'Windows'
-        with:
-          name: Moonlight-${{ runner.os }}-x64-${{ env.CI_VERSION }}
-          path: build/deploy-x64-release/*
-          if-no-files-found: error
-
-      - name: Upload Binaries (Windows arm64)
-        uses: actions/upload-artifact@v6
-        if: runner.os == 'Windows'
-        with:
-          name: Moonlight-${{ runner.os }}-arm64-${{ env.CI_VERSION }}
-          path: build/deploy-arm64-release/*
-          if-no-files-found: error
-
-      - name: Upload Binaries (macOS)
-        uses: actions/upload-artifact@v6
-        if: runner.os == 'macOS'
-        with:
-          name: Moonlight-${{ runner.os }}-${{ env.CI_VERSION }}
-          path: build/installer-Release/*.dmg
-          compression-level: 0
-          if-no-files-found: error
-
-      - name: Upload Symbols
-        uses: actions/upload-artifact@v6
-        with:
-          name: zDevDbgSyms-${{ runner.os }}-${{ env.CI_VERSION }}
-          path: |
-            build/installer-*/*.dsym/*
-            build/symbols-*/*.pdb
-          if-no-files-found: error
@@ -1,45 +0,0 @@
---
-name: Build
-permissions:
-  contents: read
-
-on:
-  push:
-  pull_request:
-    branches:
-      - master
-
-concurrency:
-  group: build-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      ci_version: ${{ steps.set-ci-version.outputs.ci_version }}
-    steps:
-      - name: Set CI version
-        id: set-ci-version
-        shell: bash
-        run: |
-          CI_VERSION=`echo ${GITHUB_SHA} | cut -c1-6`
-          echo "ci_version=${CI_VERSION}" >> "${GITHUB_OUTPUT}"
-
-  build-appimage:
-    needs: setup
-    uses: ./.github/workflows/build-appimage.yml
-    with:
-      ci_version: ${{ needs.setup.outputs.ci_version }}
-
-  build-steamlink:
-    needs: setup
-    uses: ./.github/workflows/build-steamlink.yml
-    with:
-      ci_version: ${{ needs.setup.outputs.ci_version }}
-
-  build-windows-macos:
-    needs: setup
-    uses: ./.github/workflows/build-win-mac.yml
-    with:
-      ci_version: ${{ needs.setup.outputs.ci_version }}
@@ -2,8 +2,6 @@


 **/.vs/
-.vscode/
 build/
-libs/
 config.tests/*/.qmake.stash
 config.tests/*/Makefile
@@ -6,7 +6,10 @@
 	url = https://github.com/cgutman/qmdnsengine.git
 [submodule "app/SDL_GameControllerDB"]
 	path = app/SDL_GameControllerDB
-	url = https://github.com/gabomdq/SDL_GameControllerDB.git
+	url = https://github.com/gabomdq/gamecontrollerdb.git
+[submodule "soundio/libsoundio"]
+	path = soundio/libsoundio
+	url = https://github.com/andrewrk/libsoundio.git
 [submodule "h264bitstream/h264bitstream"]
 	path = h264bitstream/h264bitstream
 	url = https://github.com/aizvorski/h264bitstream.git
@@ -0,0 +1,72 @@
+language: cpp
+
+git:
+  depth: 1
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env: TRAVIS_TARGET=osx
+      addons:
+        homebrew:
+          packages:
+            - qt
+    - os: linux
+      sudo: required
+      dist: xenial
+      compiler: gcc
+      env: TRAVIS_TARGET=steamlink
+      addons:
+        apt:
+          packages:
+            - libc6:i386
+            - libstdc++6:i386
+    - os: linux
+      sudo: required
+      dist: bionic
+      compiler: gcc
+      env: TRAVIS_TARGET=linux
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:savoury1/multimedia'
+            - sourceline: 'ppa:savoury1/ffmpeg4'
+          packages:
+            - qt5-default
+            - qtbase5-dev
+            - qtquickcontrols2-5-dev
+            - libqt5svg5-dev
+            - libgl1-mesa-dev
+            - libegl1-mesa-dev
+            - libxkbcommon-dev
+            - wayland-protocols
+            - libopus-dev
+            - libva-dev
+            - libvdpau-dev
+            - libsdl2-dev
+            - qtdeclarative5-dev
+            - libssl-dev
+            - libsdl2-ttf-dev
+            - libavcodec-dev
+            - libavutil-dev
+
+install:
+    - '[ "$TRAVIS_TARGET" != osx ] || brew link --force qt'
+    - if [[ "$TRAVIS_TARGET" = "osx" ]]; then nvm use node && npm install --global create-dmg; fi
+    - if [[ "$TRAVIS_TARGET" = "steamlink" ]]; then git clone --depth=1 https://github.com/ValveSoftware/steamlink-sdk.git $HOME/steamlink-sdk; fi
+
+before_script:
+    - '[ "$TRAVIS_TARGET" = "steamlink" ] || qmake -v'
+    - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != clang++ ]] || export QMAKESPEC=linux-clang'
+    - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != g++     ]] || export QMAKESPEC=linux-g++'
+    - '[ "$TRAVIS_TARGET" != osx ]                          || export QMAKESPEC=macx-clang'
+    - '[ "$TRAVIS_TARGET" != "steamlink" ]                  || export STEAMLINK_SDK_PATH=$HOME/steamlink-sdk'
+
+script:
+    - '[ "$TRAVIS_TARGET" != "linux" ] || qmake moonlight-qt.pro -spec $QMAKESPEC'
+    - '[ "$TRAVIS_TARGET" != "linux" ] || make -j$(nproc) debug'
+    - '[ "$TRAVIS_TARGET" != "linux" ] || make -j$(nproc) release'
+    - '[ "$TRAVIS_TARGET" != "osx" ] || scripts/generate-dmg.sh Release'
+    - '[ "$TRAVIS_TARGET" != "steamlink" ] || scripts/build-steamlink-app.sh'
@@ -12,11 +12,8 @@ contains(QT_ARCH, i386) {
 contains(QT_ARCH, x86_64) {
    LIBS += -L$$PWD/../libs/windows/lib/x64
 }
-contains(QT_ARCH, arm64) {
-    LIBS += -L$$PWD/../libs/windows/lib/arm64
-}

-LIBS += -ldetours
+LIBS += -lNktHookLib
 DEFINES += ANTIHOOKING_LIBRARY
 SOURCES += antihookingprotection.cpp
 HEADERS += antihookingprotection.h
@@ -1,9 +1,6 @@
 #include "antihookingprotection.h"

-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-#include <detours.h>
+#include <NktHookLib.h>

 typedef HMODULE (WINAPI *LoadLibraryAFunc)(LPCSTR lpLibFileName);
 typedef HMODULE (WINAPI *LoadLibraryWFunc)(LPCWSTR lpLibFileName);
@@ -15,35 +12,25 @@ class AntiHookingProtection
 public:
    static void enable()
    {
-        DetourTransactionBegin();
-        DetourUpdateThread(GetCurrentThread());
+    #ifdef QT_DEBUG
+        s_HookManager.SetEnableDebugOutput(true);
+    #endif

-        s_RealLoadLibraryA = LoadLibraryA;
-        DetourAttach(&(PVOID&)s_RealLoadLibraryA, LoadLibraryAHook);
+        HINSTANCE kernel32Handle = NktHookLibHelpers::GetModuleBaseAddress(L"kernel32.dll");
+        SIZE_T hookId;

-        s_RealLoadLibraryW = LoadLibraryW;
-        DetourAttach(&(PVOID&)s_RealLoadLibraryW, LoadLibraryWHook);
-
-        s_RealLoadLibraryExA = LoadLibraryExA;
-        DetourAttach(&(PVOID&)s_RealLoadLibraryExA, LoadLibraryExAHook);
-
-        s_RealLoadLibraryExW = LoadLibraryExW;
-        DetourAttach(&(PVOID&)s_RealLoadLibraryExW, LoadLibraryExWHook);
-
-        DetourTransactionCommit();
-    }
-
-    static void disable()
-    {
-        DetourTransactionBegin();
-        DetourUpdateThread(GetCurrentThread());
-
-        DetourDetach(&(PVOID&)s_RealLoadLibraryA, LoadLibraryAHook);
-        DetourDetach(&(PVOID&)s_RealLoadLibraryW, LoadLibraryWHook);
-        DetourDetach(&(PVOID&)s_RealLoadLibraryExA, LoadLibraryExAHook);
-        DetourDetach(&(PVOID&)s_RealLoadLibraryExW, LoadLibraryExWHook);
-
-        DetourTransactionCommit();
+        s_HookManager.Hook(&hookId, (LPVOID*)&s_RealLoadLibraryA,
+                           NktHookLibHelpers::GetProcedureAddress(kernel32Handle, "LoadLibraryA"),
+                           (LPVOID)AntiHookingProtection::LoadLibraryAHook);
+        s_HookManager.Hook(&hookId, (LPVOID*)&s_RealLoadLibraryW,
+                           NktHookLibHelpers::GetProcedureAddress(kernel32Handle, "LoadLibraryW"),
+                           (LPVOID)AntiHookingProtection::LoadLibraryWHook);
+        s_HookManager.Hook(&hookId, (LPVOID*)&s_RealLoadLibraryExA,
+                           NktHookLibHelpers::GetProcedureAddress(kernel32Handle, "LoadLibraryExA"),
+                           (LPVOID)AntiHookingProtection::LoadLibraryExAHook);
+        s_HookManager.Hook(&hookId, (LPVOID*)&s_RealLoadLibraryExW,
+                           NktHookLibHelpers::GetProcedureAddress(kernel32Handle, "LoadLibraryExW"),
+                           (LPVOID)AntiHookingProtection::LoadLibraryExWHook);
    }

 private:
@@ -137,53 +124,33 @@ private:
        return s_RealLoadLibraryExW(lpLibFileName, hFile, dwFlags);
    }

+    static CNktHookLib s_HookManager;
    static LoadLibraryAFunc s_RealLoadLibraryA;
    static LoadLibraryWFunc s_RealLoadLibraryW;
    static LoadLibraryExAFunc s_RealLoadLibraryExA;
    static LoadLibraryExWFunc s_RealLoadLibraryExW;

    static constexpr LPCWSTR k_BlacklistedDlls[] = {
-        // These A-Volute DLLs shipped with various audio driver packages improperly handle
-        // D3D9 exclusive fullscreen in a way that causes CreateDeviceEx() to deadlock.
-        // https://github.com/moonlight-stream/moonlight-qt/issues/102
-        L"NahimicOSD.dll", // ASUS Sonic Radar 3
-        L"SSAudioOSD.dll", // SteelSeries headsets
-        L"SS2OSD.dll", // ASUS Sonic Studio 2
-        L"Nahimic2OSD.dll",
-        L"NahimicMSIOSD.dll",
-        L"nhAsusPhoebusOSD.dll", // ASUS Phoebus
+        // This DLL shipped with ASUS Sonic Radar 3 improperly handles
+        // D3D9 exclusive fullscreen in a way that causes CreateDeviceEx()
+        // to deadlock. https://github.com/moonlight-stream/moonlight-qt/issues/102
+        L"NahimicOSD.dll",

        // This DLL has been seen in several crash reports. Some Googling
        // suggests it's highly unstable and causes issues in many games.
        L"EZFRD32.dll",
        L"EZFRD64.dll",

-        // These are the older dList/AppInit DLLs for Optimus hybrid graphics DDI.
+        // These are the dList DLLs for Optimus hybrid graphics DDI.
        // https://docs.microsoft.com/en-us/windows-hardware/drivers/display/hybrid-system-ddi
        //
-        // These seem to cause a crash in PresentEx() in full-screen exclusive mode.
-        // This block will prevent Optimus from ever using the dGPU even if the user has requested it.
-        // https://github.com/moonlight-stream/moonlight-qt/issues/386
-        //
-        // d3d9!CSwapChain::BltToHybridPrimary+0x200:
-        // 00007ffa`23f37e58 488b01          mov     rax,qword ptr [rcx] ds:00000000`00000038=????????????????
-        // 00 0000004e`496ff4e0 00007ffa`23f39e2c d3d9!CSwapChain::BltToHybridPrimary+0x200
-        // 01 0000004e`496ff880 00007ffa`23ee39ce d3d9!CSwapChain::FlipToSurface+0x15c
-        // 02 0000004e`496ff900 00007ffa`23f4dd75 d3d9!CSwapChain::PresentMain+0x3e13e
-        // 03 0000004e`496ffab0 00007ffa`23f4dccd d3d9!CBaseDevice::PresentMain+0x9d
-        // 04 0000004e`496ffb00 00007ff7`8e31016f d3d9!CBaseDevice::PresentEx+0xbd
-        // 05 0000004e`496ffb50 00007ff7`8e30df1e Moonlight!DXVA2Renderer::renderFrame+0x61f [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\dxva2.cpp @ 1035]
-        // 06 0000004e`496ffd50 00007ff7`8e30e46a Moonlight!Pacer::renderFrame+0x3e [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 265]
-        // 07 (Inline Function) --------`-------- Moonlight!Pacer::renderLastFrameAndUnlock+0x197 [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 156]
-        // 08 0000004e`496ffda0 00007ffa`14476978 Moonlight!Pacer::renderThread+0x1ca [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 88]
-        // 09 0000004e`496ffde0 00007ffa`14476ee2 SDL2!SDL_RunThread+0x38 [C:\Users\camer\SDL\src\thread\SDL_thread.c @ 276]
-        // 0a 0000004e`496ffe10 00007ffa`2aae0e82 SDL2!RunThread+0x12 [C:\Users\camer\SDL\src\thread\windows\SDL_systhread.c @ 83]
-        // 0b 0000004e`496ffe40 00007ffa`2d627bd4 ucrtbase!thread_start<unsigned int (__cdecl*)(void *),1>+0x42
-        // 0c 0000004e`496ffe70 00007ffa`2da4ce51 kernel32!BaseThreadInitThunk+0x14
-        // 0d 0000004e`496ffea0 00000000`00000000 ntdll!RtlUserThreadStart+0x21
-        //
-        L"nvinit.dll",
-        L"nvinitx.dll",
+        // We forcefully block them from loading because Optimus has a bug that
+        // deadlocks DXVA2 when we present with D3DPRESENT_DONOTWAIT. This will prevent
+        // Optimus from ever using the dGPU even if the user has requested it.
+        // https://github.com/moonlight-stream/moonlight-qt/issues/240
+        // https://github.com/moonlight-stream/moonlight-qt/issues/235
+        L"nvdlist.dll",
+        L"nvdlistx.dll",

        // In some unknown circumstances, RTSS tries to hook in the middle of an instruction, leaving garbage
        // code inside d3d9.dll that causes a crash when executed:
@@ -207,31 +174,10 @@ private:
        // Since the RTSS OSD doesn't even work with DXVA2, we'll just block the hooks entirely.
        L"RTSSHooks.dll",
        L"RTSSHooks64.dll",
-
-        // Bandicam's Vulkan layer DLL crashes during destruction of the Vulkan swapchain
-        // bdcamvk64+0x10b73:
-        // 00007ffa`be3b0b73 498b5630        mov     rdx,qword ptr [r14+30h] ds:00000000`00000030=????????????????
-        //
-        // bdcamvk64+0x10b73
-        // libplacebo_357!vk_sw_destroy+0x14f [D:\a\moonlight-deps\moonlight-deps\libplacebo\src\vulkan\swapchain.c @ 460]
-        // libplacebo_357!pl_swapchain_destroy+0x1a [D:\a\moonlight-deps\moonlight-deps\libplacebo\src\swapchain.c @ 30]
-        // Moonlight!PlVkRenderer::~PlVkRenderer+0x159 [D:\a\moonlight-qt\app\streaming\video\ffmpeg-renderers\plvk.cpp @ 140]
-        // Moonlight!PlVkRenderer::`scalar deleting destructor'+0x17
-        // Moonlight!FFmpegVideoDecoder::reset+0x203 [D:\a\moonlight-qt\app\streaming\video\ffmpeg.cpp @ 301]
-        // Moonlight!FFmpegVideoDecoder::~FFmpegVideoDecoder+0x22 [D:\a\moonlight-qt\app\streaming\video\ffmpeg.cpp @ 257]
-        // Moonlight!FFmpegVideoDecoder::`scalar deleting destructor'+0x17
-        // Moonlight!Session::getDecoderInfo+0x19a [D:\a\moonlight-qt\app\streaming\session.cpp @ 415]
-        // Moonlight!SystemProperties::querySdlVideoInfoInternal+0x134 [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 161]
-        // Moonlight!SystemProperties::querySdlVideoInfo+0x97 [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 123]
-        // Moonlight!SystemProperties::SystemProperties+0x4bf [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 75]
-        //
-        // https://github.com/moonlight-stream/moonlight-qt/issues/1425
-        // https://github.com/moonlight-stream/moonlight-qt/issues/1579
-        L"bdcamvk32.dll",
-        L"bdcamvk64.dll",
    };
 };

+CNktHookLib AntiHookingProtection::s_HookManager;
 LoadLibraryAFunc AntiHookingProtection::s_RealLoadLibraryA;
 LoadLibraryWFunc AntiHookingProtection::s_RealLoadLibraryW;
 LoadLibraryExAFunc AntiHookingProtection::s_RealLoadLibraryExA;
@@ -240,26 +186,14 @@ LoadLibraryExWFunc AntiHookingProtection::s_RealLoadLibraryExW;
 AH_EXPORT void AntiHookingDummyImport() {}

 extern "C"
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)
 {
-    if (DetourIsHelperProcess()) {
-        return TRUE;
-    }
-
    switch (fdwReason)
    {
    case DLL_PROCESS_ATTACH:
-        DetourRestoreAfterWith();
        AntiHookingProtection::enable();
        DisableThreadLibraryCalls(hinstDLL);
        break;
-    case DLL_PROCESS_DETACH:
-        // Ignore DLL_PROCESS_DETACH on process exit. No need to waste time
-        // unhooking everything if the whole process is being destroyed.
-        if (lpvReserved == NULL) {
-            AntiHookingProtection::disable();
-        }
-        break;
    }

    return TRUE;
@@ -1,110 +1,67 @@
 # Moonlight PC

-[Moonlight PC](https://moonlight-stream.org) is an open source PC client for NVIDIA GameStream and [Sunshine](https://github.com/LizardByte/Sunshine).
+[Moonlight PC](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built to run on Windows, Mac, and Linux. This client is the successor to [Moonlight Chrome](https://github.com/moonlight-stream/moonlight-chrome) for streaming on PC.

-Moonlight also has mobile versions for [Android](https://github.com/moonlight-stream/moonlight-android) and [iOS](https://github.com/moonlight-stream/moonlight-ios).
+Moonlight also has mobile versions for [Android](https://github.com/moonlight-stream/moonlight-android) and  [iOS](https://github.com/moonlight-stream/moonlight-ios).

-You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-qt/).
+You can follow development on our [Discord server](https://discord.gg/6ERtzFY).

- [![Build](https://img.shields.io/github/actions/workflow/status/moonlight-stream/moonlight-qt/build.yml?branch=master)](https://github.com/moonlight-stream/moonlight-qt/actions/workflows/build.yml?query=branch%3Amaster)
+ [![Windows AppVeyor Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master)
+ [![Mac and Linux Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-qt.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-qt)
 [![Downloads](https://img.shields.io/github/downloads/moonlight-stream/moonlight-qt/total)](https://github.com/moonlight-stream/moonlight-qt/releases)
- [![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-qt/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-qt/)

 ## Features
 - Hardware accelerated video decoding on Windows, Mac, and Linux
- - H.264, HEVC, and AV1 codec support (AV1 requires Sunshine and a supported host GPU)
- - YUV 4:4:4 support (Sunshine only)
- - HDR streaming support
- - 7.1 surround sound audio support
- - 10-point multitouch support (Sunshine only)
- - Gamepad support with force feedback and motion controls for up to 16 players
- - Support for both pointer capture (for games) and direct mouse control (for remote desktop)
- - Support for passing system-wide keyboard shortcuts like Alt+Tab to the host
+ - Supports streaming at up to 120 FPS (high refresh rate monitor recommended)
+ - Supports streaming at 720p, 1080p, 1440p, 4K, and the client PC's native screen resolution
+ - 5.1 surround sound audio
+ - HEVC support for better image quality at reduced bandwidth
+ - Keyboard and mouse support
+ - Gamepad support with force feedback for up to 4 players
 
 ## Downloads
 - [Windows, macOS, and Steam Link](https://github.com/moonlight-stream/moonlight-qt/releases)
 - [Snap (for Ubuntu-based Linux distros)](https://snapcraft.io/moonlight)
 - [Flatpak (for other Linux distros)](https://flathub.org/apps/details/com.moonlight_stream.Moonlight)
- [AppImage](https://github.com/moonlight-stream/moonlight-qt/releases)
- [Raspberry Pi 4 and 5](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-Raspberry-Pi-4)
- [Generic ARM 32-bit and 64-bit Debian packages](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-ARM%E2%80%90based-Single-Board-Computers) (not for Raspberry Pi)
- [Experimental RISC-V Debian packages](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-RISC%E2%80%90V-Single-Board-Computers)
- [NVIDIA Jetson and Nintendo Switch (Ubuntu L4T)](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-Linux4Tegra-(L4T)-Ubuntu)
-
-### Nightly Builds
- [Downloads](https://nightly.link/moonlight-stream/moonlight-qt/workflows/build/master)
-
-#### Special Thanks
-
-[![Hosted By: Cloudsmith](https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith&style=flat-square)](https://cloudsmith.com)
-
-Hosting for Moonlight's Debian and L4T package repositories is graciously provided for free by [Cloudsmith](https://cloudsmith.com).

 ## Building
+### General Build Requirements
+* Qt 5.9 SDK or later

-### Windows Build Requirements
-* Qt 6.7 SDK or later (earlier versions may work but are not officially supported)
-* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) (Community edition is fine)
-* Select **MSVC** option during Qt installation. MinGW is not supported.
+### Windows-specific Build Requirements
+* Windows 7 or later
+* [Visual Studio](https://visualstudio.microsoft.com/downloads/) 2017 (Community edition is fine)
+* Select MSVC Desktop toolchain during Qt installation
+* [DirectX SDK](https://www.microsoft.com/en-us/download/details.aspx?id=6812)
 * [7-Zip](https://www.7-zip.org/) (only if building installers for non-development PCs)
-* Graphics Tools (only if running debug builds)
-  * Install "Graphics Tools" in the Optional Features page of the Windows Settings app.
-  * Alternatively, run `dism /online /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0` and reboot.
+* [WiX Toolset](http://wixtoolset.org/releases/) v3.11 or later (only if building installers for non-development PCs)

-### macOS Build Requirements
-* Qt 6.7 SDK or later (earlier versions may work but are not officially supported)
-* Xcode 14 or later (earlier versions may work but are not officially supported)
+### Mac-specific Build Requirements
+* macOS Sierra (10.12) or later
+* Xcode 10
 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs)

-### Linux/Unix Build Requirements
-* Qt 6 is recommended, but Qt 5.12 or later is also supported (replace `qmake6` with `qmake` when using Qt 5).
+### Linux-specific Build Requirements
 * GCC or Clang
-* FFmpeg 4.0 or later
-* Install the required packages:
-  * Debian/Ubuntu:
-    * Base Requirements: `libegl1-mesa-dev libgl1-mesa-dev libopus-dev libsdl2-dev libsdl2-ttf-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libva-dev libvdpau-dev libxkbcommon-dev wayland-protocols libdrm-dev`
-    * Qt 6 (Recommended): `qt6-base-dev qt6-declarative-dev libqt6svg6-dev qt6-wayland qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml6-module-qtquick-window qml6-module-qtquick`
-    * Qt 5: `qtbase5-dev qt5-qmake qtdeclarative5-dev qtquickcontrols2-5-dev qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-window2 qml-module-qtquick2 qtwayland5`
-  * RedHat/Fedora (RPM Fusion repo required):
-    * Base Requirements: `openssl-devel SDL2-devel SDL2_ttf-devel ffmpeg-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel libdrm-devel`
-    * Qt 6 (Recommended): `qt6-qtsvg-devel qt6-qtdeclarative-devel`
-    * Qt 5: `qt5-qtsvg-devel qt5-qtquickcontrols2-devel`
-* Building the Vulkan renderer requires a `libplacebo-dev`/`libplacebo-devel` version of at least v7.349.0 and FFmpeg 6.1 or later.
+* Install your distro equivalents of: `openssl-devel qt5-devel SDL2-devel ffmpeg-devel qt5-qtquickcontrols2-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel SDL2_ttf-devel`
+* FFmpeg 4.0 is required to build. If your distro doesn't package FFmpeg 4.0, you can build and install it from source on http://ffmpeg.org/

-### Steam Link Build Requirements
+### Steam Link-specific Build Requirements
 * [Steam Link SDK](https://github.com/ValveSoftware/steamlink-sdk) cloned on your build system
 * STEAMLINK_SDK_PATH environment variable set to the Steam Link SDK path

-**Steam Link Hardware Limitations**  
-Moonlight builds for Steam Link are subject to hardware limitations of the Steam Link device:
-* Maximum resolution: **1080p (1920x1080)**
-* Maximum framerate: **60 FPS**
-* Maximum video bitrate: **40 Mbps**
-* **HDR streaming is not supported** on the original hardware
-
-### Docker containers
-If you want to use Docker for building, look at [this repo](https://github.com/cgutman/moonlight-packaging) containing canonical containers
-for different architectures, which handle building deps and extra linking for you.
-
 ### Build Setup Steps
 1. Install the latest Qt SDK (and optionally, the Qt Creator IDE) from https://www.qt.io/download
    * You can install Qt via Homebrew on macOS, but you will need to use `brew install qt --with-debug` to be able to create debug builds of Moonlight.
-    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.12 or later.
-    * This step is not required for building on Steam Link, because the Steam Link SDK includes Qt 5.14.
-2. Download submodules and dependencies
-    * Run `git submodule update --init --recursive` from within `moonlight-qt/`.
-    * On Windows and macOS, you must also run `setup-deps.ps1` (Windows) or `setup-deps.py` (macOS).
-    * Perform these steps each time you pull new changes from the Git repository.
+    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.9 or later.
+    * This step is not required for building on Steam Link, because the Steam Link SDK includes Qt 5.9.
+2. Run `git submodule update --init --recursive` from within `moonlight-qt/`
 3. Open the project in Qt Creator or build from qmake on the command line.
    * To build a binary for use on non-development machines, use the scripts in the `scripts` folder.
-        * For Windows builds, use `scripts\build-arch.bat` and `scripts\generate-bundle.bat`. Execute these scripts from the root of the repository within a Qt command prompt. Ensure  7-Zip binary directory is on your `%PATH%`.
+        * For Windows builds, use `scripts\generate-installers.bat`. Execute this script from the root of the repository within a Qt command prompt. Ensure WiX and 7-Zip binary directories are in your `%PATH%`.
        * For macOS builds, use `scripts/generate-dmg.sh`. Execute this script from the root of the repository and ensure Qt's `bin` folder is in your `$PATH`.
        * For Steam Link builds, run `scripts/build-steamlink-app.sh` from the root of the repository.
-    * To build from the command line for development use on macOS or Linux, run `qmake6 moonlight-qt.pro` then `make debug` or `make release`.
-        * The final binary will be placed in `app/moonlight`.
-    * To create an embedded build for a single-purpose device, use `qmake6 "CONFIG+=embedded" moonlight-qt.pro` and build normally.
-        * This build will lack windowed mode, Discord/Help links, and other features that don't make sense on an embedded device.
-        * For platforms with poor GPU performance, add `"CONFIG+=gpuslow"` to prefer direct KMSDRM rendering over GL/Vulkan renderers. Direct KMSDRM rendering can use dedicated YUV/RGB conversion and scaling hardware rather than slower GPU shaders for these operations.
+    * To build from the command line for development use, run `qmake moonlight-qt.pro` then `make debug` or `make release`

 ## Contribute
 1. Fork us
@@ -2,14 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>GCSupportsGameMode</key>
-	<true/>
 	<key>CFBundleExecutable</key>
 	<string>Moonlight</string>
-	<key>LSSupportsGameMode</key>
-	<true/>
 	<key>CFBundleGetInfoString</key>
-	<string>Stream games and other applications from another PC</string>
+	<string>Stream games from your NVIDIA GameStream-enabled PC</string>
 	<key>CFBundleIconFile</key>
 	<string>moonlight</string>
 	<key>CFBundleIdentifier</key>
@@ -21,34 +17,16 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>11.0.0</string>
+	<string>10.11</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
-	<key>GCSupportedGameControllers</key>
-	<array>
-		<dict>
-			<key>ProfileName</key>
-			<string>ExtendedGamepad</string>
-		</dict>
-	</array>
-	<key>GCSupportsControllerUserInteraction</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>Moonlight uses the local network to connect to your gaming PC for streaming.</string>
 	<key>CFBundleVersion</key>
 	<string>VERSION</string>
 	<key>CFBundleShortVersionString</key>
 	<string>VERSION</string>
 	<key>CFBundleDisplayName</key>
 	<string>Moonlight</string>
-    <key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
 </dict>
 </plist>
@@ -1,67 +0,0 @@
-//
-// Compatibility header for older version of SDL.
-// Include this instead of SDL.h directly.
-//
-
-#pragma once
-
-#include <SDL.h>
-
-// SDL_FRect wasn't added until 2.0.10
-#if !SDL_VERSION_ATLEAST(2, 0, 10)
-typedef struct SDL_FRect
-{
-    float x;
-    float y;
-    float w;
-    float h;
-} SDL_FRect;
-#endif
-
-#ifndef SDL_HINT_VIDEO_X11_FORCE_EGL
-#define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL"
-#endif
-
-#ifndef SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER
-#define SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER "SDL_KMSDRM_REQUIRE_DRM_MASTER"
-#endif
-
-#ifndef SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED
-#define SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED "SDL_ALLOW_ALT_TAB_WHILE_GRABBED"
-#endif
-
-#ifndef SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE
-#define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE"
-#endif
-
-#ifndef SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE
-#define SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE "SDL_JOYSTICK_HIDAPI_PS5_RUMBLE"
-#endif
-
-#ifndef SDL_HINT_WINDOWS_USE_D3D9EX
-#define SDL_HINT_WINDOWS_USE_D3D9EX "SDL_WINDOWS_USE_D3D9EX"
-#endif
-
-#ifndef SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS
-#define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS"
-#endif
-
-#ifndef SDL_HINT_MOUSE_RELATIVE_SCALING
-#define SDL_HINT_MOUSE_RELATIVE_SCALING "SDL_MOUSE_RELATIVE_SCALING"
-#endif
-
-#ifndef SDL_HINT_AUDIO_DEVICE_APP_NAME
-#define SDL_HINT_AUDIO_DEVICE_APP_NAME "SDL_AUDIO_DEVICE_APP_NAME"
-#endif
-
-#ifndef SDL_HINT_APP_NAME
-#define SDL_HINT_APP_NAME "SDL_APP_NAME"
-#endif
-
-#ifndef SDL_HINT_MOUSE_AUTO_CAPTURE
-#define SDL_HINT_MOUSE_AUTO_CAPTURE "SDL_MOUSE_AUTO_CAPTURE"
-#endif
-
-#ifndef SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP
-#define SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP "SDL_VIDEO_WAYLAND_EMULATE_MOUSE_WARP"
-#endif
@@ -1,5 +1,5 @@
 QT += core quick network quickcontrols2 svg
-CONFIG += c++17
+CONFIG += c++11

 unix:!macx {
    TARGET = moonlight
@@ -12,13 +12,10 @@ include(../globaldefs.pri)

 # Precompile QML files to avoid writing qmlcache on portable versions.
 # Since this binds the app against the Qt runtime version, we will only
-# do this for Windows and Mac (when disable-prebuilts is not defined),
-# since they always ship with the matching build of the Qt runtime.
-!disable-prebuilts {
-    win32|macx {
-        CONFIG(release, debug|release) {
-            CONFIG += qtquickcompiler
-        }
+# do this for Windows and Mac, since they ship with the Qt runtime.
+win32|macx {
+    CONFIG(release, debug|release) {
+        CONFIG += qtquickcompiler
    }
 }

@@ -36,139 +33,96 @@ DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

 win32 {
-    !exists($$PWD/../libs/windows) {
-        error("Missing dependencies. Please run 'powershell .\setup-deps.ps1' to fetch prebuilt libraries.")
-    }
+    INCLUDEPATH += \
+        $$PWD/../libs/windows/include \
+        $$(DXSDK_DIR)/Include

+    contains(QT_ARCH, i386) {
+        LIBS += -L$$PWD/../libs/windows/lib/x86
+        LIBS += -L$$(DXSDK_DIR)/Lib/x86
+    }
    contains(QT_ARCH, x86_64) {
        LIBS += -L$$PWD/../libs/windows/lib/x64
-        INCLUDEPATH += $$PWD/../libs/windows/include/x64 $$PWD/../libs/windows/include/x64/SDL2
-    }
-    contains(QT_ARCH, arm64) {
-        LIBS += -L$$PWD/../libs/windows/lib/arm64
-        INCLUDEPATH += $$PWD/../libs/windows/include/arm64 $$PWD/../libs/windows/include/arm64/SDL2
+        LIBS += -L$$(DXSDK_DIR)/Lib/x64
    }

-    INCLUDEPATH += $$PWD/../libs/windows/include
    LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
 }
-macx:!disable-prebuilts {
-    !exists($$PWD/../libs/mac) {
-        error("Missing dependencies. Please run 'python3 setup-deps.py' to fetch prebuilt libraries.")
-    }
-
-    INCLUDEPATH += $$PWD/../libs/mac/include $$PWD/../libs/mac/include/SDL2
-    LIBS += -L$$PWD/../libs/mac/lib
+macx {
+    INCLUDEPATH += $$PWD/../libs/mac/include
+    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
+    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
+    LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
 }

-unix:if(!macx|disable-prebuilts) {
+unix:!macx {
    CONFIG += link_pkgconfig
-    PKGCONFIG += openssl sdl2 SDL2_ttf
+    PKGCONFIG += openssl sdl2 SDL2_ttf opus

-    # We have our own optimized libopus.a for Steam Link
-    if(!config_SL|disable-prebuilts) {
-        PKGCONFIG += opus
+    # SLAudio is used on Steam Link
+    !config_SL {
+        CONFIG += soundio
    }

-    !disable-ffmpeg {
-        packagesExist(libavcodec) {
-            PKGCONFIG += libavcodec libavutil libswscale
-            CONFIG += ffmpeg
+    soundio {
+        packagesExist(libpulse) {
+            PKGCONFIG += libpulse
+        }
+        packagesExist(alsa) {
+            PKGCONFIG += alsa
+        }
+    }

-            !disable-libva {
-                packagesExist(libva) {
-                    !disable-x11 {
-                        packagesExist(libva-x11) {
-                            CONFIG += libva-x11
-                        }
-                    }
-                    !disable-wayland {
-                        packagesExist(libva-wayland) {
-                            CONFIG += libva-wayland
-                        }
-                    }
-                    !disable-libdrm {
-                        packagesExist(libva-drm) {
-                            CONFIG += libva-drm
-                        }
-                    }
-                    CONFIG += libva
-                }
-            }
+    packagesExist(libavcodec) {
+        PKGCONFIG += libavcodec libavutil
+        CONFIG += ffmpeg

-            !disable-libvdpau {
-                packagesExist(vdpau) {
-                    CONFIG += libvdpau
-                }
+        packagesExist(libva) {
+            packagesExist(libva-x11) {
+                CONFIG += libva-x11
            }
-
-            !disable-mmal {
-                packagesExist(mmal) {
-                    PKGCONFIG += mmal
-                    CONFIG += mmal
-                }
+            packagesExist(libva-wayland) {
+                CONFIG += libva-wayland
            }
-
-            !disable-libdrm {
-                packagesExist(libdrm) {
-                    PKGCONFIG += libdrm
-                    CONFIG += libdrm
-                }
-            }
-
-            # Disabled by default due to reliability issues. See #1314.
-            # CUDA interop is superseded by VDPAU and Vulkan Video.
-            enable-cuda {
-                packagesExist(ffnvcodec) {
-                    PKGCONFIG += ffnvcodec
-                    CONFIG += cuda
-                }
-            }
-
-            !disable-libplacebo {
-                packagesExist(libplacebo) {
-                    PKGCONFIG += libplacebo
-                    CONFIG += libplacebo
-                }
+            packagesExist(libva-drm) {
+                CONFIG += libva-drm
            }
+            CONFIG += libva
        }

-        !disable-wayland {
-            packagesExist(wayland-client) {
-                CONFIG += wayland
-                PKGCONFIG += wayland-client
-            }
+        packagesExist(vdpau) {
+            CONFIG += libvdpau
        }

-        !disable-x11 {
-            packagesExist(x11) {
-                DEFINES += HAS_X11
-                PKGCONFIG += x11
-            }
+        packagesExist(mmal) {
+            PKGCONFIG += mmal
+            CONFIG += mmal
+        }
+
+        packagesExist(libdrm) {
+            PKGCONFIG += libdrm
+            CONFIG += libdrm
        }
    }
 }
 win32 {
-    LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lswscale -lopus -ldxgi -ld3d11 -llibplacebo
-    CONFIG += ffmpeg libplacebo
+    LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lopus -ld3dx9
+    CONFIG += ffmpeg
 }
 win32:!winrt {
-    CONFIG += discord-rpc
+    CONFIG += soundio discord-rpc
 }
 macx {
-    !disable-prebuilts {
-        LIBS += -lssl.3 -lcrypto.3 -lavcodec.62 -lavutil.60 -lswscale.9 -lopus -lSDL2 -lSDL2_ttf
-        CONFIG += discord-rpc
-    }
+    LIBS += -lssl -lcrypto -lavcodec.58 -lavutil.56 -lopus -framework SDL2 -framework SDL2_ttf
+    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal

-    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal -framework QuartzCore
-    CONFIG += ffmpeg
+    # For libsoundio
+    LIBS += -framework CoreAudio -framework AudioUnit
+
+    CONFIG += ffmpeg soundio discord-rpc
 }

 SOURCES += \
-    backend/nvaddress.cpp \
-    backend/nvapp.cpp \
-    cli/pair.cpp \
    main.cpp \
    backend/computerseeker.cpp \
    backend/identitymanager.cpp \
@@ -179,40 +133,24 @@ SOURCES += \
    backend/boxartmanager.cpp \
    backend/richpresencemanager.cpp \
    cli/commandlineparser.cpp \
-    cli/listapps.cpp \
    cli/quitstream.cpp \
    cli/startstream.cpp \
-    settings/compatfetcher.cpp \
-    settings/mappingfetcher.cpp \
    settings/streamingpreferences.cpp \
-    streaming/input/abstouch.cpp \
-    streaming/input/gamepad.cpp \
-    streaming/input/input.cpp \
-    streaming/input/keyboard.cpp \
-    streaming/input/mouse.cpp \
-    streaming/input/reltouch.cpp \
+    streaming/input.cpp \
    streaming/session.cpp \
    streaming/audio/audio.cpp \
    streaming/audio/renderers/sdlaud.cpp \
    gui/computermodel.cpp \
    gui/appmodel.cpp \
-    streaming/bandwidth.cpp \
    streaming/streamutils.cpp \
    backend/autoupdatechecker.cpp \
    path.cpp \
    settings/mappingmanager.cpp \
    gui/sdlgamepadkeynavigation.cpp \
    streaming/video/overlaymanager.cpp \
-    backend/systemproperties.cpp \
-    wm.cpp
+    backend/systemproperties.cpp

 HEADERS += \
-    SDL_compat.h \
-    backend/nvaddress.h \
-    backend/nvapp.h \
-    cli/pair.h \
-    settings/compatfetcher.h \
-    settings/mappingfetcher.h \
    utils.h \
    backend/computerseeker.h \
    backend/identitymanager.h \
@@ -223,18 +161,16 @@ HEADERS += \
    backend/boxartmanager.h \
    backend/richpresencemanager.h \
    cli/commandlineparser.h \
-    cli/listapps.h \
    cli/quitstream.h \
    cli/startstream.h \
    settings/streamingpreferences.h \
-    streaming/input/input.h \
+    streaming/input.h \
    streaming/session.h \
    streaming/audio/renderers/renderer.h \
    streaming/audio/renderers/sdl.h \
    gui/computermodel.h \
    gui/appmodel.h \
    streaming/video/decoder.h \
-    streaming/bandwidth.h \
    streaming/streamutils.h \
    backend/autoupdatechecker.h \
    path.h \
@@ -250,18 +186,18 @@ ffmpeg {
    DEFINES += HAVE_FFMPEG
    SOURCES += \
        streaming/video/ffmpeg.cpp \
-        streaming/video/ffmpeg-renderers/genhwaccel.cpp \
        streaming/video/ffmpeg-renderers/sdlvid.cpp \
-        streaming/video/ffmpeg-renderers/swframemapper.cpp \
-        streaming/video/ffmpeg-renderers/pacer/pacer.cpp
+        streaming/video/ffmpeg-renderers/cuda.cpp \
+        streaming/video/ffmpeg-renderers/pacer/pacer.cpp \
+        streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp

    HEADERS += \
        streaming/video/ffmpeg.h \
        streaming/video/ffmpeg-renderers/renderer.h \
-        streaming/video/ffmpeg-renderers/genhwaccel.h \
        streaming/video/ffmpeg-renderers/sdlvid.h \
-        streaming/video/ffmpeg-renderers/swframemapper.h \
-        streaming/video/ffmpeg-renderers/pacer/pacer.h
+        streaming/video/ffmpeg-renderers/cuda.h \
+        streaming/video/ffmpeg-renderers/pacer/pacer.h \
+        streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
 }
 libva {
    message(VAAPI renderer selected)
@@ -283,7 +219,7 @@ libva-wayland {
    PKGCONFIG += libva-wayland
    DEFINES += HAVE_LIBVA_WAYLAND
 }
-libva-drm {
+libva-wayland {
    message(VAAPI DRM support enabled)

    PKGCONFIG += libva-drm
@@ -302,18 +238,6 @@ mmal {
    DEFINES += HAVE_MMAL
    SOURCES += streaming/video/ffmpeg-renderers/mmal.cpp
    HEADERS += streaming/video/ffmpeg-renderers/mmal.h
-
-    # We suppress EGL usage when MMAL is available because MMAL has
-    # significantly better performance than EGL on the Pi. Setting
-    # this option allows EGL usage even if built with MMAL support.
-    #
-    # It is highly recommended to also build with 'gpuslow' to avoid
-    # EGL being preferred if direct DRM rendering is available.
-    allow-egl-with-mmal {
-        message(Allowing EGL usage with MMAL enabled)
-
-        DEFINES += ALLOW_EGL_WITH_MMAL
-    }
 }
 libdrm {
    message(DRM renderer selected)
@@ -321,60 +245,11 @@ libdrm {
    DEFINES += HAVE_DRM
    SOURCES += streaming/video/ffmpeg-renderers/drm.cpp
    HEADERS += streaming/video/ffmpeg-renderers/drm.h
-
-    linux {
-        !disable-masterhooks {
-            message(Master hooks enabled)
-            DEFINES += HAVE_DRM_MASTER_HOOKS
-            SOURCES += masterhook.c masterhook_internal.c
-            LIBS += -ldl -pthread
-        }
-    }
-}
-cuda {
-    message(CUDA support enabled)
-
-    DEFINES += HAVE_CUDA
-    SOURCES += streaming/video/ffmpeg-renderers/cuda.cpp
-    HEADERS += streaming/video/ffmpeg-renderers/cuda.h
-
-    # ffnvcodec uses libdl in cuda_load_functions()/cuda_free_functions()
-    LIBS += -ldl
-}
-libplacebo {
-    message(Vulkan support enabled via libplacebo)
-
-    DEFINES += HAVE_LIBPLACEBO_VULKAN
-    SOURCES += \
-        streaming/video/ffmpeg-renderers/plvk.cpp \
-        streaming/video/ffmpeg-renderers/plvk_c.c
-    HEADERS += \
-        streaming/video/ffmpeg-renderers/plvk.h
-}
-config_EGL {
-    message(EGL renderer selected)
-
-    CONFIG += egl
-    DEFINES += HAVE_EGL
-    SOURCES += \
-        streaming/video/ffmpeg-renderers/eglvid.cpp \
-        streaming/video/ffmpeg-renderers/egl_extensions.cpp \
-        streaming/video/ffmpeg-renderers/eglimagefactory.cpp
-    HEADERS += \
-        streaming/video/ffmpeg-renderers/eglvid.h \
-        streaming/video/ffmpeg-renderers/eglimagefactory.h
 }
 config_SL {
    message(Steam Link build configuration selected)

-    !disable-prebuilts {
-        # Link against our NEON-optimized libopus build
-        LIBS += -L$$PWD/../libs/steamlink/lib
-        INCLUDEPATH += $$PWD/../libs/steamlink/include
-        LIBS += -lopus -larmasm -lNE10
-    }
-
-    DEFINES += EMBEDDED_BUILD STEAM_LINK HAVE_SLVIDEO HAVE_SLAUDIO
+    DEFINES += STEAM_LINK HAVE_SLVIDEO HAVE_SLAUDIO
    LIBS += -lSLVideo -lSLAudio

    SOURCES += \
@@ -384,103 +259,44 @@ config_SL {
        streaming/video/slvid.h \
        streaming/audio/renderers/slaud.h
 }
-win32 {
-    HEADERS += streaming/video/ffmpeg-renderers/dxutil.h
-}
 win32:!winrt {
-    message(DXVA2 and D3D11VA renderers selected)
+    message(DXVA2 renderer selected)

    SOURCES += \
        streaming/video/ffmpeg-renderers/dxva2.cpp \
-        streaming/video/ffmpeg-renderers/d3d11va.cpp \
        streaming/video/ffmpeg-renderers/pacer/dxvsyncsource.cpp

    HEADERS += \
        streaming/video/ffmpeg-renderers/dxva2.h \
-        streaming/video/ffmpeg-renderers/d3d11va.h \
        streaming/video/ffmpeg-renderers/pacer/dxvsyncsource.h
 }
 macx {
    message(VideoToolbox renderer selected)

    SOURCES += \
-        streaming/video/ffmpeg-renderers/vt_base.mm \
-        streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm \
-        streaming/video/ffmpeg-renderers/vt_metal.mm
+        streaming/video/ffmpeg-renderers/vt.mm

    HEADERS += \
        streaming/video/ffmpeg-renderers/vt.h
 }
+soundio {
+    message(libsoundio audio renderer selected)
+
+    DEFINES += HAVE_SOUNDIO SOUNDIO_STATIC_LIBRARY
+    SOURCES += streaming/audio/renderers/soundioaudiorenderer.cpp
+    HEADERS += streaming/audio/renderers/soundioaudiorenderer.h
+}
 discord-rpc {
    message(Discord integration enabled)

    LIBS += -ldiscord-rpc
    DEFINES += HAVE_DISCORD
 }
-embedded {
-    message(Embedded build)
-
-    DEFINES += EMBEDDED_BUILD
-}
-glslow {
-    message(GL slow build)
-
-    DEFINES += GL_IS_SLOW
-}
-vkslow {
-    message(Vulkan slow build)
-
-    DEFINES += VULKAN_IS_SLOW
-}
-gpuslow {
-    message(GPU slow build)
-
-    DEFINES += GL_IS_SLOW VULKAN_IS_SLOW
-}
-wayland {
-    message(Wayland extensions enabled)
-
-    DEFINES += HAS_WAYLAND
-    SOURCES += streaming/video/ffmpeg-renderers/pacer/waylandvsyncsource.cpp
-    HEADERS += streaming/video/ffmpeg-renderers/pacer/waylandvsyncsource.h
-}

 RESOURCES += \
    resources.qrc \
    qml.qrc

-TRANSLATIONS += \
-    languages/qml_zh_CN.ts \
-    languages/qml_de.ts \
-    languages/qml_fr.ts \
-    languages/qml_nb_NO.ts \
-    languages/qml_ru.ts \
-    languages/qml_es.ts \
-    languages/qml_ja.ts \
-    languages/qml_vi.ts \
-    languages/qml_th.ts \
-    languages/qml_ko.ts \
-    languages/qml_hu.ts \
-    languages/qml_nl.ts \
-    languages/qml_sv.ts \
-    languages/qml_tr.ts \
-    languages/qml_uk.ts \
-    languages/qml_zh_TW.ts \
-    languages/qml_el.ts \
-    languages/qml_hi.ts \
-    languages/qml_it.ts \
-    languages/qml_pt.ts \
-    languages/qml_pt_BR.ts \
-    languages/qml_pl.ts \
-    languages/qml_cs.ts \
-    languages/qml_he.ts \
-    languages/qml_ckb.ts \
-    languages/qml_lt.ts \
-    languages/qml_et.ts \
-    languages/qml_bg.ts \
-    languages/qml_eo.ts \
-    languages/qml_ta.ts
-
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =

@@ -501,6 +317,15 @@ else:unix: LIBS += -L$$OUT_PWD/../qmdnsengine/ -lqmdnsengine
 INCLUDEPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine
 DEPENDPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine

+soundio {
+    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio
+    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio
+    else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio
+
+    INCLUDEPATH += $$PWD/../soundio/libsoundio
+    DEPENDPATH += $$PWD/../soundio/libsoundio
+}
+
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/release/ -lh264bitstream
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/debug/ -lh264bitstream
 else:unix: LIBS += -L$$OUT_PWD/../h264bitstream/ -lh264bitstream
@@ -559,19 +384,12 @@ macx {
    APP_BUNDLE_RESOURCES.files = moonlight.icns
    APP_BUNDLE_RESOURCES.path = Contents/Resources

-    APP_BUNDLE_PLIST.files = $$OUT_PWD/Info.plist
-    APP_BUNDLE_PLIST.path = Contents
+    APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) $$files(../libs/mac/lib/*.dylib, true)
+    APP_BUNDLE_FRAMEWORKS.path = Contents/Frameworks

-    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_PLIST
+    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_FRAMEWORKS

-    !disable-prebuilts {
-        APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) $$files(../libs/mac/lib/*.dylib, true)
-        APP_BUNDLE_FRAMEWORKS.path = Contents/Frameworks
-
-        QMAKE_BUNDLE_DATA += APP_BUNDLE_FRAMEWORKS
-
-        QMAKE_RPATHDIR += @executable_path/../Frameworks
-    }
+    QMAKE_RPATHDIR += @executable_path/../Frameworks
 }

 VERSION = "$$cat(version.txt)"
@@ -6,18 +6,17 @@
 #include <QJsonObject>

 AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_Nam(this)
 {
-    m_Nam = new QNetworkAccessManager(this);
-
    // Never communicate over HTTP
-    m_Nam->setStrictTransportSecurityEnabled(true);
+    m_Nam.setStrictTransportSecurityEnabled(true);

    // Allow HTTP redirects
-    m_Nam->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
+    m_Nam.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);

-    connect(m_Nam, &QNetworkAccessManager::finished,
-            this, &AutoUpdateChecker::handleUpdateCheckRequestFinished);
+    connect(&m_Nam, SIGNAL(finished(QNetworkReply*)),
+            this, SLOT(handleUpdateCheckRequestFinished(QNetworkReply*)));

    QString currentVersion(VERSION_STR);
    qDebug() << "Current Moonlight version:" << currentVersion;
@@ -29,98 +28,40 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :

 void AutoUpdateChecker::start()
 {
-    if (!m_Nam) {
-        Q_ASSERT(m_Nam);
-        return;
-    }
-
-#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) || defined(APP_IMAGE) // Only run update checker on platforms without auto-update
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT)
-    // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1)
-    QT_WARNING_PUSH
-    QT_WARNING_DISABLE_DEPRECATED
-    m_Nam->setNetworkAccessible(QNetworkAccessManager::Accessible);
-    QT_WARNING_POP
-#endif
+#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) // Only run update checker on platforms without auto-update
+    // HACK: Set network accessibility to work around QTBUG-80947
+    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);

    // We'll get a callback when this is finished
    QUrl url("https://moonlight-stream.org/updates/qt.json");
-    QNetworkRequest request(url);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    request.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
-#else
-    request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
-#endif
-    m_Nam->get(request);
+    m_Nam.get(QNetworkRequest(url));
 #endif
 }

 void AutoUpdateChecker::parseStringToVersionQuad(QString& string, QVector<int>& version)
 {
    QStringList list = string.split('.');
-    for (const QString& component : std::as_const(list)) {
+    for (const QString& component : list) {
        version.append(component.toInt());
    }
 }

 QString AutoUpdateChecker::getPlatform()
 {
-#if defined(STEAM_LINK)
+#ifdef STEAM_LINK
    return QStringLiteral("steamlink");
-#elif defined(APP_IMAGE)
-    return QStringLiteral("appimage");
-#elif defined(Q_OS_DARWIN) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    // Qt 6 changed this from 'osx' to 'macos'. Use the old one
-    // to be consistent (and not require another entry in the manifest).
-    return QStringLiteral("osx");
 #else
    return QSysInfo::productType();
 #endif
 }

-int AutoUpdateChecker::compareVersion(QVector<int>& version1, QVector<int>& version2) {
-    for (int i = 0;; i++) {
-        int v1Val = 0;
-        int v2Val = 0;
-
-        // Treat missing decimal places as 0
-        if (i < version1.count()) {
-            v1Val = version1[i];
-        }
-        if (i < version2.count()) {
-            v2Val = version2[i];
-        }
-        if (i >= version1.count() && i >= version2.count()) {
-            // Equal versions
-            return 0;
-        }
-
-        if (v1Val < v2Val) {
-            return -1;
-        }
-        else if (v1Val > v2Val) {
-            return 1;
-        }
-    }
-}
-
 void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
 {
    Q_ASSERT(reply->isFinished());

-    // Delete the QNetworkAccessManager to free resources and
-    // prevent the bearer plugin from polling in the background.
-    m_Nam->deleteLater();
-    m_Nam = nullptr;
-
    if (reply->error() == QNetworkReply::NoError) {
        QTextStream stream(reply);
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        stream.setEncoding(QStringConverter::Utf8);
-#else
        stream.setCodec("UTF-8");
-#endif

        // Read all data and queue the reply for deletion
        QString jsonString = stream.readAll();
@@ -139,7 +80,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
            return;
        }

-        for (const auto& updateEntry : std::as_const(array)) {
+        for (QJsonValueRef updateEntry : array) {
            if (updateEntry.isObject()) {
                QJsonObject updateObj = updateEntry.toObject();
                if (!updateObj.contains("platform") ||
@@ -160,47 +101,46 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)

                if (updateObj["arch"] == QSysInfo::buildCpuArchitecture() &&
                        updateObj["platform"] == getPlatform()) {
-
-                    // Check the kernel version minimum if one exists
-                    if (updateObj.contains("kernel_version_at_least") && updateObj["kernel_version_at_least"].isString()) {
-                        QVector<int> requiredVersionQuad;
-                        QVector<int> actualVersionQuad;
-
-                        QString requiredVersion = updateObj["kernel_version_at_least"].toString();
-                        QString actualVersion = QSysInfo::kernelVersion();
-                        parseStringToVersionQuad(requiredVersion, requiredVersionQuad);
-                        parseStringToVersionQuad(actualVersion, actualVersionQuad);
-
-                        if (compareVersion(actualVersionQuad, requiredVersionQuad) < 0) {
-                            qDebug() << "Skipping manifest entry due to kernel version (" << actualVersion << "<" << requiredVersion << ")";
-                            continue;
-                        }
-                    }
-
                    qDebug() << "Found update manifest match for current platform";

                    QString latestVersion = updateObj["version"].toString();
                    qDebug() << "Latest version of Moonlight for this platform is:" << latestVersion;

                    QVector<int> latestVersionQuad;
+
                    parseStringToVersionQuad(latestVersion, latestVersionQuad);

-                    int res = compareVersion(m_CurrentVersionQuad, latestVersionQuad);
-                    if (res < 0) {
-                        // m_CurrentVersionQuad < latestVersionQuad
-                        qDebug() << "Update available";
-                        emit onUpdateAvailable(updateObj["version"].toString(),
-                                               updateObj["browser_url"].toString());
-                        return;
-                    }
-                    else if (res > 0) {
-                        qDebug() << "Update manifest version lower than current version";
-                        return;
-                    }
-                    else {
-                        qDebug() << "Update manifest version equal to current version";
-                        return;
+                    for (int i = 0;; i++) {
+                        int latestVer = 0;
+                        int currentVer = 0;
+
+                        // Treat missing decimal places as 0
+                        if (i < latestVersionQuad.count()) {
+                            latestVer = latestVersionQuad[i];
+                        }
+                        if (i < m_CurrentVersionQuad.count()) {
+                            currentVer = m_CurrentVersionQuad[i];
+                        }
+                        if (i >= latestVersionQuad.count() && i >= m_CurrentVersionQuad.count()) {
+                            break;
+                        }
+
+                        if (currentVer < latestVer) {
+                            qDebug() << "Update available";
+
+                            emit onUpdateAvailable(updateObj["version"].toString(),
+                                                   updateObj["browser_url"].toString());
+                            return;
+                        }
+                        else if (currentVer > latestVer) {
+                            qDebug() << "Update manifest version lower than current version";
+                            return;
+                        }
                    }
+
+                    qDebug() << "Update manifest version equal to current version";
+
+                    return;
                }
            }
            else {
@@ -208,11 +148,11 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
            }
        }

-        qWarning() << "No entry in update manifest found for current platform:"
-                   << QSysInfo::buildCpuArchitecture() << getPlatform() << QSysInfo::kernelVersion();
+        qWarning() << "No entry in update manifest found for current platform: "
+                   << QSysInfo::buildCpuArchitecture() << getPlatform();
    }
    else {
-        qWarning() << "Update checking failed with error:" << reply->error();
+        qWarning() << "Update checking failed with error: " << reply->error();
        reply->deleteLater();
    }
 }
@@ -20,10 +20,8 @@ private slots:
 private:
    void parseStringToVersionQuad(QString& string, QVector<int>& version);

-    int compareVersion(QVector<int>& version1, QVector<int>& version2);
-
    QString getPlatform();

    QVector<int> m_CurrentVersionQuad;
-    QNetworkAccessManager* m_Nam;
+    QNetworkAccessManager m_Nam;
 };
@@ -46,8 +46,8 @@ public:
          m_Computer(computer),
          m_App(app)
    {
-        connect(this, &NetworkBoxArtLoadTask::boxArtFetchCompleted,
-                boxArtManager, &BoxArtManager::handleBoxArtLoadComplete);
+        connect(this, SIGNAL(boxArtFetchCompleted(NvComputer*,NvApp,QUrl)),
+                boxArtManager, SLOT(handleBoxArtLoadComplete(NvComputer*,NvApp,QUrl)));
    }

 signals:
@@ -71,10 +71,10 @@ private:

 QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
 {
-    // Try to open the cached file if it exists and contains data
-    QFile cacheFile(getFilePathForBoxArt(computer, app.id));
-    if (cacheFile.exists() && cacheFile.size() > 0) {
-        return QUrl::fromLocalFile(cacheFile.fileName());
+    // Try to open the cached file
+    QString cacheFilePath = getFilePathForBoxArt(computer, app.id);
+    if (QFile::exists(cacheFilePath)) {
+        return QUrl::fromLocalFile(cacheFilePath);
    }

    // If we get here, we need to fetch asynchronously.
@@ -87,16 +87,6 @@ QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
    return QUrl("qrc:/res/no_app_image.png");
 }

-void BoxArtManager::deleteBoxArt(NvComputer* computer)
-{
-    QDir dir(Path::getBoxArtCacheDir());
-
-    // Delete everything in this computer's box art directory
-    if (dir.cd(computer->uuid)) {
-        dir.removeRecursively();
-    }
-}
-
 void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image)
 {
    if (!image.isEmpty()) {
@@ -106,7 +96,7 @@ void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QU

 QUrl BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
 {
-    NvHTTP http(computer);
+    NvHTTP http(computer->activeAddress, computer->serverCert);

    QString cachePath = getFilePathForBoxArt(computer, appId);
    QImage image;
@@ -119,10 +109,6 @@ QUrl BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
        if (image.save(cachePath)) {
            return QUrl::fromLocalFile(cachePath);
        }
-        else {
-            // A failed save() may leave a zero byte file. Make sure that's removed.
-            QFile(cachePath).remove();
-        }
    }

    return QUrl();
@@ -18,10 +18,6 @@ public:
    QUrl
    loadBoxArt(NvComputer* computer, NvApp& app);

-    static
-    void
-    deleteBoxArt(NvComputer* computer);
-
 signals:
    void
    boxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image);
@@ -1,7 +1,6 @@
 #include "computermanager.h"
-#include "boxartmanager.h"
 #include "nvhttp.h"
-#include "nvpairingmanager.h"
+#include "settings/streamingpreferences.h"

 #include <Limelight.h>
 #include <QtEndian>
@@ -9,10 +8,8 @@
 #include <QThread>
 #include <QThreadPool>
 #include <QCoreApplication>
-#include <QRandomGenerator>

 #define SER_HOSTS "hosts"
-#define SER_HOSTS_BACKUP "hostsbackup"

 class PcMonitorThread : public QThread
 {
@@ -29,22 +26,22 @@ public:
    }

 private:
-    bool tryPollComputer(QNetworkAccessManager* nam, NvAddress address, bool& changed)
+    bool tryPollComputer(QString address, bool& changed)
    {
-        NvHTTP http(address, 0, m_Computer->serverCert, nam);
+        NvHTTP http(address, m_Computer->serverCert);

        QString serverInfo;
        try {
-            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NVLL_NONE, true);
+            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NVLL_NONE);
        } catch (...) {
            return false;
        }

-        NvComputer newState(http, serverInfo);
+        NvComputer newState(address, serverInfo, QSslCertificate());

        // Ensure the machine that responded is the one we intended to contact
        if (m_Computer->uuid != newState.uuid) {
-            qInfo() << "Found unexpected PC" << newState.name << "looking for" << m_Computer->name;
+            qInfo() << "Found unexpected PC " << newState.name << " looking for " << m_Computer->name;
            return false;
        }

@@ -52,9 +49,11 @@ private:
        return true;
    }

-    bool updateAppList(QNetworkAccessManager* nam, bool& changed)
+    bool updateAppList(bool& changed)
    {
-        NvHTTP http(m_Computer, nam);
+        Q_ASSERT(m_Computer->activeAddress != nullptr);
+
+        NvHTTP http(m_Computer->activeAddress, m_Computer->serverCert);

        QVector<NvApp> appList;

@@ -68,42 +67,32 @@ private:
        }

        QWriteLocker lock(&m_Computer->lock);
-        changed = m_Computer->updateAppList(appList);
+        if (m_Computer->appList != appList) {
+            m_Computer->appList = appList;
+            m_Computer->sortAppList();
+            changed = true;
+        }
+
        return true;
    }

    void run() override
    {
-        // Reduce the power and performance impact of our
-        // computer status polling while it's running.
-        setPriority(QThread::LowPriority);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-        setServiceLevel(QThread::QualityOfService::Eco);
-#endif
-
-        // Share the QNetworkAccessManager to conserve resources when polling.
-        // Each instance creates a worker thread, so sharing them ensures that
-        // we are not spamming a new thread for every single polling attempt.
-        //
-        // Since QThread inherit the priority of the current thread, this also
-        // ensures that the NAM's worker thread will inherit our lower priority.
-        QNetworkAccessManager nam;
-
        // Always fetch the applist the first time
        int pollsSinceLastAppListFetch = POLLS_PER_APPLIST_FETCH;
        while (!isInterruptionRequested()) {
            bool stateChanged = false;
            bool online = false;
            bool wasOnline = m_Computer->state == NvComputer::CS_ONLINE;
-            for (int i = 0; i < (wasOnline ? TRIES_BEFORE_OFFLINING : 1) && !online; i++) {
+            for (int i = 0; i < TRIES_BEFORE_OFFLINING && !online; i++) {
                for (auto& address : m_Computer->uniqueAddresses()) {
                    if (isInterruptionRequested()) {
                        return;
                    }

-                    if (tryPollComputer(&nam, address, stateChanged)) {
+                    if (tryPollComputer(address, stateChanged)) {
                        if (!wasOnline) {
-                            qInfo() << m_Computer->name << "is now online at" << m_Computer->activeAddress.toString();
+                            qInfo() << m_Computer->name << "is now online at" << m_Computer->activeAddress;
                        }
                        online = true;
                        break;
@@ -132,7 +121,7 @@ private:
                    stateChanged = false;
                }

-                if (updateAppList(&nam, stateChanged)) {
+                if (updateAppList(stateChanged)) {
                    pollsSinceLastAppListFetch = 0;
                }
            }
@@ -158,65 +147,32 @@ private:
    NvComputer* m_Computer;
 };

-ComputerManager::ComputerManager(StreamingPreferences* prefs)
-    : m_Prefs(prefs),
+ComputerManager::ComputerManager(QObject *parent)
+    : QObject(parent),
      m_PollingRef(0),
-      m_MdnsBrowser(nullptr),
-      m_CompatFetcher(nullptr),
-      m_NeedsDelayedFlush(false)
+      m_MdnsBrowser(nullptr)
 {
    QSettings settings;

-    // If there's a hosts backup copy, we must have failed to commit
-    // a previous update before exiting. Restore the backup now.
-    int hosts = settings.beginReadArray(SER_HOSTS_BACKUP);
-    if (hosts == 0) {
-        // If there's no host backup, read from the primary location.
-        settings.endArray();
-        hosts = settings.beginReadArray(SER_HOSTS);
-    }
-
    // Inflate our hosts from QSettings
+    int hosts = settings.beginReadArray(SER_HOSTS);
    for (int i = 0; i < hosts; i++) {
        settings.setArrayIndex(i);
        NvComputer* computer = new NvComputer(settings);
        m_KnownHosts[computer->uuid] = computer;
-        m_LastSerializedHosts[computer->uuid] = *computer;
    }
    settings.endArray();

-    // Fetch latest compatibility data asynchronously
-    m_CompatFetcher.start();
-
-    // Start the delayed flush thread to handle saveHosts() calls
-    m_DelayedFlushThread = new DelayedFlushThread(this);
-    m_DelayedFlushThread->start();
-
    // To quit in a timely manner, we must block additional requests
-    // after we receive the aboutToQuit() signal. This is necessary
-    // because NvHTTP uses aboutToQuit() to abort requests in progress
+    // after we receive the aboutToQuit() signal. This is neccessary
+    // because NvHTTP uses aboutToQuit() to abort requests in progres
    // while quitting, however this is a one time signal - additional
    // requests would not be aborted and block termination.
-    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, &ComputerManager::handleAboutToQuit);
+    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(handleAboutToQuit()));
 }

 ComputerManager::~ComputerManager()
 {
-    // Stop the delayed flush thread before acquiring the lock in write mode
-    // to avoid deadlocking with a flush that needs the lock in read mode.
-    {
-        // Wake the delayed flush thread
-        m_DelayedFlushThread->requestInterruption();
-        m_DelayedFlushCondition.wakeOne();
-
-        // Wait for it to terminate (and finish any pending flush)
-        m_DelayedFlushThread->wait();
-        delete m_DelayedFlushThread;
-
-        // Delayed flushes should have completed by now
-        Q_ASSERT(!m_NeedsDelayedFlush);
-    }
-
    QWriteLocker lock(&m_Lock);

    // Delete machines that haven't been resolved yet
@@ -231,95 +187,33 @@ ComputerManager::~ComputerManager()
    m_MdnsBrowser = nullptr;

    // Interrupt polling
-    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
+    for (ComputerPollingEntry* entry : m_PollEntries) {
        entry->interrupt();
    }

    // Delete all polling entries (and associated threads)
-    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
+    for (ComputerPollingEntry* entry : m_PollEntries) {
        delete entry;
    }

    // Destroy all NvComputer objects now that polling is halted
-    for (NvComputer* computer : std::as_const(m_KnownHosts)) {
+    for (NvComputer* computer : m_KnownHosts) {
        delete computer;
    }
 }

-void DelayedFlushThread::run() {
-    for (;;) {
-        // Wait for a delayed flush request or an interruption
-        {
-            QMutexLocker locker(&m_ComputerManager->m_DelayedFlushMutex);
-
-            while (!QThread::currentThread()->isInterruptionRequested() && !m_ComputerManager->m_NeedsDelayedFlush) {
-                m_ComputerManager->m_DelayedFlushCondition.wait(&m_ComputerManager->m_DelayedFlushMutex);
-            }
-
-            // Bail without flushing if we woke up for an interruption alone.
-            // If we have both an interruption and a flush request, do the flush.
-            if (!m_ComputerManager->m_NeedsDelayedFlush) {
-                Q_ASSERT(QThread::currentThread()->isInterruptionRequested());
-                break;
-            }
-
-            // Reset the delayed flush flag to ensure any racing saveHosts() call will set it again
-            m_ComputerManager->m_NeedsDelayedFlush = false;
-
-            // Update the last serialized hosts map under the delayed flush mutex
-            m_ComputerManager->m_LastSerializedHosts.clear();
-            for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
-                // Copy the current state of the NvComputer to allow us to check later if we need
-                // to serialize it again when attribute updates occur.
-                QReadLocker computerLock(&computer->lock);
-                m_ComputerManager->m_LastSerializedHosts[computer->uuid] = *computer;
-            }
-        }
-
-        // Perform the flush
-        {
-            QSettings settings;
-
-            // First, write to the backup location
-            settings.beginWriteArray(SER_HOSTS_BACKUP);
-            {
-                QReadLocker lock(&m_ComputerManager->m_Lock);
-                int i = 0;
-                for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
-                    settings.setArrayIndex(i++);
-                    computer->serialize(settings, false);
-                }
-            }
-            settings.endArray();
-
-            // Next, write to the primary location
-            settings.remove(SER_HOSTS);
-            settings.beginWriteArray(SER_HOSTS);
-            {
-                QReadLocker lock(&m_ComputerManager->m_Lock);
-                int i = 0;
-                for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
-                    settings.setArrayIndex(i++);
-                    computer->serialize(settings, true);
-                }
-            }
-            settings.endArray();
-
-            // Finally, delete the backup copy
-            settings.remove(SER_HOSTS_BACKUP);
-        }
-    }
-}
-
 void ComputerManager::saveHosts()
 {
-    Q_ASSERT(m_DelayedFlushThread != nullptr && m_DelayedFlushThread->isRunning());
+    QSettings settings;
+    QReadLocker lock(&m_Lock);

-    // Punt to a worker thread because QSettings on macOS can take ages (> 500 ms)
-    // to persist our host list to disk (especially when a host has a bunch of apps).
-    QMutexLocker locker(&m_DelayedFlushMutex);
-    m_NeedsDelayedFlush = true;
-    m_DelayedFlushCondition.wakeOne();
+    settings.remove(SER_HOSTS);
+    settings.beginWriteArray(SER_HOSTS);
+    for (int i = 0; i < m_KnownHosts.count(); i++) {
+        settings.setArrayIndex(i);
+        m_KnownHosts.value(m_KnownHosts.keys()[i])->serialize(settings);
+    }
+    settings.endArray();
 }

 QHostAddress ComputerManager::getBestGlobalAddressV6(QVector<QHostAddress> &addresses)
@@ -366,15 +260,16 @@ void ComputerManager::startPolling()
        return;
    }

-    if (m_Prefs->enableMdns) {
+    StreamingPreferences prefs;
+
+    if (prefs.enableMdns) {
        // Start an MDNS query for GameStream hosts
-        m_MdnsServer.reset(new QMdnsEngine::Server());
-        m_MdnsBrowser = new QMdnsEngine::Browser(m_MdnsServer.data(), "_nvstream._tcp.local.");
+        m_MdnsBrowser = new QMdnsEngine::Browser(&m_MdnsServer, "_nvstream._tcp.local.", &m_MdnsCache);
        connect(m_MdnsBrowser, &QMdnsEngine::Browser::serviceAdded,
                this, [this](const QMdnsEngine::Service& service) {
            qInfo() << "Discovered mDNS host:" << service.hostname();

-            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(m_MdnsServer, service);
+            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(&m_MdnsServer, service);
            connect(pendingComputer, &MdnsPendingComputer::resolvedHost,
                    this, &ComputerManager::handleMdnsServiceResolved);
            m_PendingResolution.append(pendingComputer);
@@ -410,8 +305,8 @@ void ComputerManager::startPollingComputer(NvComputer* computer)

    if (!pollingEntry->isActive()) {
        PcMonitorThread* thread = new PcMonitorThread(computer);
-        connect(thread, &PcMonitorThread::computerStateChanged,
-                this, &ComputerManager::handleComputerStateChanged);
+        connect(thread, SIGNAL(computerStateChanged(NvComputer*)),
+                this, SLOT(handleComputerStateChanged(NvComputer*)));
        pollingEntry->setActiveThread(thread);
        thread->start();
    }
@@ -424,15 +319,13 @@ void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,
    bool added = false;

    // Add the host using the IPv4 address
-    for (const QHostAddress& address : std::as_const(addresses)) {
+    for (const QHostAddress& address : addresses) {
        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
            // NB: We don't just call addNewHost() here with v6Global because the IPv6
            // address may not be reachable (if the user hasn't installed the IPv6 helper yet
            // or if this host lacks outbound IPv6 capability). We want to add IPv6 even if
            // it's not currently reachable.
-            addNewHost(NvAddress(address, computer->port()),
-                       true, computer->hostname(),
-                       NvAddress(v6Global, computer->port()));
+            addNewHost(address.toString(), true, v6Global);
            added = true;
            break;
        }
@@ -440,15 +333,14 @@ void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,

    if (!added) {
        // If we get here, there wasn't an IPv4 address so we'll do it v6-only
-        for (const QHostAddress& address : std::as_const(addresses)) {
+        for (const QHostAddress& address : addresses) {
            if (address.protocol() == QAbstractSocket::IPv6Protocol) {
                // Use a link-local or site-local address for the "local address"
                if (address.isInSubnet(QHostAddress("fe80::"), 10) ||
                        address.isInSubnet(QHostAddress("fec0::"), 10) ||
                        address.isInSubnet(QHostAddress("fc00::"), 7)) {
-                    addNewHost(NvAddress(address, computer->port()),
-                               true, computer->hostname(),
-                               NvAddress(v6Global, computer->port()));
+                    addNewHost(address.toString(), true, v6Global);
+                    added = true;
                    break;
                }
            }
@@ -459,19 +351,6 @@ void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,
    computer->deleteLater();
 }

-void ComputerManager::saveHost(NvComputer *computer)
-{
-    // If no serializable properties changed, don't bother saving hosts
-    QMutexLocker lock(&m_DelayedFlushMutex);
-    QReadLocker computerLock(&computer->lock);
-    if (!m_LastSerializedHosts.value(computer->uuid).isEqualSerialized(*computer)) {
-        // Queue a request for a delayed flush to QSettings outside of the lock
-        computerLock.unlock();
-        lock.unlock();
-        saveHosts();
-    }
-}
-
 void ComputerManager::handleComputerStateChanged(NvComputer* computer)
 {
    emit computerStateChanged(computer);
@@ -481,20 +360,15 @@ void ComputerManager::handleComputerStateChanged(NvComputer* computer)
        emit quitAppCompleted(QVariant());
    }

-    // Save updates to this host
-    saveHost(computer);
+    // Save updated hosts to QSettings
+    saveHosts();
 }

 QVector<NvComputer*> ComputerManager::getComputers()
 {
    QReadLocker lock(&m_Lock);

-    // Return a sorted host list
-    auto hosts = QVector<NvComputer*>::fromList(m_KnownHosts.values());
-    std::stable_sort(hosts.begin(), hosts.end(), [](const NvComputer* host1, const NvComputer* host2) {
-        return host1->name.toLower() < host2->name.toLower();
-    });
-    return hosts;
+    return QVector<NvComputer*>::fromList(m_KnownHosts.values());
 }

 class DeferredHostDeletionTask : public QRunnable
@@ -518,15 +392,12 @@ public:
            m_ComputerManager->m_KnownHosts.remove(m_Computer->uuid);
        }

-        // Persist the new host list with this computer deleted
+        // Persist the new host list
        m_ComputerManager->saveHosts();

        // Delete the polling entry first. This will stop all polling threads too.
        delete pollingEntry;

-        // Delete cached box art
-        BoxArtManager::deleteBoxArt(m_Computer);
-
        // Finally, delete the computer itself. This must be done
        // last because the polling thread might be using it.
        delete m_Computer;
@@ -544,32 +415,13 @@ void ComputerManager::deleteHost(NvComputer* computer)
    QThreadPool::globalInstance()->start(new DeferredHostDeletionTask(this, computer));
 }

-void ComputerManager::renameHost(NvComputer* computer, QString name)
-{
-    {
-        QWriteLocker lock(&computer->lock);
-
-        computer->name = name;
-        computer->hasCustomName = true;
-    }
-
-    // Notify the UI of the state change
-    handleComputerStateChanged(computer);
-}
-
-void ComputerManager::clientSideAttributeUpdated(NvComputer* computer)
-{
-    // Notify the UI of the state change
-    handleComputerStateChanged(computer);
-}
-
 void ComputerManager::handleAboutToQuit()
 {
-    QReadLocker lock(&m_Lock);
+    QWriteLocker lock(&m_Lock);

    // Interrupt polling threads immediately, so they
    // avoid making additional requests while quitting
-    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
+    for (ComputerPollingEntry* entry : m_PollEntries) {
        entry->interrupt();
    }
 }
@@ -580,8 +432,7 @@ class PendingPairingTask : public QObject, public QRunnable

 public:
    PendingPairingTask(ComputerManager* computerManager, NvComputer* computer, QString pin)
-        : m_ComputerManager(computerManager),
-          m_Computer(computer),
+        : m_Computer(computer),
          m_Pin(pin)
    {
        connect(this, &PendingPairingTask::pairingCompleted,
@@ -594,41 +445,32 @@ signals:
 private:
    void run()
    {
-        NvPairingManager pairingManager(m_Computer);
+        NvPairingManager pairingManager(m_Computer->activeAddress);

        try {
           NvPairingManager::PairState result = pairingManager.pair(m_Computer->appVersion, m_Pin, m_Computer->serverCert);
           switch (result)
           {
           case NvPairingManager::PairState::PIN_WRONG:
-               emit pairingCompleted(m_Computer, tr("The PIN from the PC didn't match. Please try again."));
+               emit pairingCompleted(m_Computer, "The PIN from the PC didn't match. Please try again.");
               break;
           case NvPairingManager::PairState::FAILED:
-               if (m_Computer->currentGameId != 0) {
-                   emit pairingCompleted(m_Computer, tr("You cannot pair while a previous session is still running on the host PC. Quit any running games or reboot the host PC, then try pairing again."));
-               }
-               else {
-                   emit pairingCompleted(m_Computer, tr("Pairing failed. Please try again."));
-               }
+               emit pairingCompleted(m_Computer, "Pairing failed. Please try again.");
               break;
           case NvPairingManager::PairState::ALREADY_IN_PROGRESS:
-               emit pairingCompleted(m_Computer, tr("Another pairing attempt is already in progress."));
+               emit pairingCompleted(m_Computer, "Another pairing attempt is already in progress.");
               break;
           case NvPairingManager::PairState::PAIRED:
-               // Persist the newly pinned server certificate for this host
-               m_ComputerManager->saveHost(m_Computer);
-
               emit pairingCompleted(m_Computer, nullptr);
               break;
           }
        } catch (const GfeHttpResponseException& e) {
-            emit pairingCompleted(m_Computer, tr("GeForce Experience returned error: %1").arg(e.toQString()));
+            emit pairingCompleted(m_Computer, "GeForce Experience returned error: " + e.toQString());
        } catch (const QtNetworkReplyException& e) {
            emit pairingCompleted(m_Computer, e.toQString());
        }
    }

-    ComputerManager* m_ComputerManager;
    NvComputer* m_Computer;
    QString m_Pin;
 };
@@ -659,7 +501,7 @@ signals:
 private:
    void run()
    {
-        NvHTTP http(m_Computer);
+        NvHTTP http(m_Computer->activeAddress, m_Computer->serverCert);

        try {
            if (m_Computer->currentGameId != 0) {
@@ -672,8 +514,8 @@ private:
            }
            if (e.getStatusCode() == 599) {
                // 599 is a special code we make a custom message for
-                emit quitAppFailed(tr("The running game wasn't started by this PC. "
-                                      "You must quit the game on the host PC manually or use the device that originally started the game."));
+                emit quitAppFailed("The running game wasn't started by this PC. "
+                                   "You must quit the game on the host PC manually or use the device that originally started the game.");
            }
            else {
                emit quitAppFailed(e.toQString());
@@ -715,74 +557,42 @@ void ComputerManager::stopPollingAsync()
        m_PendingResolution.removeFirst();
    }

-    // Delete the browser and server to stop discovery and refresh polling
+    // Delete the browser to stop discovery
    delete m_MdnsBrowser;
    m_MdnsBrowser = nullptr;
-    m_MdnsServer.reset();

    // Interrupt all threads, but don't wait for them to terminate
-    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
+    for (ComputerPollingEntry* entry : m_PollEntries) {
        entry->interrupt();
    }
 }

-void ComputerManager::addNewHostManually(QString address)
-{
-    QUrl url = QUrl::fromUserInput("moonlight://" + address);
-    if (url.isValid() && !url.host().isEmpty() && url.scheme() == "moonlight") {
-        // If there wasn't a port specified, use the default
-        addNewHost(NvAddress(url.host(), url.port(DEFAULT_HTTP_PORT)), false);
-    }
-    else if (QHostAddress(address).protocol() == QAbstractSocket::IPv6Protocol) {
-        // The user specified an IPv6 literal without URL escaping, so use the default port
-        addNewHost(NvAddress(address, DEFAULT_HTTP_PORT), false);
-    }
-    else {
-        emit computerAddCompleted(false, false);
-    }
-}
-
 class PendingAddTask : public QObject, public QRunnable
 {
    Q_OBJECT

 public:
-    PendingAddTask(ComputerManager* computerManager, QString name, NvAddress address, NvAddress mdnsIpv6Address, bool mdns)
+    PendingAddTask(ComputerManager* computerManager, QString address, QHostAddress mdnsIpv6Address, bool mdns)
        : m_ComputerManager(computerManager),
-          m_Name(name),
          m_Address(address),
          m_MdnsIpv6Address(mdnsIpv6Address),
-          m_Mdns(mdns),
-          m_AboutToQuit(false)
+          m_Mdns(mdns)
    {
        connect(this, &PendingAddTask::computerAddCompleted,
                computerManager, &ComputerManager::computerAddCompleted);
        connect(this, &PendingAddTask::computerStateChanged,
                computerManager, &ComputerManager::handleComputerStateChanged);
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
-                this, &PendingAddTask::handleAboutToQuit);
    }

 signals:
-    void computerAddCompleted(QVariant success, QVariant detectedPortBlocking);
+    void computerAddCompleted(QVariant success);

    void computerStateChanged(NvComputer* computer);

 private:
-    void handleAboutToQuit()
-    {
-        m_AboutToQuit = true;
-    }
-
    QString fetchServerInfo(NvHTTP& http)
    {
        QString serverInfo;
-
-        // Do nothing if we're quitting
-        if (m_AboutToQuit) {
-            return QString();
-        }
-
        try {
            // There's a race condition between GameStream servers reporting presence over
            // mDNS and the HTTPS server being ready to respond to our queries. To work
@@ -805,19 +615,7 @@ private:
            return serverInfo;
        } catch (...) {
            if (!m_Mdns) {
-                unsigned int portTestResult;
-
-                if (m_ComputerManager->m_Prefs->detectNetworkBlocking) {
-                    // We failed to connect to the specified PC. Let's test to make sure this network
-                    // isn't blocking Moonlight, so we can tell the user about it.
-                    portTestResult = LiTestClientConnectivity("qt.conntest.moonlight-stream.org", 443,
-                                                              ML_PORT_FLAG_TCP_47984 | ML_PORT_FLAG_TCP_47989);
-                }
-                else {
-                    portTestResult = 0;
-                }
-
-                emit computerAddCompleted(false, portTestResult != 0 && portTestResult != ML_TEST_RESULT_INCONCLUSIVE);
+                emit computerAddCompleted(false);
            }
            return QString();
        }
@@ -825,26 +623,15 @@ private:

    void run()
    {
-        NvHTTP http(m_Address, 0, QSslCertificate());
+        NvHTTP http(m_Address, QSslCertificate());

-        if (m_Mdns) {
-            if (m_MdnsIpv6Address.isNull()) {
-                qInfo() << "Processing new PC" << m_Name << "from mDNS with local address" << m_Address.toString();
-            }
-            else {
-                qInfo() << "Processing new PC" << m_Name << "from mDNS with local address" << m_Address.toString()
-                        << "and IPv6 address" << m_MdnsIpv6Address.toString();
-            }
-        }
-        else {
-            qInfo() << "Processing new PC at" << m_Address.toString() << "from user";
-        }
+        qInfo() << "Processing new PC at" << m_Address << "from" << (m_Mdns ? "mDNS" : "user") << m_MdnsIpv6Address;

        // Perform initial serverinfo fetch over HTTP since we don't know which cert to use
        QString serverInfo = fetchServerInfo(http);
        if (serverInfo.isEmpty() && !m_MdnsIpv6Address.isNull()) {
            // Retry using the global IPv6 address if the IPv4 or link-local IPv6 address fails
-            http.setAddress(m_MdnsIpv6Address);
+            http.setAddress(m_MdnsIpv6Address.toString());
            serverInfo = fetchServerInfo(http);
        }
        if (serverInfo.isEmpty()) {
@@ -852,7 +639,7 @@ private:
        }

        // Create initial newComputer using HTTP serverinfo with no pinned cert
-        NvComputer* newComputer = new NvComputer(http, serverInfo);
+        NvComputer* newComputer = new NvComputer(http.address(), serverInfo, QSslCertificate());

        // Check if we have a record of this host UUID to pull the pinned cert
        NvComputer* existingComputer;
@@ -866,14 +653,13 @@ private:

        // Fetch serverinfo again over HTTPS with the pinned cert
        if (existingComputer != nullptr) {
-            Q_ASSERT(http.httpsPort() != 0);
            serverInfo = fetchServerInfo(http);
            if (serverInfo.isEmpty()) {
                return;
            }

            // Update the polled computer with the HTTPS information
-            NvComputer httpsComputer(http, serverInfo);
+            NvComputer httpsComputer(http.address(), serverInfo, QSslCertificate());
            newComputer->update(httpsComputer);
        }

@@ -887,11 +673,11 @@ private:
            }

            // Get the WAN IP address using STUN if we're on mDNS over IPv4
-            if (QHostAddress(newComputer->localAddress.address()).protocol() == QAbstractSocket::IPv4Protocol) {
+            if (QHostAddress(newComputer->localAddress).protocol() == QAbstractSocket::IPv4Protocol) {
                quint32 addr;
                int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
                if (err == 0) {
-                    newComputer->setRemoteAddress(QHostAddress(qFromBigEndian(addr)));
+                    newComputer->remoteAddress = QHostAddress(qFromBigEndian(addr)).toString();
                }
                else {
                    qWarning() << "STUN failed to get WAN address:" << err;
@@ -899,55 +685,34 @@ private:
            }

            if (!m_MdnsIpv6Address.isNull()) {
-                Q_ASSERT(QHostAddress(m_MdnsIpv6Address.address()).protocol() == QAbstractSocket::IPv6Protocol);
-                newComputer->ipv6Address = m_MdnsIpv6Address;
+                Q_ASSERT(m_MdnsIpv6Address.protocol() == QAbstractSocket::IPv6Protocol);
+                newComputer->ipv6Address = m_MdnsIpv6Address.toString();
            }
        }
        else {
            newComputer->manualAddress = m_Address;
        }

-        QHostAddress hostAddress(m_Address.address());
-        bool addressIsSiteLocalV4 =
-                hostAddress.isInSubnet(QHostAddress("10.0.0.0"), 8) ||
-                hostAddress.isInSubnet(QHostAddress("172.16.0.0"), 12) ||
-                hostAddress.isInSubnet(QHostAddress("192.168.0.0"), 16);
-
        {
-            // Check if this PC already exists using opportunistic read lock
-            m_ComputerManager->m_Lock.lockForRead();
+            // Check if this PC already exists
+            QWriteLocker lock(&m_ComputerManager->m_Lock);
            NvComputer* existingComputer = m_ComputerManager->m_KnownHosts.value(newComputer->uuid);
-
-            // If it doesn't already exist, convert to a write lock in preparation for updating.
-            //
-            // NB: ComputerManager's lock protects the host map itself, not the elements inside.
-            // Those are protected by their individual locks. Since we only mutate the map itself
-            // when the PC doesn't exist, we need the lock in write-mode for that case only.
-            if (existingComputer == nullptr) {
-                m_ComputerManager->m_Lock.unlock();
-                m_ComputerManager->m_Lock.lockForWrite();
-
-                // Since we had to unlock to lock for write, someone could have raced and added
-                // this PC before us. We have to check again whether it already exists.
-                existingComputer = m_ComputerManager->m_KnownHosts.value(newComputer->uuid);
-            }
-
            if (existingComputer != nullptr) {
                // Fold it into the existing PC
                bool changed = existingComputer->update(*newComputer);
                delete newComputer;

                // Drop the lock before notifying
-                m_ComputerManager->m_Lock.unlock();
+                lock.unlock();

                // For non-mDNS clients, let them know it succeeded
                if (!m_Mdns) {
-                    emit computerAddCompleted(true, false);
+                    emit computerAddCompleted(true);
                }

                // Tell our client if something changed
                if (changed) {
-                    qInfo() << existingComputer->name << "is now at" << existingComputer->activeAddress.toString();
+                    qInfo() << existingComputer->name << "is now at" << existingComputer->activeAddress;
                    emit computerStateChanged(existingComputer);
                }
            }
@@ -959,24 +724,11 @@ private:
                m_ComputerManager->startPollingComputer(newComputer);

                // Drop the lock before notifying
-                m_ComputerManager->m_Lock.unlock();
-
-                // If this wasn't added via mDNS but it is a RFC 1918 IPv4 address and not a VPN,
-                // go ahead and do the STUN request now to populate an external address.
-                if (!m_Mdns && addressIsSiteLocalV4 && newComputer->getActiveAddressReachability() != NvComputer::RI_VPN) {
-                    quint32 addr;
-                    int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
-                    if (err == 0) {
-                        newComputer->setRemoteAddress(QHostAddress(qFromBigEndian(addr)));
-                    }
-                    else {
-                        qWarning() << "STUN failed to get WAN address:" << err;
-                    }
-                }
+                lock.unlock();

                // For non-mDNS clients, let them know it succeeded
                if (!m_Mdns) {
-                    emit computerAddCompleted(true, false);
+                    emit computerAddCompleted(true);
                }

                // Tell our client about this new PC
@@ -986,24 +738,17 @@ private:
    }

    ComputerManager* m_ComputerManager;
-    QString m_Name;
-    NvAddress m_Address;
-    NvAddress m_MdnsIpv6Address;
+    QString m_Address;
+    QHostAddress m_MdnsIpv6Address;
    bool m_Mdns;
-    bool m_AboutToQuit;
 };

-void ComputerManager::addNewHost(NvAddress address, bool mdns, QString name, NvAddress mdnsIpv6Address)
+void ComputerManager::addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address)
 {
    // Punt to a worker thread to avoid stalling the
    // UI while waiting for serverinfo query to complete
-    PendingAddTask* addTask = new PendingAddTask(this, name, address, mdnsIpv6Address, mdns);
+    PendingAddTask* addTask = new PendingAddTask(this, address, mdnsIpv6Address, mdns);
    QThreadPool::globalInstance()->start(addTask);
 }

-QString ComputerManager::generatePinString()
-{
-    return QString::asprintf("%04u", QRandomGenerator::system()->bounded(10000));
-}
-
 #include "computermanager.moc"
@@ -1,8 +1,7 @@
 #pragma once

 #include "nvcomputer.h"
-#include "settings/streamingpreferences.h"
-#include "settings/compatfetcher.h"
+#include "nvpairingmanager.h"

 #include <qmdnsengine/server.h>
 #include <qmdnsengine/cache.h>
@@ -15,38 +14,16 @@
 #include <QSettings>
 #include <QRunnable>
 #include <QTimer>
-#include <QMutex>
-#include <QWaitCondition>
-
-class ComputerManager;
-
-class DelayedFlushThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    DelayedFlushThread(ComputerManager* cm)
-        : m_ComputerManager(cm)
-    {
-        setObjectName("CM Delayed Flush Thread");
-    }
-
-    void run();
-
-private:
-    ComputerManager* m_ComputerManager;
-};

 class MdnsPendingComputer : public QObject
 {
    Q_OBJECT

 public:
-    explicit MdnsPendingComputer(const QSharedPointer<QMdnsEngine::Server> server,
+    explicit MdnsPendingComputer(QMdnsEngine::Server* server,
                                 const QMdnsEngine::Service& service)
        : m_Hostname(service.hostname()),
-          m_Port(service.port()),
-          m_ServerWeak(server),
+          m_Server(server),
          m_Resolver(nullptr)
    {
        // Start resolving
@@ -63,24 +40,13 @@ public:
        return m_Hostname;
    }

-    uint16_t port()
-    {
-        return m_Port;
-    }
-
 private slots:
    void handleResolvedTimeout()
    {
        if (m_Addresses.isEmpty()) {
-            if (m_Retries-- > 0) {
-                // Try again
-                qInfo() << "Resolving" << hostname() << "timed out. Retrying...";
-                resolve();
-            }
-            else {
-                qWarning() << "Giving up on resolving" << hostname() << "after repeated failures";
-                cleanup();
-            }
+            // Try again
+            qInfo() << "Resolving" << hostname() << "timed out. Retrying...";
+            resolve();
        }
        else {
            Q_ASSERT(!m_Addresses.isEmpty());
@@ -90,6 +56,7 @@ private slots:

    void handleResolvedAddress(const QHostAddress& address)
    {
+        qInfo() << "Resolved" << hostname() << "to" << address;
        m_Addresses.push_back(address);
    }

@@ -97,41 +64,19 @@ signals:
    void resolvedHost(MdnsPendingComputer*,QVector<QHostAddress>&);

 private:
-    void cleanup()
-    {
-        // Delete our resolver, so we're guaranteed that nothing is referencing m_Server.
-        delete m_Resolver;
-        m_Resolver = nullptr;
-
-        // Now delete our strong reference that we held on behalf of m_Resolver.
-        // The server may be destroyed after we make this call.
-        m_Server.reset();
-    }
-
    void resolve()
    {
-        // Clean up any existing resolver object and server references
-        cleanup();
-
-        // Re-acquire a strong reference if the server still exists.
-        m_Server = m_ServerWeak.toStrongRef();
-        if (!m_Server) {
-            return;
-        }
-
-        m_Resolver = new QMdnsEngine::Resolver(m_Server.data(), m_Hostname);
+        delete m_Resolver;
+        m_Resolver = new QMdnsEngine::Resolver(m_Server, m_Hostname);
        connect(m_Resolver, &QMdnsEngine::Resolver::resolved,
                this, &MdnsPendingComputer::handleResolvedAddress);
-        QTimer::singleShot(2000, this, &MdnsPendingComputer::handleResolvedTimeout);
+        QTimer::singleShot(2000, this, SLOT(handleResolvedTimeout()));
    }

    QByteArray m_Hostname;
-    uint16_t m_Port;
-    QWeakPointer<QMdnsEngine::Server> m_ServerWeak;
-    QSharedPointer<QMdnsEngine::Server> m_Server;
+    QMdnsEngine::Server* m_Server;
    QMdnsEngine::Resolver* m_Resolver;
    QVector<QHostAddress> m_Addresses;
-    int m_Retries = 10;
 };

 class ComputerPollingEntry
@@ -150,7 +95,7 @@ public:
        // interrupt() should have taken care of this
        Q_ASSERT(m_ActiveThread == nullptr);

-        for (QThread* thread : std::as_const(m_InactiveList)) {
+        for (QThread* thread : m_InactiveList) {
            thread->wait();
            delete thread;
        }
@@ -213,11 +158,9 @@ class ComputerManager : public QObject

    friend class DeferredHostDeletionTask;
    friend class PendingAddTask;
-    friend class PendingPairingTask;
-    friend class DelayedFlushThread;

 public:
-    explicit ComputerManager(StreamingPreferences* prefs);
+    explicit ComputerManager(QObject *parent = nullptr);

    virtual ~ComputerManager();

@@ -225,11 +168,7 @@ public:

    Q_INVOKABLE void stopPollingAsync();

-    Q_INVOKABLE void addNewHostManually(QString address);
-
-    void addNewHost(NvAddress address, bool mdns, QString name = QString(), NvAddress mdnsIpv6Address = NvAddress());
-
-    QString generatePinString();
+    Q_INVOKABLE void addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address = QHostAddress());

    void pairHost(NvComputer* computer, QString pin);

@@ -240,16 +179,12 @@ public:
    // computer is deleted inside this call
    void deleteHost(NvComputer* computer);

-    void renameHost(NvComputer* computer, QString name);
-
-    void clientSideAttributeUpdated(NvComputer* computer);
-
 signals:
    void computerStateChanged(NvComputer* computer);

    void pairingCompleted(NvComputer* computer, QString error);

-    void computerAddCompleted(QVariant success, QVariant detectedPortBlocking);
+    void computerAddCompleted(QVariant success);

    void quitAppCompleted(QVariant error);

@@ -263,24 +198,16 @@ private slots:
 private:
    void saveHosts();

-    void saveHost(NvComputer* computer);
-
    QHostAddress getBestGlobalAddressV6(QVector<QHostAddress>& addresses);

    void startPollingComputer(NvComputer* computer);

-    StreamingPreferences* m_Prefs;
    int m_PollingRef;
    QReadWriteLock m_Lock;
    QMap<QString, NvComputer*> m_KnownHosts;
    QMap<QString, ComputerPollingEntry*> m_PollEntries;
-    QHash<QString, NvComputer> m_LastSerializedHosts; // Protected by m_DelayedFlushMutex
-    QSharedPointer<QMdnsEngine::Server> m_MdnsServer;
+    QMdnsEngine::Server m_MdnsServer;
    QMdnsEngine::Browser* m_MdnsBrowser;
+    QMdnsEngine::Cache m_MdnsCache;
    QVector<MdnsPendingComputer*> m_PendingResolution;
-    CompatFetcher m_CompatFetcher;
-    DelayedFlushThread* m_DelayedFlushThread;
-    QMutex m_DelayedFlushMutex; // Lock ordering: Must never be acquired while holding NvComputer lock
-    QWaitCondition m_DelayedFlushCondition;
-    bool m_NeedsDelayedFlush;
 };
@@ -6,14 +6,6 @@ ComputerSeeker::ComputerSeeker(ComputerManager *manager, QString computerName, Q
    : QObject(parent), m_ComputerManager(manager), m_ComputerName(computerName),
      m_TimeoutTimer(new QTimer(this))
 {
-    // If we know this computer, send a WOL packet to wake it up in case it is asleep.
-    const auto computers = m_ComputerManager->getComputers();
-    for (NvComputer* computer : computers) {
-        if (this->matchComputer(computer)) {
-            computer->wake();
-        }
-    }
-
    m_TimeoutTimer->setSingleShot(true);
    connect(m_TimeoutTimer, &QTimer::timeout,
            this, &ComputerSeeker::onTimeout);
@@ -28,7 +20,7 @@ void ComputerSeeker::start(int timeout)
    // if m_ComputerName is UUID, or the name that doesn't resolve to an IP
    // address) and by polling it using mDNS, hopefully one of these methods
    // would find the host
-    m_ComputerManager->addNewHostManually(m_ComputerName);
+    m_ComputerManager->addNewHost(m_ComputerName, false);
    m_ComputerManager->startPolling();
 }

@@ -52,9 +44,8 @@ bool ComputerSeeker::matchComputer(NvComputer *computer) const
        return true;
    }

-    const auto uniqueAddresses = computer->uniqueAddresses();
-    for (const NvAddress& addr : uniqueAddresses) {
-        if (addr.address().toLower() == value || addr.toString().toLower() == value) {
+    for (const QString& addr : computer->uniqueAddresses()) {
+        if (addr.toLower() == value) {
            return true;
        }
    }
@@ -5,6 +5,7 @@

 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>

@@ -31,23 +32,19 @@ void IdentityManager::createCredentials(QSettings& settings)
    X509* cert = X509_new();
    THROW_BAD_ALLOC_IF_NULL(cert);

-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    EVP_PKEY* pk = EVP_RSA_gen(2048);
+    EVP_PKEY* pk = EVP_PKEY_new();
    THROW_BAD_ALLOC_IF_NULL(pk);
-#else
-    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
-    THROW_BAD_ALLOC_IF_NULL(ctx);

-    EVP_PKEY_keygen_init(ctx);
-    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048);
+    BIGNUM* bne = BN_new();
+    THROW_BAD_ALLOC_IF_NULL(bne);

-    // pk must be initialized on input
-    EVP_PKEY* pk = NULL;
-    EVP_PKEY_keygen(ctx, &pk);
+    RSA* rsa = RSA_new();
+    THROW_BAD_ALLOC_IF_NULL(rsa);

-    EVP_PKEY_CTX_free(ctx);
-    THROW_BAD_ALLOC_IF_NULL(pk);
-#endif
+    BN_set_word(bne, RSA_F4);
+    RSA_generate_key_ex(rsa, 2048, bne, nullptr);
+
+    EVP_PKEY_assign_RSA(pk, rsa);

    X509_set_version(cert, 2);
    ASN1_INTEGER_set(X509_get_serialNumber(cert), 0);
@@ -55,20 +52,28 @@ void IdentityManager::createCredentials(QSettings& settings)
    X509_gmtime_adj(X509_get_notBefore(cert), 0);
    X509_gmtime_adj(X509_get_notAfter(cert), 60 * 60 * 24 * 365 * 20); // 20 yrs
 #else
-    X509_gmtime_adj(X509_getm_notBefore(cert), 0);
-    X509_gmtime_adj(X509_getm_notAfter(cert), 60 * 60 * 24 * 365 * 20); // 20 yrs
+    ASN1_TIME* before = ASN1_STRING_dup(X509_get0_notBefore(cert));
+    THROW_BAD_ALLOC_IF_NULL(before);
+    ASN1_TIME* after = ASN1_STRING_dup(X509_get0_notAfter(cert));
+    THROW_BAD_ALLOC_IF_NULL(after);
+
+    X509_gmtime_adj(before, 0);
+    X509_gmtime_adj(after, 60 * 60 * 24 * 365 * 20); // 20 yrs
+
+    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_NAME_new();
-    THROW_BAD_ALLOC_IF_NULL(name);
+    X509_NAME* name = X509_get_subject_name(cert);
    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
                               reinterpret_cast<unsigned char *>(const_cast<char*>("NVIDIA GameStream Client")),
                               -1, -1, 0);
-    X509_set_subject_name(cert, name);
    X509_set_issuer_name(cert, name);
-    X509_NAME_free(name);

    X509_sign(cert, pk, EVP_sha256());

@@ -89,17 +94,10 @@ void IdentityManager::createCredentials(QSettings& settings)

    X509_free(cert);
    EVP_PKEY_free(pk);
+    BN_free(bne);
    BIO_free(biokey);
    BIO_free(biocert);

-    // Check that the new keypair is valid before persisting it
-    if (getSslCertificate().isNull()) {
-        qFatal("Newly generated certificate is unreadable");
-    }
-    if (getSslKey().isNull()) {
-        qFatal("Newly generated private key is unreadable");
-    }
-
    settings.setValue(SER_CERT, m_CachedPemCert);
    settings.setValue(SER_KEY, m_CachedPrivateKey);

@@ -128,10 +126,10 @@ IdentityManager::IdentityManager()

    // We should have valid credentials now. If not, we're screwed
    if (getSslCertificate().isNull()) {
-        qFatal("Certificate is unreadable");
+        qFatal("Newly generated certificate is unreadable");
    }
    if (getSslKey().isNull()) {
-        qFatal("Private key is unreadable");
+        qFatal("Newly generated private key is unreadable");
    }
 }

@@ -148,10 +146,7 @@ QSslKey
 IdentityManager::getSslKey()
 {
    if (m_CachedSslKey.isNull()) {
-        // This seemingly useless const_cast is required for old OpenSSL headers
-        // where BIO_new_mem_buf's parameter is not declared const like those on
-        // the Steam Link hardware.
-        BIO* bio = BIO_new_mem_buf(const_cast<char*>(m_CachedPrivateKey.constData()), -1);
+        BIO* bio = BIO_new_mem_buf(m_CachedPrivateKey.data(), -1);
        THROW_BAD_ALLOC_IF_NULL(bio);

        EVP_PKEY* pk = PEM_read_bio_PrivateKey(bio, nullptr, nullptr, nullptr);
@@ -1,65 +0,0 @@
-#include "nvaddress.h"
-
-#include <QHostAddress>
-
-NvAddress::NvAddress()
-{
-    setAddress(nullptr);
-    setPort(0);
-}
-
-NvAddress::NvAddress(QString addr, uint16_t port)
-{
-    setAddress(addr);
-    setPort(port);
-}
-
-NvAddress::NvAddress(QHostAddress addr, uint16_t port)
-{
-    setAddress(addr);
-    setPort(port);
-}
-
-uint16_t NvAddress::port() const
-{
-    return m_Port;
-}
-
-QString NvAddress::address() const
-{
-    return m_Address;
-}
-
-void NvAddress::setPort(uint16_t port)
-{
-    m_Port = port;
-}
-
-void NvAddress::setAddress(QString addr)
-{
-    m_Address = addr;
-}
-
-void NvAddress::setAddress(QHostAddress addr)
-{
-    m_Address = addr.toString();
-}
-
-bool NvAddress::isNull() const
-{
-    return m_Address.isEmpty();
-}
-
-QString NvAddress::toString() const
-{
-    if (m_Address.isEmpty()) {
-        return "<NULL>";
-    }
-
-    if (QHostAddress(m_Address).protocol() == QAbstractSocket::IPv6Protocol) {
-        return QString("[%1]:%2").arg(m_Address).arg(m_Port);
-    }
-    else {
-        return QString("%1:%2").arg(m_Address).arg(m_Port);
-    }
-}
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <QHostAddress>
-
-#define DEFAULT_HTTP_PORT 47989
-#define DEFAULT_HTTPS_PORT 47984
-
-class NvAddress
-{
-public:
-    NvAddress();
-    explicit NvAddress(QString addr, uint16_t port);
-    explicit NvAddress(QHostAddress addr, uint16_t port);
-
-    uint16_t port() const;
-    void setPort(uint16_t port);
-
-    QString address() const;
-    void setAddress(QString addr);
-    void setAddress(QHostAddress addr);
-
-    bool isNull() const;
-    QString toString() const;
-
-    bool operator==(const NvAddress& other) const
-    {
-        return m_Address == other.m_Address &&
-                m_Port == other.m_Port;
-    }
-
-    bool operator!=(const NvAddress& other) const
-    {
-        return !operator==(other);
-    }
-
-private:
-    QString m_Address;
-    uint16_t m_Port;
-};
@@ -1,28 +0,0 @@
-#include "nvapp.h"
-
-#define SER_APPNAME "name"
-#define SER_APPID "id"
-#define SER_APPHDR "hdr"
-#define SER_APPCOLLECTOR "appcollector"
-#define SER_HIDDEN "hidden"
-#define SER_DIRECTLAUNCH "directlaunch"
-
-NvApp::NvApp(QSettings& settings)
-{
-    name = settings.value(SER_APPNAME).toString();
-    id = settings.value(SER_APPID).toInt();
-    hdrSupported = settings.value(SER_APPHDR).toBool();
-    isAppCollectorGame = settings.value(SER_APPCOLLECTOR).toBool();
-    hidden = settings.value(SER_HIDDEN).toBool();
-    directLaunch = settings.value(SER_DIRECTLAUNCH).toBool();
-}
-
-void NvApp::serialize(QSettings& settings) const
-{
-    settings.setValue(SER_APPNAME, name);
-    settings.setValue(SER_APPID, id);
-    settings.setValue(SER_APPHDR, hdrSupported);
-    settings.setValue(SER_APPCOLLECTOR, isAppCollectorGame);
-    settings.setValue(SER_HIDDEN, hidden);
-    settings.setValue(SER_DIRECTLAUNCH, directLaunch);
-}
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <QSettings>
-
-class NvApp
-{
-public:
-    NvApp() {}
-    explicit NvApp(QSettings& settings);
-
-    bool operator==(const NvApp& other) const
-    {
-        return id == other.id &&
-                name == other.name &&
-                hdrSupported == other.hdrSupported &&
-                isAppCollectorGame == other.isAppCollectorGame &&
-                hidden == other.hidden &&
-                directLaunch == other.directLaunch;
-    }
-
-    bool operator!=(const NvApp& other) const
-    {
-        return !operator==(other);
-    }
-
-    bool isInitialized()
-    {
-        return id != 0 && !name.isEmpty();
-    }
-
-    void
-    serialize(QSettings& settings) const;
-
-    int id = 0;
-    QString name;
-    bool hdrSupported = false;
-    bool isAppCollectorGame = false;
-    bool hidden = false;
-    bool directLaunch = false;
-};
-
-Q_DECLARE_METATYPE(NvApp)
@@ -1,6 +1,4 @@
 #include "nvcomputer.h"
-#include "nvapp.h"
-#include "settings/compatfetcher.h"

 #include <QUdpSocket>
 #include <QHostInfo>
@@ -11,46 +9,43 @@
 #define SER_UUID "uuid"
 #define SER_MAC "mac"
 #define SER_LOCALADDR "localaddress"
-#define SER_LOCALPORT "localport"
 #define SER_REMOTEADDR "remoteaddress"
-#define SER_REMOTEPORT "remoteport"
 #define SER_MANUALADDR "manualaddress"
-#define SER_MANUALPORT "manualport"
 #define SER_IPV6ADDR "ipv6address"
-#define SER_IPV6PORT "ipv6port"
 #define SER_APPLIST "apps"
 #define SER_SRVCERT "srvcert"
-#define SER_CUSTOMNAME "customname"
-#define SER_NVIDIASOFTWARE "nvidiasw"
+
+#define SER_APPNAME "name"
+#define SER_APPID "id"
+#define SER_APPHDR "hdr"

 NvComputer::NvComputer(QSettings& settings)
 {
    this->name = settings.value(SER_NAME).toString();
    this->uuid = settings.value(SER_UUID).toString();
-    this->hasCustomName = settings.value(SER_CUSTOMNAME).toBool();
    this->macAddress = settings.value(SER_MAC).toByteArray();
-    this->localAddress = NvAddress(settings.value(SER_LOCALADDR).toString(),
-                                   settings.value(SER_LOCALPORT, QVariant(DEFAULT_HTTP_PORT)).toUInt());
-    this->remoteAddress = NvAddress(settings.value(SER_REMOTEADDR).toString(),
-                                    settings.value(SER_REMOTEPORT, QVariant(DEFAULT_HTTP_PORT)).toUInt());
-    this->ipv6Address = NvAddress(settings.value(SER_IPV6ADDR).toString(),
-                                  settings.value(SER_IPV6PORT, QVariant(DEFAULT_HTTP_PORT)).toUInt());
-    this->manualAddress = NvAddress(settings.value(SER_MANUALADDR).toString(),
-                                    settings.value(SER_MANUALPORT, QVariant(DEFAULT_HTTP_PORT)).toUInt());
+    this->localAddress = settings.value(SER_LOCALADDR).toString();
+    this->remoteAddress = settings.value(SER_REMOTEADDR).toString();
+    this->ipv6Address = settings.value(SER_IPV6ADDR).toString();
+    this->manualAddress = settings.value(SER_MANUALADDR).toString();
    this->serverCert = QSslCertificate(settings.value(SER_SRVCERT).toByteArray());
-    this->isNvidiaServerSoftware = settings.value(SER_NVIDIASOFTWARE).toBool();

    int appCount = settings.beginReadArray(SER_APPLIST);
-    this->appList.reserve(appCount);
    for (int i = 0; i < appCount; i++) {
+        NvApp app;
+
        settings.setArrayIndex(i);

-        NvApp app(settings);
+        app.name = settings.value(SER_APPNAME).toString();
+        app.id = settings.value(SER_APPID).toInt();
+        app.hdrSupported = settings.value(SER_APPHDR).toBool();
+
        this->appList.append(app);
    }
    settings.endArray();
    sortAppList();

+    this->activeAddress = nullptr;
    this->currentGameId = 0;
    this->pairState = PS_UNKNOWN;
    this->state = CS_UNKNOWN;
@@ -60,66 +55,36 @@ NvComputer::NvComputer(QSettings& settings)
    this->serverCodecModeSupport = 0;
    this->pendingQuit = false;
    this->gpuModel = nullptr;
-    this->isSupportedServerVersion = true;
-    this->externalPort = this->remoteAddress.port();
-    this->activeHttpsPort = 0;
 }

-void NvComputer::setRemoteAddress(QHostAddress address)
-{
-    QWriteLocker lock(&this->lock);
-
-    Q_ASSERT(this->externalPort != 0);
-
-    this->remoteAddress = NvAddress(address, this->externalPort);
-}
-
-void NvComputer::serialize(QSettings& settings, bool serializeApps) const
+void NvComputer::serialize(QSettings& settings)
 {
    QReadLocker lock(&this->lock);

    settings.setValue(SER_NAME, name);
-    settings.setValue(SER_CUSTOMNAME, hasCustomName);
    settings.setValue(SER_UUID, uuid);
    settings.setValue(SER_MAC, macAddress);
-    settings.setValue(SER_LOCALADDR, localAddress.address());
-    settings.setValue(SER_LOCALPORT, localAddress.port());
-    settings.setValue(SER_REMOTEADDR, remoteAddress.address());
-    settings.setValue(SER_REMOTEPORT, remoteAddress.port());
-    settings.setValue(SER_IPV6ADDR, ipv6Address.address());
-    settings.setValue(SER_IPV6PORT, ipv6Address.port());
-    settings.setValue(SER_MANUALADDR, manualAddress.address());
-    settings.setValue(SER_MANUALPORT, manualAddress.port());
+    settings.setValue(SER_LOCALADDR, localAddress);
+    settings.setValue(SER_REMOTEADDR, remoteAddress);
+    settings.setValue(SER_IPV6ADDR, ipv6Address);
+    settings.setValue(SER_MANUALADDR, manualAddress);
    settings.setValue(SER_SRVCERT, serverCert.toPem());
-    settings.setValue(SER_NVIDIASOFTWARE, isNvidiaServerSoftware);

    // Avoid deleting an existing applist if we couldn't get one
-    if (!appList.isEmpty() && serializeApps) {
+    if (!appList.isEmpty()) {
        settings.remove(SER_APPLIST);
        settings.beginWriteArray(SER_APPLIST);
        for (int i = 0; i < appList.count(); i++) {
            settings.setArrayIndex(i);
-            appList.at(i).serialize(settings);
+
+            settings.setValue(SER_APPNAME, appList[i].name);
+            settings.setValue(SER_APPID, appList[i].id);
+            settings.setValue(SER_APPHDR, appList[i].hdrSupported);
        }
        settings.endArray();
    }
 }

-bool NvComputer::isEqualSerialized(const NvComputer &that) const
-{
-    return this->name == that.name &&
-           this->hasCustomName == that.hasCustomName &&
-           this->uuid == that.uuid &&
-           this->macAddress == that.macAddress &&
-           this->localAddress == that.localAddress &&
-           this->remoteAddress == that.remoteAddress &&
-           this->ipv6Address == that.ipv6Address &&
-           this->manualAddress == that.manualAddress &&
-           this->serverCert == that.serverCert &&
-           this->isNvidiaServerSoftware == that.isNvidiaServerSoftware &&
-           this->appList == that.appList;
-}
-
 void NvComputer::sortAppList()
 {
    std::stable_sort(appList.begin(), appList.end(), [](const NvApp& app1, const NvApp& app2) {
@@ -127,11 +92,10 @@ void NvComputer::sortAppList()
    });
 }

-NvComputer::NvComputer(NvHTTP& http, QString serverInfo)
+NvComputer::NvComputer(QString address, QString serverInfo, QSslCertificate serverCert)
 {
-    this->serverCert = http.serverCert();
+    this->serverCert = serverCert;

-    this->hasCustomName = false;
    this->name = NvHTTP::getXmlString(serverInfo, "hostname");
    if (this->name.isEmpty()) {
        this->name = "UNKNOWN";
@@ -141,7 +105,7 @@ NvComputer::NvComputer(NvHTTP& http, QString serverInfo)
    QString newMacString = NvHTTP::getXmlString(serverInfo, "mac");
    if (newMacString != "00:00:00:00:00:00") {
        QStringList macOctets = newMacString.split(':');
-        for (const QString& macOctet : std::as_const(macOctets)) {
+        for (QString macOctet : macOctets) {
            this->macAddress.append((char) macOctet.toInt(nullptr, 16));
        }
    }
@@ -151,8 +115,7 @@ NvComputer::NvComputer(NvHTTP& http, QString serverInfo)
        this->serverCodecModeSupport = codecSupport.toInt();
    }
    else {
-        // Assume H.264 is always supported
-        this->serverCodecModeSupport = SCM_H264;
+        this->serverCodecModeSupport = 0;
    }

    QString maxLumaPixelsHEVC = NvHTTP::getXmlString(serverInfo, "MaxLumaPixelsHEVC");
@@ -166,104 +129,61 @@ NvComputer::NvComputer(NvHTTP& http, QString serverInfo)
    this->displayModes = NvHTTP::getDisplayModeList(serverInfo);
    std::stable_sort(this->displayModes.begin(), this->displayModes.end(),
                     [](const NvDisplayMode& mode1, const NvDisplayMode& mode2) {
-        return (uint64_t)mode1.width * mode1.height * mode1.refreshRate <
-                (uint64_t)mode2.width * mode2.height * mode2.refreshRate;
+        return mode1.width * mode1.height * mode1.refreshRate <
+                mode2.width * mode2.height * mode2.refreshRate;
    });

    // We can get an IPv4 loopback address if we're using the GS IPv6 Forwarder
-    this->localAddress = NvAddress(NvHTTP::getXmlString(serverInfo, "LocalIP"), http.httpPort());
-    if (this->localAddress.address().startsWith("127.")) {
-        this->localAddress = NvAddress();
+    this->localAddress = NvHTTP::getXmlString(serverInfo, "LocalIP");
+    if (this->localAddress.startsWith("127.")) {
+        this->localAddress = QString();
    }

-    QString httpsPort = NvHTTP::getXmlString(serverInfo, "HttpsPort");
-    if (httpsPort.isEmpty() || (this->activeHttpsPort = httpsPort.toUShort()) == 0) {
-        this->activeHttpsPort = DEFAULT_HTTPS_PORT;
-    }
-
-    // This is an extension which is not present in GFE. It is present for Sunshine to be able
-    // to support dynamic HTTP WAN ports without requiring the user to manually enter the port.
-    QString remotePortStr = NvHTTP::getXmlString(serverInfo, "ExternalPort");
-    if (remotePortStr.isEmpty() || (this->externalPort = remotePortStr.toUShort()) == 0) {
-        this->externalPort = http.httpPort();
-    }
-
-    QString remoteAddress = NvHTTP::getXmlString(serverInfo, "ExternalIP");
-    if (!remoteAddress.isEmpty()) {
-        this->remoteAddress = NvAddress(remoteAddress, this->externalPort);
-    }
-    else {
-        this->remoteAddress = NvAddress();
-    }
-
-    // Real Nvidia host software (GeForce Experience and RTX Experience) both use the 'Mjolnir'
-    // codename in the state field and no version of Sunshine does. We can use this to bypass
-    // some assumptions about Nvidia hardware that don't apply to Sunshine hosts.
-    this->isNvidiaServerSoftware = NvHTTP::getXmlString(serverInfo, "state").contains("MJOLNIR");
-
+    this->remoteAddress = NvHTTP::getXmlString(serverInfo, "ExternalIP");
    this->pairState = NvHTTP::getXmlString(serverInfo, "PairStatus") == "1" ?
                PS_PAIRED : PS_NOT_PAIRED;
    this->currentGameId = NvHTTP::getCurrentGame(serverInfo);
    this->appVersion = NvHTTP::getXmlString(serverInfo, "appversion");
    this->gfeVersion = NvHTTP::getXmlString(serverInfo, "GfeVersion");
    this->gpuModel = NvHTTP::getXmlString(serverInfo, "gputype");
-    this->activeAddress = http.address();
+    this->activeAddress = address;
    this->state = NvComputer::CS_ONLINE;
    this->pendingQuit = false;
-    this->isSupportedServerVersion = CompatFetcher::isGfeVersionSupported(this->gfeVersion);
 }

-bool NvComputer::wake() const
+bool NvComputer::wake()
 {
-    QByteArray wolPayload;
-
-    {
-        QReadLocker readLocker(&lock);
-
-        if (state == NvComputer::CS_ONLINE) {
-            qWarning() << name << "is already online";
-            return true;
-        }
-
-        if (macAddress.isEmpty()) {
-            qWarning() << name << "has no MAC address stored";
-            return false;
-        }
-
-        // Create the WoL payload
-        wolPayload.append(QByteArray::fromHex("FFFFFFFFFFFF"));
-        for (int i = 0; i < 16; i++) {
-            wolPayload.append(macAddress);
-        }
-        Q_ASSERT(wolPayload.size() == 102);
+    if (state == NvComputer::CS_ONLINE) {
+        qWarning() << name << "is already online";
+        return true;
    }

-    // Ports used as-is
-    const quint16 STATIC_WOL_PORTS[] = {
-        9, // Standard WOL port (privileged port)
-        47009, // Port opened by Moonlight Internet Hosting Tool for WoL (non-privileged port)
-    };
+    if (macAddress.isEmpty()) {
+        qWarning() << name << "has no MAC address stored";
+        return false;
+    }

-    // Ports offset by the HTTP base port for hosts using alternate ports
-    const quint16 DYNAMIC_WOL_PORTS[] = {
+    const quint16 WOL_PORTS[] = {
+        7, 9, // Standard WOL ports
        47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
    };

+    // Create the WoL payload
+    QByteArray wolPayload;
+    wolPayload.append(QByteArray::fromHex("FFFFFFFFFFFF"));
+    for (int i = 0; i < 16; i++) {
+        wolPayload.append(macAddress);
+    }
+    Q_ASSERT(wolPayload.count() == 102);
+
    // Add the addresses that we know this host to be
    // and broadcast addresses for this link just in
    // case the host has timed out in ARP entries.
-    QMap<QString, quint16> addressMap;
-    QSet<quint16> basePortSet;
-    const auto uniqueHostAddresses = uniqueAddresses();
-    for (const NvAddress& addr : uniqueHostAddresses) {
-        addressMap.insert(addr.address(), addr.port());
-        basePortSet.insert(addr.port());
-    }
-    addressMap.insert("255.255.255.255", 0);
+    QVector<QString> addressList = uniqueAddresses();
+    addressList.append("255.255.255.255");

    // Try to broadcast on all available NICs
-    const auto allInterfaces = QNetworkInterface::allInterfaces();
-    for (const QNetworkInterface& nic : allInterfaces) {
+    for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
        // Ensure the interface is up and skip the loopback adapter
        if ((nic.flags() & QNetworkInterface::IsUp) == 0 ||
                (nic.flags() & QNetworkInterface::IsLoopBack) != 0) {
@@ -271,8 +191,7 @@ bool NvComputer::wake() const
        }

        QHostAddress allNodesMulticast("FF02::1");
-        const auto allInterfaceAddresses = nic.addressEntries();
-        for (const QNetworkAddressEntry& addr : allInterfaceAddresses) {
+        for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
            // Store the scope ID for this NIC if IPv6 is enabled
            if (!addr.ip().scopeId().isEmpty()) {
                allNodesMulticast.setScopeId(addr.ip().scopeId());
@@ -280,42 +199,31 @@ bool NvComputer::wake() const

            // Skip IPv6 which doesn't support broadcast
            if (!addr.broadcast().isNull()) {
-                addressMap.insert(addr.broadcast().toString(), 0);
+                addressList.append(addr.broadcast().toString());
            }
        }

        if (!allNodesMulticast.scopeId().isEmpty()) {
-            addressMap.insert(allNodesMulticast.toString(), 0);
+            addressList.append(allNodesMulticast.toString());
        }
    }

    // Try all unique address strings or host names
    bool success = false;
-    for (auto i = addressMap.constBegin(); i != addressMap.constEnd(); i++) {
-        QHostAddress literalAddress;
-        QList<QHostAddress> addressList;
+    for (QString& addressString : addressList) {
+        QHostInfo hostInfo = QHostInfo::fromName(addressString);

-        // If this is an IPv4/IPv6 literal, don't use QHostInfo::fromName() because that will
-        // try to perform a reverse DNS lookup that leads to delays sending WoL packets.
-        if (literalAddress.setAddress(i.key())) {
-            addressList.append(literalAddress);
-        }
-        else {
-            QHostInfo hostInfo = QHostInfo::fromName(i.key());
-            if (hostInfo.error() != QHostInfo::NoError) {
-                qWarning() << "Error resolving" << i.key() << ":" << hostInfo.errorString();
-                continue;
-            }
-
-            addressList.append(hostInfo.addresses());
+        if (hostInfo.error() != QHostInfo::NoError) {
+            qWarning() << "Error resolving" << addressString << ":" << hostInfo.errorString();
+            continue;
        }

        // Try all IP addresses that this string resolves to
-        for (QHostAddress& address : addressList) {
+        for (QHostAddress& address : hostInfo.addresses()) {
            QUdpSocket sock;

-            // Send to all static ports
-            for (quint16 port : STATIC_WOL_PORTS) {
+            // Send to all ports
+            for (quint16 port : WOL_PORTS) {
                if (sock.writeDatagram(wolPayload, address, port)) {
                    qInfo().nospace().noquote() << "Sent WoL packet to " << name << " via " << address.toString() << ":" << port;
                    success = true;
@@ -324,69 +232,32 @@ bool NvComputer::wake() const
                    qWarning() << "Send failed:" << sock.error();
                }
            }
-
-            QList<quint16> basePorts;
-            if (i.value() != 0) {
-                // If we have a known base port for this address, use only that port
-                basePorts.append(i.value());
-            }
-            else {
-                // If this is a broadcast address without a known HTTP port, try all of them
-                basePorts.append(basePortSet.values());
-            }
-
-            // Send to all dynamic ports using the HTTP port offset(s) for this address
-            for (quint16 basePort : basePorts) {
-                for (quint16 port : DYNAMIC_WOL_PORTS) {
-                    port = (port - 47989) + basePort;
-
-                    if (sock.writeDatagram(wolPayload, address, port)) {
-                        qInfo().nospace().noquote() << "Sent WoL packet to " << name << " via " << address.toString() << ":" << port;
-                        success = true;
-                    }
-                    else {
-                        qWarning() << "Send failed:" << sock.error();
-                    }
-                }
-            }
        }
    }

    return success;
 }

-NvComputer::ReachabilityType NvComputer::getActiveAddressReachability() const
+bool NvComputer::isReachableOverVpn()
 {
-    NvAddress copyOfActiveAddress;
-
-    {
-        QReadLocker readLocker(&lock);
-
-        if (activeAddress.isNull()) {
-            return ReachabilityType::RI_UNKNOWN;
-        }
-
-        // Grab a copy of the active address to avoid having to hold
-        // the computer lock while doing socket operations
-        copyOfActiveAddress = activeAddress;
+    if (activeAddress.isEmpty()) {
+        return false;
    }

    QTcpSocket s;
+
    s.setProxy(QNetworkProxy::NoProxy);
-    s.connectToHost(copyOfActiveAddress.address(), copyOfActiveAddress.port());
+    s.connectToHost(activeAddress, 47984);
    if (s.waitForConnected(3000)) {
        Q_ASSERT(!s.localAddress().isNull());
-        Q_ASSERT(!s.peerAddress().isNull());

-        const auto allInterfaces = QNetworkInterface::allInterfaces();
-        for (const QNetworkInterface& nic : allInterfaces) {
+        for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
            // Ensure the interface is up
            if ((nic.flags() & QNetworkInterface::IsUp) == 0) {
                continue;
            }

-            const auto allInterfaceAddresses = nic.addressEntries();
-            for (const QNetworkAddressEntry& addr : allInterfaceAddresses) {
+            for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
                if (addr.ip() == s.localAddress()) {
                    qInfo() << "Found matching interface:" << nic.humanReadableName() << nic.hardwareAddress() << nic.flags();

@@ -397,95 +268,54 @@ NvComputer::ReachabilityType NvComputer::getActiveAddressReachability() const
                    if (nic.type() == QNetworkInterface::Virtual ||
                            nic.type() == QNetworkInterface::Ppp) {
                        // Treat PPP and virtual interfaces as likely VPNs
-                        return ReachabilityType::RI_VPN;
+                        return true;
                    }

                    if (nic.maximumTransmissionUnit() != 0 && nic.maximumTransmissionUnit() < 1500) {
                        // Treat MTUs under 1500 as likely VPNs
-                        return ReachabilityType::RI_VPN;
+                        return true;
                    }
 #endif

                    if (nic.flags() & QNetworkInterface::IsPointToPoint) {
                        // Treat point-to-point links as likely VPNs.
                        // This check detects OpenVPN on Unix-like OSes.
-                        return ReachabilityType::RI_VPN;
+                        return true;
                    }

-#ifdef Q_OS_WINDOWS
-                    if (nic.name().startsWith("iftype53_") || nic.name().startsWith("iftype131_")) {
-                        // Match by NDIS interface type. These values are Microsoft's recommended values for VPN connections:
-                        // https://learn.microsoft.com/en-US/troubleshoot/windows-client/networking/windows-connection-manager-disconnects-wlan#more-information
-                        //
-                        // The following VPNs use IF_TYPE_PROP_VIRTUAL under Windows:
-                        //  - WireguardNT VPNs
-                        //  - All WinTun-based VPNs (such as Slack Nebula)
-                        //  - OpenVPN with tap-windows6
-                        return ReachabilityType::RI_VPN;
-                    }
-#endif
-
                    if (nic.hardwareAddress().startsWith("00:FF", Qt::CaseInsensitive)) {
                        // OpenVPN TAP interfaces have a MAC address starting with 00:FF on Windows
-                        return ReachabilityType::RI_VPN;
+                        return true;
                    }

                    if (nic.humanReadableName().startsWith("ZeroTier")) {
                        // ZeroTier interfaces always start with "ZeroTier"
-                        return ReachabilityType::RI_VPN;
+                        return true;
                    }

                    if (nic.humanReadableName().contains("VPN")) {
-                        // This one is just a final VPN heuristic if all else fails
-                        return ReachabilityType::RI_VPN;
+                        // This one is just a final heuristic if all else fails
+                        return true;
                    }

-                    // Didn't meet any of our VPN heuristics. Let's see if the peer address is on-link.
-                    Q_ASSERT(addr.prefixLength() >= 0);
-                    if (addr.prefixLength() >= 0 && s.localAddress().isInSubnet(s.peerAddress(), addr.prefixLength())) {
-                        return ReachabilityType::RI_LAN;
-                    }
-
-                    // Default to unknown if nothing else matched
-                    return ReachabilityType::RI_UNKNOWN;
+                    // Didn't meet any of our VPN heuristics
+                    return false;
                }
            }
        }

        qWarning() << "No match found for address:" << s.localAddress();
-        return ReachabilityType::RI_UNKNOWN;
+        return false;
    }
    else {
        // If we fail to connect, just pretend that it's not a VPN
-        qWarning() << "Unable to check for reachability within 3 seconds";
-        return ReachabilityType::RI_UNKNOWN;
-    }
-}
-
-bool NvComputer::updateAppList(QVector<NvApp> newAppList) {
-    if (appList == newAppList) {
        return false;
    }
-
-    // Propagate client-side attributes to the new app list
-    for (const NvApp& existingApp : std::as_const(appList)) {
-        for (NvApp& newApp : newAppList) {
-            if (existingApp.id == newApp.id) {
-                newApp.hidden = existingApp.hidden;
-                newApp.directLaunch = existingApp.directLaunch;
-            }
-        }
-    }
-
-    appList = newAppList;
-    sortAppList();
-    return true;
 }

-QVector<NvAddress> NvComputer::uniqueAddresses() const
+QVector<QString> NvComputer::uniqueAddresses()
 {
-    QReadLocker readLocker(&lock);
-    QVector<NvAddress> uniqueAddressList;
+    QVector<QString> uniqueAddressList;

    // Start with addresses correctly ordered
    uniqueAddressList.append(activeAddress);
@@ -496,7 +326,7 @@ QVector<NvAddress> NvComputer::uniqueAddresses() const

    // Prune duplicates (always giving precedence to the first)
    for (int i = 0; i < uniqueAddressList.count(); i++) {
-        if (uniqueAddressList[i].isNull()) {
+        if (uniqueAddressList[i].isEmpty()) {
            uniqueAddressList.remove(i);
            i--;
            continue;
@@ -516,7 +346,7 @@ QVector<NvAddress> NvComputer::uniqueAddresses() const
    return uniqueAddressList;
 }

-bool NvComputer::update(const NvComputer& that)
+bool NvComputer::update(NvComputer& that)
 {
    bool changed = false;

@@ -547,17 +377,12 @@ bool NvComputer::update(const NvComputer& that)
        changed = true;                       \
    }

-    if (!hasCustomName) {
-        // Only overwrite the name if it's not custom
-        ASSIGN_IF_CHANGED(name);
-    }
+    ASSIGN_IF_CHANGED(name);
    ASSIGN_IF_CHANGED_AND_NONEMPTY(macAddress);
-    ASSIGN_IF_CHANGED_AND_NONNULL(localAddress);
-    ASSIGN_IF_CHANGED_AND_NONNULL(remoteAddress);
-    ASSIGN_IF_CHANGED_AND_NONNULL(ipv6Address);
-    ASSIGN_IF_CHANGED_AND_NONNULL(manualAddress);
-    ASSIGN_IF_CHANGED(activeHttpsPort);
-    ASSIGN_IF_CHANGED(externalPort);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(localAddress);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(remoteAddress);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(ipv6Address);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(manualAddress);
    ASSIGN_IF_CHANGED(pairState);
    ASSIGN_IF_CHANGED(serverCodecModeSupport);
    ASSIGN_IF_CHANGED(currentGameId);
@@ -565,17 +390,10 @@ bool NvComputer::update(const NvComputer& that)
    ASSIGN_IF_CHANGED(state);
    ASSIGN_IF_CHANGED(gfeVersion);
    ASSIGN_IF_CHANGED(appVersion);
-    ASSIGN_IF_CHANGED(isSupportedServerVersion);
-    ASSIGN_IF_CHANGED(isNvidiaServerSoftware);
    ASSIGN_IF_CHANGED(maxLumaPixelsHEVC);
    ASSIGN_IF_CHANGED(gpuModel);
    ASSIGN_IF_CHANGED_AND_NONNULL(serverCert);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(appList);
    ASSIGN_IF_CHANGED_AND_NONEMPTY(displayModes);
-
-    if (!that.appList.isEmpty()) {
-        // updateAppList() handles merging client-side attributes
-        updateAppList(that.appList);
-    }
-
    return changed;
 }
@@ -1,23 +1,12 @@
 #pragma once

 #include "nvhttp.h"
-#include "nvaddress.h"

 #include <QThread>
 #include <QReadWriteLock>
 #include <QSettings>
 #include <QRunnable>

-class CopySafeReadWriteLock : public QReadWriteLock
-{
-public:
-    CopySafeReadWriteLock() = default;
-
-    // Don't actually copy the QReadWriteLock
-    CopySafeReadWriteLock(const CopySafeReadWriteLock&) : QReadWriteLock() {}
-    CopySafeReadWriteLock& operator=(const CopySafeReadWriteLock &) { return *this; }
-};
-
 class NvComputer
 {
    friend class PcMonitorThread;
@@ -27,51 +16,27 @@ class NvComputer
 private:
    void sortAppList();

-    bool updateAppList(QVector<NvApp> newAppList);
-
    bool pendingQuit;

 public:
-    NvComputer() = default;
-
-    // Caller is responsible for synchronizing read access to the other host
-    NvComputer(const NvComputer&) = default;
-
-    // Caller is responsible for synchronizing read access to the other host
-    NvComputer& operator=(const NvComputer &) = default;
-
-    explicit NvComputer(NvHTTP& http, QString serverInfo);
+    explicit NvComputer(QString address, QString serverInfo, QSslCertificate serverCert);

    explicit NvComputer(QSettings& settings);

-    void
-    setRemoteAddress(QHostAddress);
+    bool
+    update(NvComputer& that);

    bool
-    update(const NvComputer& that);
+    wake();

    bool
-    wake() const;
+    isReachableOverVpn();

-    enum ReachabilityType
-    {
-        RI_UNKNOWN,
-        RI_LAN,
-        RI_VPN,
-    };
-
-    ReachabilityType
-    getActiveAddressReachability() const;
-
-    QVector<NvAddress>
-    uniqueAddresses() const;
+    QVector<QString>
+    uniqueAddresses();

    void
-    serialize(QSettings& settings, bool serializeApps) const;
-
-    // Caller is responsible for synchronizing read access to both hosts
-    bool
-    isEqualSerialized(const NvComputer& that) const;
+    serialize(QSettings& settings);

    enum PairState
    {
@@ -90,8 +55,7 @@ public:
    // Ephemeral traits
    ComputerState state;
    PairState pairState;
-    NvAddress activeAddress;
-    uint16_t activeHttpsPort;
+    QString activeAddress;
    int currentGameId;
    QString gfeVersion;
    QString appVersion;
@@ -99,25 +63,18 @@ public:
    int maxLumaPixelsHEVC;
    int serverCodecModeSupport;
    QString gpuModel;
-    bool isSupportedServerVersion;

    // Persisted traits
-    NvAddress localAddress;
-    NvAddress remoteAddress;
-    NvAddress ipv6Address;
-    NvAddress manualAddress;
+    QString localAddress;
+    QString remoteAddress;
+    QString ipv6Address;
+    QString manualAddress;
    QByteArray macAddress;
    QString name;
-    bool hasCustomName;
    QString uuid;
    QSslCertificate serverCert;
    QVector<NvApp> appList;
-    bool isNvidiaServerSoftware;
-    // Remember to update isEqualSerialized() when adding fields here!

    // Synchronization
-    mutable CopySafeReadWriteLock lock;
-
-private:
-    uint16_t externalPort;
+    QReadWriteLock lock;
 };
@@ -1,4 +1,4 @@
-#include "nvcomputer.h"
+#include "nvhttp.h"
 #include <Limelight.h>

 #include <QDebug>
@@ -12,31 +12,26 @@
 #include <QtEndian>
 #include <QNetworkProxy>

-#define FAST_FAIL_TIMEOUT_MS 2000
 #define REQUEST_TIMEOUT_MS 5000
 #define LAUNCH_TIMEOUT_MS 120000
 #define RESUME_TIMEOUT_MS 30000
 #define QUIT_TIMEOUT_MS 30000

-NvHTTP::NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert, QNetworkAccessManager* nam) :
-    m_Nam(nam ? nam : new QNetworkAccessManager(this)),
+NvHTTP::NvHTTP(QString address, QSslCertificate serverCert) :
    m_ServerCert(serverCert)
 {
    m_BaseUrlHttp.setScheme("http");
    m_BaseUrlHttps.setScheme("https");
+    m_BaseUrlHttp.setPort(47989);
+    m_BaseUrlHttps.setPort(47984);

    setAddress(address);
-    setHttpsPort(httpsPort);

    // Never use a proxy server
    QNetworkProxy noProxy(QNetworkProxy::NoProxy);
-    m_Nam->setProxy(noProxy);
-}
-
-NvHTTP::NvHTTP(NvComputer* computer, QNetworkAccessManager* nam) :
-    NvHTTP(computer->activeAddress, computer->activeHttpsPort, computer->serverCert, nam)
-{
+    m_Nam.setProxy(noProxy);

+    connect(&m_Nam, &QNetworkAccessManager::sslErrors, this, &NvHTTP::handleSslErrors);
 }

 void NvHTTP::setServerCert(QSslCertificate serverCert)
@@ -44,43 +39,21 @@ void NvHTTP::setServerCert(QSslCertificate serverCert)
    m_ServerCert = serverCert;
 }

-void NvHTTP::setAddress(NvAddress address)
+void NvHTTP::setAddress(QString address)
 {
-    Q_ASSERT(!address.isNull());
+    Q_ASSERT(!address.isEmpty());

    m_Address = address;

-    m_BaseUrlHttp.setHost(address.address());
-    m_BaseUrlHttps.setHost(address.address());
-
-    m_BaseUrlHttp.setPort(address.port());
+    m_BaseUrlHttp.setHost(address);
+    m_BaseUrlHttps.setHost(address);
 }

-void NvHTTP::setHttpsPort(uint16_t port)
-{
-    m_BaseUrlHttps.setPort(port);
-}
-
-NvAddress NvHTTP::address()
+QString NvHTTP::address()
 {
    return m_Address;
 }

-QSslCertificate NvHTTP::serverCert()
-{
-    return m_ServerCert;
-}
-
-uint16_t NvHTTP::httpPort()
-{
-    return m_BaseUrlHttp.port();
-}
-
-uint16_t NvHTTP::httpsPort()
-{
-    return m_BaseUrlHttps.port();
-}
-
 QVector<int>
 NvHTTP::parseQuad(QString quad)
 {
@@ -93,8 +66,7 @@ NvHTTP::parseQuad(QString quad)
    }

    QStringList parts = quad.split(".");
-    ret.reserve(parts.length());
-    for (int i = 0; i < parts.length(); i++)
+    for (int i = 0; i < 4; i++)
    {
        ret.append(parts.at(i).toInt());
    }
@@ -120,12 +92,12 @@ NvHTTP::getCurrentGame(QString serverInfo)
 }

 QString
-NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
+NvHTTP::getServerInfo(NvLogLevel logLevel)
 {
    QString serverInfo;

-    // Check if we have a pinned cert and HTTPS port for this host yet
-    if (!m_ServerCert.isNull() && httpsPort() != 0)
+    // Check if we have a pinned cert for this host yet
+    if (!m_ServerCert.isNull())
    {
        try
        {
@@ -134,7 +106,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
            serverInfo = openConnectionToString(m_BaseUrlHttps,
                                                "serverinfo",
                                                nullptr,
-                                                fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                                REQUEST_TIMEOUT_MS,
                                                logLevel);
            // Throws if the request failed
            verifyResponseStatus(serverInfo);
@@ -147,7 +119,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
                serverInfo = openConnectionToString(m_BaseUrlHttp,
                                                    "serverinfo",
                                                    nullptr,
-                                                    fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                                    REQUEST_TIMEOUT_MS,
                                                    logLevel);
                verifyResponseStatus(serverInfo);
            }
@@ -160,41 +132,48 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
    }
    else
    {
-        // Only use HTTP prior to pairing or fetching HTTPS port
+        // Only use HTTP prior to pairing
        serverInfo = openConnectionToString(m_BaseUrlHttp,
                                            "serverinfo",
                                            nullptr,
-                                            fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                            REQUEST_TIMEOUT_MS,
                                            logLevel);
        verifyResponseStatus(serverInfo);
-
-        // Populate the HTTPS port
-        uint16_t httpsPort = getXmlString(serverInfo, "HttpsPort").toUShort();
-        if (httpsPort == 0) {
-            httpsPort = DEFAULT_HTTPS_PORT;
-        }
-        setHttpsPort(httpsPort);
-
-        // If we just needed to determine the HTTPS port, we'll try again over
-        // HTTPS now that we have the port number
-        if (!m_ServerCert.isNull()) {
-            return getServerInfo(logLevel, fastFail);
-        }
    }

    return serverInfo;
 }

+static QString
+getSurroundAudioInfoString(int audioConfig)
+{
+    int channelMask;
+    int channelCount;
+
+    switch (audioConfig)
+    {
+    case AUDIO_CONFIGURATION_STEREO:
+        channelCount = 2;
+        channelMask = 0x3;
+        break;
+    case AUDIO_CONFIGURATION_51_SURROUND:
+        channelCount = 6;
+        channelMask = 0xFC;
+        break;
+    default:
+        Q_ASSERT(false);
+        return 0;
+    }
+
+    return QString::number(channelMask << 16 | channelCount);
+}
+
 void
-NvHTTP::startApp(QString verb,
-                 bool isGfe,
-                 int appId,
-                 PSTREAM_CONFIGURATION streamConfig,
-                 bool sops,
-                 bool localAudio,
-                 int gamepadMask,
-                 bool persistGameControllersOnDisconnect,
-                 QString& rtspSessionUrl)
+NvHTTP::launchApp(int appId,
+                  PSTREAM_CONFIGURATION streamConfig,
+                  bool sops,
+                  bool localAudio,
+                  int gamepadMask)
 {
    int riKeyId;

@@ -203,35 +182,48 @@ NvHTTP::startApp(QString verb,

    QString response =
            openConnectionToString(m_BaseUrlHttps,
-                                   verb,
+                                   "launch",
                                   "appid="+QString::number(appId)+
                                   "&mode="+QString::number(streamConfig->width)+"x"+
                                   QString::number(streamConfig->height)+"x"+
                                   // 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 don't need this hack for Sunshine.
-                                   QString::number((streamConfig->fps > 60 && isGfe) ? 0 : streamConfig->fps)+
+                                   // so force it to 60 when starting. This won't impact our ability
+                                   // to get > 60 FPS while actually streaming though.
+                                   QString::number(streamConfig->fps > 60 ? 60 : streamConfig->fps)+
                                   "&additionalStates=1&sops="+QString::number(sops ? 1 : 0)+
                                   "&rikey="+QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex()+
                                   "&rikeyid="+QString::number(riKeyId)+
-                                   ((streamConfig->supportedVideoFormats & VIDEO_FORMAT_MASK_10BIT) ?
+                                   (streamConfig->enableHdr ?
                                       "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0" :
                                        "")+
                                   "&localAudioPlayMode="+QString::number(localAudio ? 1 : 0)+
-                                   "&surroundAudioInfo="+QString::number(SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(streamConfig->audioConfiguration))+
+                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration)+
                                   "&remoteControllersBitmap="+QString::number(gamepadMask)+
-                                   "&gcmap="+QString::number(gamepadMask)+
-                                   "&gcpersist="+QString::number(persistGameControllersOnDisconnect ? 1 : 0)+
-                                   LiGetLaunchUrlQueryParameters(),
+                                   "&gcmap="+QString::number(gamepadMask),
                                   LAUNCH_TIMEOUT_MS);

-    qInfo() << "Launch response:" << response;
-
    // Throws if the request failed
    verifyResponseStatus(response);
+}

-    rtspSessionUrl = getXmlString(response, "sessionUrl0");
+void
+NvHTTP::resumeApp(PSTREAM_CONFIGURATION streamConfig)
+{
+    int riKeyId;
+
+    memcpy(&riKeyId, streamConfig->remoteInputAesIv, sizeof(riKeyId));
+    riKeyId = qFromBigEndian(riKeyId);
+
+    QString response =
+            openConnectionToString(m_BaseUrlHttps,
+                                   "resume",
+                                   "rikey="+QString(QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex())+
+                                   "&rikeyid="+QString::number(riKeyId)+
+                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration),
+                                   RESUME_TIMEOUT_MS);
+
+    // Throws if the request failed
+    verifyResponseStatus(response);
 }

 void
@@ -243,13 +235,11 @@ NvHTTP::quitApp()
                                   nullptr,
                                   QUIT_TIMEOUT_MS);

-    qInfo() << "Quit response:" << response;
-
    // Throws if the request failed
    verifyResponseStatus(response);

    // Newer GFE versions will just return success even if quitting fails
-    // if we're not the original requester.
+    // if we're not the original requestor.
    if (getCurrentGame(getServerInfo(NvHTTP::NVLL_ERROR)) != 0) {
        // Generate a synthetic GfeResponseException letting the caller know
        // that they can't kill someone else's stream.
@@ -265,17 +255,17 @@ NvHTTP::getDisplayModeList(QString serverInfo)

    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
-            auto name = xmlReader.name();
-            if (name == QString("DisplayMode")) {
+            QStringRef name = xmlReader.name();
+            if (xmlReader.name() == "DisplayMode") {
                modes.append(NvDisplayMode());
            }
-            else if (name == QString("Width")) {
+            else if (xmlReader.name() == "Width") {
                modes.last().width = xmlReader.readElementText().toInt();
            }
-            else if (name == QString("Height")) {
+            else if (xmlReader.name() == "Height") {
                modes.last().height = xmlReader.readElementText().toInt();
            }
-            else if (name == QString("RefreshRate")) {
+            else if (xmlReader.name() == "RefreshRate") {
                modes.last().refreshRate = xmlReader.readElementText().toInt();
            }
        }
@@ -298,27 +288,25 @@ NvHTTP::getAppList()
    QVector<NvApp> apps;
    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
-            auto name = xmlReader.name();
-            if (name == QString("App")) {
+            QStringRef name = xmlReader.name();
+            if (xmlReader.name() == "App") {
                // We must have a valid app before advancing to the next one
                if (!apps.isEmpty() && !apps.last().isInitialized()) {
                    qWarning() << "Invalid applist XML";
-                    throw std::runtime_error("Invalid applist XML");
+                    Q_ASSERT(false);
+                    return QVector<NvApp>();
                }
                apps.append(NvApp());
            }
-            else if (name == QString("AppTitle")) {
+            else if (xmlReader.name() == "AppTitle") {
                apps.last().name = xmlReader.readElementText();
            }
-            else if (name == QString("ID")) {
+            else if (xmlReader.name() == "ID") {
                apps.last().id = xmlReader.readElementText().toInt();
            }
-            else if (name == QString("IsHdrSupported")) {
+            else if (xmlReader.name() == "IsHdrSupported") {
                apps.last().hdrSupported = xmlReader.readElementText() == "1";
            }
-            else if (name == QString("IsAppCollectorGame")) {
-                apps.last().isAppCollectorGame = xmlReader.readElementText() == "1";
-            }
        }
    }

@@ -332,12 +320,9 @@ NvHTTP::verifyResponseStatus(QString xml)

    while (xmlReader.readNextStartElement())
    {
-        if (xmlReader.name() == QString("root"))
+        if (xmlReader.name() == "root")
        {
-            // Status code can be 0xFFFFFFFF in some rare cases on GFE 3.20.3, and
-            // QString::toInt() will fail in that case, so use QString::toUInt()
-            // and cast the result to an int instead.
-            int statusCode = (int)xmlReader.attributes().value("status_code").toUInt();
+            int statusCode = xmlReader.attributes().value("status_code").toInt();
            if (statusCode == 200)
            {
                // Successful
@@ -350,18 +335,10 @@ NvHTTP::verifyResponseStatus(QString xml)
                    // 401 is expected for unpaired PCs when we fetch serverinfo over HTTPS
                    qWarning() << "Request failed:" << statusCode << statusMessage;
                }
-                if (statusCode == -1 && statusMessage == "Invalid") {
-                    // Special case handling an audio capture error which GFE doesn't
-                    // provide any useful status message for.
-                    statusCode = 418;
-                    statusMessage = tr("Missing audio capture device. Reinstalling GeForce Experience should resolve this error.");
-                }
                throw GfeHttpResponseException(statusCode, statusMessage);
            }
        }
    }
-
-    throw GfeHttpResponseException(-1, "Malformed XML (missing root element)");
 }

 QImage
@@ -389,7 +366,7 @@ NvHTTP::getXmlStringFromHex(QString xml,
        return nullptr;
    }

-    return QByteArray::fromHex(str.toUtf8());
+    return QByteArray::fromHex(str.toLatin1());
 }

 QString
@@ -424,7 +401,7 @@ void NvHTTP::handleSslErrors(QNetworkReply* reply, const QList<QSslError>& error
        return;
    }

-    for (const QSslError& error : errors) {
+    for (auto error : errors) {
        if (m_ServerCert != error.certificate()) {
            ignoreErrors = false;
            break;
@@ -447,13 +424,7 @@ NvHTTP::openConnectionToString(QUrl baseUrl,
    QString ret;

    QTextStream stream(reply);
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    stream.setEncoding(QStringConverter::Utf8);
-#else
    stream.setCodec("UTF-8");
-#endif
-
    ret = stream.readAll();
    delete reply;

@@ -467,9 +438,6 @@ NvHTTP::openConnection(QUrl baseUrl,
                       int timeoutMs,
                       NvLogLevel logLevel)
 {
-    // Port must be set
-    Q_ASSERT(baseUrl.port(0) != 0);
-
    // Build a URL for the request
    QUrl url(baseUrl);
    url.setPath("/" + command);
@@ -486,27 +454,17 @@ NvHTTP::openConnection(QUrl baseUrl,
    // Add our client certificate
    request.setSslConfiguration(IdentityManager::get()->getSslConfig());

-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    // Disable HTTP/2 (GFE 3.22 doesn't like it) and Qt 6 enables it by default
-    request.setAttribute(QNetworkRequest::Http2AllowedAttribute, false);
-#endif
+    // HACK: Set reachability to work around QTBUG-80947
+    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);

-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-    // Use fine-grained idle timeouts to avoid calling QNetworkAccessManager::clearAccessCache(),
-    // which tears down the NAM's global thread each time. We must not keep persistent connections
-    // or GFE will puke.
-    request.setAttribute(QNetworkRequest::ConnectionCacheExpiryTimeoutSecondsAttribute, 0);
-#endif
-
-    auto sslErrorsConnection = connect(m_Nam, &QNetworkAccessManager::sslErrors, this, &NvHTTP::handleSslErrors);
-    QNetworkReply* reply = m_Nam->get(request);
+    QNetworkReply* reply = m_Nam.get(request);

    // Run the request with a timeout if requested
    QEventLoop loop;
-    connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
-    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, &loop, &QEventLoop::quit);
+    connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
+    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), &loop, SLOT(quit()));
    if (timeoutMs) {
-        QTimer::singleShot(timeoutMs, &loop, &QEventLoop::quit);
+        QTimer::singleShot(timeoutMs, &loop, SLOT(quit()));
    }
    if (logLevel >= NvLogLevel::NVLL_VERBOSE) {
        qInfo() << "Executing request:" << url.toString();
@@ -522,17 +480,15 @@ NvHTTP::openConnection(QUrl baseUrl,
        reply->abort();
    }

-#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
-    // If we couldn't use fine-grained connection idle timeouts, kill them all now
-    m_Nam->clearAccessCache();
-#endif
-    disconnect(sslErrorsConnection);
+    // We must clear out cached authentication and connections or
+    // GFE will puke next time
+    m_Nam.clearAccessCache();

    // Handle error
    if (reply->error() != QNetworkReply::NoError)
    {
        if (logLevel >= NvLogLevel::NVLL_ERROR) {
-            qWarning() << command << "request failed with error:" << reply->error();
+            qWarning() << command << " request failed with error " << reply->error();
        }

        if (reply->error() == QNetworkReply::SslHandshakeFailedError) {
@@ -1,8 +1,6 @@
 #pragma once

 #include "identitymanager.h"
-#include "nvapp.h"
-#include "nvaddress.h"

 #include <Limelight.h>

@@ -10,7 +8,25 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>

-class NvComputer;
+class NvApp
+{
+public:
+    bool operator==(const NvApp& other) const
+    {
+        return id == other.id;
+    }
+
+    bool isInitialized()
+    {
+        return id != 0 && !name.isEmpty();
+    }
+
+    int id;
+    QString name;
+    bool hdrSupported;
+};
+
+Q_DECLARE_METATYPE(NvApp)

 class NvDisplayMode
 {
@@ -26,26 +42,25 @@ public:
    int height;
    int refreshRate;
 };
-Q_DECLARE_TYPEINFO(NvDisplayMode, Q_PRIMITIVE_TYPE);

 class GfeHttpResponseException : public std::exception
 {
 public:
    GfeHttpResponseException(int statusCode, QString message) :
        m_StatusCode(statusCode),
-        m_StatusMessage(message.toUtf8())
+        m_StatusMessage(message)
    {

    }

    const char* what() const throw()
    {
-        return m_StatusMessage.constData();
+        return m_StatusMessage.toLatin1();
    }

    const char* getStatusMessage() const
    {
-        return m_StatusMessage.constData();
+        return m_StatusMessage.toLatin1();
    }

    int getStatusCode() const
@@ -55,12 +70,12 @@ public:

    QString toQString() const
    {
-        return QString::fromUtf8(m_StatusMessage) + " (Error " + QString::number(m_StatusCode) + ")";
+        return m_StatusMessage + " (Error " + QString::number(m_StatusCode) + ")";
    }

 private:
    int m_StatusCode;
-    QByteArray m_StatusMessage;
+    QString m_StatusMessage;
 };

 class QtNetworkReplyException : public std::exception
@@ -68,19 +83,19 @@ class QtNetworkReplyException : public std::exception
 public:
    QtNetworkReplyException(QNetworkReply::NetworkError error, QString errorText) :
        m_Error(error),
-        m_ErrorText(errorText.toUtf8())
+        m_ErrorText(errorText)
    {

    }

    const char* what() const throw()
    {
-        return m_ErrorText.constData();
+        return m_ErrorText.toLatin1();
    }

    const char* getErrorText() const
    {
-        return m_ErrorText.constData();
+        return m_ErrorText.toLatin1();
    }

    QNetworkReply::NetworkError getError() const
@@ -90,12 +105,12 @@ public:

    QString toQString() const
    {
-        return QString::fromUtf8(m_ErrorText) + " (Error " + QString::number(m_Error) + ")";
+        return m_ErrorText + " (Error " + QString::number(m_Error) + ")";
    }

 private:
    QNetworkReply::NetworkError m_Error;
-    QByteArray m_ErrorText;
+    QString m_ErrorText;
 };

 class NvHTTP : public QObject
@@ -109,16 +124,14 @@ public:
        NVLL_VERBOSE
    };

-    explicit NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert, QNetworkAccessManager* nam = nullptr);
-
-    explicit NvHTTP(NvComputer* computer, QNetworkAccessManager* nam = nullptr);
+    explicit NvHTTP(QString address, QSslCertificate serverCert);

    static
    int
    getCurrentGame(QString serverInfo);

    QString
-    getServerInfo(NvLogLevel logLevel, bool fastFail = false);
+    getServerInfo(NvLogLevel logLevel);

    static
    void
@@ -143,16 +156,9 @@ public:

    void setServerCert(QSslCertificate serverCert);

-    void setAddress(NvAddress address);
-    void setHttpsPort(uint16_t port);
+    void setAddress(QString address);

-    NvAddress address();
-
-    QSslCertificate serverCert();
-
-    uint16_t httpPort();
-
-    uint16_t httpsPort();
+    QString address();

    static
    QVector<int>
@@ -162,15 +168,14 @@ public:
    quitApp();

    void
-    startApp(QString verb,
-             bool isGfe,
-             int appId,
-             PSTREAM_CONFIGURATION streamConfig,
-             bool sops,
-             bool localAudio,
-             int gamepadMask,
-             bool persistGameControllersOnDisconnect,
-             QString& rtspSessionUrl);
+    resumeApp(PSTREAM_CONFIGURATION streamConfig);
+
+    void
+    launchApp(int appId,
+              PSTREAM_CONFIGURATION streamConfig,
+              bool sops,
+              bool localAudio,
+              int gamepadMask);

    QVector<NvApp>
    getAppList();
@@ -195,7 +200,7 @@ private:
                   int timeoutMs,
                   NvLogLevel logLevel);

-    NvAddress m_Address;
-    QNetworkAccessManager* m_Nam;
+    QString m_Address;
+    QNetworkAccessManager m_Nam;
    QSslCertificate m_ServerCert;
 };
@@ -1,9 +1,8 @@
 #include "nvpairingmanager.h"
 #include "utils.h"

-#include <stdexcept>
-
 #include <openssl/bio.h>
+#include <openssl/aes.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
@@ -11,8 +10,8 @@

 #define REQUEST_TIMEOUT_MS 5000

-NvPairingManager::NvPairingManager(NvComputer* computer) :
-    m_Http(computer)
+NvPairingManager::NvPairingManager(QString address) :
+    m_Http(address, QSslCertificate())
 {
    QByteArray cert = IdentityManager::get()->getCertificate();
    BIO *bio = BIO_new_mem_buf(cert.data(), -1);
@@ -52,58 +51,44 @@ NvPairingManager::generateRandomBytes(int length)
 }

 QByteArray
-NvPairingManager::encrypt(const QByteArray& plaintext, const QByteArray& key)
+NvPairingManager::encrypt(QByteArray plaintext, AES_KEY* key)
 {
    QByteArray ciphertext(plaintext.size(), 0);
-    EVP_CIPHER_CTX* cipher;
-    int ciphertextLen;

-    cipher = EVP_CIPHER_CTX_new();
-    THROW_BAD_ALLOC_IF_NULL(cipher);
-
-    EVP_EncryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
-    EVP_CIPHER_CTX_set_padding(cipher, 0);
-
-    EVP_EncryptUpdate(cipher,
-                      reinterpret_cast<unsigned char*>(ciphertext.data()),
-                      &ciphertextLen,
-                      reinterpret_cast<const unsigned char*>(plaintext.data()),
-                      plaintext.length());
-    Q_ASSERT(ciphertextLen == ciphertext.length());
-
-    EVP_CIPHER_CTX_free(cipher);
+    for (int i = 0; i < plaintext.size(); i += 16)
+    {
+        AES_encrypt(reinterpret_cast<unsigned char*>(&plaintext.data()[i]),
+                    reinterpret_cast<unsigned char*>(&ciphertext.data()[i]),
+                    key);
+    }

    return ciphertext;
 }

 QByteArray
-NvPairingManager::decrypt(const QByteArray& ciphertext, const QByteArray& key)
+NvPairingManager::decrypt(QByteArray ciphertext, AES_KEY* key)
 {
    QByteArray plaintext(ciphertext.size(), 0);
-    EVP_CIPHER_CTX* cipher;
-    int plaintextLen;

-    cipher = EVP_CIPHER_CTX_new();
-    THROW_BAD_ALLOC_IF_NULL(cipher);
-
-    EVP_DecryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
-    EVP_CIPHER_CTX_set_padding(cipher, 0);
-
-    EVP_DecryptUpdate(cipher,
-                      reinterpret_cast<unsigned char*>(plaintext.data()),
-                      &plaintextLen,
-                      reinterpret_cast<const unsigned char*>(ciphertext.data()),
-                      ciphertext.length());
-    Q_ASSERT(plaintextLen == plaintext.length());
-
-    EVP_CIPHER_CTX_free(cipher);
+    for (int i = 0; i < plaintext.size(); i += 16)
+    {
+        AES_decrypt(reinterpret_cast<unsigned char*>(&ciphertext.data()[i]),
+                    reinterpret_cast<unsigned char*>(&plaintext.data()[i]),
+                    key);
+    }

    return plaintext;
 }

 QByteArray
-NvPairingManager::getSignatureFromCert(X509* cert)
+NvPairingManager::getSignatureFromPemCert(QByteArray certificate)
 {
+    BIO* bio = BIO_new_mem_buf(certificate.data(), -1);
+    THROW_BAD_ALLOC_IF_NULL(bio);
+
+    X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
+    BIO_free_all(bio);
+
 #if (OPENSSL_VERSION_NUMBER < 0x10002000L)
    ASN1_BIT_STRING *asnSignature = cert->signature;
 #elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
@@ -114,43 +99,17 @@ NvPairingManager::getSignatureFromCert(X509* cert)
    X509_get0_signature(&asnSignature, NULL, cert);
 #endif

-    return QByteArray(
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-        reinterpret_cast<const char*>(ASN1_STRING_data(asnSignature)),
-#else
-        reinterpret_cast<const char*>(ASN1_STRING_get0_data(asnSignature)),
-#endif
-        ASN1_STRING_length(asnSignature)
-    );
-}
+    QByteArray signature(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);

-QByteArray
-NvPairingManager::getSignatureFromPemCert(const QByteArray& certificate)
-{
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    BIO* bio = BIO_new_mem_buf(const_cast<char*>(certificate.data()), -1);
-#else
-    BIO* bio = BIO_new_mem_buf(certificate.data(), -1);
-#endif
-    THROW_BAD_ALLOC_IF_NULL(bio);
-
-    X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
-    BIO_free_all(bio);
-
-    QByteArray signature = getSignatureFromCert(cert);
    X509_free(cert);

    return signature;
 }

 bool
-NvPairingManager::verifySignature(const QByteArray& data, const QByteArray& signature, const QByteArray& serverCertificate)
+NvPairingManager::verifySignature(QByteArray data, QByteArray signature, QByteArray serverCertificate)
 {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    BIO* bio = BIO_new_mem_buf(const_cast<char*>(serverCertificate.data()), -1);
-#else
    BIO* bio = BIO_new_mem_buf(serverCertificate.data(), -1);
-#endif
    THROW_BAD_ALLOC_IF_NULL(bio);

    X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
@@ -164,7 +123,7 @@ NvPairingManager::verifySignature(const QByteArray& data, const QByteArray& sign

    EVP_DigestVerifyInit(mdctx, nullptr, EVP_sha256(), nullptr, pubKey);
    EVP_DigestVerifyUpdate(mdctx, data.data(), data.length());
-    int result = EVP_DigestVerifyFinal(mdctx, reinterpret_cast<unsigned char*>(const_cast<char*>(signature.data())), signature.length());
+    int result = EVP_DigestVerifyFinal(mdctx, reinterpret_cast<unsigned char*>(signature.data()), signature.length());

    EVP_PKEY_free(pubKey);
    EVP_MD_CTX_destroy(mdctx);
@@ -174,13 +133,17 @@ NvPairingManager::verifySignature(const QByteArray& data, const QByteArray& sign
 }

 QByteArray
-NvPairingManager::signMessage(const QByteArray& message)
+NvPairingManager::signMessage(QByteArray message)
 {
    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
    THROW_BAD_ALLOC_IF_NULL(ctx);

-    EVP_DigestSignInit(ctx, NULL, EVP_sha256(), NULL, m_PrivateKey);
-    EVP_DigestSignUpdate(ctx, reinterpret_cast<unsigned char*>(const_cast<char*>(message.data())), message.length());
+    const EVP_MD *md = EVP_get_digestbyname("SHA256");
+    THROW_BAD_ALLOC_IF_NULL(md);
+
+    EVP_DigestInit_ex(ctx, md, NULL);
+    EVP_DigestSignInit(ctx, NULL, md, NULL, m_PrivateKey);
+    EVP_DigestSignUpdate(ctx, reinterpret_cast<unsigned char*>(message.data()), message.length());

    size_t signatureLength = 0;
    EVP_DigestSignFinal(ctx, NULL, &signatureLength);
@@ -194,9 +157,9 @@ NvPairingManager::signMessage(const QByteArray& message)
 }

 QByteArray
-NvPairingManager::saltPin(const QByteArray& salt, QString pin)
+NvPairingManager::saltPin(QByteArray salt, QString pin)
 {
-    return QByteArray().append(salt).append(pin.toUtf8());
+    return QByteArray().append(salt).append(pin.toLatin1());
 }

 NvPairingManager::PairState
@@ -223,8 +186,9 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    QByteArray salt = generateRandomBytes(16);
    QByteArray saltedPin = saltPin(salt, pin);

-    QByteArray aesKey = QCryptographicHash::hash(saltedPin, hashAlgo).constData();
-    aesKey.truncate(16);
+    AES_KEY encKey, decKey;
+    AES_set_decrypt_key(reinterpret_cast<const unsigned char*>(QCryptographicHash::hash(saltedPin, hashAlgo).data()), 128, &decKey);
+    AES_set_encrypt_key(reinterpret_cast<const unsigned char*>(QCryptographicHash::hash(saltedPin, hashAlgo).data()), 128, &encKey);

    QString getCert = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                    "pair",
@@ -246,21 +210,20 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
        return PairState::ALREADY_IN_PROGRESS;
    }

-    QSslCertificate unverifiedServerCert = QSslCertificate(serverCertStr);
-    if (unverifiedServerCert.isNull()) {
-        Q_ASSERT(!unverifiedServerCert.isNull());
+    serverCert = QSslCertificate(serverCertStr);
+    if (serverCert.isNull()) {
+        Q_ASSERT(!serverCert.isNull());

        qCritical() << "Failed to parse plaincert";
        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
        return PairState::FAILED;
    }

-    // Pin this cert for TLS until pairing is complete. If successful, we will propagate
-    // the cert into the NvComputer object and persist it.
-    m_Http.setServerCert(unverifiedServerCert);
+    // Pin this cert for TLS
+    m_Http.setServerCert(serverCert);

    QByteArray randomChallenge = generateRandomBytes(16);
-    QByteArray encryptedChallenge = encrypt(randomChallenge, aesKey);
+    QByteArray encryptedChallenge = encrypt(randomChallenge, &encKey);
    QString challengeXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                         "pair",
                                                         "devicename=roth&updateState=1&clientchallenge=" +
@@ -274,18 +237,28 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
        return PairState::FAILED;
    }

-    QByteArray challengeResponseData = decrypt(m_Http.getXmlStringFromHex(challengeXml, "challengeresponse"), aesKey);
+    QByteArray challengeResponseData = decrypt(m_Http.getXmlStringFromHex(challengeXml, "challengeresponse"), &decKey);
    QByteArray clientSecretData = generateRandomBytes(16);
    QByteArray challengeResponse;
    QByteArray serverResponse(challengeResponseData.data(), hashLength);

+#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
+    ASN1_BIT_STRING *asnSignature = m_Cert->signature;
+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, m_Cert);
+#else
+    const ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, m_Cert);
+#endif
+
    challengeResponse.append(challengeResponseData.data() + hashLength, 16);
-    challengeResponse.append(getSignatureFromCert(m_Cert));
+    challengeResponse.append(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
    challengeResponse.append(clientSecretData);

    QByteArray paddedHash = QCryptographicHash::hash(challengeResponse, hashAlgo);
    paddedHash.resize(32);
-    QByteArray encryptedChallengeResponseHash = encrypt(paddedHash, aesKey);
+    QByteArray encryptedChallengeResponseHash = encrypt(paddedHash, &encKey);
    QString respXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                    "pair",
                                                    "devicename=roth&updateState=1&serverchallengeresp=" +
@@ -300,8 +273,8 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    }

    QByteArray pairingSecret = NvHTTP::getXmlStringFromHex(respXml, "pairingsecret");
-    QByteArray serverSecret = pairingSecret.left(16);
-    QByteArray serverSignature = pairingSecret.mid(16);
+    QByteArray serverSecret = QByteArray(pairingSecret.data(), 16);
+    QByteArray serverSignature = QByteArray(&pairingSecret.data()[16], 256);

    if (!verifySignature(serverSecret,
                         serverSignature,
@@ -352,6 +325,5 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
        return PairState::FAILED;
    }

-    serverCert = std::move(unverifiedServerCert);
    return PairState::PAIRED;
 }
@@ -3,6 +3,7 @@
 #include "identitymanager.h"
 #include "nvhttp.h"

+#include <openssl/aes.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>

@@ -17,7 +18,7 @@ public:
        ALREADY_IN_PROGRESS
    };

-    explicit NvPairingManager(NvComputer* computer);
+    explicit NvPairingManager(QString address);

    ~NvPairingManager();

@@ -29,25 +30,22 @@ private:
    generateRandomBytes(int length);

    QByteArray
-    saltPin(const QByteArray& salt, QString pin);
+    saltPin(QByteArray salt, QString pin);

    QByteArray
-    encrypt(const QByteArray& plaintext, const QByteArray& key);
+    encrypt(QByteArray plaintext, AES_KEY* key);

    QByteArray
-    decrypt(const QByteArray& ciphertext, const QByteArray& key);
+    decrypt(QByteArray ciphertext, AES_KEY* key);

    QByteArray
-    getSignatureFromCert(X509* cert);
-
-    QByteArray
-    getSignatureFromPemCert(const QByteArray& certificate);
+    getSignatureFromPemCert(QByteArray certificate);

    bool
-    verifySignature(const QByteArray& data, const QByteArray& signature, const QByteArray& serverCertificate);
+    verifySignature(QByteArray data, QByteArray signature, QByteArray serverCertificate);

    QByteArray
-    signMessage(const QByteArray& message);
+    signMessage(QByteArray message);

    NvHTTP m_Http;
    X509* m_Cert;
@@ -24,9 +24,6 @@ RichPresenceManager::RichPresenceManager(StreamingPreferences& prefs, QString ga
        discordPresence.largeImageKey = "icon";
        Discord_UpdatePresence(&discordPresence);
    }
-#else
-    Q_UNUSED(prefs)
-    Q_UNUSED(gameName)
 #endif
 }

@@ -1,95 +1,26 @@
 #include "systemproperties.h"
-#include "utils.h"

 #include <QGuiApplication>
-#include <QLibraryInfo>

 #include "streaming/session.h"
 #include "streaming/streamutils.h"

-#ifdef Q_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#endif
-
-class SystemPropertyQueryThread : public QThread
-{
-public:
-    SystemPropertyQueryThread(SystemProperties* properties)
-        : QThread(properties), m_Properties(properties)
-    {
-        setObjectName("System Properties Async Query Thread");
-    }
-
-private:
-    void run() override
-    {
-        bool hasHardwareAcceleration;
-        bool rendererAlwaysFullScreen;
-        bool supportsHdr;
-        QSize maximumResolution;
-
-        Session::getDecoderInfo(m_Properties->testWindow, hasHardwareAcceleration, rendererAlwaysFullScreen, supportsHdr, maximumResolution);
-
-        // Propagate the decoder properties to the SystemProperties singleton and emit any change signals on the main thread
-        QMetaObject::invokeMethod(m_Properties, "updateDecoderProperties",
-                                  Qt::QueuedConnection,
-                                  Q_ARG(bool, hasHardwareAcceleration),
-                                  Q_ARG(bool, rendererAlwaysFullScreen),
-                                  Q_ARG(QSize, maximumResolution),
-                                  Q_ARG(bool, supportsHdr));
-    }
-
-private:
-    SystemProperties* m_Properties;
-};
-
 SystemProperties::SystemProperties()
 {
-    versionString = QString(VERSION_STR);
-    hasDesktopEnvironment = WMUtils::isRunningDesktopEnvironment();
-    isRunningWayland = WMUtils::isRunningWayland();
-    isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb";
-    usesMaterial3Theme = QLibraryInfo::version() >= QVersionNumber(6, 5, 0);
-    QString nativeArch = QSysInfo::currentCpuArchitecture();
+    isRunningWayland = qgetenv("XDG_SESSION_TYPE") == "wayland";
+    isRunningXWayland = qgetenv("XDG_SESSION_TYPE") == "wayland" && QGuiApplication::platformName() == "xcb";

 #ifdef Q_OS_WIN32
-    {
-        USHORT processArch, machineArch;
-
-        // Use IsWow64Process2() because it doesn't lie on ARM64
-        if (IsWow64Process2(GetCurrentProcess(), &processArch, &machineArch)) {
-            switch (machineArch) {
-            case IMAGE_FILE_MACHINE_I386:
-                nativeArch = "i386";
-                break;
-            case IMAGE_FILE_MACHINE_AMD64:
-                nativeArch = "x86_64";
-                break;
-            case IMAGE_FILE_MACHINE_ARM64:
-                nativeArch = "arm64";
-                break;
-            }
-        }
-
-        isWow64 = nativeArch != QSysInfo::buildCpuArchitecture();
-    }
+    isWow64 = QSysInfo::currentCpuArchitecture() != QSysInfo::buildCpuArchitecture();
 #else
    isWow64 = false;
 #endif

-    if (nativeArch == "i386") {
-        friendlyNativeArchName = "x86";
-    }
-    else if (nativeArch == "x86_64") {
-        friendlyNativeArchName = "x64";
-    }
-    else {
-        friendlyNativeArchName = nativeArch.toUpper();
-    }
-
-    // Assume we can probably launch a browser if we're in a GUI environment
-    hasBrowser = hasDesktopEnvironment;
+#ifndef STEAM_LINK
+    hasBrowser = true;
+#else
+    hasBrowser = false;
+#endif

 #ifdef HAVE_DISCORD
    hasDiscordIntegration = true;
@@ -97,151 +28,66 @@ SystemProperties::SystemProperties()
    hasDiscordIntegration = false;
 #endif

-    // These will be queried asynchronously to avoid blocking the UI
-    hasHardwareAcceleration = true;
-    rendererAlwaysFullScreen = false;
-    supportsHdr = true;
-    maximumResolution = QSize(0, 0);
+    unmappedGamepads = SdlInputHandler::getUnmappedGamepads();
+
+    // Populate data that requires talking to SDL. We do it all in one shot
+    // and cache the results to speed up future queries on this data.
+    querySdlVideoInfo();
+
+    Q_ASSERT(maximumStreamingFrameRate >= 60);
+    Q_ASSERT(!monitorDesktopResolutions.isEmpty());
+    Q_ASSERT(!monitorNativeResolutions.isEmpty());
 }

-SystemProperties::~SystemProperties()
+QRect SystemProperties::getDesktopResolution(int displayIndex)
 {
-    waitForAsyncLoad();
-}
-
-void SystemProperties::updateDecoderProperties(bool hasHardwareAcceleration, bool rendererAlwaysFullScreen, QSize maximumResolution, bool supportsHdr)
-{
-    SDL_assert(testWindow);
-
-    if (hasHardwareAcceleration != this->hasHardwareAcceleration) {
-        this->hasHardwareAcceleration = hasHardwareAcceleration;
-        emit hasHardwareAccelerationChanged();
-    }
-
-    if (rendererAlwaysFullScreen != this->rendererAlwaysFullScreen) {
-        this->rendererAlwaysFullScreen = rendererAlwaysFullScreen;
-        emit rendererAlwaysFullScreenChanged();
-    }
-
-    if (maximumResolution != this->maximumResolution) {
-        this->maximumResolution = maximumResolution;
-        emit maximumResolutionChanged();
-    }
-
-    if (supportsHdr != this->supportsHdr) {
-        this->supportsHdr = supportsHdr;
-        emit supportsHdrChanged();
-    }
-
-    SDL_DestroyWindow(testWindow);
-    testWindow = nullptr;
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    // Returns default constructed QRect if out of bounds
+    return monitorDesktopResolutions.value(displayIndex);
 }

 QRect SystemProperties::getNativeResolution(int displayIndex)
 {
    // Returns default constructed QRect if out of bounds
-    Q_ASSERT(!monitorNativeResolutions.isEmpty());
    return monitorNativeResolutions.value(displayIndex);
 }

-QRect SystemProperties::getSafeAreaResolution(int displayIndex)
+void SystemProperties::querySdlVideoInfo()
 {
-    // Returns default constructed QRect if out of bounds
-    Q_ASSERT(!monitorSafeAreaResolutions.isEmpty());
-    return monitorSafeAreaResolutions.value(displayIndex);
-}
-
-int SystemProperties::getRefreshRate(int displayIndex)
-{
-    // Returns 0 if out of bounds
-    Q_ASSERT(!monitorRefreshRates.isEmpty());
-    return monitorRefreshRates.value(displayIndex);
-}
-
-void SystemProperties::startAsyncLoad()
-{
-    if (systemPropertyQueryThread) {
-        // Already started/completed
-        return;
-    }
-
-    // This isn't actually asynchronous (due to the need to synchronize with
-    // SdlGamepadKeyNavigation), but we don't query it in the constructor
-    // because it's expensive.
-    unmappedGamepads = SdlInputHandler::getUnmappedGamepads();
-    if (!unmappedGamepads.isEmpty()) {
-        emit unmappedGamepadsChanged();
-    }
-
-    // We initialize the video subsystem and test window on the main thread
-    // because some platforms (macOS) do not support window creation on
-    // non-main threads.
-    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
-                     SDL_GetError());
-        return;
-    }
-
-    testWindow = StreamUtils::createTestWindow();
-    if (!testWindow) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Failed to create window for hardware decode test: %s",
-                     SDL_GetError());
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        return;
-    }
-
-    // Update display related attributes (max FPS, native resolution, etc).
-    //
-    // NB: SDL3 will forcefully refresh displays when a window is created,
-    // so we place this after the window creation to ensure we don't pay
-    // the penalty for mode enumeration twice.
-    refreshDisplays();
-
-    systemPropertyQueryThread = new SystemPropertyQueryThread(this);
-    systemPropertyQueryThread->start();
-}
-
-void SystemProperties::waitForAsyncLoad()
-{
-    if (systemPropertyQueryThread) {
-        systemPropertyQueryThread->wait();
-    }
-}
-
-void SystemProperties::refreshDisplays()
-{
-    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
-                     SDL_GetError());
-        return;
-    }
-
+    monitorDesktopResolutions.clear();
    monitorNativeResolutions.clear();
+    hasHardwareAcceleration = false;
+
+    // Never let the maximum drop below 60 FPS
+    maximumStreamingFrameRate = 60;
+
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        return;
+    }

    SDL_DisplayMode bestMode;
    for (int displayIndex = 0; displayIndex < SDL_GetNumVideoDisplays(); displayIndex++) {
        SDL_DisplayMode desktopMode;
-        SDL_Rect safeArea;
+        int err;

-        if (StreamUtils::getNativeDesktopMode(displayIndex, &desktopMode, &safeArea)) {
-            if (desktopMode.w <= 8192 && desktopMode.h <= 8192) {
-                monitorNativeResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
-                monitorSafeAreaResolutions.insert(displayIndex, QRect(0, 0, safeArea.w, safeArea.h));
-            }
-            else {
-                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                            "Skipping resolution over 8K: %dx%d",
-                            desktopMode.w, desktopMode.h);
-            }
+        err = SDL_GetDesktopDisplayMode(displayIndex, &desktopMode);
+        if (err == 0) {
+            monitorDesktopResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
+        }
+        else {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "SDL_GetDesktopDisplayMode() failed: %s",
+                         SDL_GetError());
+        }
+
+        if (StreamUtils::getRealDesktopMode(displayIndex, &desktopMode)) {
+            monitorNativeResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));

            // Start at desktop mode and work our way up
            bestMode = desktopMode;
-            int numDisplayModes = SDL_GetNumDisplayModes(displayIndex);
-            for (int i = 0; i < numDisplayModes; i++) {
+            for (int i = 0; i < SDL_GetNumDisplayModes(displayIndex); i++) {
                SDL_DisplayMode mode;
                if (SDL_GetDisplayMode(displayIndex, i, &mode) == 0) {
                    if (mode.w == desktopMode.w && mode.h == desktopMode.h) {
@@ -252,19 +98,26 @@ void SystemProperties::refreshDisplays()
                }
            }

-            // Try to normalize values around our our standard refresh rates.
-            // Some displays/OSes report values that are slightly off.
-            if (bestMode.refresh_rate >= 58 && bestMode.refresh_rate <= 62) {
-                monitorRefreshRates.append(60);
-            }
-            else if (bestMode.refresh_rate >= 28 && bestMode.refresh_rate <= 32) {
-                monitorRefreshRates.append(30);
-            }
-            else {
-                monitorRefreshRates.append(bestMode.refresh_rate);
-            }
+            maximumStreamingFrameRate = qMax(maximumStreamingFrameRate, bestMode.refresh_rate);
        }
    }

+    SDL_Window* testWindow = SDL_CreateWindow("", 0, 0, 1280, 720, SDL_WINDOW_HIDDEN);
+    if (!testWindow) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Failed to create window for hardware decode test: %s",
+                     SDL_GetError());
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return;
+    }
+
+    hasHardwareAcceleration =
+            Session::isHardwareDecodeAvailable(testWindow,
+                                               StreamingPreferences::VDS_AUTO,
+                                               VIDEO_FORMAT_H264,
+                                               1920, 1080, 60);
+
+    SDL_DestroyWindow(testWindow);
+
    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
@@ -3,80 +3,40 @@
 #include <QObject>
 #include <QRect>

-#include "SDL_compat.h"
-
 class SystemProperties : public QObject
 {
    Q_OBJECT

-    friend class SystemPropertyQueryThread;
-
 public:
    SystemProperties();
-    ~SystemProperties();

-    // Static properties queried synchronously during the constructor
+    Q_PROPERTY(bool hasHardwareAcceleration MEMBER hasHardwareAcceleration CONSTANT)
    Q_PROPERTY(bool isRunningWayland MEMBER isRunningWayland CONSTANT)
    Q_PROPERTY(bool isRunningXWayland MEMBER isRunningXWayland CONSTANT)
    Q_PROPERTY(bool isWow64 MEMBER isWow64 CONSTANT)
-    Q_PROPERTY(QString friendlyNativeArchName MEMBER friendlyNativeArchName CONSTANT)
-    Q_PROPERTY(bool hasDesktopEnvironment MEMBER hasDesktopEnvironment CONSTANT)
    Q_PROPERTY(bool hasBrowser MEMBER hasBrowser CONSTANT)
    Q_PROPERTY(bool hasDiscordIntegration MEMBER hasDiscordIntegration CONSTANT)
-    Q_PROPERTY(bool usesMaterial3Theme MEMBER usesMaterial3Theme CONSTANT)
-    Q_PROPERTY(QString versionString MEMBER versionString CONSTANT)
-
-    // Properties queried asynchronously (startAsyncLoad() must be called!)
-    Q_PROPERTY(bool hasHardwareAcceleration MEMBER hasHardwareAcceleration NOTIFY hasHardwareAccelerationChanged)
-    Q_PROPERTY(bool rendererAlwaysFullScreen MEMBER rendererAlwaysFullScreen NOTIFY rendererAlwaysFullScreenChanged)
    Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged)
-    Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution NOTIFY maximumResolutionChanged)
-    Q_PROPERTY(bool supportsHdr MEMBER supportsHdr NOTIFY supportsHdrChanged)
+    Q_PROPERTY(int maximumStreamingFrameRate MEMBER maximumStreamingFrameRate CONSTANT)

-    // Either startAsyncLoad()+waitForAsyncLoad() or refreshDisplays() must be invoked first
+    Q_INVOKABLE QRect getDesktopResolution(int displayIndex);
    Q_INVOKABLE QRect getNativeResolution(int displayIndex);
-    Q_INVOKABLE QRect getSafeAreaResolution(int displayIndex);
-    Q_INVOKABLE int getRefreshRate(int displayIndex);
-
-    Q_INVOKABLE void startAsyncLoad();
-    Q_INVOKABLE void waitForAsyncLoad();
-    Q_INVOKABLE void refreshDisplays();

 signals:
    void unmappedGamepadsChanged();
-    void hasHardwareAccelerationChanged();
-    void rendererAlwaysFullScreenChanged();
-    void maximumResolutionChanged();
-    void supportsHdrChanged();
-
-private slots:
-    void updateDecoderProperties(bool hasHardwareAcceleration, bool rendererAlwaysFullScreen, QSize maximumResolution, bool supportsHdr);

 private:
-    QThread* systemPropertyQueryThread = nullptr;
-    SDL_Window* testWindow = nullptr;
+    void querySdlVideoInfo();

-    // Properties set by the constructor
+    bool hasHardwareAcceleration;
    bool isRunningWayland;
    bool isRunningXWayland;
    bool isWow64;
-    QString friendlyNativeArchName;
-    bool hasDesktopEnvironment;
    bool hasBrowser;
    bool hasDiscordIntegration;
-    QString versionString;
-    bool usesMaterial3Theme;
-
-    // Properties only set if startAsyncLoad() is called
-    bool hasHardwareAcceleration;
-    bool rendererAlwaysFullScreen;
-    QSize maximumResolution;
-    bool supportsHdr;
    QString unmappedGamepads;
-
-    // Properties set by refreshDisplays()
+    int maximumStreamingFrameRate;
+    QList<QRect> monitorDesktopResolutions;
    QList<QRect> monitorNativeResolutions;
-    QList<QRect> monitorSafeAreaResolutions;
-    QList<int> monitorRefreshRates;
 };

@@ -52,13 +52,20 @@ public:

    void handleUnknownOptions()
    {
-        if (!unknownOptionNames().isEmpty()) {
+        if (unknownOptionNames().length()) {
            showError(QString("Unknown options: %1").arg(unknownOptionNames().join(", ")));
        }
    }

    void showMessage(QString message, MessageType type) const
    {
+    #if defined(Q_OS_WIN32)
+        UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
+        flags |= (type == Info ? MB_ICONINFORMATION : MB_ICONERROR);
+        QString title = "Moonlight";
+        MessageBoxW(nullptr, reinterpret_cast<const wchar_t *>(message.utf16()),
+                    reinterpret_cast<const wchar_t *>(title.utf16()), flags);
+    #endif
        message = message.endsWith('\n') ? message : message + '\n';
        fputs(qPrintable(message), type == Info ? stdout : stderr);
    }
@@ -106,7 +113,7 @@ public:

    QPair<int,int> getResolutionOptionValue(QString name) const
    {
-        static QRegularExpression re("^(\\d+)x(\\d+)$", QRegularExpression::CaseInsensitiveOption);
+        QRegularExpression re("^(\\d+)x(\\d+)$", QRegularExpression::CaseInsensitiveOption);
        auto match = re.match(value(name));
        if (!match.hasMatch()) {
            showError(QString("Invalid %1 format: %2").arg(name, value(name)));
@@ -157,45 +164,28 @@ GlobalCommandLineParser::ParseResult GlobalCommandLineParser::parse(const QStrin
        "Starts Moonlight normally if no arguments are given.\n"
        "\n"
        "Available actions:\n"
-        "  list            List the available apps on a host\n"
        "  quit            Quit the currently running app\n"
        "  stream          Start streaming an app\n"
-        "  pair            Pair a new host\n"
        "\n"
        "See 'moonlight <action> --help' for help of specific action."
    );
    parser.addPositionalArgument("action", "Action to execute", "<action>");
    parser.parse(args);
    auto posArgs = parser.positionalArguments();
+    QString action = posArgs.isEmpty() ? QString() : posArgs.first().toLower();

-    if (posArgs.isEmpty()) {
+    if (action == "") {
        // This method will not return and terminates the process if --version
        // or --help is specified
        parser.handleHelpAndVersionOptions();
        parser.handleUnknownOptions();
        return NormalStartRequested;
-    }
-    else {
-        // If users supply arguments that accept values prior to the "quit"
-        // or "stream" positional arguments, we will not be able to correctly
-        // parse the value out of the input because this QCommandLineParser
-        // doesn't know about all of the options that "quit" and "stream"
-        // commands can accept. To work around this issue, we just look
-        // for "quit" or "stream" positional arguments anywhere.
-        for (int i = 0; i < posArgs.size(); i++) {
-            QString action = posArgs.at(i).toLower();
-            if (action == "quit") {
-                return QuitRequested;
-            } else if (action == "stream") {
-                return StreamRequested;
-            } else if (action == "pair") {
-                return PairRequested;
-            } else if (action == "list") {
-                return ListRequested;
-            }
-        }
-
-        parser.showError(QString("Invalid action"));
+    } else if (action == "quit") {
+        return QuitRequested;
+    } else if (action == "stream") {
+        return StreamRequested;
+    } else {
+        parser.showError(QString("Invalid action: %1").arg(action));
    }
 }

@@ -241,58 +231,6 @@ QString QuitCommandLineParser::getHost() const
    return m_Host;
 }

-PairCommandLineParser::PairCommandLineParser()
-{
-}
-
-PairCommandLineParser::~PairCommandLineParser()
-{
-}
-
-void PairCommandLineParser::parse(const QStringList &args)
-{
-    CommandLineParser parser;
-    parser.setupCommonOptions();
-    parser.setApplicationDescription(
-        "\n"
-        "Pair with the specified host."
-    );
-    parser.addPositionalArgument("pair", "pair host");
-    parser.addPositionalArgument("host", "Host computer name, UUID, or IP address", "<host>");
-    parser.addValueOption("pin", "4 digit pairing PIN");
-
-    if (!parser.parse(args)) {
-        parser.showError(parser.errorText());
-    }
-
-    parser.handleUnknownOptions();
-
-    // This method will not return and terminates the process if --version or
-    // --help is specified
-    parser.handleHelpAndVersionOptions();
-
-    // Verify that host has been provided
-    auto posArgs = parser.positionalArguments();
-    if (posArgs.length() < 2) {
-        parser.showError("Host not provided");
-    }
-    m_Host = parser.positionalArguments().at(1);
-    m_PredefinedPin = parser.value("pin");
-    if (!m_PredefinedPin.isEmpty() && m_PredefinedPin.length() != 4) {
-        parser.showError("PIN must be 4 digits");
-    }
-}
-
-QString PairCommandLineParser::getHost() const
-{
-    return m_Host;
-}
-
-QString PairCommandLineParser::getPredefinedPin() const
-{
-    return m_PredefinedPin;
-}
-
 StreamCommandLineParser::StreamCommandLineParser()
 {
    m_WindowModeMap = {
@@ -303,23 +241,16 @@ StreamCommandLineParser::StreamCommandLineParser()
    m_AudioConfigMap = {
        {"stereo",       StreamingPreferences::AC_STEREO},
        {"5.1-surround", StreamingPreferences::AC_51_SURROUND},
-        {"7.1-surround", StreamingPreferences::AC_71_SURROUND},
    };
    m_VideoCodecMap = {
        {"auto",  StreamingPreferences::VCC_AUTO},
        {"H.264", StreamingPreferences::VCC_FORCE_H264},
        {"HEVC",  StreamingPreferences::VCC_FORCE_HEVC},
-        {"AV1", StreamingPreferences::VCC_FORCE_AV1},
    };
    m_VideoDecoderMap = {
        {"auto",     StreamingPreferences::VDS_AUTO},
-        {"software", StreamingPreferences::VDS_FORCE_SOFTWARE},
-        {"hardware", StreamingPreferences::VDS_FORCE_HARDWARE},
-    };
-    m_CaptureSysKeysModeMap = {
-        {"never",      StreamingPreferences::CSK_OFF},
-        {"fullscreen", StreamingPreferences::CSK_FULLSCREEN},
-        {"always",     StreamingPreferences::CSK_ALWAYS},
+        {"software", StreamingPreferences::VDS_FORCE_HARDWARE},
+        {"hardware", StreamingPreferences::VDS_FORCE_SOFTWARE},
    };
 }

@@ -349,26 +280,14 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    parser.addToggleOption("vsync", "V-Sync");
    parser.addValueOption("fps", "FPS");
    parser.addValueOption("bitrate", "bitrate in Kbps");
-    parser.addValueOption("packet-size", "video packet size");
    parser.addChoiceOption("display-mode", "display mode", m_WindowModeMap.keys());
    parser.addChoiceOption("audio-config", "audio config", m_AudioConfigMap.keys());
    parser.addToggleOption("multi-controller", "multiple controller support");
    parser.addToggleOption("quit-after", "quit app after session");
-    parser.addToggleOption("absolute-mouse", "remote desktop optimized mouse control");
-    parser.addToggleOption("mouse-buttons-swap", "left and right mouse buttons swap");
-    parser.addToggleOption("touchscreen-trackpad", "touchscreen in trackpad mode");
+    parser.addToggleOption("mouse-acceleration", "mouse acceleration");
    parser.addToggleOption("game-optimization", "game optimizations");
    parser.addToggleOption("audio-on-host", "audio on host PC");
    parser.addToggleOption("frame-pacing", "frame pacing");
-    parser.addToggleOption("mute-on-focus-loss", "mute audio when Moonlight window loses focus");
-    parser.addToggleOption("background-gamepad", "background gamepad input");
-    parser.addToggleOption("reverse-scroll-direction", "inverted scroll direction");
-    parser.addToggleOption("swap-gamepad-buttons", "swap A/B and X/Y gamepad buttons (Nintendo-style)");
-    parser.addToggleOption("keep-awake", "prevent display sleep while streaming");
-    parser.addToggleOption("performance-overlay", "show performance overlay");
-    parser.addToggleOption("hdr", "HDR streaming");
-    parser.addToggleOption("yuv444", "YUV 4:4:4 sampling, if supported");
-    parser.addChoiceOption("capture-system-keys", "capture system key combos", m_CaptureSysKeysModeMap.keys());
    parser.addChoiceOption("video-codec", "video codec", m_VideoCodecMap.keys());
    parser.addChoiceOption("video-decoder", "video decoder", m_VideoDecoderMap.keys());

@@ -379,23 +298,27 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    parser.handleUnknownOptions();

    // Resolve display's width and height
-    static QRegularExpression resolutionRexExp("^(720|1080|1440|4K|resolution)$");
+    QRegularExpression resolutionRexExp("^(720|1080|1440|4K|resolution)$");
    QStringList resoOptions = parser.optionNames().filter(resolutionRexExp);
-    bool displaySet = !resoOptions.isEmpty();
+    bool displaySet = resoOptions.length();
    if (displaySet) {
        QString name = resoOptions.last();
        if (name == "720") {
            preferences->width  = 1280;
            preferences->height = 720;
+            displaySet = true;
        } else if (name == "1080") {
            preferences->width  = 1920;
            preferences->height = 1080;
+            displaySet = true;
        } else if (name == "1440") {
            preferences->width  = 2560;
            preferences->height = 1440;
+            displaySet = true;
        } else if (name == "4K") {
            preferences->width  = 3840;
            preferences->height = 2160;
+            displaySet = true;
        } else if (name == "resolution") {
            auto resolution = parser.getResolutionOptionValue(name);
            preferences->width  = resolution.first;
@@ -406,28 +329,20 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    // Resolve --fps option
    if (parser.isSet("fps")) {
        preferences->fps = parser.getIntOption("fps");
-        if (!inRange(preferences->fps, 10, 480)) {
-            fprintf(stderr, "Warning: FPS is out of the supported range (10 - 480 FPS). Performance may suffer!\n");
+        if (!inRange(preferences->fps, 30, 120)) {
+            parser.showError("FPS must be in range: 30 - 120");
        }
    }

    // Resolve --bitrate option
    if (parser.isSet("bitrate")) {
        preferences->bitrateKbps = parser.getIntOption("bitrate");
-        if (!inRange(preferences->bitrateKbps, 500, 500000)) {
-            fprintf(stderr, "Warning: Bitrate is out of the supported range (500 - 500000 Kbps). Performance may suffer!\n");
+        if (!inRange(preferences->bitrateKbps, 500, 150000)) {
+            parser.showError("Bitrate must be in range: 500 - 150000");
        }
    } else if (displaySet || parser.isSet("fps")) {
        preferences->bitrateKbps = preferences->getDefaultBitrate(
-            preferences->width, preferences->height, preferences->fps, preferences->enableYUV444);
-    }
-
-    // Resolve --packet-size option
-    if (parser.isSet("packet-size")) {
-        preferences->packetSize = parser.getIntOption("packet-size");
-        if (preferences->packetSize < 1024) {
-            parser.showError("Packet size must be greater than 1024 bytes");
-        }
+            preferences->width, preferences->height, preferences->fps);
    }

    // Resolve --display option
@@ -449,14 +364,8 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    // Resolve --quit-after and --no-quit-after options
    preferences->quitAppAfter = parser.getToggleOptionValue("quit-after", preferences->quitAppAfter);

-    // Resolve --absolute-mouse and --no-absolute-mouse options
-    preferences->absoluteMouseMode = parser.getToggleOptionValue("absolute-mouse", preferences->absoluteMouseMode);
-
-    // Resolve --mouse-buttons-swap and --no-mouse-buttons-swap options
-    preferences->swapMouseButtons = parser.getToggleOptionValue("mouse-buttons-swap", preferences->swapMouseButtons);
-
-    // Resolve --touchscreen-trackpad and --no-touchscreen-trackpad options
-    preferences->absoluteTouchMode = !parser.getToggleOptionValue("touchscreen-trackpad", !preferences->absoluteTouchMode);
+    // Resolve --mouse-acceleration and --no-mouse-acceleration options
+    preferences->mouseAcceleration = parser.getToggleOptionValue("mouse-acceleration", preferences->mouseAcceleration);

    // Resolve --game-optimization and --no-game-optimization options
    preferences->gameOptimizations = parser.getToggleOptionValue("game-optimization", preferences->gameOptimizations);
@@ -467,35 +376,6 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    // Resolve --frame-pacing and --no-frame-pacing options
    preferences->framePacing = parser.getToggleOptionValue("frame-pacing", preferences->framePacing);

-    // Resolve --mute-on-focus-loss and --no-mute-on-focus-loss options
-    preferences->muteOnFocusLoss = parser.getToggleOptionValue("mute-on-focus-loss", preferences->muteOnFocusLoss);
-
-    // Resolve --background-gamepad and --no-background-gamepad options
-    preferences->backgroundGamepad = parser.getToggleOptionValue("background-gamepad", preferences->backgroundGamepad);
-
-    // Resolve --reverse-scroll-direction and --no-reverse-scroll-direction options
-    preferences->reverseScrollDirection = parser.getToggleOptionValue("reverse-scroll-direction", preferences->reverseScrollDirection);
-
-    // Resolve --swap-gamepad-buttons and --no-swap-gamepad-buttons options
-    preferences->swapFaceButtons = parser.getToggleOptionValue("swap-gamepad-buttons", preferences->swapFaceButtons);
-
-    // Resolve --keep-awake and --no-keep-awake options
-    preferences->keepAwake = parser.getToggleOptionValue("keep-awake", preferences->keepAwake);
-
-    // Resolve --performance-overlay and --no-performance-overlay options
-    preferences->showPerformanceOverlay = parser.getToggleOptionValue("performance-overlay", preferences->showPerformanceOverlay);
-
-    // Resolve --hdr and --no-hdr options
-    preferences->enableHdr = parser.getToggleOptionValue("hdr", preferences->enableHdr);
-
-    // Resolve --yuv444 and --no-yuv444 options
-    preferences->enableYUV444 = parser.getToggleOptionValue("yuv444", preferences->enableYUV444);
-    
-    // Resolve --capture-system-keys option
-    if (parser.isSet("capture-system-keys")) {
-        preferences->captureSysKeysMode = mapValue(m_CaptureSysKeysModeMap, parser.getChoiceOptionValue("capture-system-keys"));
-    }
-
    // Resolve --video-codec option
    if (parser.isSet("video-codec")) {
        preferences->videoCodecConfig = mapValue(m_VideoCodecMap, parser.getChoiceOptionValue("video-codec"));
@@ -532,62 +412,3 @@ QString StreamCommandLineParser::getAppName() const
 {
    return m_AppName;
 }
-
-ListCommandLineParser::ListCommandLineParser()
-{
-}
-
-ListCommandLineParser::~ListCommandLineParser()
-{
-}
-
-void ListCommandLineParser::parse(const QStringList &args)
-{
-    CommandLineParser parser;
-    parser.setupCommonOptions();
-    parser.setApplicationDescription(
-        "\n"
-        "List the available apps on the given host."
-    );
-    parser.addPositionalArgument("list", "list available apps");
-    parser.addPositionalArgument("host", "Host computer name, UUID, or IP address", "<host>");
-
-    parser.addFlagOption("csv",     "Print as CSV with additional information");
-    parser.addFlagOption("verbose", "Displays additional information");
-
-    if (!parser.parse(args)) {
-        parser.showError(parser.errorText());
-    }
-
-    parser.handleUnknownOptions();
-
-
-    m_PrintCSV = parser.isSet("csv");
-    m_Verbose = parser.isSet("verbose");
-
-    // This method will not return and terminates the process if --version or
-    // --help is specified
-    parser.handleHelpAndVersionOptions();
-
-    // Verify that host has been provided
-    auto posArgs = parser.positionalArguments();
-    if (posArgs.length() < 2) {
-        parser.showError("Host not provided");
-    }
-    m_Host = parser.positionalArguments().at(1);
-}
-
-QString ListCommandLineParser::getHost() const
-{
-    return m_Host;
-}
-
-bool ListCommandLineParser::isPrintCSV() const
-{
-    return m_PrintCSV;
-}
-
-bool ListCommandLineParser::isVerbose() const
-{
-    return m_Verbose;
-}
@@ -12,8 +12,6 @@ public:
        NormalStartRequested,
        StreamRequested,
        QuitRequested,
-        PairRequested,
-        ListRequested,
    };

    GlobalCommandLineParser();
@@ -37,22 +35,6 @@ private:
    QString m_Host;
 };

-class PairCommandLineParser
-{
-public:
-    PairCommandLineParser();
-    virtual ~PairCommandLineParser();
-
-    void parse(const QStringList &args);
-
-    QString getHost() const;
-    QString getPredefinedPin() const;
-
-private:
-    QString m_Host;
-    QString m_PredefinedPin;
-};
-
 class StreamCommandLineParser
 {
 public:
@@ -71,23 +53,4 @@ private:
    QMap<QString, StreamingPreferences::AudioConfig> m_AudioConfigMap;
    QMap<QString, StreamingPreferences::VideoCodecConfig> m_VideoCodecMap;
    QMap<QString, StreamingPreferences::VideoDecoderSelection> m_VideoDecoderMap;
-    QMap<QString, StreamingPreferences::CaptureSysKeysMode> m_CaptureSysKeysModeMap;
-};
-
-class ListCommandLineParser
-{
-public:
-    ListCommandLineParser();
-    virtual ~ListCommandLineParser();
-
-    void parse(const QStringList &args);
-
-    QString getHost() const;
-    bool isPrintCSV() const;
-    bool isVerbose() const;
-
-private:
-    QString m_Host;
-    bool m_PrintCSV;
-    bool m_Verbose;
 };
@@ -1,196 +0,0 @@
-#include "listapps.h"
-
-#include "backend/boxartmanager.h"
-#include "backend/computermanager.h"
-#include "backend/computerseeker.h"
-
-#include <QCoreApplication>
-
-#define COMPUTER_SEEK_TIMEOUT 30000
-
-namespace CliListApps
-{
-
-enum State {
-    StateInit,
-    StateSeekComputer,
-    StateListApps,
-    StateFailure,
-};
-
-class Event
-{
-public:
-    enum Type {
-        ComputerFound,
-        ComputerSeekTimedout,
-        Executed,
-    };
-
-    Event(Type type)
-        : type(type), computerManager(nullptr), computer(nullptr) {}
-
-    Type type;
-    ComputerManager *computerManager;
-    NvComputer *computer;
-    QString errorMessage;
-};
-
-class LauncherPrivate
-{
-    Q_DECLARE_PUBLIC(Launcher)
-
-public:
-    LauncherPrivate(Launcher *q) : q_ptr(q) {}
-
-    void handleEvent(Event event)
-    {
-        Q_Q(Launcher);
-        NvApp app;
-
-        switch (event.type) {
-        // Occurs when CLI main calls execute
-        case Event::Executed:
-            if (m_State == StateInit) {
-                m_State = StateSeekComputer;
-                m_ComputerManager = event.computerManager;
-
-                m_ComputerSeeker = new ComputerSeeker(m_ComputerManager, m_ComputerName, q);
-                q->connect(m_ComputerSeeker, &ComputerSeeker::computerFound,
-                           q, &Launcher::onComputerFound);
-                q->connect(m_ComputerSeeker, &ComputerSeeker::errorTimeout,
-                           q, &Launcher::onComputerSeekTimeout);
-                m_ComputerSeeker->start(COMPUTER_SEEK_TIMEOUT);
-
-                m_BoxArtManager = new BoxArtManager(q);
-
-                if (m_Arguments.isVerbose()) {
-                    fprintf(stdout, "Establishing connection to PC...\n");
-                }
-            }
-            break;
-        // Occurs when computer search timed out
-        case Event::ComputerSeekTimedout:
-            if (m_State == StateSeekComputer) {
-                fprintf(stderr, "%s\n", qPrintable(QString("Failed to connect to %1").arg(m_ComputerName)));
-
-                QCoreApplication::exit(-1);
-            }
-            break;
-        // Occurs when searched computer is found
-        case Event::ComputerFound:
-            if (m_State == StateSeekComputer) {
-                if (event.computer->pairState == NvComputer::PS_PAIRED) {
-                    m_State = StateListApps;
-                    m_Computer = event.computer;
-
-                    if (m_Arguments.isVerbose()) {
-                        fprintf(stdout, "Loading app list...\n");
-                    }
-
-                    // To avoid race conditions where ComputerSeeker stops async polling, but
-                    // ComputerManager is yet to update the app list, we will explicitly fetch the latest app list.
-                    // Otherwise, it becomes complicated as we would have to guess whether ComputerManager
-                    // would emit 1 signal (the list did not change) or 2 signals (indicating that the list has changed)
-                    try {
-                        NvHTTP http{m_Computer};
-
-                        const auto appList = http.getAppList();
-                        m_Arguments.isPrintCSV() ? printAppsCSV(appList) : printApps(appList);
-
-                        QCoreApplication::exit(0);
-                    } catch (std::exception& exception) {
-                        fprintf(stderr, "%s\n", exception.what());
-                        QCoreApplication::exit(1);
-                    }
-                } else {
-                    m_State = StateFailure;
-                    fprintf(stderr, "%s\n", qPrintable(QObject::tr("Computer %1 has not been paired. "
-                                            "Please open Moonlight to pair before retrieving games list.")
-                                            .arg(event.computer->name)));
-
-                    QCoreApplication::exit(-1);
-                }
-            }
-            break;
-        }
-    }
-
-    void printApps(QVector<NvApp> apps) {
-        for (int i = 0; i < apps.length(); i++) {
-            fprintf(stdout, "%s\n", qPrintable(apps[i].name));
-        }
-    }
-
-    void printAppsCSV(QVector<NvApp> apps) {
-        fprintf(stdout, "Name, ID, HDR Support, App Collection Game, Hidden, Direct Launch, Boxart URL\n");
-        for (int i = 0; i < apps.length(); i++) {
-            printAppCSV(apps[i]);
-        }
-    }
-
-    void printAppCSV(NvApp app) const
-    {
-        fprintf(stdout, "\"%s\",%d,%s,%s,%s,%s,\"%s\"\n", qPrintable(app.name),
-                                                          app.id,
-                                                          app.hdrSupported ? "true" : "false",
-                                                          app.isAppCollectorGame ? "true" : "false",
-                                                          app.hidden ? "true" : "false",
-                                                          app.directLaunch ? "true" : "false",
-                                                          qPrintable(m_BoxArtManager->loadBoxArt(m_Computer, app).toDisplayString()));
-    }
-
-    Launcher *q_ptr;
-    ComputerManager *m_ComputerManager;
-    QString m_ComputerName;
-    ComputerSeeker *m_ComputerSeeker;
-    BoxArtManager *m_BoxArtManager;
-    NvComputer *m_Computer;
-    State m_State;
-    ListCommandLineParser m_Arguments;
-};
-
-Launcher::Launcher(QString computer, ListCommandLineParser arguments, QObject *parent)
-    : QObject(parent),
-      m_DPtr(new LauncherPrivate(this))
-{
-    Q_D(Launcher);
-    d->m_ComputerName = computer;
-    d->m_State = StateInit;
-    d->m_Arguments = arguments;
-}
-
-Launcher::~Launcher()
-{
-}
-
-void Launcher::execute(ComputerManager *manager)
-{
-    Q_D(Launcher);
-    Event event(Event::Executed);
-    event.computerManager = manager;
-    d->handleEvent(event);
-}
-
-bool Launcher::isExecuted() const
-{
-    Q_D(const Launcher);
-    return d->m_State != StateInit;
-}
-
-void Launcher::onComputerFound(NvComputer *computer)
-{
-    Q_D(Launcher);
-    Event event(Event::ComputerFound);
-    event.computer = computer;
-    d->handleEvent(event);
-}
-
-void Launcher::onComputerSeekTimeout()
-{
-    Q_D(Launcher);
-    Event event(Event::ComputerSeekTimedout);
-    d->handleEvent(event);
-}
-
-}
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "commandlineparser.h"
-
-#include <QObject>
-#include <QVariant>
-
-class ComputerManager;
-class NvComputer;
-
-namespace CliListApps
-{
-
-class LauncherPrivate;
-
-class Launcher : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE_D(m_DPtr, Launcher)
-
-public:
-    explicit Launcher(QString computer, ListCommandLineParser arguments, QObject *parent = nullptr);
-    ~Launcher();
-
-    Q_INVOKABLE void execute(ComputerManager *manager);
-    Q_INVOKABLE bool isExecuted() const;
-
-private slots:
-    void onComputerFound(NvComputer *computer);
-    void onComputerSeekTimeout();
-
-private:
-    QScopedPointer<LauncherPrivate> m_DPtr;
-    ListCommandLineParser m_Arguments;
-};
-
-}
@@ -1,181 +0,0 @@
-#include "pair.h"
-
-#include "backend/computermanager.h"
-#include "backend/computerseeker.h"
-#include <QCoreApplication>
-#include <QTimer>
-
-#define COMPUTER_SEEK_TIMEOUT 10000
-
-namespace CliPair
-{
-
-enum State {
-    StateInit,
-    StateSeekComputer,
-    StatePairing,
-    StateFailure,
-    StateComplete,
-};
-
-class Event
-{
-public:
-    enum Type {
-        ComputerFound,
-        Executed,
-        PairingCompleted,
-        Timedout,
-    };
-
-    Event(Type type)
-        : type(type), computerManager(nullptr), computer(nullptr) {}
-
-    Type type;
-    ComputerManager *computerManager;
-    NvComputer *computer;
-    QString errorMessage;
-};
-
-class LauncherPrivate
-{
-    Q_DECLARE_PUBLIC(Launcher)
-
-public:
-    LauncherPrivate(Launcher *q) : q_ptr(q) {}
-
-    void handleEvent(Event event)
-    {
-        Q_Q(Launcher);
-
-        switch (event.type) {
-        // Occurs when CliPair becomes visible and the UI calls launcher's execute()
-        case Event::Executed:
-            if (m_State == StateInit) {
-                m_State = StateSeekComputer;
-                m_ComputerManager = event.computerManager;
-                q->connect(m_ComputerManager, &ComputerManager::pairingCompleted,
-                           q, &Launcher::onPairingCompleted);
-
-                // If we weren't provided a predefined PIN, generate one now
-                if (m_PredefinedPin.isEmpty()) {
-                    m_PredefinedPin = m_ComputerManager->generatePinString();
-                }
-
-                m_ComputerSeeker = new ComputerSeeker(m_ComputerManager, m_ComputerName, q);
-                q->connect(m_ComputerSeeker, &ComputerSeeker::computerFound,
-                           q, &Launcher::onComputerFound);
-                q->connect(m_ComputerSeeker, &ComputerSeeker::errorTimeout,
-                           q, &Launcher::onTimeout);
-                m_ComputerSeeker->start(COMPUTER_SEEK_TIMEOUT);
-
-                emit q->searchingComputer();
-            }
-            break;
-        // Occurs when searched computer is found
-        case Event::ComputerFound:
-            if (m_State == StateSeekComputer) {
-                if (event.computer->pairState == NvComputer::PS_PAIRED) {
-                    m_State = StateFailure;
-                    QString msg = QObject::tr("%1 is already paired").arg(event.computer->name);
-                    emit q->failed(msg);
-                }
-                else {
-                    Q_ASSERT(!m_PredefinedPin.isEmpty());
-
-                    m_State = StatePairing;
-                    m_ComputerManager->pairHost(event.computer, m_PredefinedPin);
-                    emit q->pairing(event.computer->name, m_PredefinedPin);
-                }
-            }
-            break;
-        // Occurs when pairing operation completes
-        case Event::PairingCompleted:
-            if (m_State == StatePairing) {
-                if (event.errorMessage.isEmpty()) {
-                    m_State = StateComplete;
-                    emit q->success();
-                }
-                else {
-                    m_State = StateFailure;
-                    emit q->failed(event.errorMessage);
-                }
-            }
-            break;
-        // Occurs when computer search timed out
-        case Event::Timedout:
-            if (m_State == StateSeekComputer) {
-                m_State = StateFailure;
-                emit q->failed(QObject::tr("Failed to connect to %1").arg(m_ComputerName));
-            }
-            break;
-        }
-    }
-
-    Launcher *q_ptr;
-    QString m_ComputerName;
-    QString m_PredefinedPin;
-    ComputerManager *m_ComputerManager;
-    ComputerSeeker *m_ComputerSeeker;
-    NvComputer *m_Computer;
-    State m_State;
-    QTimer *m_TimeoutTimer;
-};
-
-Launcher::Launcher(QString computer, QString predefinedPin, QObject *parent)
-    : QObject(parent),
-      m_DPtr(new LauncherPrivate(this))
-{
-    Q_D(Launcher);
-    d->m_ComputerName = computer;
-    d->m_PredefinedPin = predefinedPin;
-    d->m_State = StateInit;
-    d->m_TimeoutTimer = new QTimer(this);
-    d->m_TimeoutTimer->setSingleShot(true);
-    connect(d->m_TimeoutTimer, &QTimer::timeout,
-            this, &Launcher::onTimeout);
-}
-
-Launcher::~Launcher()
-{
-}
-
-void Launcher::execute(ComputerManager *manager)
-{
-    Q_D(Launcher);
-    Event event(Event::Executed);
-    event.computerManager = manager;
-    d->handleEvent(event);
-}
-
-bool Launcher::isExecuted() const
-{
-    Q_D(const Launcher);
-    return d->m_State != StateInit;
-}
-
-void Launcher::onComputerFound(NvComputer *computer)
-{
-    Q_D(Launcher);
-    Event event(Event::ComputerFound);
-    event.computer = computer;
-    d->handleEvent(event);
-}
-
-void Launcher::onTimeout()
-{
-    Q_D(Launcher);
-    Event event(Event::Timedout);
-    d->handleEvent(event);
-}
-
-void Launcher::onPairingCompleted(NvComputer* computer, QString error)
-{
-    Q_D(Launcher);
-    Event event(Event::PairingCompleted);
-    event.computer = computer;
-    event.errorMessage = error;
-    d->handleEvent(event);
-}
-
-}
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QVariant>
-
-class ComputerManager;
-class NvComputer;
-class Session;
-class StreamingPreferences;
-
-namespace CliPair
-{
-
-class Event;
-class LauncherPrivate;
-
-class Launcher : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE_D(m_DPtr, Launcher)
-
-public:
-    explicit Launcher(QString computer, QString predefinedPin,
-                      QObject *parent = nullptr);
-    ~Launcher();
-    Q_INVOKABLE void execute(ComputerManager *manager);
-    Q_INVOKABLE bool isExecuted() const;
-
-signals:
-    void searchingComputer();
-    void pairing(QString pcName, QString pin);
-    void failed(QString text);
-    void success();
-
-private slots:
-    void onComputerFound(NvComputer *computer);
-    void onPairingCompleted(NvComputer *computer, QString error);
-    void onTimeout();
-
-private:
-    QScopedPointer<LauncherPrivate> m_DPtr;
-};
-
-}
@@ -73,7 +73,7 @@ public:
        case Event::ComputerSeekTimedout:
            if (m_State == StateSeekComputer) {
                m_State = StateFailure;
-                emit q->failed(QObject::tr("Failed to connect to %1").arg(m_ComputerName));
+                emit q->failed(QString("Failed to connect to %1").arg(m_ComputerName));
            }
            break;
        // Occurs when searched computer is found
@@ -85,8 +85,8 @@ public:
                    m_ComputerManager->quitRunningApp(event.computer);
                } else {
                    m_State = StateFailure;
-                    QString msg = QObject::tr("Computer %1 has not been paired. "
-                                              "Please open Moonlight to pair before streaming.")
+                    QString msg = QString("Computer %1 has not been paired. "
+                                          "Please open Moonlight to pair before streaming.")
                            .arg(event.computer->name);
                    emit q->failed(msg);
                }
@@ -99,7 +99,7 @@ public:
                    QCoreApplication::exit(0);
                } else {
                    m_State = StateFailure;
-                    emit q->failed(QObject::tr("Quitting app failed, reason: %1").arg(event.errorMessage));
+                    emit q->failed(QString("Quitting app failed, reason: %1").arg(event.errorMessage));
                }
            }
            break;
@@ -6,7 +6,7 @@
 #include <QCoreApplication>
 #include <QTimer>

-#define COMPUTER_SEEK_TIMEOUT 30000
+#define COMPUTER_SEEK_TIMEOUT 10000
 #define APP_SEEK_TIMEOUT 10000

 namespace CliStartStream
@@ -86,8 +86,8 @@ public:
                    emit q->searchingApp();
                } else {
                    m_State = StateFailure;
-                    QString msg = QObject::tr("Computer %1 has not been paired. "
-                                              "Please open Moonlight to pair before streaming.")
+                    QString msg = QString("Computer %1 has not been paired. "
+                                          "Please open Moonlight to pair before streaming.")
                            .arg(event.computer->name);
                    emit q->failed(msg);
                }
@@ -118,23 +118,23 @@ public:
            }
            break;
        // Occurs when the previous app quit has been completed, handles quitting errors if any
-        // happened. ComputerUpdated event's handler handles session start when previous app has
+        // happended. ComputerUpdated event's handler handles session start when previous app has
        // quit.
        case Event::AppQuitCompleted:
            if (m_State == StateSeekApp && !event.errorMessage.isEmpty()) {
                m_State = StateFailure;
-                emit q->failed(QObject::tr("Quitting app failed, reason: %1").arg(event.errorMessage));
+                emit q->failed(QString("Quitting app failed, reason: %1").arg(event.errorMessage));
            }
            break;
        // Occurs when computer or app search timed out
        case Event::Timedout:
            if (m_State == StateSeekComputer) {
                m_State = StateFailure;
-                emit q->failed(QObject::tr("Failed to connect to %1").arg(m_ComputerName));
+                emit q->failed(QString("Failed to connect to %1").arg(m_ComputerName));
            }
            if (m_State == StateSeekApp) {
                m_State = StateFailure;
-                emit q->failed(QObject::tr("Failed to find application %1").arg(m_AppName));
+                emit q->failed(QString("Failed to find application %1").arg(m_AppName));
            }
            break;
        }
@@ -162,7 +162,7 @@ public:

    QString getCurrentAppName() const
    {
-        for (const NvApp& app : std::as_const(m_Computer->appList)) {
+        for (NvApp app : m_Computer->appList) {
            if (m_Computer->currentGameId == app.id) {
                return app.name;
            }
@@ -1,476 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
+<component type="desktop">
 	<id>com.moonlight_stream.Moonlight</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0+</project_license>
 	<name>Moonlight</name>
-	<summary>Stream games and other applications from another PC running Sunshine or GeForce Experience</summary>
+	<summary>Play games remotely from your NVIDIA GameStream-enabled PC</summary>

 	<description>
-		<p>Moonlight can stream games and other applications from another PC with Sunshine or GeForce Experience software installed.</p>
+		<p>Moonlight can stream games and other applications from a PC with an NVIDIA GeForce GTX 600-series or higher GPU and GeForce Experience installed.</p>
 		<p>Features include:</p>
 		<ul>
-			<li>Hardware accelerated video decoding with VAAPI, VDPAU, and Vulkan Video support</li>
-			<li>H.264, HEVC, and AV1 codec support</li>
-			<li>7.1 surround sound audio support</li>
-			<li>10-point multitouch support</li>
-			<li>Gamepad support with force feedback for up to 16 players</li>
-			<li>Support for both pointer capture (for games) and direct mouse control (for remote desktop)</li>
-			<li>Support for passing system-wide keyboard shortcuts like Alt+Tab to the host</li>
+			<li>Streaming at up to 4K resolution</li>
+			<li>Support for up to 120 FPS streaming (high refresh rate monitor recommended)</li>
+			<li>Hardware accelerated video decoding with VAAPI, VDPAU, and NVDEC support</li>
+			<li>5.1 surround sound audio support</li>
+			<li>HEVC support for better video compression efficiency</li>
+			<li>Gamepad support with force feedback for up to 4 players</li>
 		</ul>
 	</description>

 	<url type="homepage">https://moonlight-stream.org</url>
 	<url type="bugtracker">https://github.com/moonlight-stream/moonlight-qt/issues</url>
 	<url type="help">https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide</url>
-	<url type="vcs-browser">https://github.com/moonlight-stream/moonlight-qt</url>
-	<developer id="org.moonlight-stream">
-		<name>Moonlight Game Streaming Team</name>
-	</developer>
-	<update_contact>cameron@moonlight-stream.org</update_contact>
-	<launchable type="desktop-id">com.moonlight_stream.Moonlight.desktop</launchable>
-	<provides>
-		<binary>moonlight</binary>
-	</provides>
-	<content_rating type="oars-1.1" />	
-
-	<branding>
-		<color type="primary" scheme_preference="light">#710085</color>
-		<color type="primary" scheme_preference="dark">#55285d</color>
-	</branding>

 	<screenshots>
 		<screenshot type="default">
 			<image>https://moonlight-stream.org/appstream_resources/moonlight_screenshot_1.png</image>
-			<caption>Host selection page showing local PCs</caption>
 		</screenshot>
 		<screenshot>
 			<image>https://moonlight-stream.org/appstream_resources/moonlight_screenshot_2.png</image>
-			<caption>Settings page displaying streaming options</caption>
 		</screenshot>
 	</screenshots>

 	<releases>
-		<release version="6.1.0" date="2024-09-16">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Experimental YUV 4:4:4 support for improved text clarity during remote desktop usage</li>
-					<li>HDR is now supported with software decoding (requires GPU with Vulkan support)</li>
-					<li>Bitrate limit can now be increased to 500 Mbps</li>
-					<li>Audio decoding now uses 32-bit floating point format</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed incorrect color range when streaming with AV1 from a host with an AMD GPU</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="6.0.1" date="2024-06-30">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>HDR to SDR tonemapping is now supported by the Vulkan renderer on Linux</li>
-				</ul>
-				<p>Behavior Changes:</p>
-				<ul>
-					<li>More time is now provided for PCs to wake up before displaying an error when starting a stream from the CLI</li>
-					<li>Moonlight will no longer try to guess VA driver names when running libva 2.20 or later</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed crash when the Vulkan renderer executed on a system with no Vulkan devices</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="6.0.0" date="2024-06-06">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>HDR is now supported on Steam Deck and other HDR-capable Linux systems using a new Vulkan-based renderer</li>
-					<li>Vulkan Video decoding of H.264, HEVC, and AV1 is now supported using the new Vulkan renderer</li>
-					<li>Full E2E stream encryption is now supported when streaming from Sunshine v0.22 or later</li>
-					<li>Initiating a stream via the command-line will now automatically wake the target machine if it is sleeping</li>
-					<li>Error codes are now displayed in the connection termination dialog</li>
-					<li>Detailed PC state information is now available via the new "View Details" context menu option (similar to the Android client)</li>
-					<li>The performance overlay can now be configured to be shown by default when starting a stream</li>
-				</ul>
-				<p>Behavior Changes:</p>
-				<ul>
-					<li>The selected bitrate is no longer silently adjusted by Moonlight based upon the video codec or HDR mode</li>
-					<li>The selected mouse mode when starting a stream no longer influences the acceleration curve when the mouse mode is toggled using the Ctrl+Alt+Shift+M key combo while streaming</li>
-					<li>Hardcoded fallback paths for VAAPI and VDPAU drivers are no longer used</li>
-					<li>Per-session keys (rikey and rikeyid values) are now automatically stripped from logs</li>
-					<li>Log messages will now be logged to stderr rather than stdout</li>
-					<li>EGL is now always used instead of GLX for loading OpenGL in X11 environments on non-x86 platforms</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Improved reliability of streaming during momentary drops of WiFi connections</li>
-					<li>Improved performance with high polling rate mice</li>
-					<li>Improved input latency when a gamepad is connected</li>
-					<li>Added missing command-line options to control HDR and AV1 codec usage</li>
-					<li>Fixed instant connection termination error when streaming over the Internet behind certain Carrier-Grade NAT devices</li>
-					<li>Fixed incorrect MTU detection when streaming over the Internet without a VPN</li>
-					<li>Fixed recovery of audio when no audio output device is present when the stream starts</li>
-					<li>Fixed merging of gamepad state when multi-controller mode is disabled</li>
-					<li>Fixed indefinitely resending mDNS queries when a host could not be resolved</li>
-					<li>Fixed inability to pair when the host is not using a RSA-2048 key</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="5.0.1" date="2023-11-02">
-			<description>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed connection issue streaming from some hosts running GeForce Experience or Sunshine v0.20 and earlier</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="5.0.0" date="2023-10-18">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Custom FPS values</li>
-					<li>Streaming using the AV1 codec from Sunshine hosts</li>
-					<li>Horizontal scrolling with Sunshine hosts</li>
-					<li>Native multi-touch input with Sunshine hosts</li>
-					<li>Controller type information is passed to Sunshine for controller type autoselection</li>
-					<li>Extended features of PS4/PS5 controllers (touchpad, battery state, gyro/accelerometer motion, and RGB LED) are natively passed to Sunshine hosts</li>
-					<li>Support for up to 16 gamepads with Sunshine hosts</li>
-					<li>Frame pacing support on Wayland</li>
-					<li>Host-side processing latency is now displayed in the performance overlay with Sunshine hosts</li>
-					<li>Window title now includes the PC name when streaming</li>
-					<li>Alphabetical sorting of the PC list</li>
-					<li>Updated Play and Stop button design to improve contrast with app box art</li>
-					<li>The settings page automatically scrolls to the selected element when using keyboard or gamepad navigation</li>
-					<li>Pressing Share+PS buttons on PS4/PS5 controllers can be used to emulate a clickpad press</li>
-					<li>Improved audio quality when streaming with a high bitrate from remote hosts</li>
-					<li>Increased mouse polling rate</li>
-				</ul>
-				<p>Behavior Changes:</p>
-				<ul>
-					<li>IPv6 addresses must be provided in URL-escaped form. Example: [2001:db8::1234:5678] or [2001:db8::1234:5678]:47989</li>
-					<li>Default bitrate logic has been adjusted to behave better with custom resolutions and frame rates</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Reduced the frequency of audio underruns (clicks and pops) by increasing audio buffer size</li>
-					<li>Fixed "Quitting App" message never dismissing in some cases</li>
-					<li>Fixed parsing IPv6 literals with port numbers</li>
-					<li>Fixed unnecessary WiFi activity causing stream disruptions</li>
-					<li>Fixed paired hosts being forgotten if Moonlight terminates while writing hosts to disk</li>
-					<li>Fixed freeze when closing the stream on Windows with some software that uses DX11 hooks</li>
-					<li>Fixed delayed PC wake when activating Wake-On-LAN feature</li>
-					<li>Fixed Wake-on-LAN when Sunshine is running on alternate ports</li>
-					<li>Fixed leak of /dev/dri fds when trying to initialize VAAPI decoder</li>
-					<li>Fixed support for the Applications/Menu key</li>
-					<li>Fixed automatic language detection for Simplified Chinese and Traditional Chinese</li>
-					<li>Fixed streaming from Sunshine when the client PC has multiple network interfaces or IPv6 privacy extensions enabled</li>
-					<li>Fixed small receive buffer causing video packet loss on some systems</li>
-					<li>Fixed theme overrides causing the UI to be unusable on some systems</li>
-					<li>Fixed tearing with V-Sync enabled on macOS and Linux when using the SDL renderer (software decoding and some hardware decoders)</li>
-					<li>Fixed stateful V4L2 hardware decoding using h264_v4l2m2m and hevc_v4l2m2m decoders</li>
-					<li>Fixed CVE-2023-42801</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.3.1" date="2022-11-03">
-			<description>
-				<p>Changes:</p>
-				<ul>
-					<li>Fixed crash during specific patterns of audio packet loss</li>
-					<li>Fixed detection of local streaming when using IPv6 addresses</li>
-					<li>Windowed mode streaming now starts maximized if the GUI window was maximized</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.3.0" date="2022-10-28">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Improved support for GeForce Experience 3.26</li>
-					<li>Improved image quality and performance when recovering from video packet loss using HEVC</li>
-					<li>Improved error concealment after audio packet loss</li>
-					<li>Improved UI performance when paired with many hosts or hosts with large numbers of apps</li>
-					<li>Pairing with Sunshine hosts is now supported even if the host is in a streaming session</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed streaming at resolutions below 720x480 with GeForce Experience 3.26</li>
-					<li>Fixed window position and size being lost when toggling between full-screen and windowed mode</li>
-					<li>Fixed initial window size not always respecting the stream aspect ratio</li>
-					<li>Fixed unexpected error when streaming at resolutions above 4096x4096 using Sunshine</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.2.1" date="2022-09-12">
-			<description>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed streaming from hosts running Sunshine</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.2.0" date="2022-09-10">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Added support for pairing via the terminal</li>
-					<li>Added support for listing installed apps on a host via the terminal</li>
-					<li>Improved handling of V-Sync on Wayland systems to reduce latency</li>
-					<li>Improved performance using the legacy non-EGL VAAPI rendering code</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed native resolution detection on high DPI Wayland systems</li>
-					<li>Fixed audio crackling with SDL 2.24.0 on systems using PulseAudio</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.1.0" date="2022-05-23">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Overlays are now supported on the non-EGL X11 VAAPI renderer (requires RGBA subpicture support in the VAAPI driver)</li>
-					<li>Cursor lock can now be disabled when in full-screen mode</li>
-				</ul>
-				<p>Behavior Changes:</p>
-				<ul>
-					<li>Moonlight can now reduce the client display resolution in full-screen mode if the current display mode doesn't have a high enough refresh rate for the selected stream frame rate</li>
-					<li>When choosing a new client display resolution in full-screen mode, Moonlight will pick a display mode with the closest aspect ratio to the selected stream resolution</li>
-					<li>Moonlight now defaults to borderless windowed mode on Wayland systems</li>
-
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed missing toolbar buttons in certain languages</li>
-					<li>Fixed some text on the settings page not updating when the language is changed</li>
-					<li>Fixed a frame pacing bug that could cause excessive frame drops</li>
-					<li>Fixed the "keep display awake" setting not being saved when Moonlight restarts</li>
-					<li>Fixed black screen after unmaximizing the Moonlight window on some Linux systems</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="4.0.0" date="2022-04-02">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Added a new key combo for locking the mouse cursor to the window (Ctrl+Alt+Shift+L)</li>
-					<li>Added an option to avoid keeping the client display awake while streaming</li>
-				</ul>
-				<p>Behavior Changes:</p>
-				<ul>
-					<li>HDR streaming is now a separate option rather than being part of the Video Codec override dropdown</li>
-					<li>HDR streaming is no longer restricted to apps that are certified by NVIDIA as compatible with GameStream HDR. Some newer games may require an HDR display or EDID emulator dongle connected to your host PC for HDR options to be available.</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed loss of all audio if the active audio device is unplugged while streaming</li>
-					<li>Fixed the GUI being unresponsive after manually quitting when connection to the host is lost</li>
-					<li>Fixed a rare crash if a controller disconnects right as rumble is starting</li>
-					<li>Fixed text rendering on the overlay UI when using SDL_ttf 2.0.18 on Linux</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.2.0" date="2022-01-18">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Reduced CPU usage while streaming</li>
-					<li>Non-ASCII characters are now supported when pasting clipboard data to the host</li>
-					<li>Added support for zero-copy NVDEC rendering for Nvidia Wayland systems</li>
-					<li>Significantly improved performance with asynchronous decoders like V4L2M2M on Linux</li>
-					<li>Added support for color compression planes on newer Intel systems when using VAAPI decoding</li>
-					<li>Added support for copy-back rendering in non-default pixel formats (like the Raspberry Pi SAND format)</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed unexpected GUI input after using the gamepad quit combo</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.1.4" date="2021-06-25">
-			<description>
-				<p>Changes:</p>
-				<ul>
-					<li>Added network latency statistics to the performance overlay</li>
-					<li>Improved audio quality on unreliable connections (requires GeForce Experience 3.19 or later)</li>
-					<li>Reduced video frame drops on unreliable connections (requires GeForce Experience 3.22 or later)</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.1.3" date="2021-05-07">
-			<description>
-				<p>Changes:</p>
-				<ul>
-					<li>Fixed an issue that could cause excessive audio latency on some connections</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.1.2" date="2021-05-03">
-			<description>
-				<p>Changes:</p>
-				<ul>
-					<li>Improved connection reliability and performance with GeForce Experience 3.22</li>
-					<li>Added support for audio encryption with GeForce Experience 3.22</li>
-					<li>Added compatibility update checks for future versions of GeForce Experience</li>
-					<li>Fixed keyboard capture on X11</li>
-					<li>Updated community-contributed translations from Weblate</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.1.1" date="2021-04-09">
-			<description>
-				<p>Changes:</p>
-				<ul>
-					<li>Added support for streaming from GeForce Experience 3.22</li>
-					<li>Added support for AMF-encoded HEVC streams from servers like Sunshine and OpenStream</li>
-					<li>Added new community-contributed translations from Weblate</li>
-					<li>Fixed KMSDRM rendering with buffer modifiers on embedded devices</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.1.0" date="2021-03-14">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>System keyboard shortcuts (Alt+Tab, Super key, Ctrl+Shift+Esc, etc.) can now be (optionally) captured in windowed mode</li>
-					<li>System keyboard shortcuts can now be captured under Wayland</li>
-					<li>Added support for typing the client's clipboard text on the host by pressing Ctrl+Alt+Shift+V</li>
-					<li>Added Ctrl+Alt+Shift+D key combo to minimize the streaming window</li>
-					<li>Added Ctrl+Alt+Shift+C key combo to show the local cursor while streaming in remote desktop mouse mode</li>
-					<li>Added Select+L1+R1+X gamepad button combo to toggle performance overlay</li>
-					<li>Added translations for Simplified Chinese and German</li>
-					<li>Added a language selector on the settings page</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Improved performance of loading the app grid</li>
-					<li>Fixed video scaling in High DPI mode on Wayland</li>
-					<li>Fixed window icons on Wayland</li>
-					<li>Fixed number pad enter key functionality in the UI</li>
-				</ul>
-			</description>
-		</release>
-		<release version="3.0.0" date="2021-01-17">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Added the ability to define a custom streaming resolution using the UI</li>
-					<li>Added the option to capture system key combinations (Alt+Tab, Ctrl+Shift+Esc, Win+Tab, etc) in fullscreen mode</li>
-					<li>Updated gamepad mappings are automatically downloaded each time Moonlight launches</li>
-					<li>The performance overlay is now supported for Linux clients using VAAPI and VDPAU hardware acceleration</li>
-					<li>Added the option to enable "Direct Launch" which immediately launches the specified game when clicking on a PC</li>
-					<li>Added the option to mute audio when the Moonlight window loses input focus</li>
-					<li>Added the option to toggle background gamepad input</li>
-					<li>Added the option to invert scroll direction</li>
-					<li>Added the option to swap gamepad button layout to Nintendo-style</li>
-					<li>Added the option to start the Moonlight UI in fullscreen mode</li>
-					<li>The failing TCP or UDP ports are now displayed when the connection fails</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed PS4 controllers not reading inputs during haptics in some games</li>
-					<li>Fixed some slow decoders causing the receive time value to increase rather than the decode time</li>
-					<li>Native resolution options now refresh each time the settings page is opened, rather than once per launch of Moonlight</li>
-					<li>Fixed no video or audio while streaming over Internet connections that drop packets with QoS tagging enabled</li>
-					<li>Improved connection testing accuracy for connections with low MTUs</li>
-					<li>Fixed inability to open an app's context menu with a gamepad</li>
-				</ul>
-			</description>
-		</release>
-		<release version="2.2.0" date="2020-09-10">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Added the ability to hide unwanted apps and games</li>
-					<li>Added a network test to determine if your Internet connection is blocking Moonlight</li>
-					<li>Added the option to swap mouse buttons</li>
-					<li>Added codec and resolution to the on-screen performance stats</li>
-					<li>Added a warning if the connection is too unstable to receive any complete video frames</li>
-					<li>Added a Discord link to the toolbar in settings</li>
-					<li>Enabled the new EGL renderer by default on Linux</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed streaming over networks that block QoS-tagged packets</li>
-					<li>Selecting a frame rate higher than 60 FPS no longer sets the host desktop to 720p</li>
-					<li>Right-side modifier keys no longer press the corresponding left-side keys too</li>
-					<li>Fixed mouse position never reaching the edge of the screen with certain desktop resolutions</li>
-					<li>Improved synchronization between host and client mouse cursor in remote desktop mouse mode</li>
-					<li>Cached box art is now deleted when the PC is removed from Moonlight</li>
-					<li>Fixed several CLI options not properly overriding GUI options</li>
-					<li>Updated included gamepad mappings</li>
-					<li>Updated to Qt 5.15.1</li>
-				</ul>
-			</description>
-		</release>
-		<release version="2.1.0" date="2020-05-17">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Remote desktop mode now allows interaction with the host without having to click to focus the Moonlight window first</li>
-					<li>Added a new EGL renderer for improved performance on Wayland and XWayland</li>
-					<li>Added the option to toggle between direct touchscreen mode and the old trackpad mode</li>
-					<li>Added the option to rename host PCs</li>
-					<li>Added the ability to scroll the settings page with the right analog stick</li>
-					<li>Various UI improvements</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed unreliable mouse capture when the stream begins</li>
-					<li>Fixed cursor being trapped in full-screen mode even when the mouse wasn't captured</li>
-					<li>Fixed key presses not being sent to the host if the Super/Meta/Windows key is pressed</li>
-					<li>Updated included gamepad mappings</li>
-				</ul>
-			</description>
-		</release>
-		<release version="2.0.0" date="2020-04-28">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Remote desktop-optimized mouse mode which doesn't require capturing the mouse cursor</li>
-					<li>Touchscreen input now directly controls the mouse cursor</li>
-					<li>7.1 surround sound support</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Improved performance on some lossy networks</li>
-					<li>Fixed disconnect delay when streaming from GeForce Experience 3.20.3.63</li>
-					<li>Fixed frame rate not exceeding 60 when streaming from GeForce Experience 3.20.3.63</li>
-					<li>Fixed parsing of command-line options when passing flags prior to the action</li>
-					<li>Fixed an issue that may cause excessive mDNS network traffic while Moonlight is running</li>
-					<li>Fixed hardware decoding on Intel GPUs running Mesa 20.0 and/or the Iris driver</li>
-					<li>Fixed hardware decoding on Comet Lake and later Intel GPUs using the iHD VA-API driver</li>
-					<li>Fixed hardware decoding on AMD Radeon GPUs with XWayland</li>
-					<li>Fixed a crash when using the iHD VA-API driver on Wayland</li>
-					<li>Fixed delay after exiting the stream on Wayland</li>
-					<li>Updated included gamepad mappings</li>
-				</ul>
-			</description>
-		</release>
 		<release version="1.2.0" date="2019-12-17">
 			<description>
 				<p>Bugfixes:</p>
@@ -833,4 +395,19 @@
 		</release>
 	</releases>

+	<categories>
+		<category>Game</category>
+		<category>Qt</category>
+	</categories>
+
+	<developer_name>Moonlight Game Streaming Team</developer_name>
+	<update_contact>cameron@moonlight-stream.org</update_contact>
+
+	<launchable type="desktop-id">com.moonlight_stream.Moonlight.desktop</launchable>
+
+	<provides>
+		<binary>moonlight</binary>
+	</provides>
+
+	<content_rating type="oars-1.0" />
 </component>
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Moonlight
-Comment=Stream games and other applications from another PC running Sunshine or GeForce Experience
+Comment=Stream games from your NVIDIA GameStream-enabled PC
 Exec=moonlight
 Icon=moonlight
 Terminal=false
 Type=Application
-Categories=Qt;Game;Network;RemoteAccess;
-Keywords=nvidia;gamestream;stream;sunshine;remote play;
+Categories=Qt;Game;
+Keywords=nvidia;gamestream;stream;
@@ -5,13 +5,9 @@
 # pairing data will be lost each reboot.
 HOME=/usr/local/moonlight

-# Enable Steam Controller detection in SDL
-# https://github.com/moonlight-stream/moonlight-qt/issues/697
-export SDL_ENABLE_STEAM_CONTROLLERS=1
-
 # Renice PE_Single_CPU which seems to host A/V stuff
 renice -10 -p $(pidof PE_Single_CPU)

 # Renice Moonlight itself to avoid preemption by background tasks
 # Write output to a logfile in /tmp
-exec nice -n -10 ./bin/moonlight > /tmp/moonlight.log 2>&1
+exec nice -n -10 ./bin/moonlight > /tmp/moonlight.log
@@ -1,6 +1,5 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.2

 import AppModel 1.0
 import ComputerManager 1.0
@@ -10,8 +9,6 @@ CenteredGridView {
    property int computerIndex
    property AppModel appModel : createModel()
    property bool activated
-    property bool showHiddenGames
-    property bool showGames

    id: appGrid
    focus: true
@@ -38,22 +35,9 @@ CenteredGridView {
        activated = true

        // Highlight the first item if a gamepad is connected
-        if (currentIndex === -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
+        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
            currentIndex = 0
        }
-
-        if (!showGames && !showHiddenGames) {
-            // Check if there's a direct launch app
-            var directLaunchAppIndex = model.getDirectLaunchAppIndex();
-            if (directLaunchAppIndex >= 0) {
-                // Start the direct launch app if nothing else is running
-                currentIndex = directLaunchAppIndex
-                currentItem.launchOrResumeSelectedApp(false)
-
-                // Set showGames so we will not loop when the stream ends
-                showGames = true
-            }
-        }
    }

    StackView.onDeactivating: {
@@ -64,7 +48,7 @@ CenteredGridView {
    function createModel()
    {
        var model = Qt.createQmlObject('import AppModel 1.0; AppModel {}', parent, '')
-        model.initialize(ComputerManager, computerIndex, showHiddenGames)
+        model.initialize(ComputerManager, computerIndex)
        return model
    }

@@ -74,12 +58,6 @@ CenteredGridView {
        width: 220; height: 287;
        grid: appGrid

-        property alias appContextMenu: appContextMenuLoader.item
-        property alias appNameText: appNameTextLoader.item
-
-        // Dim the app if it's hidden
-        opacity: model.hidden ? 0.4 : 1.0
-
        Image {
            property bool isPlaceholder: false

@@ -89,14 +67,9 @@ CenteredGridView {
            source: model.boxart

            onSourceSizeChanged: {
-                // Nearly all of Nvidia's official box art does not match the dimensions of placeholder
-                // images, however the one known exception is Overcooked. Therefore, we only execute
-                // the image size checks if this is not an app collector game. We know the officially
-                // supported games all have box art, so this check is not required.
-                if (!model.isAppCollectorGame &&
-                    ((sourceSize.width === 130 && sourceSize.height === 180) || // GFE 2.0 placeholder image
-                     (sourceSize.width === 628 && sourceSize.height === 888) || // GFE 3.0 placeholder image
-                     (sourceSize.width === 200 && sourceSize.height === 266)))  // Our no_app_image.png
+                if ((sourceSize.width == 130 && sourceSize.height == 180) || // GFE 2.0 placeholder image
+                    (sourceSize.width == 628 && sourceSize.height == 888) || // GFE 3.0 placeholder image
+                    (sourceSize.width == 200 && sourceSize.height == 266))   // Our no_app_image.png
                {
                    isPlaceholder = true
                }
@@ -113,117 +86,97 @@ CenteredGridView {
            ToolTip.text: model.name
            ToolTip.delay: 1000
            ToolTip.timeout: 5000
-            ToolTip.visible: (parent.hovered || parent.highlighted) && (!appNameText || appNameText.truncated)
+            ToolTip.visible: (parent.hovered || parent.highlighted) && (!appNameText.visible || appNameText.truncated)
        }

-        Loader {
-            active: model.running
-            asynchronous: true
-            anchors.fill: appIcon
+        ToolButton {
+            id: resumeButton
+            anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
+            anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
+            anchors.centerIn: appIcon
+            visible: model.running
+            implicitWidth: 125
+            implicitHeight: 125

-            sourceComponent: Item {
-                RoundButton {
-                    // Don't steal focus from the toolbar buttons
-                    focusPolicy: Qt.NoFocus
-
-                    anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
-                    anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
-                    anchors.centerIn: parent
-                    implicitWidth: 85
-                    implicitHeight: 85
-
-                    icon.source: "qrc:/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg"
-                    icon.width: 75
-                    icon.height: 75
-
-                    onClicked: {
-                        launchOrResumeSelectedApp(true)
-                    }
-
-                    ToolTip.text: qsTr("Resume Game")
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 3000
-                    ToolTip.visible: hovered
-
-                    Material.background: "#D0808080"
-                }
-
-                RoundButton {
-                    // Don't steal focus from the toolbar buttons
-                    focusPolicy: Qt.NoFocus
-
-                    anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
-                    anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
-                    anchors.centerIn: parent
-                    implicitWidth: 85
-                    implicitHeight: 85
-
-                    icon.source: "qrc:/res/stop_FILL1_wght700_GRAD200_opsz48.svg"
-                    icon.width: 75
-                    icon.height: 75
-
-                    onClicked: {
-                        doQuitGame()
-                    }
-
-                    ToolTip.text: qsTr("Quit Game")
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 3000
-                    ToolTip.visible: hovered
-
-                    Material.background: "#D0808080"
+            Image {
+                source: "qrc:/res/baseline-play_circle_filled_white-48px.svg"
+                anchors.centerIn: parent
+                sourceSize {
+                    width: 75
+                    height: 75
                }
            }
+
+            onClicked: {
+                launchOrResumeSelectedApp()
+            }
+
+            ToolTip.text: "Resume Game"
+            ToolTip.delay: 1000
+            ToolTip.timeout: 3000
+            ToolTip.visible: hovered
        }

-        Loader {
-            id: appNameTextLoader
-            active: appIcon.isPlaceholder
+        ToolButton {
+            id: quitButton
+            anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
+            anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
+            anchors.centerIn: appIcon
+            visible: model.running
+            implicitWidth: 125
+            implicitHeight: 125

-            // This loader is not asynchronous to avoid noticeable differences
-            // in the time in which the text loads for each game.
+            Image {
+                source: "qrc:/res/baseline-cancel-24px.svg"
+                anchors.centerIn: parent
+                sourceSize {
+                    width: 75
+                    height: 75
+                }
+            }

+            onClicked: {
+                doQuitGame()
+            }
+
+            ToolTip.text: "Quit Game"
+            ToolTip.delay: 1000
+            ToolTip.timeout: 3000
+            ToolTip.visible: hovered
+        }
+
+        Label {
+            id: appNameText
+            visible: appIcon.isPlaceholder
+            text: model.name
            width: appIcon.width
            height: model.running ? 175 : appIcon.height
-
+            leftPadding: 20
+            rightPadding: 20
            anchors.left: appIcon.left
            anchors.right: appIcon.right
            anchors.bottom: appIcon.bottom
-
-            sourceComponent: Label {
-                id: appNameText
-                text: model.name
-                font.pointSize: 22
-                leftPadding: 20
-                rightPadding: 20
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-                wrapMode: Text.Wrap
-                elide: Text.ElideRight
-            }
+            font.pointSize: 22
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.Wrap
+            elide: Text.ElideRight
        }

-        function launchOrResumeSelectedApp(quitExistingApp)
+        function launchOrResumeSelectedApp()
        {
-            var runningId = appModel.getRunningAppId()
-            if (runningId !== 0 && runningId !== model.appid) {
-                if (quitExistingApp) {
-                    quitAppDialog.appName = appModel.getRunningAppName()
-                    quitAppDialog.segueToStream = true
-                    quitAppDialog.nextAppName = model.name
-                    quitAppDialog.nextAppIndex = index
-                    quitAppDialog.open()
-                }
-
+            var runningIndex = appModel.getRunningAppIndex()
+            if (runningIndex >= 0 && runningIndex !== index) {
+                quitAppDialog.appName = appModel.getRunningAppName()
+                quitAppDialog.segueToStream = true
+                quitAppDialog.nextAppName = model.name
+                quitAppDialog.nextAppIndex = index
+                quitAppDialog.open()
                return
            }

            var component = Qt.createComponent("StreamSegue.qml")
-            var segue = component.createObject(stackView, {
-                                                   "appName": model.name,
-                                                   "session": appModel.createSessionForApp(index),
-                                                   "isResume": runningId === model.appid
-                                               })
+            var segue = component.createObject(stackView, {"appName": model.name, "session": appModel.createSessionForApp(index)})
            stackView.push(segue)
        }

@@ -233,26 +186,7 @@ CenteredGridView {
            // will handle starting the game and clicks on the box art will
            // be ignored.
            if (!model.running) {
-                launchOrResumeSelectedApp(true)
-            }
-        }
-
-        onPressAndHold: {
-            // popup() ensures the menu appears under the mouse cursor
-            if (appContextMenu.popup) {
-                appContextMenu.popup()
-            }
-            else {
-                // Qt 5.9 doesn't have popup()
-                appContextMenu.open()
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton;
-            onClicked: {
-                parent.pressAndHold()
+                launchOrResumeSelectedApp()
            }
        }

@@ -267,10 +201,7 @@ CenteredGridView {
            }
        }

-        Keys.onEnterPressed: {
-            // Open the app context menu if activated via the gamepad or keyboard
-            // for running games. If the game isn't running, the above onClicked
-            // method will handle the launch.
+        Keys.onMenuPressed: {
            if (model.running) {
                // This will be keyboard/gamepad driven so use
                // open() instead of popup()
@@ -278,70 +209,25 @@ CenteredGridView {
            }
        }

-        Keys.onMenuPressed: {
-            // This will be keyboard/gamepad driven so use open() instead of popup()
-            appContextMenu.open()
-        }
-
        function doQuitGame() {
            quitAppDialog.appName = appModel.getRunningAppName()
            quitAppDialog.segueToStream = false
            quitAppDialog.open()
        }

-        Loader {
-            id: appContextMenuLoader
-            asynchronous: true
-            sourceComponent: NavigableMenu {
-                id: appContextMenu
-                initiator: appContextMenuLoader.parent
-                NavigableMenuItem {
-                    text: model.running ? qsTr("Resume Game") : qsTr("Launch Game")
-                    onTriggered: launchOrResumeSelectedApp(true)
-                }
-                NavigableMenuItem {
-                    text: qsTr("Quit Game")
-                    onTriggered: doQuitGame()
-                    visible: model.running
-                }
-                NavigableMenuItem {
-                    checkable: true
-                    checked: model.directLaunch
-                    text: qsTr("Direct Launch")
-                    onTriggered: appModel.setAppDirectLaunch(model.index, !model.directLaunch)
-                    enabled: !model.hidden
-
-                    ToolTip.text: qsTr("Launch this app immediately when the host is selected, bypassing the app selection grid.")
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 3000
-                    ToolTip.visible: hovered
-                }
-                NavigableMenuItem {
-                    checkable: true
-                    checked: model.hidden
-                    text: qsTr("Hide Game")
-                    onTriggered: appModel.setAppHidden(model.index, !model.hidden)
-                    enabled: model.hidden || (!model.running && !model.directLaunch)
-
-                    ToolTip.text: qsTr("Hide this game from the app grid. To access hidden games, right-click on the host and choose %1.").arg(qsTr("View All Apps"))
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 5000
-                    ToolTip.visible: hovered
-                }
+        NavigableMenu {
+            id: appContextMenu
+            NavigableMenuItem {
+                parentMenu: appContextMenu
+                text: model.running ? "Resume Game" : "Launch Game"
+                onTriggered: launchOrResumeSelectedApp()
+            }
+            NavigableMenuItem {
+                parentMenu: appContextMenu
+                text: "Quit Game"
+                onTriggered: doQuitGame()
+                visible: model.running
            }
-        }
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: 5
-        visible: appGrid.count === 0
-
-        Label {
-            text: qsTr("This computer doesn't seem to have any applications or some applications are hidden")
-            font.pointSize: 20
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
        }
    }

@@ -351,12 +237,12 @@ CenteredGridView {
        property bool segueToStream : false
        property string nextAppName: ""
        property int nextAppIndex: 0
-        text:qsTr("Are you sure you want to quit %1? Any unsaved progress will be lost.").arg(appName)
+        text:"Are you sure you want to quit " + appName +"? Any unsaved progress will be lost."
        standardButtons: Dialog.Yes | Dialog.No

        function quitApp() {
            var component = Qt.createComponent("QuitSegue.qml")
-            var params = {"appName": appName, "quitRunningAppFn": function() { appModel.quitRunningApp() }}
+            var params = {"appName": appName}
            if (segueToStream) {
                // Store the session and app name if we're going to stream after
                // successfully quitting the old app.
@@ -369,10 +255,26 @@ CenteredGridView {
            }

            stackView.push(component.createObject(stackView, params))
+
+            // Trigger the quit after pushing the quit segue on screen
+            appModel.quitRunningApp()
        }

        onAccepted: quitApp()
    }

-    ScrollBar.vertical: ScrollBar {}
+    ScrollBar.vertical: ScrollBar {
+        // Manually hide the scrollbar to prevent it from being drawn on top
+        // of the StreamSegue during the transition. It can sometimes get stuck
+        // there since we're not consistently pumping the event loop while
+        // starting the stream.
+        visible: activated
+
+        parent: appGrid.parent
+        anchors {
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
 }
@@ -2,15 +2,12 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2

 import SdlGamepadKeyNavigation 1.0
-import SystemProperties 1.0

 // https://stackoverflow.com/questions/45029968/how-do-i-set-the-combobox-width-to-fit-the-largest-item
 ComboBox {
    property int textWidth
-    property int desiredWidth : leftPadding + textWidth + indicator.width + rightPadding
-    property int maximumWidth : parent.width

-    implicitWidth: desiredWidth < maximumWidth ? desiredWidth : maximumWidth
+    implicitWidth: leftPadding + textWidth + indicator.width + rightPadding

    TextMetrics {
        id: popupMetrics
@@ -20,7 +17,9 @@ ComboBox {
        id: textMetrics
    }

-    function recalculateWidth() {
+    // We call this every time the options change (and init)
+    // so we can adjust the combo box width here too
+    onActivated: {
        textMetrics.font = font
        popupMetrics.font = popup.font
        textWidth = 0
@@ -32,19 +31,9 @@ ComboBox {
        }
    }

-    // We call this every time the options change (and init)
-    // so we can adjust the combo box width here too
-    onActivated: recalculateWidth()
-
    popup.onAboutToShow: {
        // Switch to normal navigation for combo boxes
        SdlGamepadKeyNavigation.setUiNavMode(false)
-
-        // Override the popup color to improve contrast with the overridden
-        // Material 2 background color set in main.qml.
-        if (SystemProperties.usesMaterial3Theme) {
-            popup.background.color = "#424242"
-        }
    }

    popup.onAboutToHide: {
@@ -2,6 +2,10 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2

 GridView {
+    // Detect Qt 5.11 or earlier using presence of synchronousDrag.
+    // Prior to 5.12, the leftMargin and rightMargin values did not work.
+    property bool hasBrokenMargins: this.synchronousDrag === undefined
+
    property int minMargin: 10
    property real availableWidth: (parent.width - 2 * minMargin)
    property int itemsPerRow: availableWidth / cellWidth
@@ -11,6 +15,11 @@ GridView {
    function updateMargins() {
        leftMargin = horizontalMargin
        rightMargin = horizontalMargin
+
+        if (hasBrokenMargins) {
+            anchors.leftMargin = leftMargin
+            anchors.rightMargin = rightMargin
+        }
    }

    onHorizontalMarginChanged: {
@@ -18,8 +27,15 @@ GridView {
    }

    Component.onCompleted: {
+        if (hasBrokenMargins) {
+            // This will cause an anchor conflict with the parent StackView
+            // which breaks animation, but otherwise the grid will not be
+            // centered in the window.
+            anchors.fill = parent
+            anchors.topMargin = topMargin
+            anchors.bottomMargin = bottomMargin
+        }
+
        updateMargins()
    }
-
-    boundsBehavior: Flickable.OvershootBounds
 }
@@ -1,87 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-
-import ComputerManager 1.0
-
-Item {
-    function onSearchingComputer() {
-        stageLabel.text = qsTr("Establishing connection to PC...")
-    }
-
-    function onPairing(pcName, pin) {
-        stageLabel.text = qsTr("Pairing... Please enter '%1' on %2.").arg(pin).arg(pcName)
-    }
-
-    function onFailed(message) {
-        stageIndicator.visible = false
-        errorDialog.text = message
-        errorDialog.open()
-    }
-
-    function onSuccess(appName) {
-        stageIndicator.visible = false
-        pairCompleteDialog.open()
-    }
-
-    // Allow user to back out of pairing
-    Keys.onEscapePressed: {
-        Qt.quit()
-    }
-    Keys.onBackPressed: {
-        Qt.quit()
-    }
-    Keys.onCancelPressed: {
-        Qt.quit()
-    }
-
-    StackView.onActivated: {
-        if (!launcher.isExecuted()) {
-            toolBar.visible = false
-
-            launcher.searchingComputer.connect(onSearchingComputer)
-            launcher.pairing.connect(onPairing)
-            launcher.failed.connect(onFailed)
-            launcher.success.connect(onSuccess)
-            launcher.execute(ComputerManager)
-        }
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: 5
-        id: stageIndicator
-
-        BusyIndicator {
-            id: stageSpinner
-            running: visible
-        }
-
-        Label {
-            id: stageLabel
-            height: stageSpinner.height
-            font.pointSize: 20
-            verticalAlignment: Text.AlignVCenter
-
-            wrapMode: Text.Wrap
-        }
-    }
-
-    ErrorMessageDialog {
-        id: errorDialog
-
-        onClosed: {
-            Qt.quit();
-        }
-    }
-
-    NavigableMessageDialog {
-        id: pairCompleteDialog
-        closePolicy: Popup.CloseOnEscape
-
-        text:qsTr("Pairing completed successfully")
-        standardButtons: Dialog.Ok
-        onClosed: {
-            Qt.quit()
-        }
-    }
-}
@@ -6,11 +6,11 @@ import Session 1.0

 Item {
    function onSearchingComputer() {
-        stageLabel.text = qsTr("Establishing connection to PC...")
+        stageLabel.text = "Establishing connection to PC..."
    }

    function onQuittingApp() {
-        stageLabel.text = qsTr("Quitting app...")
+        stageLabel.text = "Quitting app..."
    }

    function onFailure(message) {
@@ -34,7 +34,6 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: visible
        }

        Label {
@@ -5,11 +5,11 @@ import ComputerManager 1.0

 Item {
    function onSearchingComputer() {
-        stageLabel.text = qsTr("Establishing connection to PC...")
+        stageLabel.text = "Establishing connection to PC..."
    }

    function onSearchingApp() {
-        stageLabel.text = qsTr("Loading app list...")
+        stageLabel.text = "Loading app list..."
    }

    function onSessionCreated(appName, session) {
@@ -25,7 +25,6 @@ Item {
    function onLaunchFailed(message) {
        errorDialog.text = message
        errorDialog.open()
-        console.error(message)
    }

    function onAppQuitRequired(appName) {
@@ -36,7 +35,6 @@ Item {
    StackView.onActivated: {
        if (!launcher.isExecuted()) {
            toolBar.visible = false
-
            launcher.searchingComputer.connect(onSearchingComputer)
            launcher.searchingApp.connect(onSearchingApp)
            launcher.sessionCreated.connect(onSessionCreated)
@@ -52,7 +50,6 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: visible
        }

        Label {
@@ -75,14 +72,16 @@ Item {

    NavigableMessageDialog {
        id: quitAppDialog
-        text:qsTr("Are you sure you want to quit %1? Any unsaved progress will be lost.").arg(appName)
+        text:"Are you sure you want to quit " + appName +"? Any unsaved progress will be lost."
        standardButtons: Dialog.Yes | Dialog.No
        property string appName : ""

        function quitApp() {
            var component = Qt.createComponent("QuitSegue.qml")
-            var params = {"appName": appName, "quitRunningAppFn": function() { launcher.quitRunningApp() }}
+            var params = {"appName": appName}
            stackView.push(component.createObject(stackView, params))
+            // Trigger the quit after pushing the quit segue on screen
+            launcher.quitRunningApp()
        }

        onAccepted: quitApp()
@@ -1,5 +1,5 @@
 import QtQuick 2.0

 Item {
-    objectName: qsTr("Gamepad Mapping")
+    objectName: "Gamepad Mapping"
 }
@@ -1,13 +1,16 @@
 import QtQuick 2.0
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.2

 Dialog {
-    modal: true
-    anchors.centerIn: Overlay.overlay
+    parent: overlay

-    onClosed: {
-        // We must force focus back to the last item. If we don't,
-        // gamepad and keyboard navigation will break after a
+    x: Math.round((parent.width - width) / 2)
+    y: Math.round((parent.height - height) / 2)
+
+    onAboutToHide: {
+        // We must force focus back to the last item for platforms without
+        // support for more than one active window like Steam Link. If
+        // we don't, gamepad and keyboard navigation will break after a
        // dialog appears.
        stackView.forceActiveFocus()
    }
@@ -17,16 +17,8 @@ ItemDelegate {
    }
    Keys.onUpPressed: {
        grid.moveCurrentIndexUp()
-
-        // If we've reached the top of the grid, move focus to the toolbar
-        if (grid.currentItem === this) {
-            nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocus)
-        }
    }
    Keys.onReturnPressed: {
        clicked()
    }
-    Keys.onEnterPressed: {
-        clicked()
-    }
 }
@@ -2,19 +2,7 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 Menu {
-    property var initiator
-
    onOpened: {
-        // If the initiating object currently has keyboard focus,
-        // give focus to the first visible and enabled menu item
-        if (initiator.focus) {
-            for (var i = 0; i < count; i++) {
-                var item = itemAt(i)
-                if (item.visible && item.enabled) {
-                    item.forceActiveFocus(Qt.TabFocusReason)
-                    break
-                }
-            }
-        }
+        itemAt(0).forceActiveFocus(Qt.TabFocusReason)
    }
 }
@@ -2,6 +2,10 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 MenuItem {
+    // Qt 5.10 has a menu property, but we need to support 5.9
+    // so we must make our own.
+    property Menu parentMenu
+
    // Ensure focus can't be given to an invisible item
    enabled: visible
    height: visible ? implicitHeight : 0
@@ -11,18 +15,14 @@ MenuItem {
        // We must close the context menu first or
        // it can steal focus from any dialogs that
        // onTriggered may spawn.
-        menu.close()
+        parentMenu.close()
    }

    Keys.onReturnPressed: {
        triggered()
    }

-    Keys.onEnterPressed: {
-        triggered()
-    }
-
    Keys.onEscapePressed: {
-        menu.close()
+        parentMenu.close()
    }
 }
@@ -6,8 +6,6 @@ NavigableDialog {
    id: dialog

    property alias text: dialogLabel.dialogText
-    property alias showSpinner: dialogSpinner.visible
-    property alias imageSrc: dialogImage.source

    property string helpText
    property string helpUrl : "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"
@@ -15,22 +13,13 @@ NavigableDialog {

    onOpened: {
        // Force keyboard focus on the label so keyboard navigation works
-        if (dialogButtonBox.count > 0) {
-            dialogButtonBox.itemAt(dialogButtonBox.count - 1).forceActiveFocus(Qt.TabFocus)
-        }
+        dialogLabel.forceActiveFocus()
    }

    RowLayout {
        spacing: 10

-        BusyIndicator {
-            id: dialogSpinner
-            visible: false
-            running: visible
-        }
-
        Image {
-            id: dialogImage
            source: (standardButtons & Dialog.Yes) ?
                        "qrc:/res/baseline-help_outline-24px.svg" :
                        "qrc:/res/baseline-error_outline-24px.svg"
@@ -39,7 +28,6 @@ NavigableDialog {
                width: 50
                height: 50
            }
-            visible: !showSpinner
        }

        Label {
@@ -54,6 +42,14 @@ NavigableDialog {
            // will cause word wrap to kick in.
            Layout.maximumWidth: 400
            Layout.maximumHeight: 400
+
+            Keys.onReturnPressed: {
+                accept()
+            }
+
+            Keys.onEscapePressed: {
+                reject()
+            }
        }
    }

@@ -61,15 +57,6 @@ NavigableDialog {
        id: dialogButtonBox
        standardButtons: dialog.standardButtons

-        delegate: Button {
-            flat: true
-
-            Keys.onReturnPressed: clicked()
-            Keys.onEnterPressed: clicked()
-            Keys.onRightPressed: nextItemInFocusChain(true).forceActiveFocus(Qt.TabFocus)
-            Keys.onLeftPressed: nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocus)
-        }
-
        onHelpRequested: {
            Qt.openUrlExternally(helpUrl)
            close()
@@ -1,28 +1,32 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3

 ToolButton {
    property string iconSource

    activeFocusOnTab: true

-    icon.source: iconSource
-    icon.width: background.width
-    icon.height: background.height
+    // FIXME: We're using an Image here rather than icon.source because
+    // icons don't work on Qt 5.9 LTS.
+    Image {
+        id: image
+        source: iconSource
+        anchors.centerIn: parent.background
+        sourceSize {
+            width: parent.background.width * 1.10
+            height: parent.background.height * 1.10
+        }
+    }

    // This determines the size of the Material highlight. We increase it
    // from the default because we use larger than normal icons for TV readability.
-    Layout.preferredHeight: parent.height
+    background.width: (parent.height - parent.anchors.bottomMargin - parent.anchors.topMargin) * 0.60
+    background.height: (parent.height - parent.anchors.bottomMargin - parent.anchors.topMargin) * 0.60

    Keys.onReturnPressed: {
        clicked()
    }

-    Keys.onEnterPressed: {
-        clicked()
-    }
-
    Keys.onRightPressed: {
        nextItemInFocusChain(true).forceActiveFocus(Qt.TabFocus)
    }
@@ -1,12 +1,10 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3

 import ComputerModel 1.0

 import ComputerManager 1.0
 import StreamingPreferences 1.0
-import SystemProperties 1.0
 import SdlGamepadKeyNavigation 1.0

 CenteredGridView {
@@ -18,7 +16,7 @@ CenteredGridView {
    topMargin: 20
    bottomMargin: 5
    cellWidth: 310; cellHeight: 330;
-    objectName: qsTr("Computers")
+    objectName: "Computers"

    Component.onCompleted: {
        // Don't show any highlighted item until interacting with them.
@@ -27,15 +25,17 @@ CenteredGridView {
        currentIndex = -1
    }

-    // Note: Any initialization done here that is critical for streaming must
-    // also be done in CliStartStreamSegue.qml, since this code does not run
-    // for command-line initiated streams.
    StackView.onActivated: {
        // Setup signals on CM
        ComputerManager.computerAddCompleted.connect(addComplete)

+        // This is a bit of a hack to do this here as opposed to main.qml, but
+        // we need it enabled before calling getConnectedGamepads() and PcView
+        // is never destroyed, so it should be okay.
+        SdlGamepadKeyNavigation.enable()
+
        // Highlight the first item if a gamepad is connected
-        if (currentIndex === -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
+        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
            currentIndex = 0
        }
    }
@@ -57,18 +57,11 @@ CenteredGridView {
        }
    }

-    function addComplete(success, detectedPortBlocking)
+    function addComplete(success)
    {
        if (!success) {
-            errorDialog.text = qsTr("Unable to connect to the specified PC.")
-
-            if (detectedPortBlocking) {
-                errorDialog.text += "\n\n" + qsTr("This PC's Internet connection is blocking Moonlight. Streaming over the Internet may not work while connected to this network.")
-            }
-            else {
-                errorDialog.helpText = qsTr("Click the Help button for possible solutions.")
-            }
-
+            errorDialog.text = "Unable to connect to the specified PC."
+            errorDialog.helpText = "Click the Help button for possible solutions."
            errorDialog.open()
        }
    }
@@ -78,7 +71,6 @@ CenteredGridView {
        var model = Qt.createQmlObject('import ComputerModel 1.0; ComputerModel {}', parent, '')
        model.initialize(ComputerManager)
        model.pairingCompleted.connect(pairingComplete)
-        model.connectionTestCompleted.connect(testConnectionDialog.connectionTestComplete)
        return model
    }

@@ -90,14 +82,13 @@ CenteredGridView {
        BusyIndicator {
            id: searchSpinner
            visible: StreamingPreferences.enableMdns
-            running: visible
        }

        Label {
            height: searchSpinner.height
            elide: Label.ElideRight
-            text: StreamingPreferences.enableMdns ? qsTr("Searching for compatible hosts on your local network...")
-                                                  : qsTr("Automatic PC discovery is disabled. Add your PC manually.")
+            text: StreamingPreferences.enableMdns ? "Searching for PCs with NVIDIA GameStream enabled..."
+                                                  : "Automatic PC discovery is disabled. Add your PC manually."
            font.pointSize: 20
            verticalAlignment: Text.AlignVCenter
            wrapMode: Text.Wrap
@@ -110,8 +101,6 @@ CenteredGridView {
        width: 300; height: 320;
        grid: pcGrid

-        property alias pcContextMenu : pcContextMenuLoader.item
-
        Image {
            id: pcIcon
            anchors.horizontalCenter: parent.horizontalCenter
@@ -127,12 +116,12 @@ CenteredGridView {
            id: stateIcon
            anchors.horizontalCenter: pcIcon.horizontalCenter
            anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: !model.online ? -18 : -16
+            anchors.verticalCenterOffset: -15
            visible: !model.statusUnknown && (!model.online || !model.paired)
-            source: !model.online ? "qrc:/res/warning_FILL1_wght300_GRAD200_opsz24.svg" : "qrc:/res/baseline-lock-24px.svg"
+            source: !model.online ? "qrc:/res/baseline-warning-24px.svg" : "qrc:/res/baseline-lock-24px.svg"
            sourceSize {
-                width: !model.online ? 75 : 70
-                height: !model.online ? 75 : 70
+                width: 75
+                height: 75
            }
        }

@@ -144,7 +133,6 @@ CenteredGridView {
            width: 75
            height: 75
            visible: model.statusUnknown
-            running: visible
        }

        Label {
@@ -160,87 +148,50 @@ CenteredGridView {
            elide: Text.ElideRight
        }

-        Loader {
-            id: pcContextMenuLoader
-            asynchronous: true
-            sourceComponent: NavigableMenu {
-                id: pcContextMenu
-                initiator: pcContextMenuLoader.parent
-                MenuItem {
-                    text: qsTr("PC Status: %1").arg(model.online ? qsTr("Online") : qsTr("Offline"))
-                    font.bold: true
-                    enabled: false
-                }
-                NavigableMenuItem {
-                    text: qsTr("View All Apps")
-                    onTriggered: {
-                        var component = Qt.createComponent("AppView.qml")
-                        var appView = component.createObject(stackView, {"computerIndex": index, "objectName": model.name, "showHiddenGames": true})
-                        stackView.push(appView)
-                    }
-                    visible: model.online && model.paired
-                }
-                NavigableMenuItem {
-                    text: qsTr("Wake PC")
-                    onTriggered: computerModel.wakeComputer(index)
-                    visible: !model.online && model.wakeable
-                }
-                NavigableMenuItem {
-                    text: qsTr("Test Network")
-                    onTriggered: {
-                        computerModel.testConnectionForComputer(index)
-                        testConnectionDialog.open()
-                    }
-                }
-
-                NavigableMenuItem {
-                    text: qsTr("Rename PC")
-                    onTriggered: {
-                        renamePcDialog.pcIndex = index
-                        renamePcDialog.originalName = model.name
-                        renamePcDialog.open()
-                    }
-                }
-                NavigableMenuItem {
-                    text: qsTr("Delete PC")
-                    onTriggered: {
-                        deletePcDialog.pcIndex = index
-                        deletePcDialog.pcName = model.name
-                        deletePcDialog.open()
-                    }
-                }
-                NavigableMenuItem {
-                    text: qsTr("View Details")
-                    onTriggered: {
-                        showPcDetailsDialog.pcDetails = model.details
-                        showPcDetailsDialog.open()
-                    }
+        NavigableMenu {
+            id: pcContextMenu
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "Delete PC"
+                onTriggered: {
+                    deletePcDialog.pcIndex = index
+                    // get confirmation first, actual closing is called from the dialog
+                    deletePcDialog.open()
                }
            }
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "Wake PC"
+                onTriggered: computerModel.wakeComputer(index)
+                visible: !model.online && model.wakeable
+            }
        }

        onClicked: {
            if (model.online) {
-                if (!model.serverSupported) {
-                    errorDialog.text = qsTr("The version of GeForce Experience on %1 is not supported by this build of Moonlight. You must update Moonlight to stream from %1.").arg(model.name)
-                    errorDialog.helpText = ""
-                    errorDialog.open()
-                }
-                else if (model.paired) {
+                if (model.paired) {
                    // go to game view
                    var component = Qt.createComponent("AppView.qml")
                    var appView = component.createObject(stackView, {"computerIndex": index, "objectName": model.name})
                    stackView.push(appView)
                }
                else {
-                    var pin = computerModel.generatePinString()
+                    if (!model.busy) {
+                        var pin = ("0000" + Math.floor(Math.random() * 10000)).slice(-4)

-                    // Kick off pairing in the background
-                    computerModel.pairComputer(index, pin)
+                        // Kick off pairing in the background
+                        computerModel.pairComputer(index, pin)

-                    // Display the pairing dialog
-                    pairDialog.pin = pin
-                    pairDialog.open()
+                        // Display the pairing dialog
+                        pairDialog.pin = pin
+                        pairDialog.open()
+                    }
+                    else {
+                        // cannot pair while something is streaming or attempting to pair
+                        errorDialog.text = "You cannot pair while a previous session is still running on the host PC. Quit any running games or reboot the host PC, then try pairing again."
+                        errorDialog.helpText = ""
+                        errorDialog.open()
+                    }
                }
            } else if (!model.online) {
                // Using open() here because it may be activated by keyboard
@@ -263,7 +214,7 @@ CenteredGridView {
            anchors.fill: parent
            acceptedButtons: Qt.RightButton;
            onClicked: {
-                parent.pressAndHold()
+                parent.onPressAndHold()
            }
        }

@@ -272,12 +223,6 @@ CenteredGridView {
            // the ItemDelegate and not where the mouse cursor is
            pcContextMenu.open()
        }
-
-        Keys.onDeletePressed: {
-            deletePcDialog.pcIndex = index
-            deletePcDialog.pcName = model.name
-            deletePcDialog.open()
-        }
    }

    ErrorMessageDialog {
@@ -290,12 +235,15 @@ CenteredGridView {

    NavigableMessageDialog {
        id: pairDialog
+
+        // Pairing dialog must be modal to prevent double-clicks from triggering
+        // pairing twice
+        modal: true
        closePolicy: Popup.CloseOnEscape

        // don't allow edits to the rest of the window while open
        property string pin : "0000"
-        text:qsTr("Please enter %1 on your host PC. This dialog will close when pairing is completed.").arg(pin)+"\n\n"+
-             qsTr("If your host PC is running Sunshine, navigate to the Sunshine web UI to enter the PIN.")
+        text:"Please enter " + pin + " on your GameStream PC. This dialog will close when pairing is completed."
        standardButtons: Dialog.Cancel
        onRejected: {
            // FIXME: We should interrupt pairing here
@@ -305,100 +253,24 @@ CenteredGridView {
    NavigableMessageDialog {
        id: deletePcDialog
        // don't allow edits to the rest of the window while open
-        property int pcIndex : -1
-        property string pcName : ""
-        text: qsTr("Are you sure you want to remove '%1'?").arg(pcName)
+        property int pcIndex : -1;
+        text:"Are you sure you want to remove this PC?"
        standardButtons: Dialog.Yes | Dialog.No

-        onAccepted: {
-            computerModel.deleteComputer(pcIndex)
+        function deletePc() {
+            console.log("deleting PC pairing for PC at index: " + pcIndex)
+            computerModel.deleteComputer(pcIndex);
        }
+
+        onAccepted: deletePc()
    }

-    NavigableMessageDialog {
-        id: testConnectionDialog
-        closePolicy: Popup.CloseOnEscape
-        standardButtons: Dialog.Ok
-
-        onAboutToShow: {
-            testConnectionDialog.text = qsTr("Moonlight is testing your network connection to determine if any required ports are blocked.") + "\n\n" + qsTr("This may take a few seconds…")
-            showSpinner = true
-        }
-
-        function connectionTestComplete(result, blockedPorts)
-        {
-            if (result === -1) {
-                text = qsTr("The network test could not be performed because none of Moonlight's connection testing servers were reachable from this PC. Check your Internet connection or try again later.")
-                imageSrc = "qrc:/res/baseline-warning-24px.svg"
-            }
-            else if (result === 0) {
-                text = qsTr("This network does not appear to be blocking Moonlight. If you still have trouble connecting, check your PC's firewall settings.") + "\n\n" + qsTr("If you are trying to stream over the Internet, install the Moonlight Internet Hosting Tool on your gaming PC and run the included Internet Streaming Tester to check your gaming PC's Internet connection.")
-                imageSrc = "qrc:/res/baseline-check_circle_outline-24px.svg"
-            }
-            else {
-                text = qsTr("Your PC's current network connection seems to be blocking Moonlight. Streaming over the Internet may not work while connected to this network.") + "\n\n" + qsTr("The following network ports were blocked:") + "\n"
-                text += blockedPorts
-                imageSrc = "qrc:/res/baseline-error_outline-24px.svg"
-            }
-
-            // Stop showing the spinner and show the image instead
-            showSpinner = false
+    ScrollBar.vertical: ScrollBar {
+        parent: pcGrid.parent
+        anchors {
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
        }
    }
-
-    NavigableDialog {
-        id: renamePcDialog
-        property string label: qsTr("Enter the new name for this PC:")
-        property string originalName
-        property int pcIndex : -1;
-
-        standardButtons: Dialog.Ok | Dialog.Cancel
-
-        onOpened: {
-            // Force keyboard focus on the textbox so keyboard navigation works
-            editText.forceActiveFocus()
-        }
-
-        onClosed: {
-            editText.clear()
-        }
-
-        onAccepted: {
-            if (editText.text) {
-                computerModel.renameComputer(pcIndex, editText.text)
-            }
-        }
-
-        ColumnLayout {
-            Label {
-                text: renamePcDialog.label
-                font.bold: true
-            }
-
-            TextField {
-                id: editText
-                placeholderText: renamePcDialog.originalName
-                Layout.fillWidth: true
-                focus: true
-
-                Keys.onReturnPressed: {
-                    renamePcDialog.accept()
-                }
-
-                Keys.onEnterPressed: {
-                    renamePcDialog.accept()
-                }
-            }
-        }
-    }
-
-    NavigableMessageDialog {
-        id: showPcDetailsDialog
-        property string pcDetails : "";
-        text: showPcDetailsDialog.pcDetails
-        imageSrc: "qrc:/res/baseline-help_outline-24px.svg"
-        standardButtons: Dialog.Ok
-    }
-
-    ScrollBar.vertical: ScrollBar {}
 }
@@ -6,11 +6,10 @@ import Session 1.0

 Item {
    property string appName
-    property var quitRunningAppFn
    property Session nextSession : null
    property string nextAppName : ""

-    property string stageText : qsTr("Quitting %1...").arg(appName)
+    property string stageText : "Quitting " + appName + "..."

    function quitAppCompleted(error)
    {
@@ -18,7 +17,6 @@ Item {
        if (error !== undefined) {
            errorDialog.text = error
            errorDialog.open()
-            console.error(error)
        }

        // If we're supposed to launch another game after this, do so now
@@ -39,11 +37,6 @@ Item {

        // Connect the quit completion signal
        ComputerManager.quitAppCompleted.connect(quitAppCompleted)
-
-        // Start the quit operation if requested
-        if (quitRunningAppFn) {
-            quitRunningAppFn()
-        }
    }

    StackView.onDeactivating: {
@@ -60,7 +53,6 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: visible
        }

        Label {
@@ -4,30 +4,23 @@ import QtQuick.Window 2.2

 import SdlGamepadKeyNavigation 1.0
 import Session 1.0
-import SystemProperties 1.0

 Item {
    property Session session
    property string appName
-    property string stageText : isResume ? qsTr("Resuming %1...").arg(appName) :
-                                           qsTr("Starting %1...").arg(appName)
-    property bool isResume : false
+    property string stageText : "Starting " + appName + "..."
    property bool quitAfter : false

    function stageStarting(stage)
    {
        // Update the spinner text
-        stageText = qsTr("Starting %1...").arg(stage)
+        stageText = "Starting " + stage + "..."
    }

-    function stageFailed(stage, errorCode, failingPorts)
+    function stageFailed(stage, errorCode)
    {
        // Display the error dialog after Session::exec() returns
-        streamSegueErrorDialog.text = qsTr("Starting %1 failed: Error %2").arg(stage).arg(errorCode)
-
-        if (failingPorts) {
-            streamSegueErrorDialog.text += "\n\n" + qsTr("Check your firewall and port forwarding rules for port(s): %1").arg(failingPorts)
-        }
+        streamSegueErrorDialog.text = "Starting " + stage + " failed: Error " + errorCode
    }

    function connectionStarted()
@@ -46,7 +39,17 @@ Item {
    {
        // Display the error dialog after Session::exec() returns
        streamSegueErrorDialog.text = text
-        console.error(text)
+    }
+
+    function displayLaunchWarning(text)
+    {
+        // This toast appears for 3 seconds, just shorter than how long
+        // Session will wait for it to be displayed. This gives it time
+        // to transition to invisible before continuing.
+        var toast = Qt.createQmlObject('import QtQuick.Controls 2.2; ToolTip {}', parent, '')
+        toast.text = text
+        toast.timeout = 3000
+        toast.visible = true
    }

    function quitStarting()
@@ -59,25 +62,25 @@ Item {
        window.visible = true
    }

-    function sessionFinished(portTestResult)
+    function sessionFinished()
    {
-        if (portTestResult !== 0 && portTestResult !== -1 && streamSegueErrorDialog.text) {
-            streamSegueErrorDialog.text += "\n\n" + qsTr("This PC's Internet connection is blocking Moonlight. Streaming over the Internet may not work while connected to this network.")
-        }
-
-        // Re-enable GUI gamepad usage now
+        // Enable GUI gamepad usage now
        SdlGamepadKeyNavigation.enable()

-        // Pop the StreamSegue off the stack if this is a GUI-based app launch
-        if (!quitAfter) {
+        if (quitAfter) {
+            if (streamSegueErrorDialog.text) {
+                // Quit when the error dialog is acknowledged
+                streamSegueErrorDialog.quitAfter = quitAfter
+                streamSegueErrorDialog.open()
+            }
+            else {
+                // Quit immediately
+                Qt.quit()
+            }
+        } else {
+            // Exit this view
            stackView.pop()
-        }

-        if (quitAfter && !streamSegueErrorDialog.text) {
-            // If this was a CLI launch without errors, exit now
-            Qt.quit()
-        }
-        else {
            // Show the Qt window again after streaming
            window.visible = true

@@ -92,19 +95,11 @@ Item {
        }
    }

-    function sessionReadyForDeletion()
-    {
-        // Garbage collect the Session object since it's pretty heavyweight
-        // and keeps other libraries (like SDL_TTF) around until it is deleted.
-        session = null
-        gc()
-    }
-
    StackView.onDeactivating: {
        // Show the toolbar again when popped off the stack
        toolBar.visible = true

-        // Re-enable GUI gamepad usage now
+        // Enable GUI gamepad usage now
        SdlGamepadKeyNavigation.enable()
    }

@@ -117,44 +112,14 @@ Item {
        session.stageFailed.connect(stageFailed)
        session.connectionStarted.connect(connectionStarted)
        session.displayLaunchError.connect(displayLaunchError)
+        session.displayLaunchWarning.connect(displayLaunchWarning)
        session.quitStarting.connect(quitStarting)
        session.sessionFinished.connect(sessionFinished)
-        session.readyForDeletion.connect(sessionReadyForDeletion)
-
-        // Ensure the SystemProperties async thread is finished,
-        // since it may currently be using the SDL video subsystem
-        SystemProperties.waitForAsyncLoad()

        // Kick off the stream
-        spinnerTimer.start()
        streamLoader.active = true
    }

-    Timer {
-        id: spinnerTimer
-
-        // Display the spinner appearance a bit to allow us to reach
-        // the code in Session.exec() that pumps the event loop.
-        // If we display it immediately, it will briefly hang in the
-        // middle of the animation on Windows, which looks very
-        // obviously broken.
-        interval: 100
-        onTriggered: stageSpinner.visible = true
-    }
-
-    Timer {
-        id: startSessionTimer
-        onTriggered: {
-            // Garbage collect QML stuff before we start streaming,
-            // since we'll probably be streaming for a while and we
-            // won't be able to GC during the stream.
-            gc()
-
-            // Run the streaming session to completion
-            session.start()
-        }
-    }
-
    Loader {
        id: streamLoader
        active: false
@@ -165,44 +130,15 @@ Item {
            // in the hintText control itself to synchronize
            // with Session.exec() which requires no concurrent
            // gamepad usage.
-            hintText.text = qsTr("Tip:") + " " + qsTr("Press %1 to disconnect your session").arg(SdlGamepadKeyNavigation.getConnectedGamepads() > 0 ?
-                                                  qsTr("Start+Select+L1+R1") : qsTr("Ctrl+Alt+Shift+Q"))
+            hintText.text = SdlGamepadKeyNavigation.getConnectedGamepads() > 0 ?
+                      "Tip: Press Start+Select+L1+R1 to disconnect your session" :
+                      "Tip: Press Ctrl+Alt+Shift+Q to disconnect your session"

            // Stop GUI gamepad usage now
            SdlGamepadKeyNavigation.disable()

-            // Initialize the session and probe for host/client capabilities
-            if (!session.initialize(window)) {
-                sessionFinished(0);
-                sessionReadyForDeletion();
-                return;
-            }
-
-            // Don't wait unless we have toasts to display
-            startSessionTimer.interval = 0
-
-            // Display the toasts together in a vertical centered arrangement
-            var yOffset = 0
-            for (var i = 0; i < session.launchWarnings.length; i++) {
-                var text = session.launchWarnings[i]
-                console.warn(text)
-
-                // Show the tooltip for 3 seconds
-                var toast = Qt.createQmlObject('import QtQuick.Controls 2.2; ToolTip {}', parent, '')
-                toast.timeout = 3000
-                toast.text = text
-                toast.y += yOffset
-                toast.visible = true
-
-                // Offset the next toast below the previous one
-                yOffset = toast.y + toast.padding + toast.height
-
-                // Allow an extra 500 ms for the tooltip's fade-out animation to finish
-                startSessionTimer.interval = toast.timeout + 500;
-            }
-
-            // Start the timer to wait for toasts (or start the session immediately)
-            startSessionTimer.start()
+            // Run the streaming session to completion
+            session.exec(Screen.virtualX, Screen.virtualY)
        }

        sourceComponent: Item {}
@@ -214,8 +150,6 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: visible
-            visible: false
        }

        Label {
@@ -7,7 +7,7 @@ AppModel::AppModel(QObject *parent)
            this, &AppModel::handleBoxArtLoaded);
 }

-void AppModel::initialize(ComputerManager* computerManager, int computerIndex, bool showHiddenGames)
+void AppModel::initialize(ComputerManager* computerManager, int computerIndex)
 {
    m_ComputerManager = computerManager;
    connect(m_ComputerManager, &ComputerManager::computerStateChanged,
@@ -15,23 +15,29 @@ void AppModel::initialize(ComputerManager* computerManager, int computerIndex, b

    Q_ASSERT(computerIndex < m_ComputerManager->getComputers().count());
    m_Computer = m_ComputerManager->getComputers().at(computerIndex);
+    m_Apps = m_Computer->appList;
    m_CurrentGameId = m_Computer->currentGameId;
-    m_ShowHiddenGames = showHiddenGames;
-
-    updateAppList(m_Computer->appList);
 }

-int AppModel::getRunningAppId()
+int AppModel::getRunningAppIndex()
 {
-    return m_CurrentGameId;
+    if (m_CurrentGameId != 0) {
+        for (int i = 0; i < m_Apps.count(); i++) {
+            if (m_Apps[i].id == m_CurrentGameId) {
+                return i;
+            }
+        }
+    }
+
+    return -1;
 }

 QString AppModel::getRunningAppName()
 {
    if (m_CurrentGameId != 0) {
-        for (int i = 0; i < m_AllApps.count(); i++) {
-            if (m_AllApps[i].id == m_CurrentGameId) {
-                return m_AllApps[i].name;
+        for (int i = 0; i < m_Apps.count(); i++) {
+            if (m_Apps[i].id == m_CurrentGameId) {
+                return m_Apps[i].name;
            }
        }
    }
@@ -41,23 +47,12 @@ QString AppModel::getRunningAppName()

 Session* AppModel::createSessionForApp(int appIndex)
 {
-    Q_ASSERT(appIndex < m_VisibleApps.count());
-    NvApp app = m_VisibleApps.at(appIndex);
+    Q_ASSERT(appIndex < m_Apps.count());
+    NvApp app = m_Apps.at(appIndex);

    return new Session(m_Computer, app);
 }

-int AppModel::getDirectLaunchAppIndex()
-{
-    for (int i = 0; i < m_VisibleApps.count(); i++) {
-        if (m_VisibleApps[i].directLaunch) {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
 int AppModel::rowCount(const QModelIndex &parent) const
 {
    // For list models only the root node (an invalid parent) should return the list's size. For all
@@ -65,7 +60,7 @@ int AppModel::rowCount(const QModelIndex &parent) const
    if (parent.isValid())
        return 0;

-    return m_VisibleApps.count();
+    return m_Apps.count();
 }

 QVariant AppModel::data(const QModelIndex &index, int role) const
@@ -73,8 +68,8 @@ QVariant AppModel::data(const QModelIndex &index, int role) const
    if (!index.isValid())
        return QVariant();

-    Q_ASSERT(index.row() < m_VisibleApps.count());
-    NvApp app = m_VisibleApps.at(index.row());
+    Q_ASSERT(index.row() < m_Apps.count());
+    NvApp app = m_Apps.at(index.row());

    switch (role)
    {
@@ -85,14 +80,6 @@ QVariant AppModel::data(const QModelIndex &index, int role) const
    case BoxArtRole:
        // FIXME: const-correctness
        return const_cast<BoxArtManager&>(m_BoxArtManager).loadBoxArt(m_Computer, app);
-    case HiddenRole:
-        return app.hidden;
-    case AppIdRole:
-        return app.id;
-    case DirectLaunchRole:
-        return app.directLaunch;
-    case AppCollectorGameRole:
-        return app.isAppCollectorGame;
    default:
        return QVariant();
    }
@@ -105,10 +92,6 @@ QHash<int, QByteArray> AppModel::roleNames() const
    names[NameRole] = "name";
    names[RunningRole] = "running";
    names[BoxArtRole] = "boxart";
-    names[HiddenRole] = "hidden";
-    names[AppIdRole] = "appid";
-    names[DirectLaunchRole] = "directLaunch";
-    names[AppCollectorGameRole] = "appCollectorGame";

    return names;
 }
@@ -118,138 +101,6 @@ void AppModel::quitRunningApp()
    m_ComputerManager->quitRunningApp(m_Computer);
 }

-bool AppModel::isAppCurrentlyVisible(const NvApp& app)
-{
-    for (const NvApp& visibleApp : std::as_const(m_VisibleApps)) {
-        if (app.id == visibleApp.id) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-QVector<NvApp> AppModel::getVisibleApps(const QVector<NvApp>& appList)
-{
-    QVector<NvApp> visibleApps;
-
-    for (const NvApp& app : appList) {
-        // Don't immediately hide games that were previously visible. This
-        // allows users to easily uncheck the "Hide App" checkbox if they
-        // check it by mistake.
-        if (m_ShowHiddenGames || !app.hidden || isAppCurrentlyVisible(app)) {
-            visibleApps.append(app);
-        }
-    }
-
-    return visibleApps;
-}
-
-void AppModel::updateAppList(QVector<NvApp> newList)
-{
-    m_AllApps = newList;
-
-    QVector<NvApp> newVisibleList = getVisibleApps(newList);
-
-    // Process removals and updates first
-    for (int i = 0; i < m_VisibleApps.count(); i++) {
-        const NvApp& existingApp = m_VisibleApps.at(i);
-
-        bool found = false;
-        for (const NvApp& newApp : std::as_const(newVisibleList)) {
-            if (existingApp.id == newApp.id) {
-                // If the data changed, update it in our list
-                if (existingApp != newApp) {
-                    m_VisibleApps.replace(i, newApp);
-                    emit dataChanged(createIndex(i, 0), createIndex(i, 0));
-                }
-
-                found = true;
-                break;
-            }
-        }
-
-        if (!found) {
-            beginRemoveRows(QModelIndex(), i, i);
-            m_VisibleApps.removeAt(i);
-            endRemoveRows();
-            i--;
-        }
-    }
-
-    // Process additions now
-    for (const NvApp& newApp : std::as_const(newVisibleList)) {
-        int insertionIndex = m_VisibleApps.size();
-        bool found = false;
-
-        for (int i = 0; i < m_VisibleApps.count(); i++) {
-            const NvApp& existingApp = m_VisibleApps.at(i);
-
-            if (existingApp.id == newApp.id) {
-                found = true;
-                break;
-            }
-            else if (existingApp.name.toLower() > newApp.name.toLower()) {
-                insertionIndex = i;
-                break;
-            }
-        }
-
-        if (!found) {
-            beginInsertRows(QModelIndex(), insertionIndex, insertionIndex);
-            m_VisibleApps.insert(insertionIndex, newApp);
-            endInsertRows();
-        }
-    }
-
-    Q_ASSERT(newVisibleList == m_VisibleApps);
-}
-
-void AppModel::setAppHidden(int appIndex, bool hidden)
-{
-    Q_ASSERT(appIndex < m_VisibleApps.count());
-    int appId = m_VisibleApps.at(appIndex).id;
-
-    {
-        QWriteLocker lock(&m_Computer->lock);
-
-        for (NvApp& app : m_Computer->appList) {
-            if (app.id == appId) {
-                app.hidden = hidden;
-                break;
-            }
-        }
-    }
-
-    m_ComputerManager->clientSideAttributeUpdated(m_Computer);
-}
-
-void AppModel::setAppDirectLaunch(int appIndex, bool directLaunch)
-{
-    Q_ASSERT(appIndex < m_VisibleApps.count());
-    int appId = m_VisibleApps.at(appIndex).id;
-
-    {
-        QWriteLocker lock(&m_Computer->lock);
-
-        for (NvApp& app : m_Computer->appList) {
-            if (directLaunch) {
-                // We must clear direct launch from all other apps
-                // to set it on the new app.
-                app.directLaunch = app.id == appId;
-            }
-            else if (app.id == appId) {
-                // If we're clearing direct launch, we're done once we
-                // find our matching app ID.
-                app.directLaunch = false;
-                break;
-            }
-        }
-    }
-
-    m_ComputerManager->clientSideAttributeUpdated(m_Computer);
-}
-
 void AppModel::handleComputerStateChanged(NvComputer* computer)
 {
    // Ignore updates for computers that aren't ours
@@ -268,15 +119,20 @@ void AppModel::handleComputerStateChanged(NvComputer* computer)
    // First, process additions/removals from the app list. This
    // is required because the new game may now be running, so
    // we can't check that first.
-    if (computer->appList != m_AllApps) {
-        updateAppList(computer->appList);
+    if (computer->appList != m_Apps) {
+        // Just reset the whole thing if the list changes
+        beginResetModel();
+        m_Apps = computer->appList;
+        m_CurrentGameId = computer->currentGameId;
+        endResetModel();
+        return;
    }

    // Finally, process changes to the active app
    if (computer->currentGameId != m_CurrentGameId) {
        // First, invalidate the running state of newly running game
-        for (int i = 0; i < m_VisibleApps.count(); i++) {
-            if (m_VisibleApps[i].id == computer->currentGameId) {
+        for (int i = 0; i < m_Apps.count(); i++) {
+            if (m_Apps[i].id == computer->currentGameId) {
                emit dataChanged(createIndex(i, 0),
                                 createIndex(i, 0),
                                 QVector<int>() << RunningRole);
@@ -286,8 +142,8 @@ void AppModel::handleComputerStateChanged(NvComputer* computer)

        // Next, invalidate the running state of the old game (if it exists)
        if (m_CurrentGameId != 0) {
-            for (int i = 0; i < m_VisibleApps.count(); i++) {
-                if (m_VisibleApps[i].id == m_CurrentGameId) {
+            for (int i = 0; i < m_Apps.count(); i++) {
+                if (m_Apps[i].id == m_CurrentGameId) {
                    emit dataChanged(createIndex(i, 0),
                                     createIndex(i, 0),
                                     QVector<int>() << RunningRole);
@@ -305,7 +161,7 @@ void AppModel::handleBoxArtLoaded(NvComputer* computer, NvApp app, QUrl /* image
 {
    Q_ASSERT(computer == m_Computer);

-    int index = m_VisibleApps.indexOf(app);
+    int index = m_Apps.indexOf(app);

    // Make sure we're not delivering a callback to an app that's already been removed
    if (index >= 0) {
@@ -14,33 +14,23 @@ class AppModel : public QAbstractListModel
    {
        NameRole = Qt::UserRole,
        RunningRole,
-        BoxArtRole,
-        HiddenRole,
-        AppIdRole,
-        DirectLaunchRole,
-        AppCollectorGameRole,
+        BoxArtRole
    };

 public:
    explicit AppModel(QObject *parent = nullptr);

    // Must be called before any QAbstractListModel functions
-    Q_INVOKABLE void initialize(ComputerManager* computerManager, int computerIndex, bool showHiddenGames);
+    Q_INVOKABLE void initialize(ComputerManager* computerManager, int computerIndex);

    Q_INVOKABLE Session* createSessionForApp(int appIndex);

-    Q_INVOKABLE int getDirectLaunchAppIndex();
-
-    Q_INVOKABLE int getRunningAppId();
+    Q_INVOKABLE int getRunningAppIndex();

    Q_INVOKABLE QString getRunningAppName();

    Q_INVOKABLE void quitRunningApp();

-    Q_INVOKABLE void setAppHidden(int appIndex, bool hidden);
-
-    Q_INVOKABLE void setAppDirectLaunch(int appIndex, bool directLaunch);
-
    QVariant data(const QModelIndex &index, int role) const override;

    int rowCount(const QModelIndex &parent) const override;
@@ -56,16 +46,9 @@ signals:
    void computerLost();

 private:
-    void updateAppList(QVector<NvApp> newList);
-
-    QVector<NvApp> getVisibleApps(const QVector<NvApp>& appList);
-
-    bool isAppCurrentlyVisible(const NvApp& app);
-
    NvComputer* m_Computer;
    BoxArtManager m_BoxArtManager;
    ComputerManager* m_ComputerManager;
-    QVector<NvApp> m_VisibleApps, m_AllApps;
+    QVector<NvApp> m_Apps;
    int m_CurrentGameId;
-    bool m_ShowHiddenGames;
 };
@@ -40,48 +40,6 @@ QVariant ComputerModel::data(const QModelIndex& index, int role) const
        return !computer->macAddress.isEmpty();
    case StatusUnknownRole:
        return computer->state == NvComputer::CS_UNKNOWN;
-    case ServerSupportedRole:
-        return computer->isSupportedServerVersion;
-    case DetailsRole: {
-        QString state, pairState;
-
-        switch (computer->state) {
-        case NvComputer::CS_ONLINE:
-            state = tr("Online");
-            break;
-        case NvComputer::CS_OFFLINE:
-            state = tr("Offline");
-            break;
-        default:
-            state = tr("Unknown");
-            break;
-        }
-
-        switch (computer->pairState) {
-        case NvComputer::PS_PAIRED:
-            pairState = tr("Paired");
-            break;
-        case NvComputer::PS_NOT_PAIRED:
-            pairState = tr("Unpaired");
-            break;
-        default:
-            pairState = tr("Unknown");
-            break;
-        }
-
-        return tr("Name: %1").arg(computer->name) + '\n' +
-               tr("Status: %1").arg(state) + '\n' +
-               tr("Active Address: %1").arg(computer->activeAddress.toString()) + '\n' +
-               tr("UUID: %1").arg(computer->uuid) + '\n' +
-               tr("Local Address: %1").arg(computer->localAddress.toString()) + '\n' +
-               tr("Remote Address: %1").arg(computer->remoteAddress.toString()) + '\n' +
-               tr("IPv6 Address: %1").arg(computer->ipv6Address.toString()) + '\n' +
-               tr("Manual Address: %1").arg(computer->manualAddress.toString()) + '\n' +
-               tr("MAC Address: %1").arg(computer->macAddress.isEmpty() ? tr("Unknown") : QString(computer->macAddress.toHex(':'))) + '\n' +
-               tr("Pair State: %1").arg(pairState) + '\n' +
-               tr("Running Game ID: %1").arg(computer->state == NvComputer::CS_ONLINE ? QString::number(computer->currentGameId) : tr("Unknown")) + '\n' +
-               tr("HTTPS Port: %1").arg(computer->state == NvComputer::CS_ONLINE ? QString::number(computer->activeHttpsPort) : tr("Unknown"));
-    }
    default:
        return QVariant();
    }
@@ -108,8 +66,6 @@ QHash<int, QByteArray> ComputerModel::roleNames() const
    names[BusyRole] = "busy";
    names[WakeableRole] = "wakeable";
    names[StatusUnknownRole] = "statusUnknown";
-    names[ServerSupportedRole] = "serverSupported";
-    names[DetailsRole] = "details";

    return names;
 }
@@ -172,47 +128,6 @@ void ComputerModel::wakeComputer(int computerIndex)
    QThreadPool::globalInstance()->start(wakeTask);
 }

-void ComputerModel::renameComputer(int computerIndex, QString name)
-{
-    Q_ASSERT(computerIndex < m_Computers.count());
-
-    m_ComputerManager->renameHost(m_Computers[computerIndex], name);
-}
-
-QString ComputerModel::generatePinString()
-{
-    return m_ComputerManager->generatePinString();
-}
-
-class DeferredTestConnectionTask : public QObject, public QRunnable
-{
-    Q_OBJECT
-public:
-    void run()
-    {
-        unsigned int portTestResult = LiTestClientConnectivity("qt.conntest.moonlight-stream.org", 443, ML_PORT_FLAG_ALL);
-        if (portTestResult == ML_TEST_RESULT_INCONCLUSIVE) {
-            emit connectionTestCompleted(-1, QString());
-        }
-        else {
-            char blockedPorts[512];
-            LiStringifyPortFlags(portTestResult, "\n", blockedPorts, sizeof(blockedPorts));
-            emit connectionTestCompleted(portTestResult, QString(blockedPorts));
-        }
-    }
-
-signals:
-    void connectionTestCompleted(int result, QString blockedPorts);
-};
-
-void ComputerModel::testConnectionForComputer(int)
-{
-    DeferredTestConnectionTask* testConnectionTask = new DeferredTestConnectionTask();
-    QObject::connect(testConnectionTask, &DeferredTestConnectionTask::connectionTestCompleted,
-                     this, &ComputerModel::connectionTestCompleted);
-    QThreadPool::globalInstance()->start(testConnectionTask);
-}
-
 void ComputerModel::pairComputer(int computerIndex, QString pin)
 {
    Q_ASSERT(computerIndex < m_Computers.count());
@@ -227,19 +142,19 @@ void ComputerModel::handlePairingCompleted(NvComputer*, QString error)

 void ComputerModel::handleComputerStateChanged(NvComputer* computer)
 {
-    QVector<NvComputer*> newComputerList = m_ComputerManager->getComputers();
-
-    // Reset the model if the structural layout of the list has changed
-    if (m_Computers != newComputerList) {
-        beginResetModel();
-        m_Computers = newComputerList;
-        endResetModel();
+    // If this is an existing computer, we can report the data changed
+    int index = m_Computers.indexOf(computer);
+    if (index >= 0) {
+        // Let the view know that this specific computer changed
+        emit dataChanged(createIndex(index, 0), createIndex(index, 0));
    }
    else {
-        // Let the view know that this specific computer changed
-        int index = m_Computers.indexOf(computer);
-        emit dataChanged(createIndex(index, 0), createIndex(index, 0));
+        // This is a new PC which may be inserted at an arbitrary point
+        // in our computer list (since it comes from CM's QMap). Reload
+        // the whole model state to ensure it stays consistent.
+        beginResetModel();
+        m_Computers = m_ComputerManager->getComputers();
+        endResetModel();
    }
 }

-#include "computermodel.moc"
@@ -14,9 +14,7 @@ class ComputerModel : public QAbstractListModel
        PairedRole,
        BusyRole,
        WakeableRole,
-        StatusUnknownRole,
-        ServerSupportedRole,
-        DetailsRole
+        StatusUnknownRole
    };

 public:
@@ -33,21 +31,14 @@ public:

    Q_INVOKABLE void deleteComputer(int computerIndex);

-    Q_INVOKABLE QString generatePinString();
-
    Q_INVOKABLE void pairComputer(int computerIndex, QString pin);

-    Q_INVOKABLE void testConnectionForComputer(int computerIndex);
-
    Q_INVOKABLE void wakeComputer(int computerIndex);

-    Q_INVOKABLE void renameComputer(int computerIndex, QString name);
-
    Q_INVOKABLE Session* createSessionForCurrentGame(int computerIndex);

 signals:
    void pairingCompleted(QVariant error);
-    void connectionTestCompleted(int result, QString blockedPorts);

 private slots:
    void handleComputerStateChanged(NvComputer* computer);
@@ -2,7 +2,6 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.2
-import QtQuick.Controls.Material 2.2

 import ComputerManager 1.0
 import AutoUpdateChecker 1.0
@@ -13,111 +12,19 @@ import SdlGamepadKeyNavigation 1.0
 ApplicationWindow {
    property bool pollingActive: false

-    // Set by SettingsView to force the back operation to pop all
-    // pages except the initial view. This is required when doing
-    // a retranslate() because AppView breaks for some reason.
-    property bool clearOnBack: false
-
    id: window
+    visible: true
    width: 1280
    height: 600

-    // This function runs prior to creation of the initial StackView item
-    function doEarlyInit() {
-        // Override the background color to Material 2 colors for Qt 6.5+
-        // in order to improve contrast between GFE's placeholder box art
-        // and the background of the app grid.
-        if (SystemProperties.usesMaterial3Theme) {
-            Material.background = "#303030"
-        }
-
-        SdlGamepadKeyNavigation.enable()
-    }
-
-    Component.onCompleted: {
-        // Show the window according to the user's preferences
-        if (SystemProperties.hasDesktopEnvironment) {
-            if (StreamingPreferences.uiDisplayMode == StreamingPreferences.UI_MAXIMIZED) {
-                window.showMaximized()
-            }
-            else if (StreamingPreferences.uiDisplayMode == StreamingPreferences.UI_FULLSCREEN) {
-                window.showFullScreen()
-            }
-            else {
-                window.show()
-            }
-        } else {
-            window.showFullScreen()
-        }
-
-        // Display any modal dialogs for configuration warnings
-        if (runConfigChecks) {
-            if (SystemProperties.isWow64) {
-                wow64Dialog.open()
-            }
-
-            // Hardware acceleration and unmapped gamepads are checked asynchronously
-            SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
-            SystemProperties.unmappedGamepadsChanged.connect(hasUnmappedGamepadsChanged)
-            SystemProperties.startAsyncLoad()
-        }
-    }
-
-    function hasHardwareAccelerationChanged() {
-        if (!SystemProperties.hasHardwareAcceleration && StreamingPreferences.videoDecoderSelection !== StreamingPreferences.VDS_FORCE_SOFTWARE) {
-            if (SystemProperties.isRunningXWayland) {
-                xWaylandDialog.open()
-            }
-            else {
-                noHwDecoderDialog.open()
-            }
-        }
-    }
-
-    function hasUnmappedGamepadsChanged() {
-        if (SystemProperties.unmappedGamepads) {
-            unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
-            unmappedGamepadDialog.open()
-        }
-    }
-
-    // It would be better to use TextMetrics here, but it always lays out
-    // the text slightly more compactly than real Text does in ToolTip,
-    // causing unexpected line breaks to be inserted
-    Text {
-        id: tooltipTextLayoutHelper
-        visible: false
-        font: ToolTip.toolTip.font
-        text: ToolTip.toolTip.text
-    }
-
-    // This configures the maximum width of the singleton attached QML ToolTip. If left unconstrained,
-    // it will never insert a line break and just extend on forever.
-    ToolTip.toolTip.contentWidth: Math.min(tooltipTextLayoutHelper.width, 400)
-
-    function goBack() {
-        if (clearOnBack) {
-            // Pop all items except the first one
-            stackView.pop(null)
-            clearOnBack = false
-        }
-        else {
-            stackView.pop()
-        }
-    }
+    visibility: StreamingPreferences.startWindowed ? "Windowed" : "Maximized"

    StackView {
        id: stackView
+        initialItem: initialView
        anchors.fill: parent
        focus: true

-        Component.onCompleted: {
-            // Perform our early initialization before constructing
-            // the initial view and pushing it to the StackView
-            doEarlyInit()
-            push(initialView)
-        }
-
        onCurrentItemChanged: {
            // Ensure focus travels to the next view when going back
            if (currentItem) {
@@ -127,7 +34,7 @@ ApplicationWindow {

        Keys.onEscapePressed: {
            if (depth > 1) {
-                goBack()
+                stackView.pop()
            }
            else {
                quitConfirmationDialog.open()
@@ -136,7 +43,7 @@ ApplicationWindow {

        Keys.onBackPressed: {
            if (depth > 1) {
-                goBack()
+                stackView.pop()
            }
            else {
                quitConfirmationDialog.open()
@@ -191,9 +98,6 @@ ApplicationWindow {
                pollingActive = true
            }
        }
-
-        // Poll for gamepad input only when the window is in focus
-        SdlGamepadKeyNavigation.notifyWindowFocus(visible && active)
    }

    onActiveChanged: {
@@ -212,15 +116,47 @@ ApplicationWindow {
            // if focus does not return within a few minutes.
            inactivityTimer.restart()
        }
-
-        // Poll for gamepad input only when the window is in focus
-        SdlGamepadKeyNavigation.notifyWindowFocus(visible && active)
    }

-    function navigateTo(url, objectType)
+    property bool initialized: false
+
+    // BUG: Using onAfterSynchronizing: here causes very strange
+    // failures on Linux. Many shaders fail to compile and we
+    // eventually segfault deep inside the Qt OpenGL code.
+    onAfterRendering: {
+        // We use this callback to trigger dialog display because
+        // it only happens once the window is fully constructed.
+        // Doing it earlier can lead to the dialog appearing behind
+        // the window or otherwise without input focus.
+        if (!initialized) {
+            // Set initialized before calling anything else, because
+            // pumping the event loop can cause us to get another
+            // onAfterRendering call and potentially reenter this code.
+            initialized = true;
+
+            if (SystemProperties.isWow64) {
+                wow64Dialog.open()
+            }
+            else if (!SystemProperties.hasHardwareAcceleration) {
+                if (SystemProperties.isRunningXWayland) {
+                    xWaylandDialog.open()
+                }
+                else {
+                    noHwDecoderDialog.open()
+                }
+            }
+
+            if (SystemProperties.unmappedGamepads) {
+                unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
+                unmappedGamepadDialog.open()
+            }
+        }
+    }
+
+    function navigateTo(url, objectName)
    {
        var existingItem = stackView.find(function(item, index) {
-            return item instanceof objectType
+            return item.objectName === objectName
        })

        if (existingItem !== null) {
@@ -239,19 +175,8 @@ ApplicationWindow {
        anchors.topMargin: 5
        anchors.bottomMargin: 5

-        Label {
-            id: titleLabel
-            visible: toolBar.width > 700
-            anchors.fill: parent
-            text: stackView.currentItem.objectName
-            font.pointSize: 20
-            elide: Label.ElideRight
-            horizontalAlignment: Qt.AlignHCenter
-            verticalAlignment: Qt.AlignVCenter
-        }
-
        RowLayout {
-            spacing: 10
+            spacing: 20
            anchors.leftMargin: 10
            anchors.rightMargin: 10
            anchors.fill: parent
@@ -262,68 +187,33 @@ ApplicationWindow {

                iconSource: "qrc:/res/arrow_left.svg"

-                onClicked: goBack()
+                onClicked: stackView.pop()

                Keys.onDownPressed: {
                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
                }
            }

-            // This label will appear when the window gets too small and
-            // we need to ensure the toolbar controls don't collide
            Label {
-                id: titleRowLabel
-                font.pointSize: titleLabel.font.pointSize
+                id: titleLabel
+                text: stackView.currentItem.objectName
+                font.pointSize: 15
                elide: Label.ElideRight
                horizontalAlignment: Qt.AlignHCenter
                verticalAlignment: Qt.AlignVCenter
                Layout.fillWidth: true
-
-                // We need this label to always be visible so it can occupy
-                // the remaining space in the RowLayout. To "hide" it, we
-                // just set the text to empty string.
-                text: !titleLabel.visible ? stackView.currentItem.objectName : ""
-            }
-
-            Label {
-                id: versionLabel
-                visible: stackView.currentItem instanceof SettingsView
-                text: qsTr("Version %1").arg(SystemProperties.versionString)
-                font.pointSize: 12
-                horizontalAlignment: Qt.AlignRight
-                verticalAlignment: Qt.AlignVCenter
-            }
-
-            NavigableToolButton {
-                id: discordButton
-                visible: SystemProperties.hasBrowser &&
-                         stackView.currentItem instanceof SettingsView
-
-                iconSource: "qrc:/res/discord.svg"
-
-                ToolTip.delay: 1000
-                ToolTip.timeout: 3000
-                ToolTip.visible: hovered
-                ToolTip.text: qsTr("Join our community on Discord")
-
-                // TODO need to make sure browser is brought to foreground.
-                onClicked: Qt.openUrlExternally("https://moonlight-stream.org/discord");
-
-                Keys.onDownPressed: {
-                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
-                }
            }

            NavigableToolButton {
                id: addPcButton
-                visible: stackView.currentItem instanceof PcView
+                visible: stackView.currentItem.objectName === "Computers"

                iconSource:  "qrc:/res/ic_add_to_queue_white_48px.svg"

                ToolTip.delay: 1000
                ToolTip.timeout: 3000
                ToolTip.visible: hovered
-                ToolTip.text: qsTr("Add PC manually") + (newPcShortcut.nativeText ? (" ("+newPcShortcut.nativeText+")") : "")
+                ToolTip.text: "Add PC manually" + (newPcShortcut.nativeText ? (" ("+newPcShortcut.nativeText+")") : "")

                Shortcut {
                    id: newPcShortcut
@@ -363,7 +253,7 @@ ApplicationWindow {

                function updateAvailable(version, url)
                {
-                    ToolTip.text = qsTr("Update available for Moonlight: Version %1").arg(version)
+                    ToolTip.text = "Update available for Moonlight: Version " + version
                    updateButton.browserUrl = url
                    updateButton.visible = true
                }
@@ -387,7 +277,7 @@ ApplicationWindow {
                ToolTip.delay: 1000
                ToolTip.timeout: 3000
                ToolTip.visible: hovered
-                ToolTip.text: qsTr("Help") + (helpShortcut.nativeText ? (" ("+helpShortcut.nativeText+")") : "")
+                ToolTip.text: "Help" + (helpShortcut.nativeText ? (" ("+helpShortcut.nativeText+")") : "")

                Shortcut {
                    id: helpShortcut
@@ -410,11 +300,11 @@ ApplicationWindow {
                ToolTip.delay: 1000
                ToolTip.timeout: 3000
                ToolTip.visible: hovered
-                ToolTip.text: qsTr("Gamepad Mapper")
+                ToolTip.text: "Gamepad Mapper"

                iconSource: "qrc:/res/ic_videogame_asset_white_48px.svg"

-                onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", GamepadMapper)
+                onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", "Gamepad Mapping")

                Keys.onDownPressed: {
                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
@@ -426,7 +316,7 @@ ApplicationWindow {

                iconSource:  "qrc:/res/settings.svg"

-                onClicked: navigateTo("qrc:/gui/SettingsView.qml", SettingsView)
+                onClicked: navigateTo("qrc:/gui/SettingsView.qml", "Settings")

                Keys.onDownPressed: {
                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
@@ -441,31 +331,31 @@ ApplicationWindow {
                ToolTip.delay: 1000
                ToolTip.timeout: 3000
                ToolTip.visible: hovered
-                ToolTip.text: qsTr("Settings") + (settingsShortcut.nativeText ? (" ("+settingsShortcut.nativeText+")") : "")
+                ToolTip.text: "Settings" + (settingsShortcut.nativeText ? (" ("+settingsShortcut.nativeText+")") : "")
            }
        }
    }

    ErrorMessageDialog {
        id: noHwDecoderDialog
-        text: qsTr("No functioning hardware accelerated video decoder was detected by Moonlight. " +
-                   "Your streaming performance may be severely degraded in this configuration.")
-        helpText: qsTr("Click the Help button for more information on solving this problem.")
+        text: "No functioning hardware accelerated H.264 video decoder was detected by Moonlight. " +
+              "Your streaming performance may be severely degraded in this configuration."
+        helpText: "Click the Help button for more information on solving this problem."
        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems"
    }

    ErrorMessageDialog {
        id: xWaylandDialog
-        text: qsTr("Hardware acceleration doesn't work on XWayland. Continuing on XWayland may result in poor streaming performance. " +
-                   "Try running with QT_QPA_PLATFORM=wayland or switch to X11.")
-        helpText: qsTr("Click the Help button for more information.")
+        text: "Hardware acceleration doesn't work on XWayland. Continuing on XWayland may result in poor streaming performance. " +
+              "Try running with QT_QPA_PLATFORM=wayland or switch to X11."
+        helpText: "Click the Help button for more information."
        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems"
    }

    NavigableMessageDialog {
        id: wow64Dialog
        standardButtons: Dialog.Ok | Dialog.Cancel
-        text: qsTr("This version of Moonlight isn't optimized for your PC. Please download the '%1' version of Moonlight for the best streaming performance.").arg(SystemProperties.friendlyNativeArchName)
+        text: "This PC is running a 64-bit version of Windows. Please download the x64 version of Moonlight for the best streaming performance."
        onAccepted: {
            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-qt/releases");
        }
@@ -474,9 +364,9 @@ ApplicationWindow {
    ErrorMessageDialog {
        id: unmappedGamepadDialog
        property string unmappedGamepads : ""
-        text: qsTr("Moonlight detected gamepads without a mapping:") + "\n" + unmappedGamepads
+        text: "Moonlight detected gamepads without a mapping:\n" + unmappedGamepads
        helpTextSeparator: "\n\n"
-        helpText: qsTr("Click the Help button for information on how to map your gamepads.")
+        helpText: "Click the Help button for information on how to map your gamepads."
        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Gamepad-Mapping"
    }

@@ -484,7 +374,7 @@ ApplicationWindow {
    NavigableMessageDialog {
        id: quitConfirmationDialog
        standardButtons: Dialog.Yes | Dialog.No
-        text: qsTr("Are you sure you want to quit?")
+        text: "Are you sure you want to quit?"
        // For keyboard/gamepad navigation
        onAccepted: Qt.quit()
    }
@@ -514,7 +404,7 @@ ApplicationWindow {

    NavigableDialog {
        id: addPcDialog
-        property string label: qsTr("Enter the IP address of your host PC:")
+        property string label: "Enter the IP address of your GameStream PC:"

        standardButtons: Dialog.Ok | Dialog.Cancel

@@ -523,13 +413,9 @@ ApplicationWindow {
            editText.forceActiveFocus()
        }

-        onClosed: {
-            editText.clear()
-        }
-
        onAccepted: {
            if (editText.text) {
-                ComputerManager.addNewHostManually(editText.text.trim())
+                ComputerManager.addNewHost(editText.text, false)
            }
        }

@@ -547,10 +433,6 @@ ApplicationWindow {
                Keys.onReturnPressed: {
                    addPcDialog.accept()
                }
-
-                Keys.onEnterPressed: {
-                    addPcDialog.accept()
-                }
            }
        }
    }
@@ -8,16 +8,13 @@

 #define AXIS_NAVIGATION_REPEAT_DELAY 150

-SdlGamepadKeyNavigation::SdlGamepadKeyNavigation(StreamingPreferences* prefs)
-    : m_Prefs(prefs),
-      m_Enabled(false),
+SdlGamepadKeyNavigation::SdlGamepadKeyNavigation()
+    : m_Enabled(false),
      m_UiNavMode(false),
-      m_FirstPoll(false),
-      m_HasFocus(false),
      m_LastAxisNavigationEventTime(0)
 {
    m_PollingTimer = new QTimer(this);
-    connect(m_PollingTimer, &QTimer::timeout, this, &SdlGamepadKeyNavigation::onPollingTimerFired);
+    connect(m_PollingTimer, SIGNAL(timeout()), this, SLOT(onPollingTimerFired()));
 }

 SdlGamepadKeyNavigation::~SdlGamepadKeyNavigation()
@@ -51,16 +48,11 @@ void SdlGamepadKeyNavigation::enable()
    // on first init of the GC subsystem. We can't depend on them due to
    // overlapping lifetimes of SdlGamepadKeyNavigation instances, so we
    // will attach ourselves.
-    //
-    // NB: We use SDL_JoystickUpdate() instead of SDL_PumpEvents() because
-    // the latter can do a bit more work that we want (like handling video
-    // events that we intentionally do not want to process yet).
-    SDL_JoystickUpdate();
+    SDL_PumpEvents();
    SDL_FlushEvent(SDL_CONTROLLERDEVICEADDED);

    // Open all currently attached game controllers
-    int numJoysticks = SDL_NumJoysticks();
-    for (int i = 0; i < numJoysticks; i++) {
+    for (int i = 0; i < SDL_NumJoysticks(); i++) {
        if (SDL_IsGameController(i)) {
            SDL_GameController* gc = SDL_GameControllerOpen(i);
            if (gc != nullptr) {
@@ -69,10 +61,10 @@ void SdlGamepadKeyNavigation::enable()
        }
    }

-    m_Enabled = true;
+    // Poll every 50 ms for a new joystick event
+    m_PollingTimer->start(50);

-    // Start the polling timer if the window is focused
-    updateTimerState();
+    m_Enabled = true;
 }

 void SdlGamepadKeyNavigation::disable()
@@ -81,9 +73,7 @@ void SdlGamepadKeyNavigation::disable()
        return;
    }

-    m_Enabled = false;
-    updateTimerState();
-    Q_ASSERT(!m_PollingTimer->isActive());
+    m_PollingTimer->stop();

    while (!m_Gamepads.isEmpty()) {
        SDL_GameControllerClose(m_Gamepads[0]);
@@ -91,31 +81,15 @@ void SdlGamepadKeyNavigation::disable()
    }

    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
-}

-void SdlGamepadKeyNavigation::notifyWindowFocus(bool hasFocus)
-{
-    m_HasFocus = hasFocus;
-    updateTimerState();
+    m_Enabled = false;
 }

 void SdlGamepadKeyNavigation::onPollingTimerFired()
 {
    SDL_Event event;

-    // Update joystick state without pumping other events (see enable() comment)
-    SDL_JoystickUpdate();
-
-    // Discard any pending button events on the first poll to avoid picking up
-    // stale input data from the stream session (like the quit combo).
-    if (m_FirstPoll) {
-        SDL_FlushEvent(SDL_CONTROLLERBUTTONDOWN);
-        SDL_FlushEvent(SDL_CONTROLLERBUTTONUP);
-        m_FirstPoll = false;
-    }
-
-    // Peep events rather than polling to avoid calling SDL_PumpEvents()
-    while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1) {
+    while (SDL_PollEvent(&event)) {
        switch (event.type) {
        case SDL_QUIT:
            // SDL may send us a quit event since we initialize
@@ -130,24 +104,6 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                    event.type == SDL_CONTROLLERBUTTONDOWN ?
                        QEvent::Type::KeyPress : QEvent::Type::KeyRelease;

-            // Swap face buttons if needed
-            if (m_Prefs->swapFaceButtons) {
-                switch (event.cbutton.button) {
-                case SDL_CONTROLLER_BUTTON_A:
-                    event.cbutton.button = SDL_CONTROLLER_BUTTON_B;
-                    break;
-                case SDL_CONTROLLER_BUTTON_B:
-                    event.cbutton.button = SDL_CONTROLLER_BUTTON_A;
-                    break;
-                case SDL_CONTROLLER_BUTTON_X:
-                    event.cbutton.button = SDL_CONTROLLER_BUTTON_Y;
-                    break;
-                case SDL_CONTROLLER_BUTTON_Y:
-                    event.cbutton.button = SDL_CONTROLLER_BUTTON_X;
-                    break;
-                }
-            }
-
            switch (event.cbutton.button) {
            case SDL_CONTROLLER_BUTTON_DPAD_UP:
                if (m_UiNavMode) {
@@ -201,24 +157,14 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
        case SDL_CONTROLLERDEVICEADDED:
            SDL_GameController* gc = SDL_GameControllerOpen(event.cdevice.which);
            if (gc != nullptr) {
-                // SDL_CONTROLLERDEVICEADDED can be reported multiple times for the same
-                // gamepad in rare cases, because SDL doesn't fixup the device index in
-                // the SDL_CONTROLLERDEVICEADDED event if an unopened gamepad disappears
-                // before we've processed the add event.
-                if (!m_Gamepads.contains(gc)) {
-                    m_Gamepads.append(gc);
-                }
-                else {
-                    // We already have this game controller open
-                    SDL_GameControllerClose(gc);
-                }
+                m_Gamepads.append(gc);
            }
            break;
        }
    }

    // Handle analog sticks by polling
-    for (auto gc : std::as_const(m_Gamepads)) {
+    for (auto gc : m_Gamepads) {
        short leftX = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_LEFTX);
        short leftY = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_LEFTY);
        if (SDL_GetTicks() - m_LastAxisNavigationEventTime < AXIS_NAVIGATION_REPEAT_DELAY) {
@@ -272,20 +218,6 @@ void SdlGamepadKeyNavigation::sendKey(QEvent::Type type, Qt::Key key, Qt::Keyboa
    }
 }

-void SdlGamepadKeyNavigation::updateTimerState()
-{
-    if (m_PollingTimer->isActive() && (!m_HasFocus || !m_Enabled)) {
-        m_PollingTimer->stop();
-    }
-    else if (!m_PollingTimer->isActive() && m_HasFocus && m_Enabled) {
-        // Flush events on the first poll
-        m_FirstPoll = true;
-
-        // Poll every 50 ms for a new joystick event
-        m_PollingTimer->start(50);
-    }
-}
-
 void SdlGamepadKeyNavigation::setUiNavMode(bool uiNavMode)
 {
    m_UiNavMode = uiNavMode;
@@ -296,8 +228,7 @@ int SdlGamepadKeyNavigation::getConnectedGamepads()
    Q_ASSERT(m_Enabled);

    int count = 0;
-    int numJoysticks = SDL_NumJoysticks();
-    for (int i = 0; i < numJoysticks; i++) {
+    for (int i = 0; i < SDL_NumJoysticks(); i++) {
        if (SDL_IsGameController(i)) {
            count++;
        }
@@ -3,16 +3,14 @@
 #include <QTimer>
 #include <QEvent>

-#include "SDL_compat.h"
-
-#include "settings/streamingpreferences.h"
+#include <SDL.h>

 class SdlGamepadKeyNavigation : public QObject
 {
    Q_OBJECT

 public:
-    SdlGamepadKeyNavigation(StreamingPreferences* prefs);
+    SdlGamepadKeyNavigation();

    ~SdlGamepadKeyNavigation();

@@ -20,8 +18,6 @@ public:

    Q_INVOKABLE void disable();

-    Q_INVOKABLE void notifyWindowFocus(bool hasFocus);
-
    Q_INVOKABLE void setUiNavMode(bool settingsMode);

    Q_INVOKABLE int getConnectedGamepads();
@@ -29,18 +25,13 @@ public:
 private:
    void sendKey(QEvent::Type type, Qt::Key key, Qt::KeyboardModifiers modifiers = Qt::NoModifier);

-    void updateTimerState();
-
 private slots:
    void onPollingTimerFired();

 private:
-    StreamingPreferences* m_Prefs;
    QTimer* m_PollingTimer;
    QList<SDL_GameController*> m_Gamepads;
    bool m_Enabled;
    bool m_UiNavMode;
-    bool m_FirstPoll;
-    bool m_HasFocus;
    Uint32 m_LastAxisNavigationEventTime;
 };
--- a/Show More
+++ b/Show More