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 /media/libstagefright/StagefrightMediaScanner.cpp | |
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 'media/libstagefright/StagefrightMediaScanner.cpp')
-rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 4449d57..6ded3a7 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -26,6 +26,7 @@ #include <media/IMediaHTTPService.h> #include <media/mediametadataretriever.h> +#include <media/MidiIoWrapper.h> #include <private/media/VideoFrame.h> // Sonivox includes @@ -71,13 +72,9 @@ static MediaScanResult HandleMIDI( EAS_DATA_HANDLE easData = NULL; EAS_HANDLE easHandle = NULL; EAS_RESULT result = EAS_Init(&easData); + MidiIoWrapper wrapper(filename); if (result == EAS_SUCCESS) { - EAS_FILE file; - file.path = filename; - file.fd = 0; - file.offset = 0; - file.length = 0; - result = EAS_OpenFile(easData, &file, &easHandle); + result = EAS_OpenFile(easData, wrapper.getLocator(), &easHandle); } if (result == EAS_SUCCESS) { result = EAS_Prepare(easData, easHandle); |