Move some logic of QAudioStateMachine to AudioStateMachineUtils

The patch is a part of QAudioStateMachine prettification.

Change-Id: I08092be2d497c5d3fba7f569e443e5139ce30ba8
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 8423c36ac7f5908f1404ad0b4c6d746857c3a2c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b96242a23f511bcc8ac7983ced09a2db62d1834e)

4 files changed, 75 insertions, 52 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 38e83f55d..53bb90a3e 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -30,6 +30,7 @@ qt_internal_add_module(Multimedia
         audio/qaudiosink.cpp audio/qaudiosink.h
         audio/qaudiosystem.cpp audio/qaudiosystem_p.h
         audio/qaudiostatemachine.cpp audio/qaudiostatemachine_p.h
+        audio/qaudiostatemachineutils_p.h
         audio/qsamplecache_p.cpp audio/qsamplecache_p.h
         audio/qsoundeffect.cpp audio/qsoundeffect.h
         audio/qwavedecoder.cpp audio/qwavedecoder.h
diff --git a/src/multimedia/audio/qaudiostatemachine.cpp b/src/multimedia/audio/qaudiostatemachine.cpp
index 8f501fc11..83716efd2 100644
--- a/src/multimedia/audio/qaudiostatemachine.cpp
+++ b/src/multimedia/audio/qaudiostatemachine.cpp
@@ -9,54 +9,7 @@
 QT_BEGIN_NAMESPACE
 
 using Notifier = QAudioStateMachine::Notifier;
-using RawState = QAudioStateMachine::RawState;
-
-namespace {
-constexpr RawState DrainingFlag = 1 << 16;
-constexpr RawState InProgressFlag = 1 << 17;
-constexpr RawState WaitingFlags = DrainingFlag | InProgressFlag;
-
-inline bool isWaitingState(RawState state)
-{
-    return (state & WaitingFlags) != 0;
-}
-
-inline bool isDrainingState(RawState state)
-{
-    return (state & DrainingFlag) != 0;
-}
-
-inline RawState fromWaitingState(RawState state)
-{
-    return state & ~WaitingFlags;
-}
-
-inline QAudio::State toAudioState(RawState state)
-{
-    return QAudio::State(fromWaitingState(state));
-}
-
-template<typename... States>
-constexpr std::pair<RawState, uint32_t> makeStatesSet(QAudio::State first, States... others)
-{
-    return { first, ((1 << first) | ... | (1 << others)) };
-}
-
-// ensures compareExchange (testAndSet) operation with opportunity
-// to check several states, can be considered as atomic
-template<typename T, typename Predicate>
-bool multipleCompareExchange(std::atomic<T> &target, T &prevValue, T newValue, Predicate predicate)
-{
-    Q_ASSERT(predicate(prevValue));
-    do {
-        if (target.compare_exchange_strong(prevValue, newValue))
-            return true;
-    } while (predicate(prevValue));
-
-    return false;
-}
-
-} // namespace
+using namespace AudioStateMachineUtils;
 
 struct QAudioStateMachine::Synchronizer {
     QMutex m_mutex;
diff --git a/src/multimedia/audio/qaudiostatemachine_p.h b/src/multimedia/audio/qaudiostatemachine_p.h
index 1baee3ef4..b3207230b 100644
--- a/src/multimedia/audio/qaudiostatemachine_p.h
+++ b/src/multimedia/audio/qaudiostatemachine_p.h
@@ -14,9 +14,7 @@
 //
 // We mean it.
 //
-
-#include <QtMultimedia/qaudio.h>
-
+#include "qaudiostatemachineutils_p.h"
 #include <qmutex.h>
 #include <qwaitcondition.h>
 #include <qpointer.h>
@@ -40,7 +38,7 @@ class QAudioStateChangeNotifier;
 class Q_MULTIMEDIA_EXPORT QAudioStateMachine
 {
 public:
-    using RawState = int;
+    using RawState = AudioStateMachineUtils::RawState;
     class Notifier
     {
     public:
diff --git a/src/multimedia/audio/qaudiostatemachineutils_p.h b/src/multimedia/audio/qaudiostatemachineutils_p.h
new file mode 100644
index 000000000..a1c5ef579
--- /dev/null
+++ b/src/multimedia/audio/qaudiostatemachineutils_p.h
@@ -0,0 +1,71 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QAUDIOSTATEMACHINEUTILS_P_H
+#define QAUDIOSTATEMACHINEUTILS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qaudio.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace AudioStateMachineUtils {
+using RawState = int;
+constexpr RawState DrainingFlag = 1 << 16;
+constexpr RawState InProgressFlag = 1 << 17;
+constexpr RawState WaitingFlags = DrainingFlag | InProgressFlag;
+
+constexpr bool isWaitingState(RawState state)
+{
+    return (state & WaitingFlags) != 0;
+}
+
+constexpr bool isDrainingState(RawState state)
+{
+    return (state & DrainingFlag) != 0;
+}
+
+constexpr RawState fromWaitingState(RawState state)
+{
+    return state & ~WaitingFlags;
+}
+
+constexpr QAudio::State toAudioState(RawState state)
+{
+    return QAudio::State(fromWaitingState(state));
+}
+
+template <typename... States>
+constexpr std::pair<RawState, uint32_t> makeStatesSet(QAudio::State first, States... others)
+{
+    return { first, ((1 << first) | ... | (1 << others)) };
+}
+
+// ensures compareExchange (testAndSet) operation with opportunity
+// to check several states, can be considered as atomic
+template <typename T, typename Predicate>
+bool multipleCompareExchange(std::atomic<T> &target, T &prevValue, T newValue, Predicate predicate)
+{
+    Q_ASSERT(predicate(prevValue));
+    do {
+        if (target.compare_exchange_strong(prevValue, newValue))
+            return true;
+    } while (predicate(prevValue));
+
+    return false;
+}
+} // namespace AudioStateMachineUtils
+
+QT_END_NAMESPACE
+
+#endif // QAUDIOSTATEMACHINEUTILS_P_H