diff options
author | Glenn Kasten <gkasten@google.com> | 2012-07-10 12:56:08 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-07-27 14:54:48 -0700 |
commit | 0ec23ce0d1ff79566c402bc30df3074f6e25a22b (patch) | |
tree | 8925eca2b9f4b9bccb7fa4d032ab80070179912d | |
parent | e4e2a37dbe2a4d923232305549101f779a2e3638 (diff) | |
download | frameworks_av-0ec23ce0d1ff79566c402bc30df3074f6e25a22b.zip frameworks_av-0ec23ce0d1ff79566c402bc30df3074f6e25a22b.tar.gz frameworks_av-0ec23ce0d1ff79566c402bc30df3074f6e25a22b.tar.bz2 |
Clean up start() parameters
Document where int is used instead of AudioSystem::sync_event_t
(probably because of a header file dependency).
TrackBase::start() and RecordTrack::start() don't need default parameters.
Change-Id: I82f4a4d078be900f3aa4bd926697e32f5ed68ec8
-rw-r--r-- | include/media/IAudioRecord.h | 2 | ||||
-rw-r--r-- | media/libmedia/IAudioRecord.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 9 |
4 files changed, 8 insertions, 9 deletions
diff --git a/include/media/IAudioRecord.h b/include/media/IAudioRecord.h index ebc03ea..d6e3141 100644 --- a/include/media/IAudioRecord.h +++ b/include/media/IAudioRecord.h @@ -37,7 +37,7 @@ public: /* After it's created the track is not active. Call start() to * make it active. */ - virtual status_t start(int event, int triggerSession) = 0; + virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession) = 0; /* Stop a track. If set, the callback will cease being called and * obtainBuffer will return an error. Buffers that are already released diff --git a/media/libmedia/IAudioRecord.cpp b/media/libmedia/IAudioRecord.cpp index 57a80a9..0d06e98 100644 --- a/media/libmedia/IAudioRecord.cpp +++ b/media/libmedia/IAudioRecord.cpp @@ -42,7 +42,7 @@ public: { } - virtual status_t start(int event, int triggerSession) + virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession) { Parcel data, reply; data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor()); @@ -92,7 +92,7 @@ status_t BnAudioRecord::onTransact( } break; case START: { CHECK_INTERFACE(IAudioRecord, data, reply); - int event = data.readInt32(); + int /*AudioSystem::sync_event_t*/ event = data.readInt32(); int triggerSession = data.readInt32(); reply->writeInt32(start(event, triggerSession)); return NO_ERROR; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4c0ad7c..fe9d09d 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -5867,7 +5867,7 @@ sp<IMemory> AudioFlinger::RecordHandle::getCblk() const { return mRecordTrack->getCblk(); } -status_t AudioFlinger::RecordHandle::start(int event, int triggerSession) { +status_t AudioFlinger::RecordHandle::start(int /*AudioSystem::sync_event_t*/ event, int triggerSession) { ALOGV("RecordHandle::start()"); return mRecordTrack->start((AudioSystem::sync_event_t)event, triggerSession); } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 82d585d..e629533 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -388,8 +388,8 @@ private: int sessionId); virtual ~TrackBase(); - virtual status_t start(AudioSystem::sync_event_t event = AudioSystem::SYNC_EVENT_NONE, - int triggerSession = 0) = 0; + virtual status_t start(AudioSystem::sync_event_t event, + int triggerSession) = 0; virtual void stop() = 0; sp<IMemory> getCblk() const { return mCblkMemory; } audio_track_cblk_t* cblk() const { return mCblk; } @@ -1378,8 +1378,7 @@ private: int sessionId); virtual ~RecordTrack(); - virtual status_t start(AudioSystem::sync_event_t event = AudioSystem::SYNC_EVENT_NONE, - int triggerSession = 0); + virtual status_t start(AudioSystem::sync_event_t event, int triggerSession); virtual void stop(); // clear the buffer overflow flag @@ -1498,7 +1497,7 @@ private: RecordHandle(const sp<RecordThread::RecordTrack>& recordTrack); virtual ~RecordHandle(); virtual sp<IMemory> getCblk() const; - virtual status_t start(int event, int triggerSession); + virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession); virtual void stop(); virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); |