Changeset 4771 for pjproject/trunk

Timestamp:

Feb 27, 2014 10:53:15 AM (11 years ago)

Author:

nanang

Message:

Fix #1741: fixed AudioMedia? in setting signal level adjustment and querying signal level.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/media.hpp (modified) (1 diff)
• src/pjsua2/media.cpp (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua2/media.hpp

@@ -309 +309 @@
     pj_caching_pool      mediaCachingPool;
     pj_pool_t           *mediaPool;
-
-private:
-    unsigned getSignalLevel(bool is_rx = true) const throw(Error);
 };
 

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -206 +206 @@
 void AudioMedia::adjustRxLevel(float level) throw(Error)
 {
+    PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_level(id, level) );
+}
+
+void AudioMedia::adjustTxLevel(float level) throw(Error)
+{
     PJSUA2_CHECK_EXPR( pjsua_conf_adjust_rx_level(id, level) );
 }
 
-void AudioMedia::adjustTxLevel(float level) throw(Error)
-{
-    PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_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;
 }