Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec23ce0 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

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
parent e4e2a37d

include/media/IAudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -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

media/libmedia/IAudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

services/audioflinger/AudioFlinger.h

+4 −5
Original line number Diff line number Diff line
@@ -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);