summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MidiMetadataRetriever.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-21 10:25:44 -0700
committerAndreas Huber <andih@google.com>2011-03-21 11:13:59 -0700
commitaf8791e112c8072452bd14ef3c43a47511d19542 (patch)
treedc914f57bfb84ec7a1729581d66c06e0cad89125 /media/libmediaplayerservice/MidiMetadataRetriever.cpp
parentebd5d2541d4e5351fd1f1a23fc9ef047cfa67575 (diff)
downloadframeworks_av-af8791e112c8072452bd14ef3c43a47511d19542.zip
frameworks_av-af8791e112c8072452bd14ef3c43a47511d19542.tar.gz
frameworks_av-af8791e112c8072452bd14ef3c43a47511d19542.tar.bz2
Support passing headers to MediaMetadataRetriever's setDataSource API
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26 related-to-bug: 3506316
Diffstat (limited to 'media/libmediaplayerservice/MidiMetadataRetriever.cpp')
-rw-r--r--media/libmediaplayerservice/MidiMetadataRetriever.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/MidiMetadataRetriever.cpp b/media/libmediaplayerservice/MidiMetadataRetriever.cpp
index ad95fac..aaf2d18 100644
--- a/media/libmediaplayerservice/MidiMetadataRetriever.cpp
+++ b/media/libmediaplayerservice/MidiMetadataRetriever.cpp
@@ -35,7 +35,8 @@ void MidiMetadataRetriever::clearMetadataValues()
mMetadataValues[0][0] = '\0';
}
-status_t MidiMetadataRetriever::setDataSource(const char *url)
+status_t MidiMetadataRetriever::setDataSource(
+ const char *url, const KeyedVector<String8, String8> *headers)
{
LOGV("setDataSource: %s", url? url: "NULL pointer");
Mutex::Autolock lock(mLock);
@@ -43,8 +44,7 @@ status_t MidiMetadataRetriever::setDataSource(const char *url)
if (mMidiPlayer == 0) {
mMidiPlayer = new MidiFile();
}
- // TODO: support headers in MetadataRetriever interface!
- return mMidiPlayer->setDataSource(url, NULL /* headers */);
+ return mMidiPlayer->setDataSource(url, headers);
}
status_t MidiMetadataRetriever::setDataSource(int fd, int64_t offset, int64_t length)