diff options
author | Marco Nelissen <marcone@google.com> | 2015-01-08 21:46:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 21:46:09 +0000 |
commit | 2702d5a073dce89fa3d97c304264b719b187c9fe (patch) | |
tree | eaf5d0bb7a34deeef7ee143ee8a23df5fb570cd2 /include/media | |
parent | 76758100c85622c178355959e454651310ea0011 (diff) | |
parent | c52af00beda4477d0fd00c3071e6ffd9c465430b (diff) | |
download | frameworks_av-2702d5a073dce89fa3d97c304264b719b187c9fe.zip frameworks_av-2702d5a073dce89fa3d97c304264b719b187c9fe.tar.gz frameworks_av-2702d5a073dce89fa3d97c304264b719b187c9fe.tar.bz2 |
am c52af00b: Merge "Use callbacks for Midi I/O"
* commit 'c52af00beda4477d0fd00c3071e6ffd9c465430b':
Use callbacks for Midi I/O
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/JetPlayer.h | 5 | ||||
-rw-r--r-- | include/media/MidiIoWrapper.h | 46 |
2 files changed, 48 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) { diff --git a/include/media/MidiIoWrapper.h b/include/media/MidiIoWrapper.h new file mode 100644 index 0000000..caf1d75 --- /dev/null +++ b/include/media/MidiIoWrapper.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MIDI_IO_WRAPPER_H_ +#define MIDI_IO_WRAPPER_H_ + +#include <libsonivox/eas_types.h> + +namespace android { + +class MidiIoWrapper : public RefBase { +public: + MidiIoWrapper(const char *path); + MidiIoWrapper(int fd, off64_t offset, int64_t size); + + ~MidiIoWrapper(); + + int readAt(void *buffer, int offset, int size); + int size(); + + EAS_FILE_LOCATOR getLocator(); + +private: + int mFd; + off64_t mBase; + int64_t mLength; + EAS_FILE mEasFile; +}; + + +} // namespace android + +#endif // MIDI_IO_WRAPPER_H_ |