summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Watkins <watk@google.com>2015-04-14 14:54:51 -0700
committerChris Watkins <watk@google.com>2015-04-14 14:54:51 -0700
commit68aeecb932ea18bf472da7eb72c3770ca2596999 (patch)
treea64876fc074b856346007eac9342d6a4ba35afc3
parent96fff29ba6e2cdc01a59a3a9ae41a4153b10ef74 (diff)
downloadandroid_frameworks_wilhelm-68aeecb932ea18bf472da7eb72c3770ca2596999.tar.gz
android_frameworks_wilhelm-68aeecb932ea18bf472da7eb72c3770ca2596999.tar.bz2
android_frameworks_wilhelm-68aeecb932ea18bf472da7eb72c3770ca2596999.zip
Add a static cast to resolve overload ambiguity.
The IMediaPlayer interface was updated with a new overload for setDataSource which caused a compiler error in StreamPlayer. Add a static cast to resolve the ambiguity. Change-Id: I26a3dc4bee1680cb260e93a151483baf398a4399
-rw-r--r--src/android/android_StreamPlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/android_StreamPlayer.cpp b/src/android/android_StreamPlayer.cpp
index 70a5881..be230f3 100644
--- a/src/android/android_StreamPlayer.cpp
+++ b/src/android/android_StreamPlayer.cpp
@@ -389,7 +389,7 @@ void StreamPlayer::onPrepare() {
mPlaybackParams.sessionId);
if (mPlayer == NULL) {
SL_LOGE("media player service failed to create player by app proxy");
- } else if (mPlayer->setDataSource(mAppProxy /*IStreamSource*/) != NO_ERROR) {
+ } else if (mPlayer->setDataSource(static_cast<sp<IStreamSource>>(mAppProxy)) != NO_ERROR) {
SL_LOGE("setDataSource failed");
mPlayer.clear();
}