diff options
author | Eric Laurent <elaurent@google.com> | 2010-10-10 16:06:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 16:06:04 -0700 |
commit | 2eeadf9ded4b5770a713496e9887d668889987bc (patch) | |
tree | 94815ad41dce013a8d793d9e70d21f330573bd2b /media/libmediaplayerservice/MediaPlayerService.h | |
parent | 0714c8262054cb6a532025feb082b21b502a128b (diff) | |
parent | 74684081846ee6e68325fa5aba5c45b7447fd368 (diff) | |
download | frameworks_av-2eeadf9ded4b5770a713496e9887d668889987bc.zip frameworks_av-2eeadf9ded4b5770a713496e9887d668889987bc.tar.gz frameworks_av-2eeadf9ded4b5770a713496e9887d668889987bc.tar.bz2 |
am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'
* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
Added getter for session Id to AudioSink
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index deb458c..c4e78f7 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -77,6 +77,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual uint32_t latency() const; virtual float msecsPerFrame() const; virtual status_t getPosition(uint32_t *position); + virtual int getSessionId(); virtual status_t open( uint32_t sampleRate, int channelCount, @@ -133,6 +134,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual uint32_t latency() const; virtual float msecsPerFrame() const; virtual status_t getPosition(uint32_t *position); + virtual int getSessionId(); virtual status_t open( uint32_t sampleRate, int channelCount, int format, |