PlayLed: use Pauser::paused() instead of referencing PauseButton.

PauseButton: no longer need static self-reference

diff --git a/src/modules/utils/PlayLed/PlayLed.cpp b/src/modules/utils/PlayLed/PlayLed.cpp
index 127fbce..afd6304 100644 (file)
--- a/src/modules/utils/PlayLed/PlayLed.cpp
+++ b/src/modules/utils/PlayLed/PlayLed.cpp
@@ -51,7 +51,7 @@ void PlayLed::on_play(void* argument)
 
 uint32_t PlayLed::half_second_tick(uint32_t)
 {
-    if (!PauseButton::instance->play_state)
+    if (kernel->pauser->paused())
         led.set(!led.get());
 
     return 0;

diff --git a/src/modules/utils/pausebutton/PauseButton.cpp b/src/modules/utils/pausebutton/PauseButton.cpp
index 4d6bb09..b7dc677 100644 (file)
--- a/src/modules/utils/pausebutton/PauseButton.cpp
+++ b/src/modules/utils/pausebutton/PauseButton.cpp
@@ -5,12 +5,7 @@
 #include <string>
 using namespace std;
 
-// so other modules can find us
-PauseButton* PauseButton::instance;
-
-PauseButton::PauseButton(){
-    instance = this;
-}
+PauseButton::PauseButton(){}
 
 void PauseButton::on_module_loaded(){
     this->button_state = true;

diff --git a/src/modules/utils/pausebutton/PauseButton.h b/src/modules/utils/pausebutton/PauseButton.h
index 31c5dac..73b3bc3 100644 (file)
--- a/src/modules/utils/pausebutton/PauseButton.h
+++ b/src/modules/utils/pausebutton/PauseButton.h
@@ -21,8 +21,6 @@ class PauseButton : public Module {
         Pin        button;
         bool       button_state;
         bool       play_state;
-
-        static PauseButton* instance;
 };
 
 #endif