From 8bf8f05add8c9ab2bed63892b4a1274d1e4294a4 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Fri, 24 Sep 2021 00:46:20 +0200 Subject: [PATCH] compilation warnings --- Session.h | 2 +- UserInterfaceManager.cpp | 8 ++++---- UserInterfaceManager.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Session.h b/Session.h index 19c332d..547007c 100644 --- a/Session.h +++ b/Session.h @@ -129,7 +129,7 @@ public: std::list::iterator deleteMixingGroup (std::list::iterator g); // snapshots - SessionSnapshots * const snapshots () { return &snapshots_; } + SessionSnapshots * snapshots () { return &snapshots_; } // playlists void addPlayGroup(const SourceIdList &ids); diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index e239929..edfda16 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -2045,8 +2045,8 @@ void HelperToolbox::Render() /// /// SOURCE CONTROLLER /// -SourceController::SourceController() : focused_(false), min_width_(0.f), h_space_(0.f), v_space_(0.f), buttons_height_(0.f), - timeline_height_(0.f), scrollbar_(0.f), mediaplayer_height_(0.f), buttons_width_(0.f), +SourceController::SourceController() : focused_(false), min_width_(0.f), h_space_(0.f), v_space_(0.f), scrollbar_(0.f), + timeline_height_(0.f), mediaplayer_height_(0.f), buttons_width_(0.f), buttons_height_(0.f), play_request_(false), replay_request_(false), next_request_(false), active_label_(LABEL_AUTO_MEDIA_PLAYER), active_selection_(-1), selection_context_menu_(false), selection_mediaplayer_(nullptr), selection_target_slower_(0), selection_target_faster_(0), @@ -2217,7 +2217,7 @@ void SourceController::Render() // Menu : list of selections if (N>0) { ImGui::Separator(); - for (size_t i = 0 ; i < N; ++i) + for (size_t i = 0 ; i < (int) N; ++i) { std::string label = std::string(ICON_FA_CHECK_SQUARE " Selection #") + std::to_string(i); if (ImGui::MenuItem( label.c_str() )) @@ -3939,7 +3939,7 @@ void Navigator::RenderNewPannel() ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); if (ImGui::BeginCombo("##Pattern", "Select generator")) { - for (int p = 0; p < Pattern::pattern_types.size(); ++p){ + for (int p = 0; p < (int) Pattern::pattern_types.size(); ++p){ if (ImGui::Selectable( Pattern::pattern_types[p].c_str() )) { pattern_type = p; update_new_source = true; diff --git a/UserInterfaceManager.h b/UserInterfaceManager.h index 0b1985d..b5cb1d8 100644 --- a/UserInterfaceManager.h +++ b/UserInterfaceManager.h @@ -124,11 +124,11 @@ class SourceController float min_width_; float h_space_; float v_space_; + float scrollbar_; + float timeline_height_; + float mediaplayer_height_; float buttons_width_; float buttons_height_; - float timeline_height_; - float scrollbar_; - float mediaplayer_height_; bool play_request_, replay_request_, next_request_; std::string active_label_;