diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 16:38:12 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-13 10:20:14 -0800 |
| commit | fff6d715a8db0daf08a50634f242c40268de3d49 (patch) | |
| tree | f5331971b746b2e0d878e1127003a0dab72e5fbb /include/media/IAudioFlinger.h | |
| parent | 09192653e836b21689f004bf8dee375356641181 (diff) | |
| download | frameworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.zip frameworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.tar.gz frameworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.tar.bz2 | |
Use audio_stream_type_t consistently
At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.
Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
Diffstat (limited to 'include/media/IAudioFlinger.h')
| -rw-r--r-- | include/media/IAudioFlinger.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 9e3cb7f..15d3ca9 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -46,7 +46,7 @@ public: */ virtual sp<IAudioTrack> createTrack( pid_t pid, - int streamType, + audio_stream_type_t streamType, uint32_t sampleRate, uint32_t format, uint32_t channelMask, @@ -89,11 +89,11 @@ public: /* set/get stream type state. This will probably be used by * the preference panel, mostly. */ - virtual status_t setStreamVolume(int stream, float value, int output) = 0; - virtual status_t setStreamMute(int stream, bool muted) = 0; + virtual status_t setStreamVolume(audio_stream_type_t stream, float value, int output) = 0; + virtual status_t setStreamMute(audio_stream_type_t stream, bool muted) = 0; - virtual float streamVolume(int stream, int output) const = 0; - virtual bool streamMute(int stream) const = 0; + virtual float streamVolume(audio_stream_type_t stream, int output) const = 0; + virtual bool streamMute(audio_stream_type_t stream) const = 0; // set audio mode virtual status_t setMode(int mode) = 0; @@ -129,7 +129,7 @@ public: uint32_t acoustics) = 0; virtual status_t closeInput(int input) = 0; - virtual status_t setStreamOutput(uint32_t stream, int output) = 0; + virtual status_t setStreamOutput(audio_stream_type_t stream, int output) = 0; virtual status_t setVoiceVolume(float volume) = 0; |