Merge pull request #304 from LizardByte/bot/manual-update-global-workflow-nightly-cnnsp

ci: update global workflows

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,3 +1,4 @@
+---
 name: Bug Report
 description: Create a bug report to help us improve.
 body:
@@ -5,7 +6,7 @@ body:
     attributes:
       value: >
         **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!**
-        Please use [Discord](https://docs.lizardbyte.dev/about/support.html#discord) for support issues.
+        Please use [Discord](https://docs.lizardbyte.dev/en/latest/about/support.html#discord) for support issues.
   - type: textarea
     id: description
     attributes:
@@ -90,9 +91,12 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: |
+        Please copy and paste any relevant log output. This will be automatically formatted into code,
+        so no need for backticks.
       render: Shell
   - type: markdown
     attributes:
       value: |
-        Make sure to close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
+        Make sure to close your issue when it's solved! If you found the solution yourself please comment
+        so that others benefit from it.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/dependabot.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/label-actions.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/CI.yml

@@ -1,3 +1,4 @@
+---
 name: CI
 
 on:
@@ -52,7 +53,8 @@ jobs:
 
       - name: Check CMakeLists.txt Version
         run: |
-          version=$(grep -o -E '^project\(Sunshine VERSION [0-9]+\.[0-9]+\.[0-9]+' CMakeLists.txt | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+')
+          version=$(grep -o -E '^project\(Sunshine VERSION [0-9]+\.[0-9]+\.[0-9]+' CMakeLists.txt | \
+            grep -o -E '[0-9]+\.[0-9]+\.[0-9]+')
           echo "cmakelists_version=${version}" >> $GITHUB_ENV
 
       - name: Compare CMakeList.txt Version
@@ -60,7 +62,8 @@ jobs:
         run: |
           echo CMakeLists version: "$cmakelists_version"
           echo Changelog version: "${{ needs.check_changelog.outputs.next_version_bare }}"
-          echo Within 'CMakeLists.txt' change "project(Sunshine [VERSION $cmakelists_version]" to "project(Sunshine [VERSION ${{ needs.check_changelog.outputs.next_version_bare }}]"
+          echo Within 'CMakeLists.txt' change "project(Sunshine [VERSION $cmakelists_version]" to \
+            "project(Sunshine [VERSION ${{ needs.check_changelog.outputs.next_version_bare }}]"
           exit 1
 
   build_linux_aur:
@@ -124,7 +127,15 @@ jobs:
           mkdir -p build
 
           cd build
-          cmake -DSUNSHINE_CONFIGURE_AUR=ON -DSUNSHINE_AUR_PKG=${aur_pkg} -DSUNSHINE_SUB_VERSION=${sub_version} -DSUNSHINE_AUR_CONFLICTS=${conflicts} -DSUNSHINE_AUR_PROVIDES=${provides} -DGITHUB_CLONE_URL=${clone_url} -DGITHUB_COMMIT=${commit} -DSUNSHINE_CONFIGURE_ONLY=ON ..
+          cmake -DSUNSHINE_CONFIGURE_AUR=ON \
+            -DSUNSHINE_AUR_PKG=${aur_pkg} \
+            -DSUNSHINE_SUB_VERSION=${sub_version} \
+            -DSUNSHINE_AUR_CONFLICTS=${conflicts} \
+            -DSUNSHINE_AUR_PROVIDES=${provides} \
+            -DGITHUB_CLONE_URL=${clone_url} \
+            -DGITHUB_COMMIT=${commit} \
+            -DSUNSHINE_CONFIGURE_ONLY=ON \
+            ..
           cd ..
 
           mv ./build/PKGBUILD ./artifacts/
@@ -174,8 +185,10 @@ jobs:
           sudo apt-get install -y \
             cmake \
             flatpak
-          sudo su $(whoami) -c 'flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo'
+          sudo su $(whoami) -c 'flatpak remote-add --user --if-not-exists flathub \
-          sudo su $(whoami) -c 'flatpak install --user flathub org.flatpak.Builder org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08 -y'
+            https://flathub.org/repo/flathub.flatpakrepo'
+          sudo su $(whoami) -c 'flatpak install --user flathub \
+            org.flatpak.Builder org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08 -y'
 
       - name: Configure Flatpak Manifest
         run: |
@@ -202,12 +215,18 @@ jobs:
           mkdir -p artifacts
 
           cd build
-          cmake -DGITHUB_CLONE_URL=${clone_url} -DGITHUB_BRANCH=${branch} -DGITHUB_COMMIT=${commit} -DSUNSHINE_CONFIGURE_FLATPAK=ON -DSUNSHINE_CONFIGURE_ONLY=ON ..
+          cmake -DGITHUB_CLONE_URL=${clone_url} \
+            -DGITHUB_BRANCH=${branch} \
+            -DGITHUB_COMMIT=${commit} \
+            -DSUNSHINE_CONFIGURE_FLATPAK=ON \
+            -DSUNSHINE_CONFIGURE_ONLY=ON \
+            ..
 
       - name: Build Linux Flatpak
         working-directory: build
         run: |
-          sudo su $(whoami) -c 'flatpak run org.flatpak.Builder --repo=repo --force-clean build-sunshine dev.lizardbyte.sunshine.yml'
+          sudo su $(whoami) -c 'flatpak run org.flatpak.Builder --repo=repo --force-clean build-sunshine \
+            dev.lizardbyte.sunshine.yml'
           sudo su $(whoami) -c 'flatpak build-bundle ./repo ../artifacts/sunshine.flatpak dev.lizardbyte.sunshine'
 
       - name: Upload Artifacts
@@ -298,10 +317,13 @@ jobs:
           sudo rm -rf /var/lib/apt/lists/*
 
           # Update gcc alias
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+          sudo update-alternatives --install \
+            /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
 
           # Install CuDA
-          sudo wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run
+          sudo wget \
+            https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run \
+            --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run
           sudo chmod a+x /root/cuda.run
           sudo /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm
           sudo rm /root/cuda.run
@@ -320,7 +342,17 @@ jobs:
           mkdir -p artifacts
 
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ matrix.CMAKE_INSTALL_PREFIX }} -DSUNSHINE_ASSETS_DIR=${{ matrix.SUNSHINE_ASSETS_DIR }} -DSUNSHINE_CONFIG_DIR=${{ matrix.SUNSHINE_CONFIG_DIR }} -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine -DSUNSHINE_ENABLE_WAYLAND=ON -DSUNSHINE_ENABLE_X11=ON -DSUNSHINE_ENABLE_DRM=ON -DSUNSHINE_ENABLE_CUDA=ON ${{ matrix.EXTRA_ARGS }} ..
+          cmake -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=${{ matrix.CMAKE_INSTALL_PREFIX }} \
+            -DSUNSHINE_ASSETS_DIR=${{ matrix.SUNSHINE_ASSETS_DIR }} \
+            -DSUNSHINE_CONFIG_DIR=${{ matrix.SUNSHINE_CONFIG_DIR }} \
+            -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \
+            -DSUNSHINE_ENABLE_WAYLAND=ON \
+            -DSUNSHINE_ENABLE_X11=ON \
+            -DSUNSHINE_ENABLE_DRM=ON \
+            -DSUNSHINE_ENABLE_CUDA=ON \
+            ${{ matrix.EXTRA_ARGS }} \
+            ..
           make -j ${nproc}
 
       - name: Package Linux - CPACK
@@ -336,7 +368,7 @@ jobs:
           mv ./cpack_artifacts/Sunshine.rpm ../artifacts/sunshine.rpm
 
       - name: Set AppImage Version
-        if: ${{ matrix.type == 'appimage' && ( needs.check_changelog.outputs.next_version_bare != needs.check_changelog.outputs.latest_version ) }}
+        if: ${{ matrix.type == 'appimage' && ( needs.check_changelog.outputs.next_version_bare != needs.check_changelog.outputs.latest_version ) }}  # yamllint disable-line rule:line-length
         run: |
           version=${{ needs.check_changelog.outputs.next_version_bare }}
           echo "VERSION=${version}" >> $GITHUB_ENV
@@ -352,7 +384,8 @@ jobs:
           # todo - this is ugly... we should use a custom AppRun script to take care of this
           mv ./AppDir${{ matrix.CMAKE_INSTALL_PREFIX }}/sunshine.AppImage.* ../artifacts/
           mkdir -p ../artifacts/${{ matrix.SUNSHINE_CONFIG_DIR }}/.config/sunshine/${{ matrix.SUNSHINE_CONFIG_DIR }}
-          cp ../artifacts/${{ matrix.SUNSHINE_CONFIG_DIR }}/apps.json ../artifacts/${{ matrix.SUNSHINE_CONFIG_DIR }}/.config/sunshine/${{ matrix.SUNSHINE_CONFIG_DIR }}/
+          cp ../artifacts/${{ matrix.SUNSHINE_CONFIG_DIR }}/apps.json \
+            ../artifacts/${{ matrix.SUNSHINE_CONFIG_DIR }}/.config/sunshine/${{ matrix.SUNSHINE_CONFIG_DIR }}/
 
           # variables
           DESKTOP_FILE="${DESKTOP_FILE:-sunshine.desktop}"
@@ -443,7 +476,11 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DSUNSHINE_ASSETS_DIR=local/sunshine/assets -DSUNSHINE_CONFIG_DIR=local/sunshine/config ..
+          cmake -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DSUNSHINE_ASSETS_DIR=local/sunshine/assets \
+            -DSUNSHINE_CONFIG_DIR=local/sunshine/config \
+            ..
           make -j ${nproc}
 
       - name: Package MacOS
@@ -476,7 +513,7 @@ jobs:
           rm -f ./sunshine-macos-experimental-bundle.dmg
           rm -f ./sunshine-macos-experimental-archive.zip
 
-      # no artifacts to release currently
+      ##  no artifacts to release currently
       # - name: Create Release
       #   if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       #   uses: LizardByte/.github/actions/create_release@master
@@ -490,11 +527,6 @@ jobs:
     name: Macports
     needs: check_changelog
     runs-on: macos-11
-#    runs-on: ${{ matrix.os }}
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        os: [ macos-10.15, macos-11, macos-12 ]
 
     steps:
       - name: Checkout
@@ -539,8 +571,11 @@ jobs:
 
           mkdir build
           cd build
-          cmake -DGITHUB_COMMIT=${commit} -DGITHUB_CLONE_URL=${clone_url} -DSUNSHINE_CONFIGURE_PORTFILE=ON -DSUNSHINE_CONFIGURE_ONLY=ON ..
+          cmake -DGITHUB_COMMIT=${commit} \
-          
+            -DGITHUB_CLONE_URL=${clone_url} \
+            -DSUNSHINE_CONFIGURE_PORTFILE=ON \
+            -DSUNSHINE_CONFIGURE_ONLY=ON \
+            ..
           cd ..
 
           # copy Portfile to artifacts
@@ -733,7 +768,11 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -DSUNSHINE_CONFIG_DIR=config -G "MinGW Makefiles" ..
+          cmake -DCMAKE_BUILD_TYPE=Release \
+            -DSUNSHINE_ASSETS_DIR=assets \
+            -DSUNSHINE_CONFIG_DIR=config \
+            -G "MinGW Makefiles" \
+            ..
           mingw32-make -j2
 
       - name: Package Windows

.github/workflows/auto-create-pr.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.
@@ -5,15 +6,12 @@
 name: Auto create PR
 
 on:
-  pull_request:
+  push:
-    types:
-      - closed
     branches:
       - 'nightly'
 
 jobs:
   create_pr:
-    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
 
     steps:
@@ -25,7 +23,7 @@ jobs:
         with:
           source_branch: ""  # should be "nightly" as it's the triggering branch
           destination_branch: "master"
-          pr_title: "Pulling ${{ github.ref }} into master"
+          pr_title: "Pulling ${{ github.ref_name }} into master"
           pr_template: ".github/pr_release_template.md"
           pr_assignee: "${{ secrets.GH_BOT_NAME }}"
           pr_draft: true

.github/workflows/automerge.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.
@@ -23,7 +24,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Label autoapproved
-      uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GH_BOT_TOKEN }}
           script: |

.github/workflows/autoupdate.yml

@@ -0,0 +1,32 @@
+---
+# This action is centrally managed in https://github.com/<organization>/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
+# the above-mentioned repo.
+
+# This workflow is designed to work with:
+# - automerge workflows
+
+# It uses GitHub Action that auto-updates pull requests branches, when changes are pushed to their destination branch.
+# Auto-updating to the latest destination branch works only in the context of upstream repo and not forks.
+
+name: autoupdate
+
+on:
+  push:
+    branches:
+      - 'nightly'
+
+jobs:
+  autoupdate-for-bot:
+    name: Autoupdate autoapproved PR created in the upstream
+    if: startsWith(github.repository, 'LizardByte/')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update
+        uses: docker://chinthakagodawita/autoupdate-action:v1
+        env:
+          GITHUB_TOKEN: '${{ secrets.GH_BOT_TOKEN }}'
+          PR_FILTER: "labelled"
+          PR_LABELS: "autoupdate"
+          PR_READY_STATE: "ready_for_review"
+          MERGE_CONFLICT_ACTION: "ignore"

.github/workflows/clang.yml

@@ -1,31 +0,0 @@
-name: clang-format-lint
-
-on:
-  pull_request:
-    branches: [master, nightly]
-    types: [opened, synchronize, reopened]
-
-jobs:
-  lint:
-    name: Clang Format Lint
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Clang format lint
-      uses: DoozyX/clang-format-lint-action@v0.14
-      with:
-        source: './sunshine'
-        extensions: 'cpp,h,m,mm'
-        clangFormatVersion: 13
-        style: file
-        inplace: false
-
-    - name: Upload Artifacts
-      if: failure()
-      uses: actions/upload-artifact@v3
-      with:
-        name: sunshine
-        path: sunshine/

.github/workflows/cpp-clang-format-lint.yml

@@ -0,0 +1,60 @@
+---
+# This action is centrally managed in https://github.com/<organization>/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
+# the above-mentioned repo.
+
+name: Clang Format Lint
+
+on:
+  pull_request:
+    branches: [master, nightly]
+    types: [opened, synchronize, reopened]
+
+jobs:
+  check_src:
+    name: Check src
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Check
+        id: check
+        run: |
+          if [ -d "./src" ]
+          then
+            FOUND=true
+          else
+            FOUND=false
+          fi
+
+          echo "::set-output name=src::${FOUND}"
+
+    outputs:
+      src: ${{ steps.check.outputs.src }}
+
+  lint:
+    name: Clang Format Lint
+    needs: [check_src]
+    if: ${{ needs.check_src.outputs.src == 'true' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Clang format lint
+        uses: DoozyX/clang-format-lint-action@v0.14
+        with:
+          source: './src'
+          extensions: 'cpp,h,m,mm'
+          clangFormatVersion: 13
+          style: file
+          inplace: false
+
+      - name: Upload Artifacts
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: clang-format-fixes
+          path: src/

.github/workflows/issues-stale.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/issues.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/localize.yml

@@ -1,3 +1,4 @@
+---
 name: localize
 
 on:
@@ -5,7 +6,7 @@ on:
     branches: [nightly]
     paths:  # prevents workflow from running unless these files change
       - '.github/workflows/localize.yml'
-      - 'sunshine/**'
+      - 'src/**'
       - 'locale/sunshine.po'
   workflow_dispatch:
 
@@ -67,7 +68,8 @@ jobs:
 
       - name: git reset
         # only run if a single line changed (date/time) and file already existed
-      if: ${{ env.git_diff == '1	1	locale/sunshine.po' && env.new_file == 'false' }}
+        # \t in next line is a tab character
+        if: ${{ env.git_diff == '1\t1\tlocale/sunshine.po' && env.new_file == 'false' }}
         run: |
           git reset --hard
 

.github/workflows/pull-requests.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/python-flake8.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/release-notifier.yml

@@ -1,3 +1,4 @@
+---
 # This action is centrally managed in https://github.com/<organization>/.github/
 # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
 # the above-mentioned repo.

.github/workflows/winget.yml

@@ -1,3 +1,4 @@
+---
 name: Publish to WinGet
 
 on:
@@ -5,10 +6,12 @@ on:
     types: [released]
 
 jobs:
-  publish:
+  winget-releaser:
+    name: winget releaser
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@latest
+      - name: winget releaser
+        uses: vedantmgoyal2009/winget-releaser@latest
         with:
           identifier: LizardByte.Sunshine
           token: ${{ secrets.GH_BOT_TOKEN }}

.github/workflows/yaml-lint.yml

@@ -0,0 +1,46 @@
+---
+# This action is centrally managed in https://github.com/<organization>/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
+# the above-mentioned repo.
+
+name: yaml lint
+
+on:
+  pull_request:
+    branches: [master, nightly]
+    types: [opened, synchronize, reopened]
+
+jobs:
+  yaml-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: yaml lint
+        id: yaml-lint
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          # https://yamllint.readthedocs.io/en/stable/configuration.html#default-configuration
+          config_data: |
+            extends: default
+            rules:
+              comments:
+                level: error
+              line-length:
+                max: 120
+              truthy:
+                allowed-values: ['true', 'false', 'on']  # GitHub uses "on" for workflow event triggers
+                check-keys: true
+                level: error
+
+      - name: Log
+        run: |
+          echo ${{ steps.yaml-lint.outputs.logfile }}
+
+      - name: Upload logs
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: yamllint-logfile
+          path: ${{ steps.yaml-lint.outputs.logfile }}

.gitmodules

@@ -13,6 +13,6 @@
 [submodule "third-party/nv-codec-headers"]
 	path = third-party/nv-codec-headers
 	url = https://github.com/FFmpeg/nv-codec-headers
-[submodule "sunshine/platform/macos/TPCircularBuffer"]
+[submodule "third-party/TPCircularBuffer"]
-	path = sunshine/platform/macos/TPCircularBuffer
+	path = third-party/TPCircularBuffer
 	url = https://github.com/michaeltyson/TPCircularBuffer

.readthedocs.yaml

@@ -1,3 +1,4 @@
+---
 # .readthedocs.yaml
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

CMakeLists.txt

@@ -100,18 +100,18 @@ if(WIN32)
 	if(NOT DEFINED SUNSHINE_ICON_PATH)
 		set(SUNSHINE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/sunshine.ico")
 	endif()
-	configure_file(sunshine/platform/windows/windows.rs.in windows.rc @ONLY)
+	configure_file(src/platform/windows/windows.rs.in windows.rc @ONLY)
 	set(PLATFORM_TARGET_FILES
 		"${CMAKE_CURRENT_BINARY_DIR}/windows.rc"
-		sunshine/platform/windows/publish.cpp
+		src/platform/windows/publish.cpp
-		sunshine/platform/windows/misc.h
+		src/platform/windows/misc.h
-		sunshine/platform/windows/misc.cpp
+		src/platform/windows/misc.cpp
-		sunshine/platform/windows/input.cpp
+		src/platform/windows/input.cpp
-		sunshine/platform/windows/display.h
+		src/platform/windows/display.h
-		sunshine/platform/windows/display_base.cpp
+		src/platform/windows/display_base.cpp
-		sunshine/platform/windows/display_vram.cpp
+		src/platform/windows/display_vram.cpp
-		sunshine/platform/windows/display_ram.cpp
+		src/platform/windows/display_ram.cpp
-		sunshine/platform/windows/audio.cpp
+		src/platform/windows/audio.cpp
 		third-party/ViGEmClient/src/ViGEmClient.cpp
 		third-party/ViGEmClient/include/ViGEm/Client.h
 		third-party/ViGEmClient/include/ViGEm/Common.h
@@ -180,21 +180,21 @@ elseif(APPLE)
 	set(APPLE_PLIST_FILE ${SUNSHINE_SOURCE_ASSETS_DIR}/macos/assets/Info.plist)
 
 	set(PLATFORM_TARGET_FILES
-		sunshine/platform/macos/av_audio.h
+		src/platform/macos/av_audio.h
-		sunshine/platform/macos/av_audio.m
+		src/platform/macos/av_audio.m
-		sunshine/platform/macos/av_img_t.h
+		src/platform/macos/av_img_t.h
-		sunshine/platform/macos/av_video.h
+		src/platform/macos/av_video.h
-		sunshine/platform/macos/av_video.m
+		src/platform/macos/av_video.m
-		sunshine/platform/macos/display.mm
+		src/platform/macos/display.mm
-		sunshine/platform/macos/input.cpp
+		src/platform/macos/input.cpp
-		sunshine/platform/macos/microphone.mm
+		src/platform/macos/microphone.mm
-		sunshine/platform/macos/misc.cpp
+		src/platform/macos/misc.cpp
-		sunshine/platform/macos/misc.h
+		src/platform/macos/misc.h
-		sunshine/platform/macos/nv12_zero_device.cpp
+		src/platform/macos/nv12_zero_device.cpp
-		sunshine/platform/macos/nv12_zero_device.h
+		src/platform/macos/nv12_zero_device.h
-		sunshine/platform/macos/publish.cpp
+		src/platform/macos/publish.cpp
-		sunshine/platform/macos/TPCircularBuffer/TPCircularBuffer.c
+		third-party/TPCircularBuffer/TPCircularBuffer.c
-		sunshine/platform/macos/TPCircularBuffer/TPCircularBuffer.h
+		third-party/TPCircularBuffer/TPCircularBuffer.h
 		${APPLE_PLIST_FILE})
 else()
 	add_compile_definitions(SUNSHINE_PLATFORM="linux")
@@ -242,14 +242,14 @@ else()
 	if(X11_FOUND)
 		add_compile_definitions(SUNSHINE_BUILD_X11)
 		include_directories(${X11_INCLUDE_DIR})
-		list(APPEND PLATFORM_TARGET_FILES sunshine/platform/linux/x11grab.cpp)
+		list(APPEND PLATFORM_TARGET_FILES src/platform/linux/x11grab.cpp)
 	endif()
 
 	if(CUDA_FOUND)
 		include_directories(third-party/nvfbc)
 		list(APPEND PLATFORM_TARGET_FILES
-			sunshine/platform/linux/cuda.cu
+			src/platform/linux/cuda.cu
-			sunshine/platform/linux/cuda.cpp
+			src/platform/linux/cuda.cpp
 			third-party/nvfbc/NvFBC.h)
 
 			add_compile_definitions(SUNSHINE_BUILD_CUDA)
@@ -259,7 +259,7 @@ else()
 		add_compile_definitions(SUNSHINE_BUILD_DRM)
 		include_directories(${LIBDRM_INCLUDE_DIRS} ${LIBCAP_INCLUDE_DIRS})
 		list(APPEND PLATFORM_LIBRARIES ${LIBDRM_LIBRARIES} ${LIBCAP_LIBRARIES})
-		list(APPEND PLATFORM_TARGET_FILES sunshine/platform/linux/kmsgrab.cpp)
+		list(APPEND PLATFORM_TARGET_FILES src/platform/linux/kmsgrab.cpp)
 		list(APPEND SUNSHINE_DEFINITIONS EGL_NO_X11=1)
 	elseif(LIBDRM_FOUND)
 		message(WARNING "Found libdrm, yet there is no libcap")
@@ -301,26 +301,26 @@ else()
 
 		list(APPEND PLATFORM_LIBRARIES ${WAYLAND_LIBRARIES})
 		list(APPEND PLATFORM_TARGET_FILES
-			sunshine/platform/linux/wlgrab.cpp
+			src/platform/linux/wlgrab.cpp
-			sunshine/platform/linux/wayland.cpp)
+			src/platform/linux/wayland.cpp)
 	endif()
 	if(NOT ${X11_FOUND} AND NOT (${LIBDRM_FOUND} AND ${LIBCAP_FOUND}) AND NOT ${WAYLAND_FOUND} AND NOT ${})
 		message(FATAL_ERROR "Couldn't find either x11, wayland, cuda or (libdrm and libcap)")
 	endif()
 
 	list(APPEND PLATFORM_TARGET_FILES
-		sunshine/platform/linux/publish.cpp
+		src/platform/linux/publish.cpp
-		sunshine/platform/linux/vaapi.h
+		src/platform/linux/vaapi.h
-		sunshine/platform/linux/vaapi.cpp
+		src/platform/linux/vaapi.cpp
-		sunshine/platform/linux/cuda.h
+		src/platform/linux/cuda.h
-		sunshine/platform/linux/graphics.h
+		src/platform/linux/graphics.h
-		sunshine/platform/linux/graphics.cpp
+		src/platform/linux/graphics.cpp
-		sunshine/platform/linux/misc.h
+		src/platform/linux/misc.h
-		sunshine/platform/linux/misc.cpp
+		src/platform/linux/misc.cpp
-		sunshine/platform/linux/audio.cpp
+		src/platform/linux/audio.cpp
-		sunshine/platform/linux/input.cpp
+		src/platform/linux/input.cpp
-		sunshine/platform/linux/x11grab.h
+		src/platform/linux/x11grab.h
-		sunshine/platform/linux/wayland.h
+		src/platform/linux/wayland.h
 		third-party/glad/src/egl.c
 		third-party/glad/src/gl.c
 		third-party/glad/include/EGL/eglplatform.h
@@ -356,47 +356,47 @@ set(SUNSHINE_TARGET_FILES
 	third-party/moonlight-common-c/src/Rtsp.h
 	third-party/moonlight-common-c/src/RtspParser.c
 	third-party/moonlight-common-c/src/Video.h
-	sunshine/upnp.cpp
+	src/upnp.cpp
-	sunshine/upnp.h
+	src/upnp.h
-	sunshine/cbs.cpp
+	src/cbs.cpp
-	sunshine/utility.h
+	src/utility.h
-	sunshine/uuid.h
+	src/uuid.h
-	sunshine/config.h
+	src/config.h
-	sunshine/config.cpp
+	src/config.cpp
-	sunshine/main.cpp
+	src/main.cpp
-	sunshine/main.h
+	src/main.h
-	sunshine/crypto.cpp
+	src/crypto.cpp
-	sunshine/crypto.h
+	src/crypto.h
-	sunshine/nvhttp.cpp
+	src/nvhttp.cpp
-	sunshine/nvhttp.h
+	src/nvhttp.h
-	sunshine/httpcommon.cpp
+	src/httpcommon.cpp
-	sunshine/httpcommon.h
+	src/httpcommon.h
-	sunshine/confighttp.cpp
+	src/confighttp.cpp
-	sunshine/confighttp.h
+	src/confighttp.h
-	sunshine/rtsp.cpp
+	src/rtsp.cpp
-	sunshine/rtsp.h
+	src/rtsp.h
-	sunshine/stream.cpp
+	src/stream.cpp
-	sunshine/stream.h
+	src/stream.h
-	sunshine/video.cpp
+	src/video.cpp
-	sunshine/video.h
+	src/video.h
-	sunshine/input.cpp
+	src/input.cpp
-	sunshine/input.h
+	src/input.h
-	sunshine/audio.cpp
+	src/audio.cpp
-	sunshine/audio.h
+	src/audio.h
-	sunshine/platform/common.h
+	src/platform/common.h
-	sunshine/process.cpp
+	src/process.cpp
-	sunshine/process.h
+	src/process.h
-	sunshine/network.cpp
+	src/network.cpp
-	sunshine/network.h
+	src/network.h
-	sunshine/move_by_copy.h
+	src/move_by_copy.h
-	sunshine/task_pool.h
+	src/task_pool.h
-	sunshine/thread_pool.h
+	src/thread_pool.h
-	sunshine/thread_safe.h
+	src/thread_safe.h
-	sunshine/sync.h
+	src/sync.h
-	sunshine/round_robin.h
+	src/round_robin.h
 	${PLATFORM_TARGET_FILES})
 
-set_source_files_properties(sunshine/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic)
+set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -414,7 +414,7 @@ string(TOUPPER "x${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 if("${BUILD_TYPE}" STREQUAL "XDEBUG")
 	list(APPEND SUNSHINE_COMPILE_OPTIONS -O0 -ggdb3)
 	if(WIN32)
-		set_source_files_properties(sunshine/nvhttp.cpp PROPERTIES COMPILE_FLAGS -O2)
+		set_source_files_properties(src/nvhttp.cpp PROPERTIES COMPILE_FLAGS -O2)
 	endif()
 else()
 	add_definitions(-DNDEBUG)

crowdin.yml

@@ -1,3 +1,4 @@
+---
 "base_path": "."
 "base_url": "https://api.crowdin.com"  # optional (for Crowdin Enterprise only)
 "preserve_hierarchy": false  # flatten tree on crowdin

docs/source/contributing/localization.rst

@@ -67,7 +67,7 @@ any of the following paths are modified.
 
    .. code-block:: yaml
 
-      - 'sunshine/**'
+      - 'src/**'
 
 When testing locally it may be desirable to manually extract, initialize, update, and compile strings. Python is
 required for this, along with the python dependencies in the `./scripts/requirements.txt` file. Additionally,

packaging/linux/flatpak/dev.lizardbyte.sunshine.yml

@@ -1,3 +1,4 @@
+---
 app-id: dev.lizardbyte.sunshine
 runtime: org.freedesktop.Platform
 runtime-version: "21.08"
@@ -35,7 +36,7 @@ modules:
       - '*'
     build-commands:
       - chmod u+x ./cuda.run
-      - ./cuda.run --silent --toolkit --toolkitpath=$FLATPAK_DEST/cuda --no-opengl-libs --no-man-page --no-drm --tmpdir=$FLATPAK_BUILDER_BUILDDIR
+      - ./cuda.run --silent --toolkit --toolkitpath=$FLATPAK_DEST/cuda --no-opengl-libs --no-man-page --no-drm --tmpdir=$FLATPAK_BUILDER_BUILDDIR  # yamllint disable-line rule:line-length
       - rm -r $FLATPAK_DEST/cuda/nsight-systems-2021.3.2
       - rm ./cuda.run
     sources:
@@ -48,7 +49,7 @@ modules:
       - type: file
         only-arches:
           - aarch64
-        url: https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux_sbsa.run
+        url: https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux_sbsa.run  # yamllint disable-line rule:line-length
         sha256: f2c4a52e06329606c8dfb7c5ea3f4cb4c0b28f9d3fdffeeb734fcc98daf580d8
         dest-filename: cuda.run
 
@@ -56,7 +57,7 @@ modules:
     buildsystem: simple
     build-commands:
       - ./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=system,thread,log
-      - ./b2 install variant=release link=static,shared runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j $FLATPAK_BUILDER_N_JOBS
+      - ./b2 install variant=release link=static,shared runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j $FLATPAK_BUILDER_N_JOBS  # yamllint disable-line rule:line-length
     sources:
       - type: archive
         url: https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
@@ -170,7 +171,7 @@ modules:
           - /bin
         sources:
           - type: archive
-            url: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz
+            url: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz  # yamllint disable-line rule:line-length
             sha256: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 
   - name: libevdev
@@ -210,6 +211,6 @@ modules:
       - -DSUNSHINE_ENABLE_CUDA=ON
     sources:
       - type: git
-        url: @GITHUB_CLONE_URL@
+        url: '@GITHUB_CLONE_URL@'
-        branch: @GITHUB_BRANCH@
+        branch: '@GITHUB_BRANCH@'
-        commit: @GITHUB_COMMIT@
+        commit: '@GITHUB_COMMIT@'

src/platform/common.h

@@ -11,8 +11,8 @@
 #include <mutex>
 #include <string>
 
-#include "sunshine/thread_safe.h"
+#include "src/thread_safe.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 struct sockaddr;
 struct AVFrame;

src/platform/linux/audio.cpp

@@ -10,11 +10,11 @@
 #include <pulse/pulseaudio.h>
 #include <pulse/simple.h>
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/thread_safe.h"
+#include "src/thread_safe.h"
 
 namespace platf {
 using namespace std::literals;

src/platform/linux/cuda.cpp

@@ -11,8 +11,8 @@ extern "C" {
 
 #include "cuda.h"
 #include "graphics.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 #include "wayland.h"
 
 #define SUNSHINE_STRINGVIEW_HELPER(x) x##sv

src/platform/linux/graphics.cpp

@@ -1,5 +1,5 @@
 #include "graphics.h"
-#include "sunshine/video.h"
+#include "src/video.h"
 
 #include <fcntl.h>
 

src/platform/linux/graphics.h

@@ -8,9 +8,9 @@
 #include <glad/gl.h>
 
 #include "misc.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 #define SUNSHINE_STRINGIFY_HELPER(x) #x
 #define SUNSHINE_STRINGIFY(x) SUNSHINE_STRINGIFY_HELPER(x)

src/platform/linux/input.cpp

@@ -9,11 +9,11 @@
 #include <cstring>
 #include <filesystem>
 
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 // Support older versions
 #ifndef REL_HWHEEL_HI_RES

src/platform/linux/kmsgrab.cpp

@@ -8,10 +8,10 @@
 
 #include <filesystem>
 
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/round_robin.h"
+#include "src/round_robin.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 // Cursor rendering support through x11
 #include "graphics.h"

src/platform/linux/misc.cpp

@@ -11,8 +11,8 @@
 #include "misc.h"
 #include "vaapi.h"
 
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 #ifdef __GNUC__
 #define SUNSHINE_GNUC_EXTENSION __extension__

src/platform/linux/misc.h

@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <vector>
 
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 KITTY_USING_MOVE_T(file_t, int, -1, {
   if(el >= 0) {

src/platform/linux/publish.cpp

@@ -3,10 +3,10 @@
 #include <thread>
 
 #include "misc.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/nvhttp.h"
+#include "src/nvhttp.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 using namespace std::literals;
 

src/platform/linux/vaapi.cpp

@@ -9,10 +9,10 @@ extern "C" {
 
 #include "graphics.h"
 #include "misc.h"
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 using namespace std::literals;
 

src/platform/linux/vaapi.h

@@ -2,7 +2,7 @@
 #define SUNSHINE_VAAPI_H
 
 #include "misc.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 namespace egl {
 struct surface_descriptor_t;

src/platform/linux/wayland.cpp

@@ -4,10 +4,10 @@
 #include <cstdlib>
 
 #include "graphics.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/round_robin.h"
+#include "src/round_robin.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 #include "wayland.h"
 
 extern const wl_interface wl_output_interface;

src/platform/linux/wlgrab.cpp

@@ -1,6 +1,6 @@
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
-#include "sunshine/main.h"
+#include "src/main.h"
 #include "vaapi.h"
 #include "wayland.h"
 

src/platform/linux/x11grab.cpp

@@ -2,7 +2,7 @@
 // Created by loki on 6/21/19.
 //
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 #include <fstream>
 
@@ -16,9 +16,9 @@
 #include <xcb/shm.h>
 #include <xcb/xfixes.h>
 
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/task_pool.h"
+#include "src/task_pool.h"
 
 #include "cuda.h"
 #include "graphics.h"

src/platform/linux/x11grab.h

@@ -3,8 +3,8 @@
 
 #include <optional>
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 // X11 Display
 extern "C" struct _XDisplay;

src/platform/macos/av_audio.h

@@ -3,7 +3,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#include "sunshine/platform/macos/TPCircularBuffer/TPCircularBuffer.h"
+#include "third-party/TPCircularBuffer/TPCircularBuffer.h"
 
 #define kBufferLength 2048
 

src/platform/macos/av_img_t.h

@@ -1,7 +1,7 @@
 #ifndef av_img_t_h
 #define av_img_t_h
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 #include <CoreMedia/CoreMedia.h>
 #include <CoreVideo/CoreVideo.h>

src/platform/macos/display.mm

@@ -1,10 +1,10 @@
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/platform/macos/av_img_t.h"
+#include "src/platform/macos/av_img_t.h"
-#include "sunshine/platform/macos/av_video.h"
+#include "src/platform/macos/av_video.h"
-#include "sunshine/platform/macos/nv12_zero_device.h"
+#include "src/platform/macos/nv12_zero_device.h"
 
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
 
 namespace fs = std::filesystem;
 

src/platform/macos/input.cpp

@@ -2,9 +2,9 @@
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 // Delay for a double click
 // FIXME: we probably want to make this configurable

src/platform/macos/microphone.mm

@@ -1,8 +1,8 @@
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/platform/macos/av_audio.h"
+#include "src/platform/macos/av_audio.h"
 
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
 
 namespace platf {
 using namespace std::literals;

src/platform/macos/misc.cpp

@@ -6,8 +6,8 @@
 #include <pwd.h>
 
 #include "misc.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 using namespace std::literals;
 namespace fs = std::filesystem;

src/platform/macos/nv12_zero_device.cpp

@@ -1,7 +1,7 @@
-#include "sunshine/platform/macos/nv12_zero_device.h"
+#include "src/platform/macos/nv12_zero_device.h"
-#include "sunshine/platform/macos/av_img_t.h"
+#include "src/platform/macos/av_img_t.h"
 
-#include "sunshine/video.h"
+#include "src/video.h"
 
 extern "C" {
 #include "libavutil/imgutils.h"

src/platform/macos/nv12_zero_device.h

@@ -1,7 +1,7 @@
 #ifndef vtdevice_h
 #define vtdevice_h
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 namespace platf {
 

src/platform/macos/publish.cpp

@@ -3,10 +3,10 @@
 #include <thread>
 
 #include "misc.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/nvhttp.h"
+#include "src/nvhttp.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 using namespace std::literals;
 

src/platform/windows/audio.cpp

@@ -14,9 +14,9 @@
 #include <propkeydef.h>
 #undef INITGUID
 
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 // Must be the last included file
 // clang-format off

src/platform/windows/display.h

@@ -12,8 +12,8 @@
 #include <dxgi.h>
 #include <dxgi1_2.h>
 
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 namespace platf::dxgi {
 extern const char *format_str[];

src/platform/windows/display_base.cpp

@@ -7,9 +7,9 @@
 
 #include "display.h"
 #include "misc.h"
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 namespace platf {
 using namespace std::literals;

src/platform/windows/display_ram.cpp

@@ -1,5 +1,5 @@
 #include "display.h"
-#include "sunshine/main.h"
+#include "src/main.h"
 
 namespace platf {
 using namespace std::literals;

src/platform/windows/display_vram.cpp

@@ -11,8 +11,8 @@ extern "C" {
 }
 
 #include "display.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/video.h"
+#include "src/video.h"
 
 
 #define SUNSHINE_SHADERS_DIR SUNSHINE_ASSETS_DIR "/shaders/directx"

src/platform/windows/input.cpp

@@ -5,9 +5,9 @@
 #include <ViGEm/Client.h>
 
 #include "misc.h"
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
 
 namespace platf {
 using namespace std::literals;

src/platform/windows/misc.cpp

@@ -12,8 +12,8 @@
 #include <ws2tcpip.h>
 // clang-format on
 
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 using namespace std::literals;
 namespace platf {

src/platform/windows/publish.cpp

@@ -8,12 +8,12 @@
 #include <boost/asio/ip/host_name.hpp>
 
 #include "misc.h"
-#include "sunshine/config.h"
+#include "src/config.h"
-#include "sunshine/main.h"
+#include "src/main.h"
-#include "sunshine/network.h"
+#include "src/network.h"
-#include "sunshine/nvhttp.h"
+#include "src/nvhttp.h"
-#include "sunshine/platform/common.h"
+#include "src/platform/common.h"
-#include "sunshine/thread_safe.h"
+#include "src/thread_safe.h"
 
 #define _FN(x, ret, args)    \
   typedef ret(*x##_fn) args; \