diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-16 12:46:34 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-12-16 14:06:57 -0800 |
| commit | 08b9e2d113213c37506a416bc95a36789bcab4ca (patch) | |
| tree | f417e27066b7ba7c59eb12606d28f1c7081e998e /include/media/JetPlayer.h | |
| parent | d3671c844e2592ce3a29d6d3c4fc344343783f46 (diff) | |
| download | frameworks_av-08b9e2d113213c37506a416bc95a36789bcab4ca.zip frameworks_av-08b9e2d113213c37506a416bc95a36789bcab4ca.tar.gz frameworks_av-08b9e2d113213c37506a416bc95a36789bcab4ca.tar.bz2 | |
Use callbacks for Midi I/O
Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.
Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
Diffstat (limited to 'include/media/JetPlayer.h')
| -rw-r--r-- | include/media/JetPlayer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h index 388f767..63d1980 100644 --- a/include/media/JetPlayer.h +++ b/include/media/JetPlayer.h @@ -22,6 +22,7 @@ #include <libsonivox/jet.h> #include <libsonivox/eas_types.h> #include <media/AudioTrack.h> +#include <media/MidiIoWrapper.h> namespace android { @@ -86,15 +87,13 @@ private: int mMaxTracks; // max number of MIDI tracks, usually 32 EAS_DATA_HANDLE mEasData; - EAS_FILE_LOCATOR mEasJetFileLoc; + sp<MidiIoWrapper> mIoWrapper; EAS_PCM* mAudioBuffer;// EAS renders the MIDI data into this buffer, sp<AudioTrack> mAudioTrack; // and we play it in this audio track int mTrackBufferSize; S_JET_STATUS mJetStatus; S_JET_STATUS mPreviousJetStatus; - char mJetFilePath[PATH_MAX]; - class JetPlayerThread : public Thread { public: JetPlayerThread(JetPlayer *player) : mPlayer(player) { |