summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-27 15:25:25 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-27 16:01:44 -0800
commit3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b (patch)
tree02ba1339028105733ff3897c5c72952781dc793d /include/media
parenta3a2cd4072aaa2d93c91251a786eb7323f8d2c27 (diff)
downloadframeworks_av-3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b.zip
frameworks_av-3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b.tar.gz
frameworks_av-3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b.tar.bz2
Use ToneGenerator::tone_type consistently
Also remove defaults in startToneCommand(), they're not needed and the default for tone type was nonsense. Change-Id: I70fa8cee4f3dbb8c66ceb3719c8d3d2f447f05b9
Diffstat (limited to 'include/media')
-rw-r--r--include/media/ToneGenerator.h4
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 {