revert accidental refactor to isPlaying

Raffaello · Nov 12, 2023 · 5c1b38e · 5c1b38e
1 parent 7d17db8
commit 5c1b38e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/sdl2-hyper-sonic-drivers/sdl2-hyper-sonic-drivers.cpp b/sdl2-hyper-sonic-drivers/sdl2-hyper-sonic-drivers.cpp
@@ -62,9 +62,9 @@ void playNotes(hardware::PCSpeaker *pcSpeaker, const hardware::PCSpeaker::eWaveF
 {
     auto start = std::chrono::steady_clock::now();
     pcSpeaker->play(waveForm, freq, length);
-    while (pcSpeaker->isActive()) { SDL_Delay(10); }
+    while (pcSpeaker->isPlaying()) { SDL_Delay(10); }
     pcSpeaker->play(waveForm, freq + 183, length * 2);
-    while (pcSpeaker->isActive()) { SDL_Delay(10); }
+    while (pcSpeaker->isPlaying()) { SDL_Delay(10); }
     auto end = std::chrono::steady_clock::now();
     std::chrono::duration<double> elapsed_seconds = end - start;
     std::cout << "Elapsed Time (s) = " << elapsed_seconds.count() << " --- Expected (s) ~=" << length + length * 2 << "\n";

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/PCSpeaker.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/PCSpeaker.cpp
@@ -90,7 +90,7 @@ namespace HyperSonicDrivers::hardware
         _setRemainingSamples(delay);
     }
 
-    bool PCSpeaker::isActive() const noexcept
+    bool PCSpeaker::isPlaying() const noexcept
     {
         return _remainingSamples != 0;
     }

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/PCSpeaker.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/PCSpeaker.hpp
@@ -47,7 +47,7 @@ namespace HyperSonicDrivers::hardware
         void play(const eWaveForm waveForm, const int freq, const int32_t length);
         /** Stop the currently playing note after delay ms. */
         void stop(const int32_t delay = 0);
-        bool isActive() const noexcept;
+        bool isPlaying() const noexcept;
         template<typename T> uint32_t readBuffer(T* buffer, uint32_t numSamples);
         uint32_t getRate() const noexcept;
         uint8_t getChannels() const noexcept;

diff --git a/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/hardware/TestPCSpeaker.cpp b/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/hardware/TestPCSpeaker.cpp
@@ -31,7 +31,7 @@ namespace HyperSonicDrivers::hardware
     {
         PCSpeaker pcSpeaker(44100, 8);
         pcSpeaker.play(PCSpeaker::eWaveForm::SINE, 440, 1);
-        EXPECT_TRUE(pcSpeaker.isActive());
+        EXPECT_TRUE(pcSpeaker.isPlaying());
     }
 
     TEST(PCSpeaker, readBuffer)
@@ -74,7 +74,7 @@ namespace HyperSonicDrivers::hardware
             double tsum = 0.0;
             uint32_t dsum = 0;
 
-            while (pcSpeaker->isActive())
+            while (pcSpeaker->isPlaying())
             {
                 uint32_t d = this->readbuf();
                 dsum += d;