From b0efd80e4205e1b7c8f61cb8f59df3d36f94b6bd Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sat, 23 Dec 2023 14:24:32 +0100 Subject: [PATCH] compilation fix for OSX --- src/ControlManager.cpp | 2 +- src/Decorations.cpp | 4 ++-- src/InputMappingWindow.cpp | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ControlManager.cpp b/src/ControlManager.cpp index 00a711e..d870fdb 100644 --- a/src/ControlManager.cpp +++ b/src/ControlManager.cpp @@ -842,7 +842,7 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut read_time = true; } if (read_time) { - int hh, mm, ss, ms; + osc::int32 hh, mm, ss, ms; args >> hh >> mm >> ss >> ms >> osc::EndMessage; target->call( new Seek( hh, mm, ss, ms ), true ); } diff --git a/src/Decorations.cpp b/src/Decorations.cpp index ab4db0b..27a8683 100644 --- a/src/Decorations.cpp +++ b/src/Decorations.cpp @@ -473,12 +473,12 @@ void Handles::draw(glm::mat4 modelview, glm::mat4 projection) // top and bottom vec = modelview * glm::vec4(0.f, 1.f, 0.f, 1.f); ctm = GlmToolkit::transform(vec, rot, glm::vec3(1.f)); - ctm = glm::rotate(ctm, M_PI_2f, glm::vec3(0.f, 0.f, 1.f)); + ctm = glm::rotate(ctm, (float) M_PI_2, glm::vec3(0.f, 0.f, 1.f)); handle_->draw( ctm, projection ); vec = modelview * glm::vec4(0.f, -1.f, 0.f, 1.f); ctm = GlmToolkit::transform(vec, rot, glm::vec3(1.f)); - ctm = glm::rotate(ctm, M_PI_2f, glm::vec3(0.f, 0.f, 1.f)); + ctm = glm::rotate(ctm, (float) M_PI_2, glm::vec3(0.f, 0.f, 1.f)); handle_->draw( ctm, projection ); } else if ( type_ == Handles::ROUNDING ){ diff --git a/src/InputMappingWindow.cpp b/src/InputMappingWindow.cpp index 9a471d4..6faead0 100644 --- a/src/InputMappingWindow.cpp +++ b/src/InputMappingWindow.cpp @@ -419,10 +419,9 @@ void InputMappingWindow::SliderParametersCallback(SourceCallback *callback, cons edited->setBidirectional(bd); // get value (gst time) and convert to hh mm s.ms - glm::uint64 val = edited->value(); - glm::uint64 ms = GST_TIME_AS_MSECONDS(val); - glm::uint64 hh = ms / 3600000; - glm::uint64 mm = (ms % 3600000) / 60000; + guint64 ms = GST_TIME_AS_MSECONDS(edited->value()); + guint64 hh = ms / 3600000; + guint64 mm = (ms % 3600000) / 60000; ms -= (hh * 3600000 + mm * 60000); float sec = (float) (ms) / 1000.f; @@ -433,7 +432,7 @@ void InputMappingWindow::SliderParametersCallback(SourceCallback *callback, cons if (data->EventChar < 256 && strchr("0123456789.,:", (char)data->EventChar)) return 0; return 1; } }; char buf6[64] = ""; - snprintf(buf6, 64, "%lu:%lu:%.2f", hh, mm, sec ); + snprintf(buf6, 64, "%lu:%lu:%.2f", (unsigned long) hh, (unsigned long) mm, sec ); // Text input field for MM:SS:MS seek target time ImGui::SetNextItemWidth(right_align);