|
@@ -5,8 +5,11 @@
|
|
|
#include "Global.h"
|
|
|
#include "MainFrm.h"
|
|
|
|
|
|
-CFormView* CMemoryClient::m_pView2 = NULL;
|
|
|
+#if _USE_DLGVIEW_
|
|
|
+CUB530View* CMemoryClient::m_pView = NULL;
|
|
|
+#else
|
|
|
CSATHelperView* CMemoryClient::m_pView = NULL;
|
|
|
+#endif
|
|
|
HANDLE CMemoryClient::m_hRecordFile = NULL;
|
|
|
HANDLE CMemoryClient::m_hThreadAudio = NULL;
|
|
|
BOOL CMemoryClient::m_bCapture = FALSE;
|
|
@@ -102,7 +105,7 @@ DWORD CMemoryClient::ThreadProc(LPVOID lpVoid)
|
|
|
CMD_Result result;
|
|
|
unsigned short nIndex = 0;
|
|
|
memcpy(&nIndex, ((BYTE*)pThis->m_pMemory) + sizeof(CommandHead), sizeof(unsigned short));
|
|
|
- //result.bResult = m_pView->HwInitialize();
|
|
|
+ result.bResult = m_pView->HwInitialize();
|
|
|
|
|
|
// 返回结果;
|
|
|
result.cmdHead = cmdHead;
|
|
@@ -117,7 +120,7 @@ DWORD CMemoryClient::ThreadProc(LPVOID lpVoid)
|
|
|
CMD_Result result;
|
|
|
unsigned short nIndex = 0;
|
|
|
memcpy(&nIndex, ((BYTE*)pThis->m_pMemory) + sizeof(CommandHead), sizeof(unsigned short));
|
|
|
- //result.bResult = m_pView->HwUninitialize();
|
|
|
+ result.bResult = m_pView->HwUninitialize();
|
|
|
m_pView->Invalidate();
|
|
|
|
|
|
// 返回结果;
|
|
@@ -271,7 +274,7 @@ BOOL CMemoryClient::CaptureImage(const CMD_CaputerImage& cmd, BOOL bSingle)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //m_pView->CaptureMultiImageEx(cmd.szSaveDir, cmd.szPrefix, bIsJPG, cmd.nKeepTime);
|
|
|
+ m_pView->CaptureMultiImageEx(cmd.szSaveDir, cmd.szPrefix, bIsJPG, cmd.nKeepTime);
|
|
|
}
|
|
|
else
|
|
|
{// 单张;
|
|
@@ -305,13 +308,13 @@ BOOL CMemoryClient::CaptureImage(const CMD_CaputerImage& cmd, BOOL bSingle)
|
|
|
strFile.append(_T("\\"));
|
|
|
}
|
|
|
|
|
|
- //m_pView->CaptureSingleImageAutoNameEx(strFile.c_str(), bIsJPG);
|
|
|
+ m_pView->CaptureSingleImageAutoNameEx(strFile.c_str(), bIsJPG);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
TCHAR szFile[MAX_PATH] = { 0 };
|
|
|
_stprintf_s(szFile, _T("%s"), cmd.szSaveDir);
|
|
|
- //m_pView->CaptureSingleImageEx(szFile, bIsJPG);
|
|
|
+ m_pView->CaptureSingleImageEx(szFile, bIsJPG);
|
|
|
}
|
|
|
// 等待磁盘完成写入;
|
|
|
//Sleep(bIsJPG ? 200 : 200);
|
|
@@ -328,12 +331,12 @@ BOOL CMemoryClient::SynCaptureAudio(const CMD_CaputerAudio& cmd)
|
|
|
|
|
|
BOOL CMemoryClient::AsyCaptureAudio(const CMD_CaputerAudio& cmd)
|
|
|
{
|
|
|
- //m_pView->StartRecord(cmd.dwDuration, cmd.szSaveDir);
|
|
|
+ m_pView->StartRecord(cmd.dwDuration, cmd.szSaveDir);
|
|
|
return TRUE;
|
|
|
}
|
|
|
|
|
|
BOOL CMemoryClient::StopCaptureAudio()
|
|
|
{
|
|
|
- //m_pView->StopRecord();
|
|
|
+ m_pView->StopRecord();
|
|
|
return TRUE;
|
|
|
}
|