Browse Source

#IQRV #comment [MediaController] 移动摄像头头文件的声明

gifur 4 years ago
parent
commit
ed881d01d3
2 changed files with 14 additions and 10 deletions
  1. 14 0
      Module/include/ModuleMix.h
  2. 0 10
      Module/mod_mediacontroller/mod_mediacontroller.cpp

+ 14 - 0
Module/include/ModuleMix.h

@@ -1,6 +1,8 @@
 #ifndef __MODULE_MIX_H
 #define __MODULE_MIX_H
+
 #pragma once
+
 enum UserDefEntityState
 {
 	USER_ENTITY_STATE_START = 0,
@@ -82,4 +84,16 @@ char *UserDefEntityMsg[USER_ENTITY_STATE_END][1] =
 	"连线失败",
 	"话机注销"
 };
+
+enum CapTypeEnum
+{
+    CAMTYPE_UNKNOWN = 0,
+    CAMTYPE_ENV,
+    CAMTYPE_OPT,
+    CAMTYPE_EWS,
+    CAMTYPE_HSPS,
+    CAMTYPE_CIRCLE,
+    CAMTYPE_MAX
+};
+
 #endif//__MODULE_MIX_H

+ 0 - 10
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -2088,16 +2088,6 @@ public:
 	// 获取高拍仪摄像头(考虑多个高拍仪)
 	ErrorCodeEnum GetHSPCameras(CAutoArray<CSimpleStringA> &HSPCameras)
 	{
-		enum CapTypeEnum {
-			CAMTYPE_UNKNOWN = 0,
-			CAMTYPE_ENV,
-			CAMTYPE_OPT,
-			CAMTYPE_EWS,
-			CAMTYPE_HSPS,
-			CAMTYPE_CIRCLE,
-			CAMTYPE_MAX
-		};
-
 		auto rc = Error_Succeed;
 
 		auto pScannerSetClient = new ScannerService_ClientBase(this);