diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-29 17:59:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-29 17:59:09 +0000 |
| commit | b59c1ad726b8bdf441f373d0bdc612539769334a (patch) | |
| tree | 9f870ae2f9f64f4a01f3c91e95d310db4d9895b7 /services/audioflinger | |
| parent | 3af48e6b28983da8c11d3d7d7fdd2088d881b462 (diff) | |
| parent | 3dcd00dddec86a1c5133083ad7ba2265d49c048c (diff) | |
| download | frameworks_av-b59c1ad726b8bdf441f373d0bdc612539769334a.zip frameworks_av-b59c1ad726b8bdf441f373d0bdc612539769334a.tar.gz frameworks_av-b59c1ad726b8bdf441f373d0bdc612539769334a.tar.bz2 | |
Merge "Declare methods in binder opcode order"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 3 | ||||
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 262d194..eee5da5 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -409,10 +409,11 @@ private: int64_t pts); virtual status_t setMediaTimeTransform(const LinearTransform& xform, int target); + virtual status_t setParameters(const String8& keyValuePairs); + virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); - virtual status_t setParameters(const String8& keyValuePairs); private: const sp<PlaybackThread::Track> mTrack; }; diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index aa1bcc2..a6c4bda 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -243,10 +243,6 @@ void AudioFlinger::TrackHandle::pause() { mTrack->pause(); } -status_t AudioFlinger::TrackHandle::setParameters(const String8& keyValuePairs) { - return mTrack->setParameters(keyValuePairs); -} - status_t AudioFlinger::TrackHandle::attachAuxEffect(int EffectId) { return mTrack->attachAuxEffect(EffectId); @@ -284,6 +280,10 @@ status_t AudioFlinger::TrackHandle::setMediaTimeTransform( xform, static_cast<TimedAudioTrack::TargetTimeline>(target)); } +status_t AudioFlinger::TrackHandle::setParameters(const String8& keyValuePairs) { + return mTrack->setParameters(keyValuePairs); +} + status_t AudioFlinger::TrackHandle::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { |