commit bf76694217e364788e29f52f23b7c1202feb5f8c
author Andy Hung <hunga@google.com> Thu Jul 13 19:54:47 2023 -0700
committer Andy Hung <hunga@google.com> Fri Oct 06 20:42:12 2023 -0700
tree eb9c5e428efd16eeb41cefb5617e13dc4cefdaf9
parent c8904850d4dff51d4a83268a7b28a80c4b9c1d9f

AudioFlinger: Extract DeviceEffectManager class

Test: atest audiorecord_tests audiotrack_tests audiorouting_tests trackplayerbase_tests audiosystem_tests
Test: atest AAudioTests AudioTrackOffloadTest
Test: atest AudioTrackTest AudioRecordTest
Test: YouTube Camera
Bug: 288339104
Merged-In: Ica9b4df3dc148310d1dc03d0dab86db56c20475d
Change-Id: Ica9b4df3dc148310d1dc03d0dab86db56c20475d

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 409322d..fb02cd6 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -130,6 +130,7 @@
 
 // Classes that depend on IAf* interfaces but are not cross-dependent.
 #include "PatchCommandThread.h"
+#include "DeviceEffectManager.h"
 
 namespace android {
 
@@ -162,6 +163,8 @@
 {
     friend class sp<AudioFlinger>;
     friend class Client; // removeClient_l();
+    friend class DeviceEffectManager;
+    friend class DeviceEffectManagerCallback;
     friend class PatchPanel;
     // TODO(b/291012167) replace the Thread friends with an interface.
     friend class DirectOutputThread;
@@ -578,18 +581,12 @@
     void requestLogMerge();
 
     // TODO(b/288339104) replace these forward declaration classes with interfaces.
-    class DeviceEffectManager;
-    // TODO(b/288339104) these should be separate files
-public:
-    class DeviceEffectManagerCallback;
 private:
     struct TeePatch;
 public:
     using TeePatches = std::vector<TeePatch>;
 private:
 
-#include "DeviceEffectManager.h"
-
 #include "MelReporter.h"
 
     // Find io handle by session id.