Merge "Declare methods in binder opcode order" (6f5980b7) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -4108,6 +4108,10 @@ AudioFlinger::TrackHandle::~TrackHandle() {
	mTrack->destroy();		mTrack->destroy();
	}		}

			sp<IMemory> AudioFlinger::TrackHandle::getCblk() const {
			return mTrack->getCblk();
			}

	status_t AudioFlinger::TrackHandle::start() {		status_t AudioFlinger::TrackHandle::start() {
	return mTrack->start();		return mTrack->start();
	}		}
	@@ -4128,10 +4132,6 @@ void AudioFlinger::TrackHandle::pause() {
	mTrack->pause();		mTrack->pause();
	}		}

	sp<IMemory> AudioFlinger::TrackHandle::getCblk() const {
	return mTrack->getCblk();
	}

	status_t AudioFlinger::TrackHandle::attachAuxEffect(int EffectId)		status_t AudioFlinger::TrackHandle::attachAuxEffect(int EffectId)
	{		{
	return mTrack->attachAuxEffect(EffectId);		return mTrack->attachAuxEffect(EffectId);
	@@ -4238,6 +4238,10 @@ AudioFlinger::RecordHandle::~RecordHandle() {
	stop();		stop();
	}		}

			sp<IMemory> AudioFlinger::RecordHandle::getCblk() const {
			return mRecordTrack->getCblk();
			}

	status_t AudioFlinger::RecordHandle::start() {		status_t AudioFlinger::RecordHandle::start() {
	ALOGV("RecordHandle::start()");		ALOGV("RecordHandle::start()");
	return mRecordTrack->start();		return mRecordTrack->start();
	@@ -4248,10 +4252,6 @@ void AudioFlinger::RecordHandle::stop() {
	mRecordTrack->stop();		mRecordTrack->stop();
	}		}

	sp<IMemory> AudioFlinger::RecordHandle::getCblk() const {
	return mRecordTrack->getCblk();
	}

	status_t AudioFlinger::RecordHandle::onTransact(		status_t AudioFlinger::RecordHandle::onTransact(
	uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
	{		{

services/audioflinger/AudioFlinger.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -907,12 +907,12 @@ private:
	public:		public:
	TrackHandle(const sp<PlaybackThread::Track>& track);		TrackHandle(const sp<PlaybackThread::Track>& track);
	virtual ~TrackHandle();		virtual ~TrackHandle();
			virtual sp<IMemory> getCblk() const;
	virtual status_t start();		virtual status_t start();
	virtual void stop();		virtual void stop();
	virtual void flush();		virtual void flush();
	virtual void mute(bool);		virtual void mute(bool);
	virtual void pause();		virtual void pause();
	virtual sp<IMemory> getCblk() const;
	virtual status_t attachAuxEffect(int effectId);		virtual status_t attachAuxEffect(int effectId);
	virtual status_t onTransact(		virtual status_t onTransact(
	uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);
	@@ -1030,9 +1030,9 @@ private:
	public:		public:
	RecordHandle(const sp<RecordThread::RecordTrack>& recordTrack);		RecordHandle(const sp<RecordThread::RecordTrack>& recordTrack);
	virtual ~RecordHandle();		virtual ~RecordHandle();
			virtual sp<IMemory> getCblk() const;
	virtual status_t start();		virtual status_t start();
	virtual void stop();		virtual void stop();
	virtual sp<IMemory> getCblk() const;
	virtual status_t onTransact(		virtual status_t onTransact(
	uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);
	private:		private: