move sunshine to src

- this will allow for common cpp workflow files within org

.github/workflows/localize.yml

@@ -6,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:
 

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,19 +180,19 @@ 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
 		third-party/TPCircularBuffer/TPCircularBuffer.c
 		third-party/TPCircularBuffer/TPCircularBuffer.h
 		${APPLE_PLIST_FILE})
@@ -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)

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,

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_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; \

tools/audio.cpp

@@ -14,7 +14,7 @@
 
 #include <iostream>
 
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);    // DEVPROP_TYPE_STRING
 DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); // DEVPROP_TYPE_STRING

tools/dxgi.cpp

@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include "sunshine/utility.h"
+#include "src/utility.h"
 
 using namespace std::literals;
 namespace dxgi {