diff options
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h | 2 | ||||
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/audio_policy_conf.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h index b9e1d4a..d15f6b4 100644 --- a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h @@ -54,6 +54,8 @@ public: private: audio_devices_t mDeviceType; + +friend class DeviceVector; }; class DeviceVector : public SortedVector< sp<DeviceDescriptor> > diff --git a/services/audiopolicy/common/managerdefinitions/include/audio_policy_conf.h b/services/audiopolicy/common/managerdefinitions/include/audio_policy_conf.h index 441bf7b..a393e3b 100644 --- a/services/audiopolicy/common/managerdefinitions/include/audio_policy_conf.h +++ b/services/audiopolicy/common/managerdefinitions/include/audio_policy_conf.h @@ -16,6 +16,7 @@ #pragma once + ///////////////////////////////////////////////// // Definitions for audio policy configuration file (audio_policy.conf) ///////////////////////////////////////////////// @@ -50,9 +51,9 @@ // "formats" in outputs descriptors indicating that supported // values should be queried after opening the output. -#define DEVICES_TAG "devices" -#define DEVICE_TYPE "type" -#define DEVICE_ADDRESS "address" +#define APM_DEVICES_TAG "devices" +#define APM_DEVICE_TYPE "type" +#define APM_DEVICE_ADDRESS "address" #define MIXERS_TAG "mixers" #define MIXER_TYPE "type" |