Selaa lähdekoodia

!10004 增加识别不到音频设备告警信息

Merge pull request !10004 from 80274480/
Gifur 3 vuotta sitten
vanhempi
sitoutus
3177373a30
2 muutettua tiedostoa jossa 22 lisäystä ja 6 poistoa
  1. 18 2
      Module/mod_sipphone/Event.h
  2. 4 4
      Module/mod_sipphone/mod_sipphone.cpp

+ 18 - 2
Module/mod_sipphone/Event.h

@@ -51,8 +51,24 @@
 #define ERROR_MOD_SIP_HANDFREE_REDUCEVOLUMNFAIL			0x30180171  //免提恢复音量失败,级别2
 
 
-#define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_FAILED		0x30190501	//创建本地图像渲染框失败
-#define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_FAILED		0x30190502  //创建远端图像渲染框失败
+#define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_FAILED		0x30190501	//创建本地视频框失败
+#define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_FAILED		0x30190502  //创建远端视频框失败
+#define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_SUCCESS		0x30190503	//创建本地视频框成功
+#define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_SUCCESS		0x30190504  //创建远端视频框成功
+#define EVENT_MOD_SIP_LOCAL_WINDOW_DESTROY_SUCCESS		0x30190505	//销毁本地视频框成功
+#define EVENT_MOD_SIP_REMOTE_WINDOW_DESTROY_SUCCESS		0x30190506  //销毁远端视频框成功
+
+#define EVENT_MOD_SIP_COM_START_INIT					0x30190511	//COM开始初始化
+#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
+#define EVENT_MOD_SIP_AUDIO_OUT_DEVICE_NOT_EXIST		0x30190526
+
 #define EVENT_MOD_SIP_AUDIO_RTP_CREATE					0x30190001
 #define EVENT_MOD_SIP_AUDIO_RTP_DESTROY					0x30190002
 

+ 4 - 4
Module/mod_sipphone/mod_sipphone.cpp

@@ -1918,7 +1918,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio handfree in device %s does not exist!", (LPCSTR)strHandFreeIn);
 				CSimpleStringA strErrMsg = "外部麦克风配置错误,请重新配置!";
-				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Middle, Error_Param, EVENT_MOD_SIP_AUDIO_IN_DEVICE_NOT_EXIST, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_handfree_in_dev, strHandFreeIn);
@@ -1930,7 +1930,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio handfree out device %s does not exist!", (LPCSTR)strHandFreeOut);
 				CSimpleStringA strErrMsg = "外部扬声器配置错误,请重新配置!";
-				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Middle, Error_Param, EVENT_MOD_SIP_AUDIO_OUT_DEVICE_NOT_EXIST, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_handfree_out_dev, strHandFreeOut);
@@ -1943,7 +1943,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio pickup in device %s does not exist!", (LPCSTR)strPickupIn);
 				CSimpleStringA strErrMsg = "话筒麦克风(大机)配置错误,请重新配置!";
-				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Middle, Error_Param, EVENT_MOD_SIP_AUDIO_IN_DEVICE_NOT_EXIST, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_pickup_in_dev, strPickupIn);
@@ -1955,7 +1955,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio device %s does not exist!", (LPCSTR)strPickupOut);
 				CSimpleStringA strErrMsg = "话筒扬声器(大机)配置错误,请重新配置!";
-				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Middle, Error_Param, EVENT_MOD_SIP_AUDIO_OUT_DEVICE_NOT_EXIST, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_pickup_out_dev, strPickupOut);