Z991239-5647 #comment 删除不再使用的集中配置逻辑

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -521,7 +521,7 @@ void CSalesRecorderEntity::OnStarted()
 
 	m_strHttpServerAPI = RVC_UPLOAD_VIDEORECORDING_HTTP_API;
 	m_iHttpTimeOut = RVC_HTTPTIMEOUT;
-	m_strHttpServerAddr = RVC_UPLOAD_VIDEORECORDING_HTTP_ADDR;
+	m_strHttpServerAddr = NULL;
 	m_strAppVersion = NULL;
 	m_strTerminalId = NULL;
 	m_bPostOn = false;
@@ -1872,7 +1872,7 @@ ErrorCodeEnum CSalesRecorderEntity::GetEntityConfig()
 	int iAudioNsPolicy = 2;
 	int iIsAudioNsOn = 0;
 	int iAudioChannels = 1;
-	int iLogLevel = 1;
+	int iLogLevel = 2;
 	int iLowestLevel = 1;
 	int iTimeOut = RVC_HTTPTIMEOUT;
 	CSimpleStringA strHttpServerAddr("");
@@ -1943,10 +1943,6 @@ ErrorCodeEnum CSalesRecorderEntity::GetEntityConfig()
 
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_bEncFlag is %s, m_iRemoteRecordType is %d.", m_bEncFlag ? "true" : "false", m_iRemoteRecordType);
 
-	if (m_bWholeSection != 0 && m_bWholeSection != 1) {
-		m_bWholeSection = false;
-	}
-
 	return Error;
 }
 

Module/mod_assistantchannel/mod_assistantchannel.cpp

@@ -174,7 +174,6 @@ ErrorCodeEnum CBizChannelEntity::Connect(const char *ip, int port, const char *c
 		config.proxy_server = const_cast<char*>(ip);
 		config.proxy_server_port = port;
 		config.session_id = const_cast<char*>(((const char*)Info.strTerminalID));
-		config.call_no = const_cast<char*>(callno);
 		config.client_id = "";
 		config.video.desc = MakeDesc(Info.eScreen,m_eDeviceType);
 		config.video.rtp_port = REC_COMMON_VIDEO_PORT;

Module/mod_recorder/mod_recorder.cpp

@@ -673,7 +673,6 @@ void CRecorderEntity::StartRecord(const char *videofilename)
 	tAudioParams.bIsTransOn = false;
 	tAudioParams.iAudioChannels = 1;
 	
-
 	CSmartPointer<IEntityFunction> Func = GetFunction();
 	CSimpleStringA strValue("");
 	Func->GetSysVar(SYSVAR_SOUNDCARDSTATE, strValue);

Module/mod_recorder/mod_recorder.h

@@ -25,7 +25,7 @@ namespace Recorder {
 		CRecorderEntity() : m_bStarted(false), m_pRecorder(NULL), m_bEncFlag(true){
 			m_strHttpServerAPI = RVC_UPLOAD_VIDEORECORDING_HTTP_API;
 			m_iHttpTimeOut = RVC_HTTPTIMEOUT;
-			m_strHttpServerAddr = RVC_UPLOAD_VIDEORECORDING_HTTP_ADDR;
+			m_strHttpServerAddr = NULL;
 			m_strAppVersion = NULL;
 			m_strTerminalId = NULL;
 			memset(m_strRecordName, 0, MAX_PATH);

Module/mod_recorder/recordinfo.h

@@ -19,13 +19,8 @@
 #define RVC_UPLOAD_VIDEORECORDING_HTTP_API "/api/upload/video_recording"
 #endif // !RVC_UPLOAD_VIDEORECORDING_HTTP_API
 
-
-#ifndef RVC_UPLOAD_VIDEORECORDING_HTTP_ADDR
-#define RVC_UPLOAD_VIDEORECORDING_HTTP_ADDR "https://uploadservice.paas.cmbchina.cn"
-#endif // !RVC_UPLOAD_VIDEORECORDING_HTTP_ADDR
-
 #ifndef RVC_HTTPTIMEOUT
-#define RVC_HTTPTIMEOUT 10
+#define RVC_HTTPTIMEOUT 20
 #endif // !RVC_HTTPTIMEOUT
 
 #define REFLECTION(var) #var

Module/mod_sipphone/mod_sipphone.cpp

@@ -273,7 +273,6 @@ CSIPEntity::CSIPEntity() : m_pCurrentSession(NULL), m_state(INIT),m_iPickupPhone
 	m_strEndTime = RVC_END_TIME;
 	m_itervalTime = RVC_INTERVAL_TIME;
 	m_bStopAutoRestart = false;
-	m_iAudioDspUseCenter = 0;
 
 	m_nCallType = NORMAL_CALLTYPE;
 	memset(m_localip, 0, RVC_MAX_IP_LEN);
@@ -649,9 +648,6 @@ ErrorCodeEnum CSIPEntity::LoadEntityConfig()
 	int iStopRestartFlag = 0;
 	CSimpleStringA strStartTime("");
 	CSimpleStringA strEndTime("");
-	int iAudioDspUseCenter = 0;
-
-	table.AddEntryInt("SipPhone", "AudioDspUseCenter", iAudioDspUseCenter, 0);
 	table.AddEntryInt("SipPhone", "ReStartInterVal", iTime, RVC_INTERVAL_TIME);
 	table.AddEntryInt("SipPhone", "StopAutoRestartFlag", iStopRestartFlag, 0);
 	table.AddEntryString("SipPhone", "StartTime", strStartTime, "$");
@@ -662,8 +658,6 @@ ErrorCodeEnum CSIPEntity::LoadEntityConfig()
 	if (Error == Error_Succeed) {
 		Error = table.Load(spConfig);
 		if (Error_Succeed == Error){
-			m_iAudioDspUseCenter = iAudioDspUseCenter;
-
 			if (iTime >= RVC_INTERVAL_TIME/3){
 				m_itervalTime = iTime;
 			}
@@ -2105,11 +2099,9 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_VOLUME_INFO, generateVolumeJson(m_kept_volume_in[DEV_HANDFREE], m_kept_volume_out[DEV_HANDFREE], m_kept_volume_in[DEV_PICKUP], m_kept_volume_out[DEV_PICKUP]).GetData());
 			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DSP_INFO, generateAudioDspFlags(conf->audio_dsp).GetData());
 
-			if (m_iAudioDspUseCenter) {
-				AudioDspFlagsUseCentersetting(conf);
-				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CENTER_AUDIO_DSP_FLAGS, generateAudioDspFlags(conf->audio_dsp).GetData());
-			}
-
+			AudioDspFlagsUseCentersetting(conf);
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CENTER_AUDIO_DSP_FLAGS, generateAudioDspFlags(conf->audio_dsp).GetData());
+			
 			conf->ref_active_camera = &m_stVideoParam.iActiveCamera;
 			conf->ref_camera_switch = &m_stVideoParam.iCameraSwitch;
 			conf->ref_window_state = &m_stVideoParam.nWindowState;

Module/mod_sipphone/mod_sipphone.h

@@ -375,7 +375,6 @@ public:
 	CSimpleStringA m_strEndTime;
 	int m_itervalTime;
 	bool m_bStopAutoRestart;
-	int m_iAudioDspUseCenter;
 
 	CSystemStaticInfo staticInfo;
 	char m_localip[RVC_MAX_IP_LEN];		//本地ip