Merge "bridge_softmix: Removed unused parameter from check_binaural_position_change(.)."

pull/9/head
Jenkins2 7 years ago committed by Gerrit Code Review
commit 9c746dc55e

@ -1404,7 +1404,7 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
} }
#ifdef BINAURAL_RENDERING #ifdef BINAURAL_RENDERING
check_binaural_position_change(bridge, softmix_data, bridge_channel); check_binaural_position_change(bridge, softmix_data);
#endif #endif
/* Go through pulling audio from each factory that has it available */ /* Go through pulling audio from each factory that has it available */

@ -465,9 +465,10 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
} }
void check_binaural_position_change(struct ast_bridge *bridge, void check_binaural_position_change(struct ast_bridge *bridge,
struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel) struct softmix_bridge_data *softmix_data)
{ {
unsigned int pos_change; unsigned int pos_change;
struct ast_bridge_channel *bridge_channel;
/* /*
* We only check binaural things if binaural is activated by the config * We only check binaural things if binaural is activated by the config

@ -377,10 +377,9 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
* *
* \param bridge The conference bridge. * \param bridge The conference bridge.
* \param softmix_data The data used by the softmix bridge. * \param softmix_data The data used by the softmix bridge.
* \param bridge_channel The bridge channel.
*/ */
void check_binaural_position_change(struct ast_bridge *bridge, void check_binaural_position_change(struct ast_bridge *bridge,
struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel); struct softmix_bridge_data *softmix_data);
/*! /*!
* \brief Processes audio data with the binaural synthesis and adds the result to the mixing array. * \brief Processes audio data with the binaural synthesis and adds the result to the mixing array.

Loading…
Cancel
Save