diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-03 15:57:54 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-04-08 12:37:35 -0700 |
| commit | 322b4d25387a04c9afebe998326d005bbdf17ede (patch) | |
| tree | 3cf0c2912dc7cb75acb60526bef382dd90e9a51d /services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h | |
| parent | 6dc4dc4ad23dc82eca9af3112292f3e6d5b17b15 (diff) | |
| download | frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.zip frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.tar.gz frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.tar.bz2 | |
audio policy: fix unique audio port ID.
Remove mId member from AudioPort as it was shadowed
by mId in DeviceDescriptor.
Add getters for Id, and HW module name and version to device,
output and input descriptors.
Fix DeviceDescriptor name initialization.
Change-Id: I4a69f385e40330954d9dad5f2926c521f60b2ec1
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h index c3f584e..cc2a3bd 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h @@ -40,7 +40,7 @@ public: audio_devices_t device() const; void changeRefCount(audio_stream_type_t stream, int delta); - + audio_port_handle_t getId() const; void setIoHandle(audio_io_handle_t ioHandle); bool isDuplicated() const { return (mOutput1 != NULL && mOutput2 != NULL); } audio_devices_t supportedDevices(); @@ -58,7 +58,6 @@ public: audio_module_handle_t getModuleHandle() const; - audio_port_handle_t mId; audio_io_handle_t mIoHandle; // output handle uint32_t mLatency; // audio_output_flags_t mFlags; // @@ -75,6 +74,9 @@ public: bool mStrategyMutedByDevice[NUM_STRATEGIES]; // strategies muted because of incompatible // device selection. See checkDeviceMuteStrategies() uint32_t mDirectOpenCount; // number of clients using this output (direct outputs only) + +private: + audio_port_handle_t mId; }; class AudioOutputCollection : |