Browse Source

Z991239-6443 #comment 卡库卡机 RVCGetTickCount

80374374 2 months ago
parent
commit
bfdbf253f6

+ 0 - 1
Framework/libtoolkit/win/bus_daemon.c

@@ -980,7 +980,6 @@ TOOLKIT_API int bus_daemon_stop(bus_daemon_t *daemon)
 
 	// close all pending handles
 	{
-		int i;
 		endpt_session_t *pos;
 		for (i = 0; i < daemon->arr_acceptor->nelts; ++i) {
 			daemon_accetpor_t *dacceptor = ARRAY_IDX(daemon->arr_acceptor, i, daemon_accetpor_t*);

+ 0 - 2
Module/include/CommEntityUtil.hpp

@@ -199,10 +199,8 @@ inline ULLINT RVCGetTickCount()
 #else
 	struct timespec ts;
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-
 	return (ts.tv_sec * 1000 + ts.tv_nsec / 1000000);
 #endif // RVC_OS_WIN
-
 }
 
 } // comm

File diff suppressed because it is too large
+ 161 - 184
Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp


+ 3 - 3
Module/mod_mediacontroller/capture.cpp

@@ -1569,7 +1569,7 @@ namespace MediaController {
 				{
 					if (cap->env_video) 
 					{
-						rvc_sleep(cap->config.uintervaltime);
+						Sleep(cap->config.uintervaltime);
 					}
 					rc = video_capture_start(cap->opt_video);
 					if (rc != Error_Succeed) 
@@ -1601,7 +1601,7 @@ namespace MediaController {
 				{
 					if (cap->env_video) 
 					{
-						rvc_sleep(cap->config.uintervaltime);
+						Sleep(cap->config.uintervaltime);
 					}
 					rc = video_capture_start(cap->opt_video);
 					if (rc != Error_Succeed) 
@@ -1631,7 +1631,7 @@ namespace MediaController {
 			{
 				if (cap->env_video) 
 				{
-					rvc_sleep(cap->config.uintervaltime);
+					Sleep(cap->config.uintervaltime);
 				}
 				rc = video_capture_start(cap->opt_video);
 				if (rc != Error_Succeed) 

+ 2 - 2
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -7,7 +7,7 @@
 #include "fileutil.h"
 #include "brightnessinfo.h"
 #include "SpDefine.h"
-#include <winpr/sync.h>
+#include <winpr/synch.h>
 #ifdef RVC_OS_WIN
 #include "iaudiorenderinterface.h"
 #endif
@@ -100,7 +100,7 @@ static int GetFormatString(char* strVala, size_t uValaLen, char* strValb, size_t
 	char strBuffer[MAX_PATH] = { 0 };
 	memcpy(strBuffer, pSrc, uSrcLen);
 	char* pIndex = NULL;
-	if (pIndex = strrchr(strBuffer, cWord)) {
+	if ((pIndex = strrchr(strBuffer, cWord)) != NULL) {
 		char* pHash = pIndex + sizeof(char);
 		*pIndex = '\0';
 		if (NULL != pHash) {

Some files were not shown because too many files changed in this diff