Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b6fcc2f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"

parents 73ec1173 684d4730

include/media/AudioEffect.h

+6 −5
Original line number Original line Diff line number Diff line
@@ -217,8 +217,9 @@ public: 
     *      higher priorities, 0 being the normal priority.

     *      higher priorities, 0 being the normal priority.

     * cbf:         optional callback function (see effect_callback_t)

     * cbf:         optional callback function (see effect_callback_t)

     * user:        pointer to context for use by the callback receiver.

     * user:        pointer to context for use by the callback receiver.

     * sessionID:   audio session this effect is associated to. If 0, the effect will be global to

     * sessionID:   audio session this effect is associated to.

     *      the output mix. If not 0, the effect will be applied to all players

     *      If equal to AUDIO_SESSION_OUTPUT_MIX, the effect will be global to

     *      the output mix.  Otherwise, the effect will be applied to all players

     *      (AudioTrack or MediaPLayer) within the same audio session.

     *      (AudioTrack or MediaPLayer) within the same audio session.

     * io:  HAL audio output or input stream to which this effect must be attached. Leave at 0 for

     * io:  HAL audio output or input stream to which this effect must be attached. Leave at 0 for

     *      automatic output selection by AudioFlinger.

     *      automatic output selection by AudioFlinger.
@@ -229,7 +230,7 @@ public: 
                  int32_t priority = 0,

                  int32_t priority = 0,

                  effect_callback_t cbf = NULL,

                  effect_callback_t cbf = NULL,

                  void* user = NULL,

                  void* user = NULL,

                  int sessionId = 0,

                  int sessionId = AUDIO_SESSION_OUTPUT_MIX,

                  audio_io_handle_t io = 0

                  audio_io_handle_t io = 0

                  );

                  );
@@ -241,7 +242,7 @@ public: 
                    int32_t priority = 0,

                    int32_t priority = 0,

                    effect_callback_t cbf = NULL,

                    effect_callback_t cbf = NULL,

                    void* user = NULL,

                    void* user = NULL,

                    int sessionId = 0,

                    int sessionId = AUDIO_SESSION_OUTPUT_MIX,

                    audio_io_handle_t io = 0

                    audio_io_handle_t io = 0

                    );

                    );
@@ -263,7 +264,7 @@ public: 
                            int32_t priority = 0,

                            int32_t priority = 0,

                            effect_callback_t cbf = NULL,

                            effect_callback_t cbf = NULL,

                            void* user = NULL,

                            void* user = NULL,

                            int sessionId = 0,

                            int sessionId = AUDIO_SESSION_OUTPUT_MIX,

                            audio_io_handle_t io = 0

                            audio_io_handle_t io = 0

                            );

                            );