summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-10-07 11:59:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-07 11:59:45 -0700
commit555e032b1a8204bb9cfc0b478270e4241b1592fb (patch)
tree6f2fc06efb405d2f8a2ff905dc1d66a2afbbb985 /include
parent7828a209af775e30af30b35ba5b24a7983ea65c8 (diff)
parent62443f5f4517ba17d911975e695f1ab75bfdbf77 (diff)
downloadframeworks_base-555e032b1a8204bb9cfc0b478270e4241b1592fb.zip
frameworks_base-555e032b1a8204bb9cfc0b478270e4241b1592fb.tar.gz
frameworks_base-555e032b1a8204bb9cfc0b478270e4241b1592fb.tar.bz2
am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-plus-aosp * commit '62443f5f4517ba17d911975e695f1ab75bfdbf77': Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Diffstat (limited to 'include')
-rw-r--r--include/media/ToneGenerator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index e8df08e..c884c2c 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -248,6 +248,7 @@ private:
// only if tone duration is less than about 27 Hours(@44100Hz sampling rate). If this time is exceeded,
// no crash will occur but tone sequence will show a glitch.
unsigned int mMaxSmp; // Maximum number of audio samples played (maximun tone duration)
+ int mDurationMs; // Maximum tone duration in ms
unsigned short mCurSegment; // Current segment index in ToneDescriptor segments[]
unsigned short mCurCount; // Current sequence repeat count