summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-06-23 20:41:52 -0400
committerSteve Kondik <shade@chemlab.org>2010-06-23 20:41:52 -0400
commit9747a8b956760e258cbb6d9f4950e0b3e8bf02ff (patch)
tree9d05b7929e034ce14166f647d5c9557615dba921
parentff993fcac78710b265524044a7349592c8c68a19 (diff)
downloadframeworks_base-9747a8b956760e258cbb6d9f4950e0b3e8bf02ff.zip
frameworks_base-9747a8b956760e258cbb6d9f4950e0b3e8bf02ff.tar.gz
frameworks_base-9747a8b956760e258cbb6d9f4950e0b3e8bf02ff.tar.bz2
Fix setDataSource method in FLACPlayer for new interface.
Change-Id: I5fe7ee4fb1b86b9ffa5575f44b0be98ac895e340
-rw-r--r--media/libmediaplayerservice/FLACPlayer.cpp6
-rw-r--r--media/libmediaplayerservice/FLACPlayer.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/FLACPlayer.cpp b/media/libmediaplayerservice/FLACPlayer.cpp
index 3773606..1f8e3b6 100644
--- a/media/libmediaplayerservice/FLACPlayer.cpp
+++ b/media/libmediaplayerservice/FLACPlayer.cpp
@@ -88,9 +88,9 @@ FLACPlayer::~FLACPlayer() {
release();
}
-status_t FLACPlayer::setDataSource(const char* path)
-{
- return setdatasource(path, -1, 0, 0x7ffffffffffffffLL); // intentionally less than LONG_MAX
+status_t FLACPlayer::setDataSource(
+ const char *uri, const KeyedVector<String8, String8> *headers) {
+ return setdatasource(uri, -1, 0, 0x7ffffffffffffffLL); // intentionally less than LONG_MAX
}
status_t FLACPlayer::setDataSource(int fd, int64_t offset, int64_t length)
diff --git a/media/libmediaplayerservice/FLACPlayer.h b/media/libmediaplayerservice/FLACPlayer.h
index cce3419..b7068c3 100644
--- a/media/libmediaplayerservice/FLACPlayer.h
+++ b/media/libmediaplayerservice/FLACPlayer.h
@@ -36,7 +36,10 @@ public:
virtual void onFirstRef();
virtual status_t initCheck();
- virtual status_t setDataSource(const char* path);
+
+ virtual status_t setDataSource(
+ const char *uri, const KeyedVector<String8, String8> *headers);
+
virtual status_t setDataSource(int fd, int64_t offset, int64_t length);
virtual status_t setVideoSurface(const sp<ISurface>& surface) { return UNKNOWN_ERROR; }
virtual status_t prepare();