diff options
| author | Eric Laurent <elaurent@google.com> | 2009-11-05 00:01:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 00:01:33 -0800 |
| commit | 1c02bfb63ea6e1d1630a09229044d64be200a9ef (patch) | |
| tree | 20d55a7e13a544f2187a44a2b9364cb75200be22 /include/media/ToneGenerator.h | |
| parent | 308d4aea9ccb62d3d9e3010a73b16435e554d5f2 (diff) | |
| parent | dee7f8349ad8e93c5b16c24bed49fa9192790e0f (diff) | |
| download | frameworks_av-1c02bfb63ea6e1d1630a09229044d64be200a9ef.zip frameworks_av-1c02bfb63ea6e1d1630a09229044d64be200a9ef.tar.gz frameworks_av-1c02bfb63ea6e1d1630a09229044d64be200a9ef.tar.bz2 | |
am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Diffstat (limited to 'include/media/ToneGenerator.h')
| -rw-r--r-- | include/media/ToneGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index c884c2c..1ad1f26 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -151,7 +151,7 @@ public: NUM_SUP_TONES = LAST_SUP_TONE-FIRST_SUP_TONE+1 }; - ToneGenerator(int streamType, float volume); + ToneGenerator(int streamType, float volume, bool threadCanCallJava = false); ~ToneGenerator(); bool startTone(int toneType, int durationMs = -1); @@ -242,6 +242,7 @@ private: static const ToneDescriptor sToneDescriptors[]; + bool mThreadCanCallJava; unsigned int mTotalSmp; // Total number of audio samples played (gives current time) unsigned int mNextSegSmp; // Position of next segment transition expressed in samples // NOTE: because mTotalSmp, mNextSegSmp are stored on 32 bit, current design will operate properly |