diff options
| author | Eric Laurent <elaurent@google.com> | 2013-11-15 08:27:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 08:27:06 -0800 |
| commit | b4213a1252c23115f3fac77101adb33a9c6b9423 (patch) | |
| tree | 1477fe0312af38a2a24e655f7d62d7c1b9b1f38f /media/libmediaplayerservice | |
| parent | b5099903c059dc913e0e592969c10d15fac0c14c (diff) | |
| parent | 576e89b523d7705545032edc67d98d9ab1dedbd2 (diff) | |
| download | frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.zip frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.gz frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.bz2 | |
am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '576e89b523d7705545032edc67d98d9ab1dedbd2':
AwesomePlayer: correct stream type for offload
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 05d44d4..a486cb5 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -100,7 +100,10 @@ class MediaPlayerService : public BnMediaPlayerService virtual void flush(); virtual void pause(); virtual void close(); - void setAudioStreamType(audio_stream_type_t streamType) { mStreamType = streamType; } + void setAudioStreamType(audio_stream_type_t streamType) { + mStreamType = streamType; } + virtual audio_stream_type_t getAudioStreamType() const { return mStreamType; } + void setVolume(float left, float right); virtual status_t setPlaybackRatePermille(int32_t ratePermille); status_t setAuxEffectSendLevel(float level); @@ -207,6 +210,9 @@ class MediaPlayerService : public BnMediaPlayerService virtual void pause() {} virtual void close() {} void setAudioStreamType(audio_stream_type_t streamType) {} + // stream type is not used for AudioCache + virtual audio_stream_type_t getAudioStreamType() const { return AUDIO_STREAM_DEFAULT; } + void setVolume(float left, float right) {} virtual status_t setPlaybackRatePermille(int32_t ratePermille) { return INVALID_OPERATION; } uint32_t sampleRate() const { return mSampleRate; } |