iCUESDK Demo: Avoid calling iCUESDK APIs when the session is not fully connected.

Author: jrlanglois

demo/source/demos/iCUESDKDemo.h

@@ -58,6 +58,14 @@ class CueSDKDemo final : public DemoBase,
 
     void timerCallback() override
     {
+        if (! corsair::globalSession->isConnected())
+        {
+            devices.clearQuick (true);
+            listbox.updateContent();
+            repaint(); // For the LEDs.
+            return;
+        }
+
         const auto newDevs = corsair::getAllAvailableDevices();
 
         bool changed = false;
@@ -205,8 +213,6 @@ class CueSDKDemo final : public DemoBase,
     TextButton redButton, greenButton, blueButton;
     ListBox listbox;
 
-    Grid pixelGrid;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CueSDKDemo)
 };
 

demo/source/main/Main.cpp

@@ -100,7 +100,7 @@ class MainWindow final : public DocumentWindow
         centreWithSize (getWidth(), getHeight());
        #endif
 
-        corsair::logInfo();
+        corsair::globalSession->logInfo();
 
         setVisible (true);
     }

modules/squarepine_graphics/linkers/iCUESDKIncluder.h

@@ -92,55 +92,6 @@
             return s;
         }
 
-        //==============================================================================
-        /** */
-        struct iCUESDKConnector final
-        {
-            /** */
-            iCUESDKConnector()
-            {
-                isValid (CorsairConnect (sessionStateChangeHandler, this));
-            }
-
-            /** */
-            ~iCUESDKConnector()
-            {
-                isValid (CorsairDisconnect());
-            }
-
-            static void sessionStateChangeHandler (void*, const CorsairSessionStateChanged*)
-            {
-            }
-        };
-
-        static juce::SharedResourcePointer<iCUESDKConnector> connector;
-
-        //==============================================================================
-        /** */
-        inline void logInfo()
-        {
-            CorsairSessionDetails details;
-            juce::zerostruct (details);
-            if (const auto result = toResult (CorsairGetSessionDetails (&details)); result.failed())
-            {
-                juce::Logger::writeToLog ("Could not log iCUE SDK information: " + result.getErrorMessage());
-                return;
-            }
-
-            juce::String info;
-            info
-            << juce::newLine
-            << "--------------------------------------------------" << juce::newLine << juce::newLine
-            << "=== Corsair iCUE SDK Information ===" << juce::newLine << juce::newLine
-            << "clientVersion: " << toString (details.clientVersion) << juce::newLine
-            << "serverVersion: " << toString (details.serverVersion) << juce::newLine
-            << "serverHostVersion: " << toString (details.serverHostVersion) << juce::newLine
-            << juce::newLine
-            << "--------------------------------------------------" << juce::newLine;
-
-            juce::Logger::writeToLog (info);
-        }
-
         //==============================================================================
         /** */
         inline bool operator== (const CorsairDeviceInfo& lhs, const CorsairDeviceInfo& rhs)
@@ -159,6 +110,7 @@
             return ! operator== (lhs, rhs);
         }
 
+        //==============================================================================
         /** */
         inline juce::Colour toColour (const CorsairLedColor& clc)
         {
@@ -177,6 +129,72 @@
             return c;
         }
 
+        //==============================================================================
+        /** */
+        class iCUESDKSession final
+        {
+        public:
+            /** */
+            iCUESDKSession()
+            {
+                juce::zerostruct (details);
+                isValid (CorsairConnect (sessionStateChangeHandler, this));
+            }
+
+            /** */
+            ~iCUESDKSession()
+            {
+                isValid (CorsairDisconnect());
+            }
+
+            /** */
+            bool isConnected() const { return connected.load (std::memory_order_relaxed); }
+
+            /** */
+            const CorsairSessionDetails& getDetails() const { return details; }
+
+            //==============================================================================
+            /** */
+            void logInfo()
+            {
+                juce::String info;
+                info
+                    << juce::newLine
+                    << "--------------------------------------------------" << juce::newLine << juce::newLine
+                    << "=== Corsair iCUE SDK Information ===" << juce::newLine << juce::newLine
+                    << "clientVersion: " << toString (details.clientVersion) << juce::newLine
+                    << "serverVersion: " << toString (details.serverVersion) << juce::newLine
+                    << "serverHostVersion: " << toString (details.serverHostVersion) << juce::newLine
+                    << juce::newLine
+                    << "--------------------------------------------------" << juce::newLine;
+
+                juce::Logger::writeToLog (info);
+            }
+
+            //==============================================================================
+            /** */
+            static void sessionStateChangeHandler (void* sourcePtr, const CorsairSessionStateChanged* newSession)
+            {
+                if (auto* session = (iCUESDKSession*) sourcePtr)
+                {
+                    session->connected = newSession != nullptr
+                                            ? newSession->state == CSS_Connected
+                                            : false;
+
+                    session->details = session->details;
+                }
+            }
+
+        private:
+            std::atomic<bool> connected { false };
+            CorsairSessionDetails details;
+
+            JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (iCUESDKSession)
+        };
+
+        /** */
+        static juce::SharedResourcePointer<iCUESDKSession> globalSession;
+
         //==============================================================================
         /**
         */
@@ -211,7 +229,7 @@
                 return {};
             }
 
-            int numLEDs = device.ledCount;
+            auto numLEDs = device.ledCount;
             std::vector<CorsairLedPosition> ledIDs ((size_t) numLEDs);
             if (isValid (CorsairGetLedPositions (device.id, numLEDs, ledIDs.data(), &numLEDs)))
                 return { ledIDs.data(), numLEDs };