am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop" (422ab3f1) · Commits · e / os / android_frameworks_base

include/media/AudioTrack.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −20

Original line number	Diff line number	Diff line
		@@ -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;