Loading include/media/AudioTrack.h +3 −1 Original line number Diff line number Diff line Loading @@ -191,7 +191,9 @@ public: /* Terminates the AudioTrack and unregisters it from AudioFlinger. * Also destroys all resources associated with the AudioTrack. */ ~AudioTrack(); protected: virtual ~AudioTrack(); public: /* Initialize an uninitialized AudioTrack. * Returned status (from utils/Errors.h) can be: Loading include/media/JetPlayer.h +1 −1 Original line number Diff line number Diff line Loading @@ -88,7 +88,7 @@ private: EAS_DATA_HANDLE mEasData; EAS_FILE_LOCATOR mEasJetFileLoc; EAS_PCM* mAudioBuffer;// EAS renders the MIDI data into this buffer, AudioTrack* mAudioTrack; // and we play it in this audio track sp<AudioTrack> mAudioTrack; // and we play it in this audio track int mTrackBufferSize; S_JET_STATUS mJetStatus; S_JET_STATUS mPreviousJetStatus; Loading include/media/SoundPool.h +2 −2 Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ protected: class SoundChannel : public SoundEvent { public: enum state { IDLE, RESUMING, STOPPING, PAUSED, PLAYING }; SoundChannel() : mAudioTrack(NULL), mState(IDLE), mNumChannels(1), SoundChannel() : mState(IDLE), mNumChannels(1), mPos(0), mToggle(0), mAutoPaused(false) {} ~SoundChannel(); void init(SoundPool* soundPool); Loading Loading @@ -148,7 +148,7 @@ private: bool doStop_l(); SoundPool* mSoundPool; AudioTrack* mAudioTrack; sp<AudioTrack> mAudioTrack; SoundEvent mNextEvent; Mutex mLock; int mState; Loading include/media/ToneGenerator.h +2 −2 Original line number Diff line number Diff line Loading @@ -160,7 +160,7 @@ public: bool isInited() { return (mState == TONE_IDLE)?false:true;} // returns the audio session this ToneGenerator belongs to or 0 if an error occured. int getSessionId() { return (mpAudioTrack == NULL) ? 0 : mpAudioTrack->getSessionId(); } int getSessionId() { return (mpAudioTrack == 0) ? 0 : mpAudioTrack->getSessionId(); } private: Loading Loading @@ -264,7 +264,7 @@ private: unsigned short mLoopCounter; // Current tone loopback count uint32_t mSamplingRate; // AudioFlinger Sampling rate AudioTrack *mpAudioTrack; // Pointer to audio track used for playback sp<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 Loading include/media/stagefright/AudioPlayer.h +1 −1 Original line number Diff line number Diff line Loading @@ -70,7 +70,7 @@ public: private: friend class VideoEditorAudioPlayer; sp<MediaSource> mSource; AudioTrack *mAudioTrack; sp<AudioTrack> mAudioTrack; MediaBuffer *mInputBuffer; Loading Loading
include/media/AudioTrack.h +3 −1 Original line number Diff line number Diff line Loading @@ -191,7 +191,9 @@ public: /* Terminates the AudioTrack and unregisters it from AudioFlinger. * Also destroys all resources associated with the AudioTrack. */ ~AudioTrack(); protected: virtual ~AudioTrack(); public: /* Initialize an uninitialized AudioTrack. * Returned status (from utils/Errors.h) can be: Loading
include/media/JetPlayer.h +1 −1 Original line number Diff line number Diff line Loading @@ -88,7 +88,7 @@ private: EAS_DATA_HANDLE mEasData; EAS_FILE_LOCATOR mEasJetFileLoc; EAS_PCM* mAudioBuffer;// EAS renders the MIDI data into this buffer, AudioTrack* mAudioTrack; // and we play it in this audio track sp<AudioTrack> mAudioTrack; // and we play it in this audio track int mTrackBufferSize; S_JET_STATUS mJetStatus; S_JET_STATUS mPreviousJetStatus; Loading
include/media/SoundPool.h +2 −2 Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ protected: class SoundChannel : public SoundEvent { public: enum state { IDLE, RESUMING, STOPPING, PAUSED, PLAYING }; SoundChannel() : mAudioTrack(NULL), mState(IDLE), mNumChannels(1), SoundChannel() : mState(IDLE), mNumChannels(1), mPos(0), mToggle(0), mAutoPaused(false) {} ~SoundChannel(); void init(SoundPool* soundPool); Loading Loading @@ -148,7 +148,7 @@ private: bool doStop_l(); SoundPool* mSoundPool; AudioTrack* mAudioTrack; sp<AudioTrack> mAudioTrack; SoundEvent mNextEvent; Mutex mLock; int mState; Loading
include/media/ToneGenerator.h +2 −2 Original line number Diff line number Diff line Loading @@ -160,7 +160,7 @@ public: bool isInited() { return (mState == TONE_IDLE)?false:true;} // returns the audio session this ToneGenerator belongs to or 0 if an error occured. int getSessionId() { return (mpAudioTrack == NULL) ? 0 : mpAudioTrack->getSessionId(); } int getSessionId() { return (mpAudioTrack == 0) ? 0 : mpAudioTrack->getSessionId(); } private: Loading Loading @@ -264,7 +264,7 @@ private: unsigned short mLoopCounter; // Current tone loopback count uint32_t mSamplingRate; // AudioFlinger Sampling rate AudioTrack *mpAudioTrack; // Pointer to audio track used for playback sp<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 Loading
include/media/stagefright/AudioPlayer.h +1 −1 Original line number Diff line number Diff line Loading @@ -70,7 +70,7 @@ public: private: friend class VideoEditorAudioPlayer; sp<MediaSource> mSource; AudioTrack *mAudioTrack; sp<AudioTrack> mAudioTrack; MediaBuffer *mInputBuffer; Loading