diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-07 09:15:37 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-09 15:32:22 -0800 |
| commit | 18868c5db2f90309c6d11e5837822135e4a0c0fa (patch) | |
| tree | 58c7505f59a1a93ab729fc039aa5cb1eaa49652e /include/media | |
| parent | f2015b625cd6bea86da7401e725332c35b90e7cf (diff) | |
| download | frameworks_av-18868c5db2f90309c6d11e5837822135e4a0c0fa.zip frameworks_av-18868c5db2f90309c6d11e5837822135e4a0c0fa.tar.gz frameworks_av-18868c5db2f90309c6d11e5837822135e4a0c0fa.tar.bz2 | |
Use audio_policy_output_flags_t consistently
This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these
Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioTrack.h | 12 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 95b9d86..552e829 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -153,7 +153,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - uint32_t flags = 0, + audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -165,7 +165,7 @@ public: int format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - uint32_t flags = 0, + uint32_t flags = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE, callback_t cbf = 0, void* user = 0, int notificationFrames = 0, @@ -185,7 +185,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, const sp<IMemory>& sharedBuffer = 0, - uint32_t flags = 0, + audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -209,7 +209,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - uint32_t flags = 0, + audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -473,7 +473,7 @@ protected: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + audio_policy_output_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, bool enforceFrameCount); @@ -515,7 +515,7 @@ protected: uint32_t mNewPosition; uint32_t mUpdatePeriod; bool mFlushed; // FIXME will be made obsolete by making flush() synchronous - uint32_t mFlags; + audio_policy_output_flags_t mFlags; int mSessionId; int mAuxEffectId; mutable Mutex mLock; diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 7a2ada0..c723b6d 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -28,6 +28,7 @@ #include <media/IAudioRecord.h> #include <media/IAudioFlingerClient.h> #include <system/audio.h> +#include <system/audio_policy.h> #include <hardware/audio_effect.h> #include <media/IEffect.h> #include <media/IEffectClient.h> @@ -121,7 +122,7 @@ public: audio_format_t *pFormat, uint32_t *pChannels, uint32_t *pLatencyMs, - uint32_t flags) = 0; + audio_policy_output_flags_t flags) = 0; virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2) = 0; virtual status_t closeOutput(audio_io_handle_t output) = 0; |