diff --git a/src/single_window/control_bar.cpp b/src/single_window/control_bar.cpp index 669f9fe..63ee2b2 100644 --- a/src/single_window/control_bar.cpp +++ b/src/single_window/control_bar.cpp @@ -3,12 +3,12 @@ #include "rd_log.h" #include "render.h" -int CountDigits(uint64_t number) { +int CountDigits(int number) { if (number == 0) return 1; - return (int)std::floor(std::log10(std::abs((int)number))) + 1; + return (int)std::floor(std::log10(std::abs(number))) + 1; } -int BitrateDisplay(uint64_t bitrate) { +int BitrateDisplay(int bitrate) { int num_of_digits = CountDigits(bitrate); if (num_of_digits <= 3) { ImGui::Text("%d bps", bitrate); @@ -219,35 +219,35 @@ int Render::NetTrafficStats() { ImGui::Text("%s", localization::video[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.video_in); + BitrateDisplay((int)net_traffic_stats_.video_in); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.video_out); + BitrateDisplay((int)net_traffic_stats_.video_out); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::audio[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.audio_in); + BitrateDisplay((int)net_traffic_stats_.audio_in); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.audio_out); + BitrateDisplay((int)net_traffic_stats_.audio_out); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::data[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.data_in); + BitrateDisplay((int)net_traffic_stats_.data_in); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.data_out); + BitrateDisplay((int)net_traffic_stats_.data_out); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::total[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.total_in); + BitrateDisplay((int)net_traffic_stats_.total_in); ImGui::TableNextColumn(); - BitrateDisplay(net_traffic_stats_.total_out); + BitrateDisplay((int)net_traffic_stats_.total_out); ImGui::EndTable(); } diff --git a/src/single_window/control_window.cpp b/src/single_window/control_window.cpp index 1f107ba..f65c191 100644 --- a/src/single_window/control_window.cpp +++ b/src/single_window/control_window.cpp @@ -47,7 +47,7 @@ int Render::ControlWindow() { } if (reset_control_bar_pos_) { - float new_control_window_pos_x, new_control_window_pos_y, new_cursor_pos_x, + int new_control_window_pos_x, new_control_window_pos_y, new_cursor_pos_x, new_cursor_pos_y; // set control window pos @@ -94,8 +94,7 @@ int Render::ControlWindow() { if (0 != mouse_diff_control_bar_pos_x_ && 0 != mouse_diff_control_bar_pos_y_) { - SDL_WarpMouseInWindow(stream_window_, (int)new_cursor_pos_x, - (int)new_cursor_pos_y); + SDL_WarpMouseInWindow(stream_window_, new_cursor_pos_x, new_cursor_pos_y); } reset_control_bar_pos_ = false; } else if (!reset_control_bar_pos_ && @@ -196,7 +195,7 @@ int Render::ControlWindow() { ImGui::PopStyleVar(); control_winodw_pos_ = ImGui::GetWindowPos(); - SDL_GetMouseState(&(int)mouse_pos_x_, &(int)mouse_pos_y_); + SDL_GetMouseState(&mouse_pos_x_, &mouse_pos_y_); mouse_diff_control_bar_pos_x_ = mouse_pos_x_ - control_winodw_pos_.x; mouse_diff_control_bar_pos_y_ = mouse_pos_y_ - control_winodw_pos_.y; diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp index 40b983e..da2afd4 100644 --- a/src/single_window/render.cpp +++ b/src/single_window/render.cpp @@ -453,8 +453,9 @@ int Render::CreateMainWindow() { ImGui::SetCurrentContext(main_ctx_); - SDL_WindowFlags window_flags = (SDL_WindowFlags)( - SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_BORDERLESS | SDL_WINDOW_HIDDEN); + SDL_WindowFlags window_flags = + (SDL_WindowFlags)(SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_BORDERLESS | + SDL_WINDOW_HIDDEN); main_window_ = SDL_CreateWindow("Remote Desk", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, (int)main_window_width_default_, @@ -903,8 +904,8 @@ int Render::Run() { window_maximized_ = false; } else if (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { reset_control_bar_pos_ = true; - SDL_GetWindowSize(stream_window_, &((int)stream_window_width_), - &((int)stream_window_height_)); + SDL_GetWindowSize(stream_window_, (int*)&stream_window_width_, + (int*)&stream_window_height_); float video_ratio = (float)video_width_ / (float)video_height_; float video_ratio_reverse = (float)video_height_ / (float)video_width_; diff --git a/src/single_window/render.h b/src/single_window/render.h index 971ccb6..937e8e2 100644 --- a/src/single_window/render.h +++ b/src/single_window/render.h @@ -215,12 +215,12 @@ class Render { float control_bar_pos_x_ = 0; float control_bar_pos_y_ = 30; - float mouse_diff_control_bar_pos_x_ = 0; - float mouse_diff_control_bar_pos_y_ = 0; - float mouse_pos_x_ = 0; - float mouse_pos_y_ = 0; - float mouse_pos_x_last_ = 0; - float mouse_pos_y_last_ = 0; + int mouse_diff_control_bar_pos_x_ = 0; + int mouse_diff_control_bar_pos_y_ = 0; + int mouse_pos_x_ = 0; + int mouse_pos_y_ = 0; + int mouse_pos_x_last_ = 0; + int mouse_pos_y_last_ = 0; int main_window_width_real_ = 720; int main_window_height_real_ = 540; diff --git a/thirdparty/projectx b/thirdparty/projectx index 826fc2d..1b7c890 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 826fc2d312d475355ab17c3cfd2c046876774e4f +Subproject commit 1b7c8905b7a99615bf04783cd75398d73b3e8c63