diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-06-01 14:25:11 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-06-02 09:07:34 -0700 |
| commit | f947dbce4390f2c3c460325d37002a34f09c0b74 (patch) | |
| tree | 5b7de9d1922af62726c5a22dda8b0a4aedd0f75f /services | |
| parent | e28456465fca86ed1b8b2225de073cfba64c7c42 (diff) | |
| download | frameworks_av-f947dbce4390f2c3c460325d37002a34f09c0b74.zip frameworks_av-f947dbce4390f2c3c460325d37002a34f09c0b74.tar.gz frameworks_av-f947dbce4390f2c3c460325d37002a34f09c0b74.tar.bz2 | |
Remove obsolete IAudioFlinger::channelCount()
Change-Id: Ie623edae2e795f9155f1f452fe4e6c7217a4a4c8
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 11 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 1 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 5b09d54..60810d5 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 29dc6b2..19b1732 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -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; diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 8c9943c..eeb33d9 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -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, |