diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-13 12:57:50 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-13 12:57:50 -0800 |
| commit | 7a2146d5807030b2629f347736be5301b61e8811 (patch) | |
| tree | 50ca10276a614287673aeefe08f3d8c5eafdad33 /media/libmedia/ToneGenerator.cpp | |
| parent | 5e07b5774c8b376776caa4f5b0a193767697e97e (diff) | |
| download | frameworks_av-7a2146d5807030b2629f347736be5301b61e8811.zip frameworks_av-7a2146d5807030b2629f347736be5301b61e8811.tar.gz frameworks_av-7a2146d5807030b2629f347736be5301b61e8811.tar.bz2 | |
auto import from //branches/cupcake/...@131421
Diffstat (limited to 'media/libmedia/ToneGenerator.cpp')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index fa36460..7fafc56 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -93,7 +93,7 @@ ToneGenerator::ToneGenerator(int streamType, float volume) { mState = TONE_IDLE; - if (AudioSystem::getOutputSamplingRate(&mSamplingRate) != NO_ERROR) { + if (AudioSystem::getOutputSamplingRate(&mSamplingRate, streamType) != NO_ERROR) { LOGE("Unable to marshal AudioFlinger"); return; } @@ -182,7 +182,7 @@ bool ToneGenerator::startTone(int toneType) { mLock.lock(); if (mState == TONE_STARTING) { if (mWaitCbkCond.waitRelative(mLock, seconds(1)) != NO_ERROR) { - LOGE("--- timed out"); + LOGE("--- Immediate start timed out"); mState = TONE_IDLE; } } @@ -200,7 +200,7 @@ bool ToneGenerator::startTone(int toneType) { } LOGV("cond received"); } else { - LOGE("--- timed out"); + LOGE("--- Delayed start timed out"); mState = TONE_IDLE; } } @@ -235,7 +235,7 @@ void ToneGenerator::stopTone() { if (lStatus == NO_ERROR) { LOGV("track stop complete, time %d", (unsigned int)(systemTime()/1000000)); } else { - LOGE("--- timed out"); + LOGE("--- Stop timed out"); mState = TONE_IDLE; mpAudioTrack->stop(); } |