diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-04-19 02:41:45 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-04-19 22:21:40 -0700 |
| commit | 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31 (patch) | |
| tree | e134a8ab7a0b5a00c7f3680b7b3ed6562ccbef80 /services/audiopolicy/service/AudioPolicyService.h | |
| parent | 489c9fb62f02e1d23d6d6c89b22f7d19c596e65e (diff) | |
| download | frameworks_av-32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31.zip frameworks_av-32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31.tar.gz frameworks_av-32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31.tar.bz2 | |
audiopolicy: Clean up the mess
* Since we're not using the policy directly to auto-attach,
let's clean it up and remove the unused stuff.
* Also fixes notifications for session release.
This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9.
Change-Id: Ibe65f427773c6ef012dde4f289d10e4089c094ea
Diffstat (limited to 'services/audiopolicy/service/AudioPolicyService.h')
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyService.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h index 01e0e5e..bc2875d 100644 --- a/services/audiopolicy/service/AudioPolicyService.h +++ b/services/audiopolicy/service/AudioPolicyService.h @@ -204,13 +204,6 @@ public: virtual status_t setEffectSessionCallbacksEnabled(bool enabled); - virtual status_t addOutputSessionEffects(audio_io_handle_t output, - audio_stream_type_t stream, - audio_session_t session, - audio_output_flags_t flags, - audio_channel_mask_t channelMask, - uid_t uid); - status_t doStartOutput(audio_io_handle_t output, audio_stream_type_t stream, audio_session_t session); @@ -248,10 +241,6 @@ public: audio_output_flags_t flags, audio_channel_mask_t channelMask, uid_t uid, bool added); - void releaseOutputSessionEffectsDelayed(audio_io_handle_t output, - audio_stream_type_t stream, - audio_unique_id_t sessionId, - int delayMs); private: AudioPolicyService() ANDROID_API; @@ -286,8 +275,6 @@ private: SET_AUDIOPORT_CONFIG, DYN_POLICY_MIX_STATE_UPDATE, EFFECT_SESSION_UPDATE, - RELEASE_OUTPUT_SESSION_EFFECTS, - ADD_OUTPUT_SESSION_EFFECTS }; AudioCommandThread (String8 name, const wp<AudioPolicyService>& service); @@ -335,17 +322,6 @@ private: audio_output_flags_t flags, audio_channel_mask_t channelMask, uid_t uid, bool added); - void releaseOutputSessionEffectsCommand(audio_io_handle_t output, - audio_stream_type_t stream, - audio_unique_id_t sessionId, - int delayMs = 0); - status_t addOutputSessionEffectsCommand(audio_io_handle_t output, - audio_stream_type_t stream, - audio_session_t sessionId, - audio_output_flags_t flags, - audio_channel_mask_t channelMask, - uid_t uid); - private: class AudioCommandData; @@ -452,23 +428,6 @@ private: bool mAdded; }; - class ReleaseOutputSessionEffectsData : public AudioCommandData { - public: - audio_io_handle_t mOutput; - audio_stream_type_t mStream; - audio_unique_id_t mSessionId; - }; - - class AddOutputSessionEffectsData : public AudioCommandData { - public: - audio_io_handle_t mOutput; - audio_stream_type_t mStream; - audio_session_t mSessionId; - audio_output_flags_t mFlags; - audio_channel_mask_t mChannelMask; - uid_t mUid; - }; - Mutex mLock; Condition mWaitWorkCV; Vector < sp<AudioCommand> > mAudioCommands; // list of pending commands |