Merge branch 'master' into stable

1 files changed, 2 insertions, 2 deletions

diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp
index 2bcdd1d..78b1235 100644
--- a/utils/midiplay/adlmidiplay.cpp
+++ b/utils/midiplay/adlmidiplay.cpp
@@ -210,7 +210,7 @@ static inline void secondsToHMSM(double seconds_full, char *hmsm_buffer, size_t
     double seconds_integral;
     double seconds_fractional = std::modf(seconds_full, &seconds_integral);
     unsigned int milliseconds = static_cast<unsigned int>(std::floor(seconds_fractional * 1000.0));
-    unsigned int seconds = std::fmod(seconds_full, 60.0);
+    unsigned int seconds = static_cast<unsigned int>(std::fmod(seconds_full, 60.0));
     unsigned int minutes = static_cast<unsigned int>(std::floor(seconds_full / 60));
     unsigned int hours   = static_cast<unsigned int>(std::floor(seconds_full / 3600));
     std::memset(hmsm_buffer, 0, hmsm_buffer_size);
@@ -657,7 +657,7 @@ int main(int argc, char **argv)
             g_audioBuffer_lock.Unlock();
 
             const SDL_AudioSpec &spec = obtained;
-            while(g_audioBuffer.size() > spec.samples + (spec.freq * g_audioFormat.sampleOffset) * OurHeadRoomLength)
+            while(g_audioBuffer.size() > static_cast<size_t>(spec.samples + (spec.freq * g_audioFormat.sampleOffset) * OurHeadRoomLength))
             {
                 SDL_Delay(1);
             }