diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
commit | 7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8 (patch) | |
tree | d9838a098f868ee2fcffc20627a8c9a33cb23377 /include/media/ToneGenerator.h | |
parent | 2729ea9262ca60d93047e984739887cfc89e82eb (diff) | |
download | frameworks_av-7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8.zip frameworks_av-7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8.tar.gz frameworks_av-7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8.tar.bz2 |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'include/media/ToneGenerator.h')
-rw-r--r-- | include/media/ToneGenerator.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index bc27d35..da1489f 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -85,7 +85,7 @@ private: TONE_RESTARTING // }; - static const unsigned int NUM_PCM_BUFFERS = 2; // number of pcm buffers of audio track + static const unsigned int NUM_PCM_BUFFERS = 2; // Number of AudioTrack pcm buffers static const unsigned int TONEGEN_MAX_WAVES = 3; static const unsigned int TONEGEN_MAX_SEGMENTS = 4; // Maximun number of elenemts in @@ -126,14 +126,17 @@ private: const ToneDescriptor *mpToneDesc; // pointer to active tone descriptor const ToneDescriptor *mpNewToneDesc; // pointer to next active tone descriptor - unsigned int mSamplingRate; // Sampling rate + int mSamplingRate; // AudioFlinger Sampling rate + int mBufferSize; // PCM buffer size in frames AudioTrack *mpAudioTrack; // Pointer to audio track used for playback Mutex mLock; // Mutex to control concurent access to ToneGenerator object from audio callback and application API Mutex mCbkCondLock; // Mutex associated to mWaitCbkCond Condition mWaitCbkCond; // condition enabling interface to wait for audio callback completion after a change is requested float mVolume; // Volume applied to audio track + int mStreamType; // Audio stream used for output - static void audioCallback(void* user, const AudioTrack::Buffer& info); + bool initAudioTrack(); + static void audioCallback(int event, void* user, void *info); bool prepareWave(); unsigned int numWaves(); void clearWaveGens(); |