Z991239-6443 #comment Sleep改造

CMakeLists.txt

@@ -30,7 +30,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 #  Include extend cmake scripts
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/addin/cmake/ )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/addin/cmake/)
 
 include(CheckStructHasMember)
 include(CheckIncludeFiles)
@@ -65,8 +65,8 @@ endif()
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 
 # find the cppcheck binary
-set(CPPCHECK_ROOT_DIR "D:\\OpenSources\\cppcheck-2.18.0\\out\\build\\x64-Debug\\bin\\Debug")
-include(CppCheckAnalysis)
+# set(CPPCHECK_ROOT_DIR "D:\\OpenSources\\cppcheck-2.18.0\\out\\build\\x64-Debug\\bin\\Debug")
+# include(CppCheckAnalysis)
 
 set(DEVOPS_ON FALSE)
 set(FORMAT_WITH_SUFFIX TRUE)

DevAdapter/liblog4vendor/test/test4log.cpp

@@ -181,7 +181,6 @@ void thread1(int param)
 		} else if(nLevel == 5) {
 			LOG4VTM(TRACE,("this is a TRACE log, times: ") << count);
 		}
-		//Sleep(nInterval);
 	} while (++count < times);
 }
 

DevAdapter/self/dep/liblog4vendor/test4log/test4log.cpp

@@ -153,7 +153,6 @@ UINT WINAPI thread1(LPVOID param)
 		} else if(nLevel == 5) {
 			LOG4VTM(TRACE,_T("this is a TRACE log, times: ") << count);
 		}
-		//Sleep(nInterval);
 	} while (++count < times);
 
 	return 0;

Framework/spbase/CMakeLists.txt

@@ -92,7 +92,7 @@ target_link_libraries(${MODULE_NAME}
     ${PRIVATE_KEYWORD} ${OTHER_LIBS}
     )
 
-target_add_cppcheck(${MODULE_NAME} FORCE_CHECK)
+# target_add_cppcheck(${MODULE_NAME} FORCE_CHECK)
 
 if (BUILD_TESTING)
     add_library(${MODULE_NAME}_a STATIC ${${MODULE_PREFIX}_SRCS})

Module/mod_mediacontroller/capture.cpp

@@ -106,17 +106,6 @@ static void __audiomgrlog(void* user_data, const char* fmt, va_list arg)
 }
 #endif
 
-//TODO: CrossPlaform  [Gifur@2025730]
-static void rvc_sleep(uint32_t umicroseconds) 
-{
-#ifdef RVC_OS_WIN
-	::Sleep(umicroseconds);
-#else
-	usleep(umicroseconds * 1000);
-#endif // RVC_OS_WIN
-}
-
-
 #ifdef RVC_OS_WIN
 static int translate_id(bool in_direction, int idx)
 {

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -7,7 +7,7 @@
 #include "fileutil.h"
 #include "brightnessinfo.h"
 #include "SpDefine.h"
-
+#include <winpr/sync.h>
 #ifdef RVC_OS_WIN
 #include "iaudiorenderinterface.h"
 #endif
@@ -2512,27 +2512,16 @@ void MediaServiceSession::Handle_ManipulateCameras(SpReqAnsContext<MediaService_
 		LogTransToCMSEvt();
 		if (m_pEntity->m_bStartCamera) {
 			Error = m_pEntity->StopCamerasAndRecord();
-			//TODO: CrossPlaform  [Gifur@2025730]
-#ifdef RVC_OS_WIN
 			Sleep(200);
-#else
-			usleep(200*1000);
-#endif
 		}
 		else {
 			m_pEntity->LogTransactionRecordCtrEvt(0);
 			Error = Error_Succeed;
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current is not on business, camera is not on.");
 		}
 		m_pEntity->m_bJsOccupyCamera = true;
 	}
 	else {
-		//TODO: CrossPlaform  [Gifur@2025730]
-#ifdef RVC_OS_WIN
 		Sleep(100);
-#else
-		usleep(100*1000);
-#endif
 		if (m_pEntity->m_bOnBusiness) {
 			Error = m_pEntity->StartCamerasAndRecord();
 		}

Module/mod_sipphone/mod_sipphone.cpp

@@ -1903,13 +1903,7 @@ void CSIPEntity::OnTimeout(DWORD dwTimerID)
 	else if (RVC_ENTER_HOME_PAGE_TIMER == dwTimerID) {
 		if (m_bFirstLaunched) 
 		{
-			//TODO: CrossPlaform  [Gifur@2025730]
-#ifdef RVC_OS_WIN
 			Sleep(2000);
-#else
-			usleep(2000 * 1000);
-#endif // RVC_OS_WIN
-
 			UIMessageBox evt;
 			evt.uboxtype = 2;
 			evt.strtitle = CSimpleStringA2W("声卡识别故障");