summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2018-01-05 13:06:33 +0100
committerAlexander Traud <pabstraud@compuserve.com>2018-01-06 19:06:00 +0100
commitb12c8cffad94fffde0278347131b089ab193717a (patch)
tree5572c5f30e04c594849f6a4899fb6d229069f23b /bridges
parent4eccf697e1c9ee87655cf8a56449dc353cec8a66 (diff)
bridge_softmix: Removed unused parameter from check_binaural_position_change(.).
Found as a result of the function being passed an uninitalized variable by clang. ASTERISK-27550 Change-Id: I8af3bd84656b685a956d498459f8db3613f68954
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c2
-rw-r--r--bridges/bridge_softmix/bridge_softmix_binaural.c3
-rw-r--r--bridges/bridge_softmix/include/bridge_softmix_internal.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 83b1a8337..334356943 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -1404,7 +1404,7 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
}
#ifdef BINAURAL_RENDERING
- check_binaural_position_change(bridge, softmix_data, bridge_channel);
+ check_binaural_position_change(bridge, softmix_data);
#endif
/* Go through pulling audio from each factory that has it available */
diff --git a/bridges/bridge_softmix/bridge_softmix_binaural.c b/bridges/bridge_softmix/bridge_softmix_binaural.c
index 128e4640e..2a8efd766 100644
--- a/bridges/bridge_softmix/bridge_softmix_binaural.c
+++ b/bridges/bridge_softmix/bridge_softmix_binaural.c
@@ -465,9 +465,10 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
}
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;
+ struct ast_bridge_channel *bridge_channel;
/*
* We only check binaural things if binaural is activated by the config
diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h
index 01e65aa1f..f842acb5e 100644
--- a/bridges/bridge_softmix/include/bridge_softmix_internal.h
+++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h
@@ -377,10 +377,9 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
*
* \param bridge The conference 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,
- 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.