diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-02-27 10:53:15 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-02-27 10:53:15 +0000 |
| commit | c594cca117f6da4e0217ed52a39458782b198a7d (patch) | |
| tree | fcc35ad9918a5b65ea88e54f0db038224988428f | |
| parent | ebb1c27f05074e4b4a82d7e50c93dca7ce096c70 (diff) | |
Fix #1741: fixed AudioMedia in setting signal level adjustment and querying signal level.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4771 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/include/pjsua2/media.hpp | 3 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/media.cpp | 21 |
2 files changed, 8 insertions, 16 deletions
diff --git a/pjsip/include/pjsua2/media.hpp b/pjsip/include/pjsua2/media.hpp index 9faa9c94..830f09b7 100644 --- a/pjsip/include/pjsua2/media.hpp +++ b/pjsip/include/pjsua2/media.hpp @@ -308,9 +308,6 @@ protected: private: pj_caching_pool mediaCachingPool; pj_pool_t *mediaPool; - -private: - unsigned getSignalLevel(bool is_rx = true) const throw(Error); }; /** Array of Audio Media */ diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp index 0c478feb..c68a4cd7 100644 --- a/pjsip/src/pjsua2/media.cpp +++ b/pjsip/src/pjsua2/media.cpp @@ -205,31 +205,26 @@ void AudioMedia::stopTransmit(const AudioMedia &sink) const throw(Error) void AudioMedia::adjustRxLevel(float level) throw(Error) { - PJSUA2_CHECK_EXPR( pjsua_conf_adjust_rx_level(id, level) ); + PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_level(id, level) ); } void AudioMedia::adjustTxLevel(float level) throw(Error) { - PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_level(id, level) ); + PJSUA2_CHECK_EXPR( pjsua_conf_adjust_rx_level(id, level) ); } unsigned AudioMedia::getRxLevel() const throw(Error) { - return getSignalLevel(true); + unsigned level; + PJSUA2_CHECK_EXPR( pjsua_conf_get_signal_level(id, &level, NULL) ); + return level; } unsigned AudioMedia::getTxLevel() const throw(Error) { - return getSignalLevel(false); -} - -unsigned AudioMedia::getSignalLevel(bool is_rx) const throw(Error) -{ - unsigned rx_level; - unsigned tx_level; - - PJSUA2_CHECK_EXPR( pjsua_conf_get_signal_level(id, &tx_level, &rx_level) ); - return is_rx?rx_level:tx_level; + unsigned level; + PJSUA2_CHECK_EXPR( pjsua_conf_get_signal_level(id, NULL, &level) ); + return level; } AudioMedia* AudioMedia::typecastFromMedia(Media *media) |