diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-18 09:24:29 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-04-18 15:04:46 -0700 |
| commit | 0ca3cf94c0dfc173ad7886ae162c4b67067539f6 (patch) | |
| tree | bc156e7822e663626b78ec2ad09ef3970fbb48c5 /include | |
| parent | ee685f6d19a6cc3b0bf02e69eb5dea11a2aeb601 (diff) | |
| download | frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.zip frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.tar.gz frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.tar.bz2 | |
rename audio policy output flags
Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 14 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 471f462..f73a317 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -185,7 +185,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = AUDIO_CHANNEL_OUT_STEREO, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE); + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE); static status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0); diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 6de6486..4906bd3 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -139,7 +139,7 @@ public: * latency of the track. The actual size selected by the AudioTrack could be * larger if the requested size is not compatible with current audio HAL * latency. - * flags: See comments on audio_policy_output_flags_t in <system/audio_policy.h>. + * flags: See comments on audio_output_flags_t in <system/audio.h>. * cbf: Callback function. If not null, this function is called periodically * to request new PCM data. * user: Context for use by the callback receiver. @@ -155,7 +155,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -167,7 +167,7 @@ public: int format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - uint32_t flags = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE, + uint32_t flags = (uint32_t) AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = 0, void* user = 0, int notificationFrames = 0, @@ -187,7 +187,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, const sp<IMemory>& sharedBuffer = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -211,7 +211,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -476,7 +476,7 @@ protected: audio_format_t format, uint32_t channelMask, int frameCount, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output); void flush_l(); @@ -517,7 +517,7 @@ protected: uint32_t mNewPosition; uint32_t mUpdatePeriod; bool mFlushed; // FIXME will be made obsolete by making flush() synchronous - audio_policy_output_flags_t mFlags; + audio_output_flags_t mFlags; int mSessionId; int mAuxEffectId; mutable Mutex mLock; diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 9e938d1..04ac3ee 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -133,7 +133,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) = 0; + audio_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; diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 04c927a..e160d70 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -52,7 +52,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE) = 0; + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE) = 0; virtual status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0) = 0; |