diff options
| -rw-r--r-- | include/media/IAudioFlinger.h | 3 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 11 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 1 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index c742810..d0e38d6 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -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; 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, |