diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-04-22 18:26:43 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-04-22 21:46:57 -0700 |
| commit | 244deea89aaf3c5dfa8bd369a845276ae501cb5a (patch) | |
| tree | 956a42c556f316d0ae3fe6678fec847700b97d4f /services/audiopolicy/service/AudioPolicyEffects.h | |
| parent | c27a16c33c78a36482336a16199b1b8be794cea4 (diff) | |
| download | frameworks_av-244deea89aaf3c5dfa8bd369a845276ae501cb5a.zip frameworks_av-244deea89aaf3c5dfa8bd369a845276ae501cb5a.tar.gz frameworks_av-244deea89aaf3c5dfa8bd369a845276ae501cb5a.tar.bz2 | |
audiopolicy: Revert all session callback patches.
* This has been rearchitected in a better way, as this
feature turns out to be more difficult than it seems.
* Reverting all of this stuff and rolling it into a single commit.
This reverts commit c27a16c33c78a36482336a16199b1b8be794cea4.
This reverts commit 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31.
This reverts commit 489c9fb62f02e1d23d6d6c89b22f7d19c596e65e.
This reverts commit a4123803d0a0e9e0c69faa4207d357cc74a65d58.
This reverts commit e13b58b988ab642d4ae5ca6d0a89013510714956.
This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9.
This reverts commit 0479d7c79a7fd6f112e8dc7e45c009cf6602dbaa.
Change-Id: Iaed9f198d806aa414c95960713e8187c98db248b
Diffstat (limited to 'services/audiopolicy/service/AudioPolicyEffects.h')
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyEffects.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/services/audiopolicy/service/AudioPolicyEffects.h b/services/audiopolicy/service/AudioPolicyEffects.h index 1c251e0..3845050 100644 --- a/services/audiopolicy/service/AudioPolicyEffects.h +++ b/services/audiopolicy/service/AudioPolicyEffects.h @@ -31,8 +31,6 @@ namespace android { -class AudioPolicyService; - // ---------------------------------------------------------------------------- // AudioPolicyEffects class @@ -46,7 +44,7 @@ public: // The constructor will parse audio_effects.conf // First it will look whether vendor specific file exists, // otherwise it will parse the system default file. - AudioPolicyEffects(AudioPolicyService *audioPolicyService); + AudioPolicyEffects(); virtual ~AudioPolicyEffects(); // NOTE: methods on AudioPolicyEffects should never be called with the AudioPolicyService @@ -86,12 +84,6 @@ public: audio_stream_type_t stream, int audioSession); - status_t doAddOutputSessionEffects(audio_io_handle_t output, - audio_stream_type_t stream, - int audioSession, - audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, - audio_channel_mask_t channelMask = 0, uid_t uid = 0); - private: // class to store the description of an effects and its parameters @@ -200,8 +192,6 @@ private: KeyedVector< audio_stream_type_t, EffectDescVector* > mOutputStreams; // Automatic output effects are unique for audiosession ID KeyedVector< int32_t, EffectVector* > mOutputSessions; - - AudioPolicyService *mAudioPolicyService; }; }; // namespace android |