diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-08 08:30:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 08:30:03 -0700 |
| commit | 4f21e517d09b9d793d20d64547df330fba705b3c (patch) | |
| tree | 872e144dacbf5668fd8012c937f1feddb06cf0c9 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | d96a068cc7b3519a5b7d122a12025684b6f28c76 (diff) | |
| parent | b37fcbfd7f9d65b90b43e0242903030c5a6517b5 (diff) | |
| download | frameworks_base-4f21e517d09b9d793d20d64547df330fba705b3c.zip frameworks_base-4f21e517d09b9d793d20d64547df330fba705b3c.tar.gz frameworks_base-4f21e517d09b9d793d20d64547df330fba705b3c.tar.bz2 | |
am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp
* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
Added getter for session Id to AudioSink
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index d975cb9..c43e9bb 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1546,6 +1546,11 @@ void MediaPlayerService::AudioOutput::CallbackWrapper( } +int MediaPlayerService::AudioOutput::getSessionId() +{ + return mSessionId; +} + #undef LOG_TAG #define LOG_TAG "AudioCache" MediaPlayerService::AudioCache::AudioCache(const char* name) : @@ -1733,4 +1738,9 @@ void MediaPlayerService::AudioCache::notify(void* cookie, int msg, int ext1, int p->mSignal.signal(); } +int MediaPlayerService::AudioCache::getSessionId() +{ + return 0; +} + } // namespace android |