diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-24 19:42:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 19:42:42 +0000 |
| commit | 840797f674f7c38d5215d0bcf0f4547c4e9a6957 (patch) | |
| tree | c1009748a8288b9b418b9597f0be853dd1f01c2a /media/libmediaplayerservice/MediaPlayerFactory.cpp | |
| parent | a21fabc0639b79a71efb326449faf750a8347cc8 (diff) | |
| parent | 76e4e02d6b6c1da140b8cbe48fc58035d2b7d311 (diff) | |
| download | frameworks_av-840797f674f7c38d5215d0bcf0f4547c4e9a6957.zip frameworks_av-840797f674f7c38d5215d0bcf0f4547c4e9a6957.tar.gz frameworks_av-840797f674f7c38d5215d0bcf0f4547c4e9a6957.tar.bz2 | |
am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"
* commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311':
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 9b239b1..e9c5e8e 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -176,11 +176,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)); @@ -203,7 +203,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; @@ -235,9 +235,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; } @@ -249,7 +249,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; @@ -280,7 +280,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, @@ -318,9 +318,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; } |