diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-24 19:35:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 19:35:26 +0000 |
| commit | 76e4e02d6b6c1da140b8cbe48fc58035d2b7d311 (patch) | |
| tree | 7a48c2c67e7c83055f26c0fe59584b3a52c44429 /media/libmediaplayerservice/MediaPlayerFactory.cpp | |
| parent | 620f348faf3ce0c39e71338a005f1528765f4d1e (diff) | |
| parent | 940c688d76828ffd83929c661e75b5197903d30f (diff) | |
| download | frameworks_av-76e4e02d6b6c1da140b8cbe48fc58035d2b7d311.zip frameworks_av-76e4e02d6b6c1da140b8cbe48fc58035d2b7d311.tar.gz frameworks_av-76e4e02d6b6c1da140b8cbe48fc58035d2b7d311.tar.bz2 | |
am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"
* commit '940c688d76828ffd83929c661e75b5197903d30f':
libmediaplayerservice: unused argument warning messages
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerFactory.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index 90aed39..09e6976 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -170,11 +170,11 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer( class StagefrightPlayerFactory : public MediaPlayerFactory::IFactory { public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, int fd, int64_t offset, - int64_t length, - float curScore) { + int64_t /*length*/, + float /*curScore*/) { char buf[20]; lseek(fd, offset, SEEK_SET); read(fd, buf, sizeof(buf)); @@ -197,7 +197,7 @@ class StagefrightPlayerFactory : class NuPlayerFactory : public MediaPlayerFactory::IFactory { public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, const char* url, float curScore) { static const float kOurScore = 0.8; @@ -229,9 +229,9 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory { return 0.0; } - virtual float scoreFactory(const sp<IMediaPlayer>& client, - const sp<IStreamSource> &source, - float curScore) { + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, + const sp<IStreamSource>& /*source*/, + float /*curScore*/) { return 1.0; } @@ -243,7 +243,7 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory { class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory { public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, const char* url, float curScore) { static const float kOurScore = 0.4; @@ -274,7 +274,7 @@ class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory { return 0.0; } - virtual float scoreFactory(const sp<IMediaPlayer>& client, + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, int fd, int64_t offset, int64_t length, @@ -312,9 +312,9 @@ class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory { class TestPlayerFactory : public MediaPlayerFactory::IFactory { public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, + virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, const char* url, - float curScore) { + float /*curScore*/) { if (TestPlayerStub::canBeUsed(url)) { return 1.0; } |