summaryrefslogtreecommitdiffstats
path: root/include/media/MidiIoWrapper.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-08 13:40:53 -0800
committerMarco Nelissen <marcone@google.com>2015-01-08 13:48:52 -0800
commit0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 (patch)
tree915b24bd6c686000a5c4fb8af920c8a16204e30e /include/media/MidiIoWrapper.h
parentc52af00beda4477d0fd00c3071e6ffd9c465430b (diff)
downloadframeworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.zip
frameworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.tar.gz
frameworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.tar.bz2
Replace MidiFile player with a Midi extractor
This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
Diffstat (limited to 'include/media/MidiIoWrapper.h')
-rw-r--r--include/media/MidiIoWrapper.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/MidiIoWrapper.h b/include/media/MidiIoWrapper.h
index caf1d75..e6f8cf7 100644
--- a/include/media/MidiIoWrapper.h
+++ b/include/media/MidiIoWrapper.h
@@ -19,12 +19,15 @@
#include <libsonivox/eas_types.h>
+#include "media/stagefright/DataSource.h"
+
namespace android {
class MidiIoWrapper : public RefBase {
public:
MidiIoWrapper(const char *path);
MidiIoWrapper(int fd, off64_t offset, int64_t size);
+ MidiIoWrapper(const sp<DataSource> &source);
~MidiIoWrapper();
@@ -37,6 +40,7 @@ private:
int mFd;
off64_t mBase;
int64_t mLength;
+ sp<DataSource> mDataSource;
EAS_FILE mEasFile;
};