diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-01 22:38:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-01 22:38:02 +0000 |
| commit | 5e600f4186207757d5b1a6bdec69c36af401ed02 (patch) | |
| tree | 27c88fb9fad07ae5f371fe54175f042d67cb9607 /services/audiopolicy/managerdefault/AudioPolicyManager.h | |
| parent | 07a4422d8de776ec275215c0de645fda51bef89e (diff) | |
| parent | 98cc191247388132b6fd8a4ecd07abd6e4c5a0ed (diff) | |
| download | frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.zip frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.tar.gz frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.tar.bz2 | |
Merge "Split ManagerDefault into Manager and ManagerDefinitions"
Diffstat (limited to 'services/audiopolicy/managerdefault/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/managerdefault/AudioPolicyManager.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h index 8308d54..279dc93 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h @@ -27,14 +27,15 @@ #include <media/AudioPolicy.h> #include "AudioPolicyInterface.h" -#include "Gains.h" -#include "Ports.h" -#include "ConfigParsingUtils.h" -#include "Devices.h" -#include "IOProfile.h" -#include "HwModule.h" -#include "AudioInputDescriptor.h" -#include "AudioOutputDescriptor.h" +#include <AudioGain.h> +#include <AudioPort.h> +#include <AudioPatch.h> +#include <ConfigParsingUtils.h> +#include <DeviceDescriptor.h> +#include <IOProfile.h> +#include <HwModule.h> +#include <AudioInputDescriptor.h> +#include <AudioOutputDescriptor.h> namespace android { @@ -208,8 +209,6 @@ public: // return the strategy corresponding to a given stream type static routing_strategy getStrategy(audio_stream_type_t stream); - - static uint32_t nextUniqueId(); protected: class EffectDescriptor : public RefBase @@ -453,7 +452,6 @@ protected: // to boost soft sounds, used to adjust volume curves accordingly Vector < sp<HwModule> > mHwModules; - static volatile int32_t mNextUniqueId; volatile int32_t mAudioPortGeneration; DefaultKeyedVector<audio_patch_handle_t, sp<AudioPatch> > mAudioPatches; |