summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-02-08 07:42:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-08 07:42:40 -0800
commit09b9ba0db29aaebe682b7391d93ae179b8bd8ee8 (patch)
treecbc69890dba1fe8460f71cb1832025cc9767007b /media
parent01a802692f6bf2c97a623683d073e949af61d7a9 (diff)
parent7c2e37dd32d42f1398a48d2ca6a51cf2e96b9893 (diff)
downloadframeworks_base-09b9ba0db29aaebe682b7391d93ae179b8bd8ee8.zip
frameworks_base-09b9ba0db29aaebe682b7391d93ae179b8bd8ee8.tar.gz
frameworks_base-09b9ba0db29aaebe682b7391d93ae179b8bd8ee8.tar.bz2
Merge "AudioTrack declare more methods const"
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioTrack.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 8c33f41..233cf75 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -506,7 +506,7 @@ status_t AudioTrack::setVolume(float left, float right)
return NO_ERROR;
}
-void AudioTrack::getVolume(float* left, float* right)
+void AudioTrack::getVolume(float* left, float* right) const
{
if (left != NULL) {
*left = mVolume[LEFT];
@@ -531,7 +531,7 @@ status_t AudioTrack::setAuxEffectSendLevel(float level)
return NO_ERROR;
}
-void AudioTrack::getAuxEffectSendLevel(float* level)
+void AudioTrack::getAuxEffectSendLevel(float* level) const
{
if (level != NULL) {
*level = mSendLevel;
@@ -553,7 +553,7 @@ status_t AudioTrack::setSampleRate(int rate)
return NO_ERROR;
}
-uint32_t AudioTrack::getSampleRate()
+uint32_t AudioTrack::getSampleRate() const
{
AutoMutex lock(mLock);
return mCblk->sampleRate;
@@ -601,7 +601,7 @@ status_t AudioTrack::setLoop_l(uint32_t loopStart, uint32_t loopEnd, int loopCou
return NO_ERROR;
}
-status_t AudioTrack::getLoop(uint32_t *loopStart, uint32_t *loopEnd, int *loopCount)
+status_t AudioTrack::getLoop(uint32_t *loopStart, uint32_t *loopEnd, int *loopCount) const
{
AutoMutex lock(mLock);
if (loopStart != NULL) {
@@ -631,7 +631,7 @@ status_t AudioTrack::setMarkerPosition(uint32_t marker)
return NO_ERROR;
}
-status_t AudioTrack::getMarkerPosition(uint32_t *marker)
+status_t AudioTrack::getMarkerPosition(uint32_t *marker) const
{
if (marker == NULL) return BAD_VALUE;
@@ -652,7 +652,7 @@ status_t AudioTrack::setPositionUpdatePeriod(uint32_t updatePeriod)
return NO_ERROR;
}
-status_t AudioTrack::getPositionUpdatePeriod(uint32_t *updatePeriod)
+status_t AudioTrack::getPositionUpdatePeriod(uint32_t *updatePeriod) const
{
if (updatePeriod == NULL) return BAD_VALUE;
@@ -712,7 +712,7 @@ audio_io_handle_t AudioTrack::getOutput_l()
mCblk->sampleRate, mFormat, mChannelMask, (audio_policy_output_flags_t)mFlags);
}
-int AudioTrack::getSessionId()
+int AudioTrack::getSessionId() const
{
return mSessionId;
}