summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-10-08 08:30:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-08 08:30:03 -0700
commit4f21e517d09b9d793d20d64547df330fba705b3c (patch)
tree872e144dacbf5668fd8012c937f1feddb06cf0c9 /include
parentd96a068cc7b3519a5b7d122a12025684b6f28c76 (diff)
parentb37fcbfd7f9d65b90b43e0242903030c5a6517b5 (diff)
downloadframeworks_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 'include')
-rw-r--r--include/media/MediaPlayerInterface.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index 3662983..0521709 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -76,6 +76,7 @@ public:
virtual uint32_t latency() const = 0;
virtual float msecsPerFrame() const = 0;
virtual status_t getPosition(uint32_t *position) = 0;
+ virtual int getSessionId() = 0;
// If no callback is specified, use the "write" API below to submit
// audio data.