Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cscore: Windows UsbCamera: Use custom windows message for initial connection (#1534)

Browse Source 
WM_CREATE is being called at a time where the message pump cannot be called back into.
This commit is contained in:
Thad House
2019-01-09 22:52:24 -08:00
committed by Peter Johnson
parent f889b45d59
commit 308bdbe298
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cscore/src/main/native/windows/UsbCameraImpl.cpp
View File

@@ -57,6 +57,7 @@
static constexpr int NewImageMessage = 0x0400 + 4488;
static constexpr int SetCameraMessage = 0x0400 + 254;
static constexpr int WaitForStartupMessage = 0x0400 + 294;
static constexpr int PumpReadyMessage = 0x0400 + 330;
static constexpr char const* kPropWbValue = "WhiteBalance";
static constexpr char const* kPropExValue = "Exposure";
@@ -196,6 +197,7 @@ void UsbCameraImpl::Start() {
[this](HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) {
return this->PumpMain(hwnd, uiMsg, wParam, lParam);
});
m_messagePump->PostWindowMessage(PumpReadyMessage, nullptr, nullptr);
}
void UsbCameraImpl::PostRequestNewFrame() {
@@ -347,7 +349,7 @@ LRESULT UsbCameraImpl::PumpMain(HWND hwnd, UINT uiMsg, WPARAM wParam,
}
m_imageCallback.Reset();
break;
case WM_CREATE:
case PumpReadyMessage:
// Pump Created and ready to go
DeviceConnect();
break;