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

Commit 0fdbdd2a authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove obsolete IAudioRecord::getCblk()"

parents 26d5ff92 fe9570c7

include/media/IAudioRecord.h

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ class IAudioRecord : public IInterface 
public:

    DECLARE_META_INTERFACE(AudioRecord);



    /* get this tracks control block */

    virtual sp<IMemory> getCblk() const = 0;



    /* After it's created the track is not active. Call start() to

     * make it active.

     */

media/libmedia/IAudioRecord.cpp

+1 −21
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
namespace android {



enum {

    GET_CBLK = IBinder::FIRST_CALL_TRANSACTION,

    UNUSED_WAS_GET_CBLK = IBinder::FIRST_CALL_TRANSACTION,

    START,

    STOP

};
@@ -42,21 +42,6 @@ public: 
    {

    }



    virtual sp<IMemory> getCblk() const

    {

        Parcel data, reply;

        sp<IMemory> cblk;

        data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor());

        status_t status = remote()->transact(GET_CBLK, data, &reply);

        if (status == NO_ERROR) {

            cblk = interface_cast<IMemory>(reply.readStrongBinder());

            if (cblk != 0 && cblk->pointer() == NULL) {

                cblk.clear();

            }

        }

        return cblk;

    }



    virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession)

    {

        Parcel data, reply;
@@ -89,11 +74,6 @@ status_t BnAudioRecord::onTransact( 
    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

    switch (code) {

        case GET_CBLK: {

            CHECK_INTERFACE(IAudioRecord, data, reply);

            reply->writeStrongBinder(getCblk()->asBinder());

            return NO_ERROR;

        } break;

        case START: {

            CHECK_INTERFACE(IAudioRecord, data, reply);

            int /*AudioSystem::sync_event_t*/ event = data.readInt32();

services/audioflinger/AudioFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ private: 
    public:

        RecordHandle(const sp<RecordThread::RecordTrack>& recordTrack);

        virtual             ~RecordHandle();

        virtual sp<IMemory> getCblk() const;

        virtual status_t    start(int /*AudioSystem::sync_event_t*/ event, int triggerSession);

        virtual void        stop();

        virtual status_t onTransact(

services/audioflinger/Tracks.cpp

+0 −4
Original line number Diff line number Diff line
@@ -1800,10 +1800,6 @@ AudioFlinger::RecordHandle::~RecordHandle() { 
    mRecordTrack->destroy();

}



sp<IMemory> AudioFlinger::RecordHandle::getCblk() const {

    return mRecordTrack->getCblk();

}



status_t AudioFlinger::RecordHandle::start(int /*AudioSystem::sync_event_t*/ event,

        int triggerSession) {

    ALOGV("RecordHandle::start()");