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

Commit f947dbce authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove obsolete IAudioFlinger::channelCount() 

Change-Id: Ie623edae2e795f9155f1f452fe4e6c7217a4a4c8
parent e2845646

include/media/IAudioFlinger.h

+0 −3
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ public: 
     * and therefore can be cached.

     */

    virtual     uint32_t    sampleRate(audio_io_handle_t output) const = 0;

#if 0

    virtual     int         channelCount(audio_io_handle_t output) const = 0;

#endif

    virtual     audio_format_t format(audio_io_handle_t output) const = 0;

    virtual     size_t      frameCount(audio_io_handle_t output) const = 0;

services/audioflinger/AudioFlinger.cpp

+0 −11
Original line number Diff line number Diff line
@@ -667,17 +667,6 @@ uint32_t AudioFlinger::sampleRate(audio_io_handle_t output) const 
    return thread->sampleRate();

}



int AudioFlinger::channelCount(audio_io_handle_t output) const

{

    Mutex::Autolock _l(mLock);

    PlaybackThread *thread = checkPlaybackThread_l(output);

    if (thread == NULL) {

        ALOGW("channelCount() unknown thread %d", output);

        return 0;

    }

    return thread->channelCount();

}



audio_format_t AudioFlinger::format(audio_io_handle_t output) const

{

    Mutex::Autolock _l(mLock);

services/audioflinger/AudioFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ public: 
                                status_t *status /*non-NULL*/);



    virtual     uint32_t    sampleRate(audio_io_handle_t output) const;

    virtual     int         channelCount(audio_io_handle_t output) const;

    virtual     audio_format_t format(audio_io_handle_t output) const;

    virtual     size_t      frameCount(audio_io_handle_t output) const;

    virtual     uint32_t    latency(audio_io_handle_t output) const;

services/audioflinger/Threads.h

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


                // dynamic externally-visible

                uint32_t    sampleRate() const { return mSampleRate; }

                uint32_t    channelCount() const { return mChannelCount; }

                audio_channel_mask_t channelMask() const { return mChannelMask; }

                audio_format_t format() const { return mFormat; }

                // Called by AudioFlinger::frameCount(audio_io_handle_t output) and effects,