diff --git a/CMakeLists.txt b/CMakeLists.txt index 90822a36..81dbc6c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.18) # set_source_files_properties requires 3.18 # todo - set this conditionally -project(Sunshine VERSION 0.0.0 +project(Apollo VERSION 0.0.0 DESCRIPTION "Self-hosted game stream host for Moonlight" HOMEPAGE_URL "https://app.lizardbyte.dev/Sunshine") @@ -14,7 +14,7 @@ set(PROJECT_FQDN "dev.lizardbyte.app.Sunshine") set(PROJECT_BRIEF_DESCRIPTION "GameStream host for Moonlight") # must be <= 35 characters set(PROJECT_LONG_DESCRIPTION "Offering low latency, cloud gaming server capabilities with support for AMD, Intel, \ -and Nvidia GPUs for hardware encoding. Software encoding is also available. You can connect to Sunshine from any \ +and Nvidia GPUs for hardware encoding. Software encoding is also available. You can connect to Apollo from any \ Moonlight client on a variety of devices. A web UI is provided to allow configuration, and client pairing, from \ your favorite web browser. Pair from the local server or any mobile device.") diff --git a/apollo.icns b/apollo.icns new file mode 100644 index 00000000..c889c312 Binary files /dev/null and b/apollo.icns differ diff --git a/apollo.ico b/apollo.ico new file mode 100644 index 00000000..0b7fa282 Binary files /dev/null and b/apollo.ico differ diff --git a/apollo.png b/apollo.png new file mode 100644 index 00000000..e492bbb4 Binary files /dev/null and b/apollo.png differ diff --git a/apollo.svg b/apollo.svg new file mode 100644 index 00000000..5822a741 --- /dev/null +++ b/apollo.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cmake/compile_definitions/windows.cmake b/cmake/compile_definitions/windows.cmake index 7643d1d9..6571eae5 100644 --- a/cmake/compile_definitions/windows.cmake +++ b/cmake/compile_definitions/windows.cmake @@ -33,9 +33,9 @@ file(GLOB NVPREFS_FILES CONFIGURE_DEPENDS # vigem include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/third-party/ViGEmClient/include") -# sunshine icon +# apollo icon if(NOT DEFINED SUNSHINE_ICON_PATH) - set(SUNSHINE_ICON_PATH "${CMAKE_SOURCE_DIR}/sunshine.ico") + set(SUNSHINE_ICON_PATH "${CMAKE_SOURCE_DIR}/apollo.ico") endif() configure_file("${CMAKE_SOURCE_DIR}/src/platform/windows/windows.rs.in" windows.rc @ONLY) diff --git a/cmake/packaging/windows.cmake b/cmake/packaging/windows.cmake index bbd497ee..6795a791 100644 --- a/cmake/packaging/windows.cmake +++ b/cmake/packaging/windows.cmake @@ -44,7 +44,7 @@ file(COPY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/assets/" DESTINATION "${CMAKE_BINARY_DIR}/assets") # set(CPACK_NSIS_MUI_HEADERIMAGE "") # TODO: image should be 150x57 bmp -set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\sunshine.ico") +set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\apollo.ico") set(CPACK_NSIS_INSTALLED_ICON_NAME "${PROJECT__DIR}\\\\${PROJECT_EXE}") # The name of the directory that will be created in C:/Program files/ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}") diff --git a/src/confighttp.cpp b/src/confighttp.cpp index 6d802206..a83ae764 100644 --- a/src/confighttp.cpp +++ b/src/confighttp.cpp @@ -264,7 +264,7 @@ namespace confighttp { getFaviconImage(resp_https_t response, req_https_t request) { print_req(request); - std::ifstream in(WEB_DIR "images/sunshine.ico", std::ios::binary); + std::ifstream in(WEB_DIR "images/apollo.ico", std::ios::binary); SimpleWeb::CaseInsensitiveMultimap headers; headers.emplace("Content-Type", "image/x-icon"); response->write(SimpleWeb::StatusCode::success_ok, in, headers); @@ -278,7 +278,7 @@ namespace confighttp { getSunshineLogoImage(resp_https_t response, req_https_t request) { print_req(request); - std::ifstream in(WEB_DIR "images/logo-sunshine-45.png", std::ios::binary); + std::ifstream in(WEB_DIR "images/logo-apollo-45.png", std::ios::binary); SimpleWeb::CaseInsensitiveMultimap headers; headers.emplace("Content-Type", "image/png"); response->write(SimpleWeb::StatusCode::success_ok, in, headers); @@ -828,8 +828,8 @@ namespace confighttp { server.resource["^/api/clients/unpair$"]["POST"] = unpair; server.resource["^/api/apps/close$"]["POST"] = closeApp; server.resource["^/api/covers/upload$"]["POST"] = uploadCover; - server.resource["^/images/sunshine.ico$"]["GET"] = getFaviconImage; - server.resource["^/images/logo-sunshine-45.png$"]["GET"] = getSunshineLogoImage; + server.resource["^/images/apollo.ico$"]["GET"] = getFaviconImage; + server.resource["^/images/logo-apollo-45.png$"]["GET"] = getSunshineLogoImage; server.resource["^/assets\\/.+$"]["GET"] = getNodeModules; server.config.reuse_address = true; server.config.address = net::af_to_any_address_string(address_family); diff --git a/src/platform/common.h b/src/platform/common.h index 24cd658b..ef1da06e 100644 --- a/src/platform/common.h +++ b/src/platform/common.h @@ -818,7 +818,7 @@ namespace platf { platform_caps::caps_t get_capabilities(); -#define SERVICE_NAME "Sunshine" +#define SERVICE_NAME "Apollo" #define SERVICE_TYPE "_nvstream._tcp" namespace publish { diff --git a/src/platform/windows/windows.rs.in b/src/platform/windows/windows.rs.in index 384d5404..8a4f31dc 100644 --- a/src/platform/windows/windows.rs.in +++ b/src/platform/windows/windows.rs.in @@ -16,12 +16,12 @@ BEGIN BEGIN BLOCK "040904E4" BEGIN - VALUE "CompanyName", "LizardByte\0" - VALUE "FileDescription", "Sunshine\0" + VALUE "CompanyName", "YukiWorkshop\0" + VALUE "FileDescription", "Apollo\0" VALUE "FileVersion", "@PROJECT_VERSION@\0" - VALUE "InternalName", "Sunshine\0" - VALUE "LegalCopyright", "https://raw.githubusercontent.com/LizardByte/Sunshine/master/LICENSE\0" - VALUE "ProductName", "Sunshine\0" + VALUE "InternalName", "Apollo\0" + VALUE "LegalCopyright", "https://raw.githubusercontent.com/ClassicOldSong/Apollo/master/LICENSE\0" + VALUE "ProductName", "Apollo\0" VALUE "ProductVersion", "@PROJECT_VERSION@\0" END END diff --git a/src/system_tray.cpp b/src/system_tray.cpp index 6dd6fa02..bce19fc4 100644 --- a/src/system_tray.cpp +++ b/src/system_tray.cpp @@ -9,20 +9,20 @@ #define WIN32_LEAN_AND_MEAN #include #include - #define TRAY_ICON WEB_DIR "images/sunshine.ico" - #define TRAY_ICON_PLAYING WEB_DIR "images/sunshine-playing.ico" - #define TRAY_ICON_PAUSING WEB_DIR "images/sunshine-pausing.ico" - #define TRAY_ICON_LOCKED WEB_DIR "images/sunshine-locked.ico" + #define TRAY_ICON WEB_DIR "images/apollo.ico" + #define TRAY_ICON_PLAYING WEB_DIR "images/apollo-playing.ico" + #define TRAY_ICON_PAUSING WEB_DIR "images/apollo-pausing.ico" + #define TRAY_ICON_LOCKED WEB_DIR "images/apollo-locked.ico" #elif defined(__linux__) || defined(linux) || defined(__linux) - #define TRAY_ICON "sunshine-tray" - #define TRAY_ICON_PLAYING "sunshine-playing" - #define TRAY_ICON_PAUSING "sunshine-pausing" - #define TRAY_ICON_LOCKED "sunshine-locked" + #define TRAY_ICON "apollo-tray" + #define TRAY_ICON_PLAYING "apollo-playing" + #define TRAY_ICON_PAUSING "apollo-pausing" + #define TRAY_ICON_LOCKED "apollo-locked" #elif defined(__APPLE__) || defined(__MACH__) - #define TRAY_ICON WEB_DIR "images/logo-sunshine-16.png" - #define TRAY_ICON_PLAYING WEB_DIR "images/sunshine-playing-16.png" - #define TRAY_ICON_PAUSING WEB_DIR "images/sunshine-pausing-16.png" - #define TRAY_ICON_LOCKED WEB_DIR "images/sunshine-locked-16.png" + #define TRAY_ICON WEB_DIR "images/logo-apollo-16.png" + #define TRAY_ICON_PLAYING WEB_DIR "images/apollo-playing-16.png" + #define TRAY_ICON_PAUSING WEB_DIR "images/apollo-pausing-16.png" + #define TRAY_ICON_LOCKED WEB_DIR "images/apollo-locked-16.png" #include #endif diff --git a/src_assets/common/assets/web/Navbar.vue b/src_assets/common/assets/web/Navbar.vue index 10ecc887..d6361296 100644 --- a/src_assets/common/assets/web/Navbar.vue +++ b/src_assets/common/assets/web/Navbar.vue @@ -2,7 +2,7 @@