summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2012-02-14 09:10:39 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-14 09:10:39 -0800
commit422ab3f1e446acad158f0ab4b36fd5815bb1351b (patch)
tree7dc7d0ee63b2a244ebd003001fa57ef89cbfb295
parentfe93505ce104388cd5da75cf5635f6847767a668 (diff)
parentf4e1bdc13e0c9bb6352e458bef283dfc7165e23f (diff)
am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop"
* commit 'f4e1bdc13e0c9bb6352e458bef283dfc7165e23f': Remove dead code AudioTrack::getLoop
-rw-r--r--include/media/AudioTrack.h1
-rw-r--r--media/libmedia/AudioTrack.cpp20
2 files changed, 0 insertions, 21 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 11db81ba52fb..03a30888278e 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -299,7 +299,6 @@ public:
* (loopEnd-loopStart) <= framecount()
*/
status_t setLoop(uint32_t loopStart, uint32_t loopEnd, int loopCount);
- status_t getLoop(uint32_t *loopStart, uint32_t *loopEnd, int *loopCount) const;
/* Sets marker position. When playback reaches the number of frames specified, a callback with
* event type EVENT_MARKER is called. Calling setMarkerPosition with marker == 0 cancels marker
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 25189216a5a8..e91678aeb4e7 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -599,26 +599,6 @@ 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) const
-{
- AutoMutex lock(mLock);
- if (loopStart != NULL) {
- *loopStart = mCblk->loopStart;
- }
- if (loopEnd != NULL) {
- *loopEnd = mCblk->loopEnd;
- }
- if (loopCount != NULL) {
- if (mCblk->loopCount < 0) {
- *loopCount = -1;
- } else {
- *loopCount = mCblk->loopCount;
- }
- }
-
- return NO_ERROR;
-}
-
status_t AudioTrack::setMarkerPosition(uint32_t marker)
{
if (mCbf == NULL) return INVALID_OPERATION;