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

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

Merge "Remove last bits of IAudioFlinger::channel_count"

parents 3e5abe9b 217916f4

media/libmedia/IAudioFlinger.cpp

+1 −19
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ enum { 
    CREATE_TRACK = IBinder::FIRST_CALL_TRANSACTION,

    OPEN_RECORD,

    SAMPLE_RATE,

    CHANNEL_COUNT,  // obsolete

    RESERVED,   // obsolete, was CHANNEL_COUNT

    FORMAT,

    FRAME_COUNT,

    LATENCY,
@@ -191,17 +191,6 @@ public: 
        return reply.readInt32();

    }



#if 0

    virtual int channelCount(audio_io_handle_t output) const

    {

        Parcel data, reply;

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

        data.writeInt32((int32_t) output);

        remote()->transact(CHANNEL_COUNT, data, &reply);

        return reply.readInt32();

    }

#endif



    virtual audio_format_t format(audio_io_handle_t output) const

    {

        Parcel data, reply;
@@ -768,13 +757,6 @@ status_t BnAudioFlinger::onTransact( 
            reply->writeInt32( sampleRate((audio_io_handle_t) data.readInt32()) );

            return NO_ERROR;

        } break;

#if 0

        case CHANNEL_COUNT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            reply->writeInt32( channelCount((audio_io_handle_t) data.readInt32()) );

            return NO_ERROR;

        } break;

#endif

        case FORMAT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            reply->writeInt32( format((audio_io_handle_t) data.readInt32()) );