diff options
author | Glenn Kasten <gkasten@google.com> | 2011-06-23 17:11:35 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2011-11-16 15:43:31 -0800 |
commit | 90100b5573f95e8404c6e2917520e090fe8b49fd (patch) | |
tree | 7d12fdb072b5eee22499efeff79d246eb3657e5f /media/libmediaplayerservice/MidiFile.h | |
parent | 5c052218128013d630b4d9a84393ebfbff11f3e8 (diff) | |
download | frameworks_av-90100b5573f95e8404c6e2917520e090fe8b49fd.zip frameworks_av-90100b5573f95e8404c6e2917520e090fe8b49fd.tar.gz frameworks_av-90100b5573f95e8404c6e2917520e090fe8b49fd.tar.bz2 |
MidiFile uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
Diffstat (limited to 'media/libmediaplayerservice/MidiFile.h')
-rw-r--r-- | media/libmediaplayerservice/MidiFile.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MidiFile.h b/media/libmediaplayerservice/MidiFile.h index 3469389..2a0dcf9 100644 --- a/media/libmediaplayerservice/MidiFile.h +++ b/media/libmediaplayerservice/MidiFile.h @@ -24,6 +24,7 @@ namespace android { +// Note that the name MidiFile is misleading; this actually represents a MIDI file player class MidiFile : public MediaPlayerInterface { public: MidiFile(); @@ -65,7 +66,6 @@ public: private: status_t createOutputTrack(); status_t reset_nosync(); - static int renderThread(void*); int render(); void updateState(){ EAS_State(mEasData, mEasHandle, &mState); } @@ -84,6 +84,29 @@ private: bool mPaused; volatile bool mRender; pid_t mTid; + + class MidiFileThread : public Thread { + public: + MidiFileThread(MidiFile *midiPlayer) : mMidiFile(midiPlayer) { + } + + protected: + virtual ~MidiFileThread() {} + + private: + MidiFile *mMidiFile; + + bool threadLoop() { + int result; + result = mMidiFile->render(); + return false; + } + + MidiFileThread(const MidiFileThread &); + MidiFileThread &operator=(const MidiFileThread &); + }; + + sp<MidiFileThread> mThread; }; }; // namespace android |