summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-17 15:36:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-17 15:36:53 +0000
commit32a7e0a5f7b000951b9adb80b17796f35b024816 (patch)
tree75d9dd61e3e3abe0c459650a97c57bac3780f8ca /media/libmedia/AudioTrack.cpp
parenta238b9b43a2b8dac60e0fd8700daa6cd4f644547 (diff)
parent2b2165c75790050810460c8de3f414876bce4c0e (diff)
downloadframeworks_av-32a7e0a5f7b000951b9adb80b17796f35b024816.zip
frameworks_av-32a7e0a5f7b000951b9adb80b17796f35b024816.tar.gz
frameworks_av-32a7e0a5f7b000951b9adb80b17796f35b024816.tar.bz2
Merge "Unify comments between AudioTrack and AudioRecord"
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index d5e3e67..f5a010b 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -355,7 +355,7 @@ status_t AudioTrack::set(
mAudioTrackThread->requestExitAndWait();
mAudioTrackThread.clear();
}
- //Use of direct and offloaded output streams is ref counted by audio policy manager.
+ // Use of direct and offloaded output streams is ref counted by audio policy manager.
// As getOutput was called above and resulted in an output stream to be opened,
// we need to release it.
AudioSystem::releaseOutput(output);
@@ -698,6 +698,7 @@ status_t AudioTrack::setPositionUpdatePeriod(uint32_t updatePeriod)
AutoMutex lock(mLock);
mNewPosition = mProxy->getPosition() + updatePeriod;
mUpdatePeriod = updatePeriod;
+
return NO_ERROR;
}
@@ -1735,7 +1736,7 @@ status_t AudioTrack::restoreTrack_l(const char *from)
}
}
if (result != NO_ERROR) {
- //Use of direct and offloaded output streams is ref counted by audio policy manager.
+ // Use of direct and offloaded output streams is ref counted by audio policy manager.
// As getOutput was called above and resulted in an output stream to be opened,
// we need to release it.
AudioSystem::releaseOutput(output);