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

Commit 6554773d authored by Dave Sparks's avatar Dave Sparks
Browse files

Update more references to openInputStream in support classes. 

Continuation of bug 1846343
parent 0e06d21a

libs/audioflinger/A2dpAudioInterface.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -71,8 +71,8 @@ AudioStreamOut* A2dpAudioInterface::openOutputStream( 
}

}





AudioStreamIn* A2dpAudioInterface::openInputStream(

AudioStreamIn* A2dpAudioInterface::openInputStream(

        int format, int channelCount, uint32_t sampleRate, status_t *status,

        int inputSource, int format, int channelCount, uint32_t sampleRate,

        AudioSystem::audio_in_acoustics acoustics)

        status_t *status, AudioSystem::audio_in_acoustics acoustics)

{

{

    if (status)

    if (status)

        *status = -1;

        *status = -1;

libs/audioflinger/A2dpAudioInterface.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -55,12 +55,24 @@ public: 
                                status_t *status=0);

                                status_t *status=0);





    virtual AudioStreamIn* openInputStream(

    virtual AudioStreamIn* openInputStream(

                                int inputSource,

                                int format,

                                int format,

                                int channelCount,

                                int channelCount,

                                uint32_t sampleRate,

                                uint32_t sampleRate,

                                status_t *status,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics);

                                AudioSystem::audio_in_acoustics acoustics);





    // DEPRECATED - WILL BE REMOVED

    virtual AudioStreamIn* openInputStream(

                                int format,

                                int channelCount,

                                uint32_t sampleRate,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics)

    {

        return openInputStream(-1, format, channelCount, sampleRate, status, acoustics);

    }



protected:

protected:

    virtual status_t    doRouting();

    virtual status_t    doRouting();

    virtual status_t    dump(int fd, const Vector<String16>& args);

    virtual status_t    dump(int fd, const Vector<String16>& args);

libs/audioflinger/AudioDumpInterface.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,13 @@ public: 
    virtual status_t    setParameter(const char* key, const char* value)

    virtual status_t    setParameter(const char* key, const char* value)

                            {return mFinalInterface->setParameter(key, value);}

                            {return mFinalInterface->setParameter(key, value);}





    virtual AudioStreamIn* openInputStream( int format, int channelCount, uint32_t sampleRate, status_t *status,

    virtual AudioStreamIn* openInputStream(int inputSource, int format, int channelCount,

                                            AudioSystem::audio_in_acoustics acoustics)

            uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)

                            {return mFinalInterface->openInputStream( format, channelCount, sampleRate, status, acoustics);}

        { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); }



    virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate,

            status_t *status, AudioSystem::audio_in_acoustics acoustics)

        { return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); }





    virtual status_t    dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }

    virtual status_t    dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }