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 | ff3c83e04ae459c4252b86dd4440b4e37ee92c16 (patch) | |
| tree | 8de4de832991dd2086313b6168f8523d002f6251 /include/media | |
| parent | a0d68338a88c2ddb4502f95017b546d603ef1ec7 (diff) | |
| parent | 3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b (diff) | |
| download | frameworks_av-ff3c83e04ae459c4252b86dd4440b4e37ee92c16.zip frameworks_av-ff3c83e04ae459c4252b86dd4440b4e37ee92c16.tar.gz frameworks_av-ff3c83e04ae459c4252b86dd4440b4e37ee92c16.tar.bz2 | |
Merge "Use ToneGenerator::tone_type consistently"
Diffstat (limited to 'include/media')
| -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 { |