izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and enable -Wmissing-braces

Browse Source
This commit is contained in:
Cameron Gutman
2023-05-11 00:37:59 -05:00
parent 390dc1c245
commit ff046bb707
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -140,7 +140,7 @@ endif()
find_package(Boost COMPONENTS locale log filesystem program_options REQUIRED) find_package(Boost COMPONENTS locale log filesystem program_options REQUIRED)
list(APPEND SUNSHINE_COMPILE_OPTIONS -Wall -Wno-missing-braces -Wno-sign-compare) list(APPEND SUNSHINE_COMPILE_OPTIONS -Wall -Wno-sign-compare)
# enable system tray, we will disable this later if we cannot find the required package config on linux # enable system tray, we will disable this later if we cannot find the required package config on linux
set(SUNSHINE_TRAY 1) set(SUNSHINE_TRAY 1)

2
src/input.cpp
View File

@@ -132,7 +132,7 @@ namespace input {
touch_port_event { std::move(touch_port_event) }, touch_port_event { std::move(touch_port_event) },
rumble_queue { std::move(rumble_queue) }, rumble_queue { std::move(rumble_queue) },
mouse_left_button_timeout {}, mouse_left_button_timeout {},
touch_port { 0, 0, 0, 0, 0, 0, 1.0f } {} touch_port { { 0, 0, 0, 0 }, 0, 0, 1.0f } {}
// Keep track of alt+ctrl+shift key combo // Keep track of alt+ctrl+shift key combo
int shortcutFlags; int shortcutFlags;

14
src/upnp.cpp
View File

@@ -147,17 +147,17 @@ namespace upnp {
auto wm_http = std::to_string(map_port(confighttp::PORT_HTTPS)); auto wm_http = std::to_string(map_port(confighttp::PORT_HTTPS));
std::vector<mapping_t> mappings { std::vector<mapping_t> mappings {
{ rtsp, rtsp, "RTSP setup port"s, true }, { { rtsp, rtsp }, "RTSP setup port"s, true },
{ video, video, "Video stream port"s, false }, { { video, video }, "Video stream port"s, false },
{ audio, audio, "Control stream port"s, false }, { { audio, audio }, "Control stream port"s, false },
{ control, control, "Audio stream port"s, false }, { { control, control }, "Audio stream port"s, false },
{ gs_http, gs_http, "Gamestream http port"s, true }, { { gs_http, gs_http }, "Gamestream http port"s, true },
{ gs_https, gs_https, "Gamestream https port"s, true }, { { gs_https, gs_https }, "Gamestream https port"s, true },
}; };
// Only map port for the Web Manager if it is configured to accept connection from WAN // Only map port for the Web Manager if it is configured to accept connection from WAN
if (net::from_enum_string(config::nvhttp.origin_web_ui_allowed) > net::LAN) { if (net::from_enum_string(config::nvhttp.origin_web_ui_allowed) > net::LAN) {
mappings.emplace_back(mapping_t { wm_http, wm_http, "Sunshine Web UI port"s, true }); mappings.emplace_back(mapping_t { { wm_http, wm_http }, "Sunshine Web UI port"s, true });
} }
auto it = std::begin(mappings); auto it = std::begin(mappings);

10
src/video.cpp
View File

@@ -1454,10 +1454,12 @@ namespace video {
auto offsetY = (config.height - h2) * 0.5f; auto offsetY = (config.height - h2) * 0.5f;
return input::touch_port_t { return input::touch_port_t {
display->offset_x, {
display->offset_y, display->offset_x,
config.width, display->offset_y,
config.height, config.width,
config.height,
},
display->env_width, display->env_width,
display->env_height, display->env_height,
offsetX, offsetX,