diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:10:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:10:00 +0000 |
commit | 3a3e87005fdfbfe4564605220a044b8023d0f539 (patch) | |
tree | 657e4b6b3ca4d8d7030333975203c91a895b30dd /services/audioflinger/Threads.h | |
parent | 5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27 (diff) | |
parent | 72215491c60fbcdb9a2f0be782e24e39cca249c5 (diff) | |
download | frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.zip frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.tar.gz frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.tar.bz2 |
am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and stream types
* commit '72215491c60fbcdb9a2f0be782e24e39cca249c5':
audio: new routing strategies and stream types
Diffstat (limited to 'services/audioflinger/Threads.h')
-rw-r--r-- | services/audioflinger/Threads.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index bcdb0e5..09383b6 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -730,9 +730,7 @@ private: void dumpTracks(int fd, const Vector<String16>& args); SortedVector< sp<Track> > mTracks; - // mStreamTypes[] uses 1 additional stream type internally for the OutputTrack used by - // DuplicatingThread - stream_type_t mStreamTypes[AUDIO_STREAM_CNT + 1]; + stream_type_t mStreamTypes[AUDIO_STREAM_CNT]; AudioStreamOut *mOutput; float mMasterVolume; |