diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-03 08:00:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-03 08:00:52 -0800 |
| commit | 191c849283e8045a64a8f2c3472798c029416086 (patch) | |
| tree | 075cdd01f9c3ac037275bda093726e9b434eb9f9 /include/media/ToneGenerator.h | |
| parent | ed4dc900f75be015bf015e1ed93e2c72c6b7a202 (diff) | |
| parent | 23f7ad39ef52c0ac0a94934a71b6802c0a806b7f (diff) | |
| download | frameworks_base-191c849283e8045a64a8f2c3472798c029416086.zip frameworks_base-191c849283e8045a64a8f2c3472798c029416086.tar.gz frameworks_base-191c849283e8045a64a8f2c3472798c029416086.tar.bz2 | |
Merge "Use ToneGenerator::tone_type consistently"
Diffstat (limited to 'include/media/ToneGenerator.h')
| -rw-r--r-- | include/media/ToneGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index 7d890bd..df0c97e 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -154,7 +154,7 @@ public: ToneGenerator(audio_stream_type_t streamType, float volume, bool threadCanCallJava = false); ~ToneGenerator(); - bool startTone(int toneType, int durationMs = -1); + bool startTone(tone_type toneType, int durationMs = -1); void stopTone(); bool isInited() { return (mState == TONE_IDLE)?false:true;} @@ -274,7 +274,7 @@ private: bool prepareWave(); unsigned int numWaves(unsigned int segmentIdx); void clearWaveGens(); - int getToneForRegion(int toneType); + tone_type getToneForRegion(tone_type toneType); // WaveGenerator generates a single sine wave class WaveGenerator { |