Browse Source

#IQRV #comment 30190521/30190522 下线

80374374 7 tháng trước cách đây
mục cha
commit
1c0d9950ba
2 tập tin đã thay đổi với 1 bổ sung20 xóa
  1. 0 2
      Module/mod_sipphone/Event.h
  2. 1 18
      Module/mod_sipphone/mod_sipphone.cpp

+ 0 - 2
Module/mod_sipphone/Event.h

@@ -61,8 +61,6 @@
 #define EVENT_MOD_SIP_COM_FINISH_INIT					0x30190512   //COM完成初始化
 #define EVENT_MOD_SIP_GET_CAMERA_INFO_FINISHED			0x30190513   //完成摄像头信息获取
 
-#define EVENT_MOD_SIP_AUDIO_DEVICE_INFO					0x30190521
-#define EVENT_MOD_SIP_AUDIO_VOLUME_INFO					0x30190522
 #define EVENT_MOD_SIP_AUDIO_DEVICE_CONFIG_ERROR			0x30190523
 #define EVENT_MOD_SIP_COREAUDIO_NOTMATCH_PORTAUDIO		0x30190524
 #define EVENT_MOD_SIP_AUDIO_IN_DEVICE_NOT_EXIST			0x30190525

+ 1 - 18
Module/mod_sipphone/mod_sipphone.cpp

@@ -165,19 +165,6 @@ static int __on_window_type_callback(void* user_data)
 	return pThis->m_stVideoParam.bShowPersonArea;
 }
 
-
-static CSimpleStringA generateAudioInfoJson(const char* handfreeIn, const char* handfreeOut, const char* pickupIn, const char* pickupOut)
-{
-	return CSimpleStringA::Format("{\"handfree_in_dev\":\"%s\",\"handfree_out_dev\":\"%s\",\"pickup_in_dev\":\"%s\",\"pickup_out_dev\":\"%s\"}",
-		handfreeIn, handfreeOut, pickupIn, pickupOut);
-}
-
-static CSimpleStringA generateVolumeJson(int ihandfreeIn, int ihandfreeOut, int ipickupIn, int ipickupOut)
-{
-	return CSimpleStringA::Format("{\"handfree_in_volume\":\"%d\",\"handfree_out_volume\":\"%d\",\"pickup_in_volume\":\"%d\",\"pickup_out_volume\":\"%d\"}",
-		ihandfreeIn, ihandfreeOut, ipickupIn, ipickupOut);
-}
-
 static CSimpleStringA generateAudioDspFlags(endpoint_audiodsp_config_t conf)
 {
 	int ipickup_in_agc = 0;
@@ -907,10 +894,7 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load config failed!");
 	}
 
-	if (IsPostAudioConfigInfo()) {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DEVICE_INFO, generateAudioInfoJson(conf.audio_handfree_in_dev, conf.audio_handfree_out_dev, conf.audio_pickup_in_dev, conf.audio_pickup_out_dev).GetData());
-	}
-	else {
+	if (!IsPostAudioConfigInfo()) {
 		//有配置为空的,进关门页
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio config is invalid.");
 		SetSoundCardSysVar(SOUNDCARD_CONFIG_EMPTY);
@@ -2126,7 +2110,6 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			rvc_snprintf(conf->audio_pickup_in_dev, MAX_PATH, "%s", strPickupIn.GetData());
 			rvc_snprintf(conf->audio_pickup_out_dev, MAX_PATH, "%s", strPickupOut.GetData());
 
-			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());
 
 			AudioDspFlagsUseCentersetting(conf);