|
@@ -72,18 +72,7 @@ QRETURN on_process_format_changed2(PVOID pDevice, ULONG nVideoInput, ULONG nAudi
|
|
strVideoInput,
|
|
strVideoInput,
|
|
strAudioInput
|
|
strAudioInput
|
|
);
|
|
);
|
|
- /*
|
|
|
|
- Global::WriteTextLog(_T("采集卡格式变更:%d x %d%s @%2.3f FPS , %d CH x %d BITS x %d HZ , 视频输入源 : %s , 音频输入源 : %s"),
|
|
|
|
- nVideoWidth,
|
|
|
|
- nVH,
|
|
|
|
- strFrameType,
|
|
|
|
- dVideoFrameRate,
|
|
|
|
- nAudioChannels,
|
|
|
|
- nAudioBitsPerSample,
|
|
|
|
- nAudioSampleFrequency,
|
|
|
|
- strVideoInput,
|
|
|
|
- strAudioInput);
|
|
|
|
- */
|
|
|
|
|
|
+
|
|
::SendMessage(g_pMainFrame->m_hWnd, MSG_STATUS_BAR, (WPARAM)&pView->m_strFormatChangedOutput, ID_STATUSBAR_PANE1);
|
|
::SendMessage(g_pMainFrame->m_hWnd, MSG_STATUS_BAR, (WPARAM)&pView->m_strFormatChangedOutput, ID_STATUSBAR_PANE1);
|
|
|
|
|
|
// NO SOURCE
|
|
// NO SOURCE
|
|
@@ -491,7 +480,7 @@ void CUB530View::CaptureSingleImage(LPTSTR lpszFileName, BOOL bIsJPG)
|
|
QCAP_SNAPSHOT_BMP(m_hVideoDevice, lpszFileName, FALSE, 5000);
|
|
QCAP_SNAPSHOT_BMP(m_hVideoDevice, lpszFileName, FALSE, 5000);
|
|
}
|
|
}
|
|
|
|
|
|
- Global::WriteTextLog("完成:CaptureSingleImage=%s", lpszFileName);
|
|
|
|
|
|
+ //Global::WriteTextLog("完成:CaptureSingleImage=%s", lpszFileName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -533,7 +522,7 @@ std::string CUB530View::CaptureSingleImageAutoName(LPCTSTR lpszDir, BOOL bIsJPG)
|
|
QCAP_SNAPSHOT_BMP(m_hVideoDevice, szPath, FALSE, 5000);
|
|
QCAP_SNAPSHOT_BMP(m_hVideoDevice, szPath, FALSE, 5000);
|
|
}
|
|
}
|
|
|
|
|
|
- Global::WriteTextLog("完成:CaptureSingleImageAutoName=%s", szPath);
|
|
|
|
|
|
+ //Global::WriteTextLog("完成:CaptureSingleImageAutoName=%s", szPath);
|
|
|
|
|
|
return std::string(szPath);
|
|
return std::string(szPath);
|
|
}
|
|
}
|
|
@@ -811,8 +800,6 @@ BOOL CUB530View::SaveImageByCaptureInfo(const CaptureInfo& capInfo)
|
|
{
|
|
{
|
|
Global::WriteTextLog("SaveImageByCaptureInfo: 保存图片失败 = %s", strFileName);
|
|
Global::WriteTextLog("SaveImageByCaptureInfo: 保存图片失败 = %s", strFileName);
|
|
}
|
|
}
|
|
-
|
|
|
|
- Global::WriteTextLogEx(3,"SaveImageByCaptureInfo: 保存图片成功 = %s", strFileName);
|
|
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -850,7 +837,7 @@ void CUB530View::CaptureImageThread(CUB530View* pView)
|
|
while (!pView->m_pBuffer)
|
|
while (!pView->m_pBuffer)
|
|
pView->m_data_cond.wait(lk);
|
|
pView->m_data_cond.wait(lk);
|
|
#endif
|
|
#endif
|
|
- Global::WriteTextLogEx(1, "CaptureImageThread=%s", pView->m_CaptureInfo.szSaveDir);
|
|
|
|
|
|
+ //Global::WriteTextLogEx(1, "CaptureImageThread=%s", pView->m_CaptureInfo.szSaveDir);
|
|
// 保存截图;
|
|
// 保存截图;
|
|
pView->SaveImageByCaptureInfo(pView->m_CaptureInfo);
|
|
pView->SaveImageByCaptureInfo(pView->m_CaptureInfo);
|
|
// 标记保存完成;
|
|
// 标记保存完成;
|