summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-12-03 09:27:27 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-03 09:27:28 -0800
commit9862e8f3ba69c46efbafdc8438bd88848a9d55da (patch)
tree135447319afbd9c293877df816bd806c7dc46980 /media/libmedia
parenta7c6ac4fae30d6248b2cfd6f5421cde4233613f1 (diff)
parentab5bfb15f63887f999f11239e12d78a7babcd112 (diff)
downloadframeworks_av-9862e8f3ba69c46efbafdc8438bd88848a9d55da.zip
frameworks_av-9862e8f3ba69c46efbafdc8438bd88848a9d55da.tar.gz
frameworks_av-9862e8f3ba69c46efbafdc8438bd88848a9d55da.tar.bz2
Merge "AudioTrack inline short const methods"
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioTrack.cpp47
1 files changed, 0 insertions, 47 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index e40895a..0463433 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -317,43 +317,6 @@ status_t AudioTrack::set(
return NO_ERROR;
}
-status_t AudioTrack::initCheck() const
-{
- return mStatus;
-}
-
-// -------------------------------------------------------------------------
-
-uint32_t AudioTrack::latency() const
-{
- return mLatency;
-}
-
-audio_stream_type_t AudioTrack::streamType() const
-{
- return mStreamType;
-}
-
-audio_format_t AudioTrack::format() const
-{
- return mFormat;
-}
-
-uint32_t AudioTrack::channelCount() const
-{
- return mChannelCount;
-}
-
-size_t AudioTrack::frameCount() const
-{
- return mFrameCount;
-}
-
-sp<IMemory>& AudioTrack::sharedBuffer()
-{
- return mSharedBuffer;
-}
-
// -------------------------------------------------------------------------
void AudioTrack::start()
@@ -496,11 +459,6 @@ void AudioTrack::mute(bool e)
mMuted = e;
}
-bool AudioTrack::muted() const
-{
- return mMuted;
-}
-
status_t AudioTrack::setVolume(float left, float right)
{
if (left < 0.0f || left > 1.0f || right < 0.0f || right > 1.0f) {
@@ -735,11 +693,6 @@ audio_io_handle_t AudioTrack::getOutput_l()
mCblk->sampleRate, mFormat, mChannelMask, mFlags);
}
-int AudioTrack::getSessionId() const
-{
- return mSessionId;
-}
-
status_t AudioTrack::attachAuxEffect(int effectId)
{
ALOGV("attachAuxEffect(%d)", effectId);