diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-27 07:19:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-27 07:19:53 -0800 |
| commit | 6f5980b75df837231365d238c1b0d6f386363fbb (patch) | |
| tree | a0e71b7150016bfd7763572c272b11b33aa13985 /services/audioflinger/AudioFlinger.h | |
| parent | 28f52c84c22e129063a576e1269a39ae0cc0bfb3 (diff) | |
| parent | 90716c5728b37637b2d0a730a721bfc9fad299e0 (diff) | |
| download | frameworks_av-6f5980b75df837231365d238c1b0d6f386363fbb.zip frameworks_av-6f5980b75df837231365d238c1b0d6f386363fbb.tar.gz frameworks_av-6f5980b75df837231365d238c1b0d6f386363fbb.tar.bz2 | |
Merge "Declare methods in binder opcode order"
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 2166e31..8e2bbcd 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -907,12 +907,12 @@ private: public: TrackHandle(const sp<PlaybackThread::Track>& track); virtual ~TrackHandle(); + virtual sp<IMemory> getCblk() const; virtual status_t start(); virtual void stop(); virtual void flush(); virtual void mute(bool); virtual void pause(); - virtual sp<IMemory> getCblk() const; virtual status_t attachAuxEffect(int effectId); virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); @@ -1030,9 +1030,9 @@ private: public: RecordHandle(const sp<RecordThread::RecordTrack>& recordTrack); virtual ~RecordHandle(); + virtual sp<IMemory> getCblk() const; virtual status_t start(); virtual void stop(); - virtual sp<IMemory> getCblk() const; virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); private: |