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

1 files changed, 8 insertions, 13 deletions

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)