Moved the ScreenSaverDefeater class out of the transport control and …

…into utilities
Tracktion · Nov 15, 2024 · 58d1202 · 58d1202
1 parent f2ae3c8
commit 58d1202
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 29 deletions.
diff --git a/modules/tracktion_engine/playback/tracktion_TransportControl.cpp b/modules/tracktion_engine/playback/tracktion_TransportControl.cpp
@@ -675,34 +675,6 @@ struct TransportControl::PlayHeadWrapper
     TransportControl& transport;
 };
 
-
-//==============================================================================
-static int numScreenSaverDefeaters = 0;
-
-struct TransportControl::ScreenSaverDefeater
-{
-    ScreenSaverDefeater()
-    {
-        if (juce::Desktop::getInstance().isHeadless())
-            return;
-
-        TRACKTION_ASSERT_MESSAGE_THREAD
-        ++numScreenSaverDefeaters;
-        juce::Desktop::setScreenSaverEnabled (numScreenSaverDefeaters == 0);
-    }
-
-    ~ScreenSaverDefeater()
-    {
-        if (juce::Desktop::getInstance().isHeadless())
-            return;
-
-        TRACKTION_ASSERT_MESSAGE_THREAD
-        --numScreenSaverDefeaters;
-        jassert (numScreenSaverDefeaters >= 0);
-        juce::Desktop::setScreenSaverEnabled (numScreenSaverDefeaters == 0);
-    }
-};
-
 //==============================================================================
 static juce::Array<TransportControl*, juce::CriticalSection> activeTransportControls;
 

diff --git a/modules/tracktion_engine/playback/tracktion_TransportControl.h b/modules/tracktion_engine/playback/tracktion_TransportControl.h
@@ -407,7 +407,6 @@ class TransportControl   : public juce::ChangeBroadcaster,
     bool isStopInProgress = false;
     bool recordingIsStoppingFlag = false;
 
-    struct ScreenSaverDefeater;
     std::unique_ptr<ScreenSaverDefeater> screenSaverDefeater;
 
     struct PlayingFlag

diff --git a/modules/tracktion_engine/tracktion_engine.h b/modules/tracktion_engine/tracktion_engine.h
@@ -426,6 +426,7 @@ namespace tracktion { inline namespace engine
 #include "utilities/tracktion_CurveEditor.h"
 #include "utilities/tracktion_Envelope.h"
 #include "utilities/tracktion_Oscillators.h"
+#include "utilities/tracktion_ScreenSaverDefeater.h"
 
 #include "project/tracktion_ProjectItemID.h"
 

diff --git a/modules/tracktion_engine/tracktion_engine_utils.cpp b/modules/tracktion_engine/tracktion_engine_utils.cpp
@@ -85,6 +85,7 @@ extern "C" char MacGetMacFSRefForREXDLL (FSRef* fsRef)
 #include "utilities/tracktion_Engine.cpp"
 #include "utilities/tracktion_Threads.cpp"
 #include "utilities/tracktion_BinaryData.cpp"
+#include "utilities/tracktion_ScreenSaverDefeater.cpp"
 
 #ifdef __GNUC__
  #pragma GCC diagnostic pop

diff --git a/modules/tracktion_engine/utilities/tracktion_ScreenSaverDefeater.cpp b/modules/tracktion_engine/utilities/tracktion_ScreenSaverDefeater.cpp
@@ -0,0 +1,37 @@
+/*
+    ,--.                     ,--.     ,--.  ,--.
+  ,-'  '-.,--.--.,--,--.,---.|  |,-.,-'  '-.`--' ,---. ,--,--,      Copyright 2018
+  '-.  .-'|  .--' ,-.  | .--'|     /'-.  .-',--.| .-. ||      \   Tracktion Software
+    |  |  |  |  \ '-'  \ `--.|  \  \  |  |  |  |' '-' '|  ||  |       Corporation
+    `---' `--'   `--`--'`---'`--'`--' `---' `--' `---' `--''--'    www.tracktion.com
+*/
+
+
+namespace tracktion { inline namespace engine
+{
+
+static int numScreenSaverDefeaters = 0;
+
+ScreenSaverDefeater::ScreenSaverDefeater()
+{
+    if (juce::Desktop::getInstance().isHeadless())
+        return;
+
+    TRACKTION_ASSERT_MESSAGE_THREAD
+    ++numScreenSaverDefeaters;
+    juce::Desktop::setScreenSaverEnabled (numScreenSaverDefeaters == 0);
+}
+
+ScreenSaverDefeater::~ScreenSaverDefeater()
+{
+    if (juce::Desktop::getInstance().isHeadless())
+        return;
+
+    TRACKTION_ASSERT_MESSAGE_THREAD
+    --numScreenSaverDefeaters;
+    jassert (numScreenSaverDefeaters >= 0);
+    juce::Desktop::setScreenSaverEnabled (numScreenSaverDefeaters == 0);
+}
+
+
+}} // namespace tracktion { inline namespace engine
diff --git a/modules/tracktion_engine/utilities/tracktion_ScreenSaverDefeater.h b/modules/tracktion_engine/utilities/tracktion_ScreenSaverDefeater.h
@@ -0,0 +1,22 @@
+/*
+    ,--.                     ,--.     ,--.  ,--.
+  ,-'  '-.,--.--.,--,--.,---.|  |,-.,-'  '-.`--' ,---. ,--,--,      Copyright 2018
+  '-.  .-'|  .--' ,-.  | .--'|     /'-.  .-',--.| .-. ||      \   Tracktion Software
+    |  |  |  |  \ '-'  \ `--.|  \  \  |  |  |  |' '-' '|  ||  |       Corporation
+    `---' `--'   `--`--'`---'`--'`--' `---' `--' `---' `--''--'    www.tracktion.com
+*/
+
+
+namespace tracktion { inline namespace engine
+{
+
+//==============================================================================
+/// As long as at least one of these objects exists, the screensaver will be disabled
+struct ScreenSaverDefeater
+{
+    ScreenSaverDefeater();
+    ~ScreenSaverDefeater();
+};
+
+
+}} // namespace tracktion { inline namespace engine