Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I3c256cf3 into eclair-mr2

Browse Source 
* changes:
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
This commit is contained in:
Android (Google) Code Review
2009-12-07 13:02:56 -08:00
parent ffacbc3419 3c256cf321
commit 62679112a2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/soundpool/SoundPool.h
View File

@@ -186,9 +186,6 @@ private:
SoundPool() {} // no default constructor SoundPool() {} // no default constructor
bool startThreads(); bool startThreads();
void doLoad(sp<Sample>& sample); void doLoad(sp<Sample>& sample);
inline void notify(const SoundPoolEvent* event) {
android_soundpool_SoundPool_notify(mSoundPoolRef, event);
}
sp<Sample> findSample(int sampleID) { return mSamples.valueFor(sampleID); } sp<Sample> findSample(int sampleID) { return mSamples.valueFor(sampleID); }
SoundChannel* findChannel (int channelID); SoundChannel* findChannel (int channelID);
SoundChannel* findNextChannel (int channelID); SoundChannel* findNextChannel (int channelID);
@@ -202,7 +199,6 @@ private:
int run(); int run();
void quit(); void quit();
jobject mSoundPoolRef;
Mutex mLock; Mutex mLock;
Mutex mRestartLock; Mutex mRestartLock;
Condition mCondition; Condition mCondition;