Bläddra i källkod

V0.8.2
1、添加了__stdcall,防止32位会崩溃

Apple 1 månad sedan
förälder
incheckning
e514b7bfa2
2 ändrade filer med 25 tillägg och 25 borttagningar
  1. 24 24
      CPlayer/HKSDKAPI/hksdkapi.cpp
  2. 1 1
      show1/CMakeLists.txt

+ 24 - 24
CPlayer/HKSDKAPI/hksdkapi.cpp

@@ -11,42 +11,42 @@
  * ======================================================================== */
 
 /* 网络登陆相关的函数指针 */
-using pNet_DEV_Init = bool(*)();
-using pNET_DVR_Cleanup = bool(*)();
-using pNET_DVR_SetConnectTime = bool(*)(DWORD dwWaitTime, DWORD dwTryTimes);
-using pNET_DVR_SetReconnect = bool(*)(DWORD dwInterval, BOOL bEnableRecon);
-using pNET_DVR_Login_V40 = LONG(*)(LPNET_DVR_USER_LOGIN_INFO pLoginInfo,LPNET_DVR_DEVICEINFO_V40 lpDeviceInfo);
-using pNET_DVR_Logout = BOOL(*)(LONG lUserID);
-using pNET_DVR_GetLastError = DWORD(*)();
+using pNet_DEV_Init = bool(__stdcall*)();
+using pNET_DVR_Cleanup = bool(__stdcall*)();
+using pNET_DVR_SetConnectTime = bool(__stdcall*)(DWORD dwWaitTime, DWORD dwTryTimes);
+using pNET_DVR_SetReconnect = bool(__stdcall*)(DWORD dwInterval, BOOL bEnableRecon);
+using pNET_DVR_Login_V40 = LONG(__stdcall*)(LPNET_DVR_USER_LOGIN_INFO pLoginInfo,LPNET_DVR_DEVICEINFO_V40 lpDeviceInfo);
+using pNET_DVR_Logout = BOOL(__stdcall*)(LONG lUserID);
+using pNET_DVR_GetLastError = DWORD(__stdcall*)();
 
-using pNET_DVR_RealPlay_V40 = LONG(*)(LONG lUserID, LPNET_DVR_PREVIEWINFO lpPreviewInfo, REALDATACALLBACK fRealDataCallBack_V30, void* pUser);
-using pNET_DVR_StopRealPlay = bool(*)(LONG lRealHandle);
+using pNET_DVR_RealPlay_V40 = LONG(__stdcall*)(LONG lUserID, LPNET_DVR_PREVIEWINFO lpPreviewInfo, REALDATACALLBACK fRealDataCallBack_V30, void* pUser);
+using pNET_DVR_StopRealPlay = bool(__stdcall*)(LONG lRealHandle);
 
-using pNET_DVR_SetExceptionCallBack_V30 =  BOOL(*)(UINT reserved1, void* reserved2, void (CALLBACK* fExceptionCallBack)(DWORD dwType, LONG lUserID, LONG lHandle, void *pUser), void *pUser);
+using pNET_DVR_SetExceptionCallBack_V30 =  BOOL(__stdcall*)(UINT reserved1, void* reserved2, void (CALLBACK* fExceptionCallBack)(DWORD dwType, LONG lUserID, LONG lHandle, void *pUser), void *pUser);
 
 
 /* 播放相关的函数指针 */
-using pPlayM4_GetPort = BOOL(*)(LONG* nPort);
-using pPlayM4_FreePort = BOOL(*)(LONG nPort);
-using pPlayM4_Stop = BOOL(*)(LONG nPort);
+using pPlayM4_GetPort = BOOL(__stdcall*)(LONG* nPort);
+using pPlayM4_FreePort = BOOL(__stdcall*)(LONG nPort);
+using pPlayM4_Stop = BOOL(__stdcall*)(LONG nPort);
 
-using pPlayM4_CloseStream = BOOL(*)(LONG nPort);
-using pPlayM4_PlaySound = BOOL(*)(LONG nPort);
-using pPlayM4_InputData = BOOL(*)(LONG nPort,PBYTE pBuf,DWORD nSize);
-using pPlayM4_GetLastError = DWORD(*)(LONG nPort);
+using pPlayM4_CloseStream = BOOL(__stdcall*)(LONG nPort);
+using pPlayM4_PlaySound = BOOL(__stdcall*)(LONG nPort);
+using pPlayM4_InputData = BOOL(__stdcall*)(LONG nPort,PBYTE pBuf,DWORD nSize);
+using pPlayM4_GetLastError = DWORD(__stdcall*)(LONG nPort);
 
 #if defined (Q_OS_WIN)
-    using pPlayM4_Play = BOOL(*)(LONG nPort, HWND hWnd);
-    using pPlayM4_OpenStream = BOOL(*)(LONG nPort,PBYTE pFileHeadBuf,DWORD nSize,DWORD nBufPoolSize);
+    using pPlayM4_Play = BOOL(__stdcall*)(LONG nPort, HWND hWnd);
+    using pPlayM4_OpenStream = BOOL(__stdcall*)(LONG nPort,PBYTE pFileHeadBuf,DWORD nSize,DWORD nBufPoolSize);
     #if defined (C_WIN32)
-        using pPlayM4_SetDecCallBackMend = BOOL(*)(LONG nPort, DecodeCB DecCBFun, long nUser);
+        using pPlayM4_SetDecCallBackMend = BOOL(__stdcall*)(LONG nPort, DecodeCB DecCBFun, long nUser);
     #elif defined (C_WIN64)
-        using pPlayM4_SetDecCallBackMend = BOOL(*)(LONG nPort, DecodeCB DecCBFun, void* nUser);
+        using pPlayM4_SetDecCallBackMend = BOOL(__stdcall*)(LONG nPort, DecodeCB DecCBFun, void* nUser);
     #endif
 #elif defined (C_LINUX)
-    using pPlayM4_Play = int(*)(int nPort, PLAYM4_HWND hWnd);
-    using pPlayM4_OpenStream = int(*)(int nPort,unsigned char * pFileHeadBuf,unsigned int nSize,unsigned int nBufPoolSize);
-    using pPlayM4_SetDecCallBackMend = int(*)(int nPort,DecodeCB DecCBFun, void* nUser);
+    using pPlayM4_Play = int(__stdcall*)(int nPort, PLAYM4_HWND hWnd);
+    using pPlayM4_OpenStream = int(__stdcall*)(int nPort,unsigned char * pFileHeadBuf,unsigned int nSize,unsigned int nBufPoolSize);
+    using pPlayM4_SetDecCallBackMend = int(__stdcall*)(int nPort,DecodeCB DecCBFun, void* nUser);
 #endif
 
 /* 网络登录相关的函数指针 */

+ 1 - 1
show1/CMakeLists.txt

@@ -51,7 +51,7 @@ target_include_directories(${execName} PRIVATE
 target_link_libraries(${execName} PRIVATE
     Qt5::Widgets
     Qt5::Core
-    Qt5::Network
+    # Qt5::Network
     Qt5::OpenGL
 
     ${spdlog_LIBRARY}