summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Grinko <iivanich@gmail.com>2015-04-28 07:33:48 +0300
committerEthan Chen <intervigil@gmail.com>2015-07-27 22:23:27 -0700
commit325f170653e3970f4e3c08d1f341c7ad123b50e8 (patch)
tree6679557303b09e6140d9b99d6447380b84b70cc8
parent45a65e7bf53d38cd6a16601c212aae1d969a5fdd (diff)
downloadhardware_qcom_audio-325f170653e3970f4e3c08d1f341c7ad123b50e8.tar.gz
hardware_qcom_audio-325f170653e3970f4e3c08d1f341c7ad123b50e8.tar.bz2
hardware_qcom_audio-325f170653e3970f4e3c08d1f341c7ad123b50e8.zip
msm8660: update audiopolicy
Change-Id: I91687b9b440f0446a23f32413599c208f95de9ec
-rw-r--r--msm8660/AudioPolicyManager.cpp12
-rw-r--r--msm8660/AudioPolicyManager.h12
2 files changed, 14 insertions, 10 deletions
diff --git a/msm8660/AudioPolicyManager.cpp b/msm8660/AudioPolicyManager.cpp
index 6d882312..8a84fee6 100644
--- a/msm8660/AudioPolicyManager.cpp
+++ b/msm8660/AudioPolicyManager.cpp
@@ -66,7 +66,9 @@ void AudioPolicyManager::setStrategyMute(routing_strategy strategy,
}
}
-void AudioPolicyManager::releaseOutput(audio_io_handle_t output)
+void AudioPolicyManager::releaseOutput(audio_io_handle_t output,
+ audio_stream_type_t stream,
+ audio_session_t session)
{
ALOGV("releaseOutput() %d", output);
ssize_t index = mOutputs.indexOfKey(output);
@@ -869,8 +871,8 @@ audio_io_handle_t AudioPolicyManager::getOutput(AudioSystem::stream_type stream,
return output;
}
status_t AudioPolicyManager::startOutput(audio_io_handle_t output,
- AudioSystem::stream_type stream,
- int session)
+ audio_stream_type stream,
+ audio_session_t session)
{
ALOGV("startOutput() output %d, stream %d, session %d", output, stream, session);
ssize_t index = mOutputs.indexOfKey(output);
@@ -951,8 +953,8 @@ status_t AudioPolicyManager::startOutput(audio_io_handle_t output,
status_t AudioPolicyManager::stopOutput(audio_io_handle_t output,
- AudioSystem::stream_type stream,
- int session)
+ audio_stream_type stream,
+ audio_session_t session)
{
ALOGV("stopOutput() output %d, stream %d, session %d", output, stream, session);
ssize_t index = mOutputs.indexOfKey(output);
diff --git a/msm8660/AudioPolicyManager.h b/msm8660/AudioPolicyManager.h
index a31f896f..7546e168 100644
--- a/msm8660/AudioPolicyManager.h
+++ b/msm8660/AudioPolicyManager.h
@@ -65,12 +65,14 @@ public:
AudioSystem::output_flags flags =
AudioSystem::OUTPUT_FLAG_INDIRECT, const audio_offload_info_t *offloadInfo = NULL);
virtual status_t startOutput(audio_io_handle_t output,
- AudioSystem::stream_type stream,
- int session = 0);
+ audio_stream_type stream,
+ audio_session_t session);
virtual status_t stopOutput(audio_io_handle_t output,
- AudioSystem::stream_type stream,
- int session = 0);
- virtual void releaseOutput(audio_io_handle_t output);
+ audio_stream_type stream,
+ audio_session_t session);
+ virtual void releaseOutput(audio_io_handle_t output,
+ audio_stream_type_t stream,
+ audio_session_t session);
virtual audio_io_handle_t getInput(int inputSource,
uint32_t samplingRate,
uint32_t format,