Fix issues

Author: kunitoki

modules/yup_audio_basics/midi/yup_MidiFile.cpp

@@ -340,7 +340,22 @@ void MidiFile::setTicksPerQuarterNote (int ticks) noexcept
 
 void MidiFile::setSmpteTimeFormat (int framesPerSecond, int subframeResolution) noexcept
 {
-    timeFormat = (short) (((-framesPerSecond) << 8) | subframeResolution);
+    switch (framesPerSecond)
+    {
+        case 24:
+        case 25:
+        case 29:
+        case 30:
+            break;
+
+        default:
+            framesPerSecond = 25;
+            break;
+    }
+
+    const int8 smpteByte = static_cast<int8> (-framesPerSecond);
+
+    timeFormat = static_cast<int16> ((static_cast<uint8> (smpteByte) << 8) | static_cast<uint8> (subframeResolution));
 }
 
 //==============================================================================

modules/yup_audio_devices/native/yup_CoreAudio_mac.cpp

@@ -1158,7 +1158,7 @@ struct CoreAudioClasses
         {
             auto& intern = *static_cast<CoreAudioInternal*> (inClientData);
 
-            const auto xruns = std::count_if (pa, pa + numAddresses, [] (const AudioObjectPropertyAddress& x)
+            const auto xruns = (int) std::count_if (pa, pa + numAddresses, [] (const AudioObjectPropertyAddress& x)
             {
                 return x.mSelector == kAudioDeviceProcessorOverload;
             });

modules/yup_events/timers/yup_Timer.cpp

@@ -134,7 +134,7 @@ class Timer::TimerThread final : private Thread
                 break;
 
             auto* timer = first.timer;
-            first.countdownMs = timer->timerPeriodMs;
+            first.countdownMs = timer->getTimerInterval();
             shuffleTimerBackInQueue (0);
             notify();
 
@@ -175,7 +175,7 @@ class Timer::TimerThread final : private Thread
 
         auto pos = timers.size();
 
-        timers.push_back ({ t, t->timerPeriodMs });
+        timers.push_back ({ t, t->getTimerInterval() });
         t->positionInQueue = pos;
         shuffleTimerForwardInQueue (pos);
         notify();
@@ -210,7 +210,7 @@ class Timer::TimerThread final : private Thread
         jassert (timers[pos].timer == t);
 
         auto lastCountdown = timers[pos].countdownMs;
-        auto newCountdown = t->timerPeriodMs;
+        auto newCountdown = t->getTimerInterval();
 
         if (newCountdown != lastCountdown)
         {
@@ -350,10 +350,7 @@ void Timer::startTimer (int interval) noexcept
 
     if (auto* instance = TimerThread::getInstance())
     {
-        bool wasStopped = (timerPeriodMs == 0);
-        timerPeriodMs = jmax (1, interval);
-
-        if (wasStopped)
+        if (timerPeriodMs.exchange (jmax (1, interval)) == 0)
             instance->addTimer (this);
         else
             instance->resetTimerCounter (this);

modules/yup_events/timers/yup_Timer.h

@@ -125,12 +125,13 @@ class YUP_API Timer
 
     //==============================================================================
     /** Returns true if the timer is currently running. */
-    bool isTimerRunning() const noexcept { return timerPeriodMs > 0; }
+    bool isTimerRunning() const noexcept { return getTimerInterval() > 0; }
 
     /** Returns the timer's interval.
+
         @returns the timer's interval in milliseconds if it's running, or 0 if it's not.
     */
-    int getTimerInterval() const noexcept { return timerPeriodMs; }
+    int getTimerInterval() const noexcept { return timerPeriodMs.load (std::memory_order_relaxed); }
 
     //==============================================================================
     /** Invokes a lambda after a given number of milliseconds. */
@@ -143,7 +144,7 @@ class YUP_API Timer
 private:
     class TimerThread;
     size_t positionInQueue = (size_t) -1;
-    int timerPeriodMs = 0;
+    std::atomic<int> timerPeriodMs = 0;
 
     Timer& operator= (const Timer&) = delete;
 };

tests/yup_audio_basics/yup_MidiFile.cpp

@@ -214,11 +214,14 @@ TEST_F (MidiFileTest, TimeFormatGetSet)
     EXPECT_EQ (file.getTimeFormat(), 96);
 
     // Test SMPTE format
-    file.setSmpteTimeFormat (24, 8);
-    //EXPECT_EQ(file.getTimeFormat(), (short)(((-24) << 8) | 8));
+    file.setSmpteTimeFormat (24, 4);
+    EXPECT_EQ (file.getTimeFormat(), -6140);
+
+    file.setSmpteTimeFormat (25, 40);
+    EXPECT_EQ (file.getTimeFormat(), -6360);
 
-    file.setSmpteTimeFormat (30, 10);
-    //EXPECT_EQ(file.getTimeFormat(), (short)(((-30) << 8) | 10));
+    file.setSmpteTimeFormat (26, 40);
+    EXPECT_EQ (file.getTimeFormat(), -6360);
 }
 
 TEST_F (MidiFileTest, ReadFromValidStream)