| author | Jian Xu <jian.xu@amlogic.com> | 2015-11-04 02:59:08 (GMT) |
|---|---|---|
| committer | Jian Xu <jian.xu@amlogic.com> | 2015-11-04 05:18:11 (GMT) |
| commit | 544c3ba84a611fcff62001bb19d2350c476979c0 (patch) | |
| tree | fa37b9b421ce9a4288db476812ee32c7ceb2bfa9 | |
| parent | 8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d (diff) | |
| download | audio-544c3ba84a611fcff62001bb19d2350c476979c0.zip audio-544c3ba84a611fcff62001bb19d2350c476979c0.tar.gz audio-544c3ba84a611fcff62001bb19d2350c476979c0.tar.bz2 | |
Revert "modify for compile error"
This reverts commit 8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d.
fix no audio issue.
Change-Id: I3727781f4540ff40bc7144bb9662ba77f17065b8
| -rw-r--r-- | DLGAudioPolicyManager.cpp | 21 | ||||
| -rw-r--r-- | DLGAudioPolicyManager.h | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/DLGAudioPolicyManager.cpp b/DLGAudioPolicyManager.cpp index 08d0499..5be1959 100644 --- a/DLGAudioPolicyManager.cpp +++ b/DLGAudioPolicyManager.cpp @@ -37,9 +37,7 @@ namespace android { extern "C" AudioPolicyInterface* createAudioPolicyManager( AudioPolicyClientInterface *clientInterface) { - //invalid new-expression of abstract class - //return new DLGAudioPolicyManager(clientInterface); - return NULL; + return new DLGAudioPolicyManager(clientInterface); } extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface) @@ -54,22 +52,21 @@ DLGAudioPolicyManager::DLGAudioPolicyManager( } float DLGAudioPolicyManager::computeVolume(audio_stream_type_t stream, - int index, - audio_io_handle_t output, - audio_devices_t device) + int index, + audio_devices_t device) { // We only use master volume, so all audio flinger streams // should be set to maximum (void)stream; (void)index; - (void)output; (void)device; - return 0.0f;//return AudioPolicyManager::computeVolume(stream,index,output,device); + return AudioPolicyManager::computeVolume(stream,index,device); } status_t DLGAudioPolicyManager::setDeviceConnectionState(audio_devices_t device, - audio_policy_dev_state_t state, - const char *device_address) + audio_policy_dev_state_t state, + const char *device_address, + const char *device_name) { audio_devices_t tmp = AUDIO_DEVICE_NONE;; ALOGV("setDeviceConnectionState %08x %x %s", device, state, @@ -88,8 +85,8 @@ status_t DLGAudioPolicyManager::setDeviceConnectionState(audio_devices_t device, status_t ret = 0; if (device != AUDIO_DEVICE_IN_REMOTE_SUBMIX) { - //ret = AudioPolicyManager::setDeviceConnectionState( - // device, state, device_address); + ret = AudioPolicyManager::setDeviceConnectionState( + device, state, device_address,device_name); } return ret; diff --git a/DLGAudioPolicyManager.h b/DLGAudioPolicyManager.h index bd3a307..2f26e39 100644 --- a/DLGAudioPolicyManager.h +++ b/DLGAudioPolicyManager.h @@ -35,14 +35,14 @@ public: virtual status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state, - const char *device_address); + const char *device_address, + const char *device_name); virtual audio_devices_t getDeviceForInputSource(audio_source_t inputSource); protected: virtual float computeVolume(audio_stream_type_t stream, int index, - audio_io_handle_t output, audio_devices_t device); private: |