Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Upgrade clang-format and clang-tidy (NFC) (#3422)

Browse Source
This commit is contained in:
Tyler Veness
2021-06-10 11:13:09 -07:00
committed by GitHub
parent 099fde97d5
commit a77c6ff3a2
29 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,8 +533,9 @@ bool UsbCameraImpl::CacheProperties(CS_Status* status) const {
auto result = m_messagePump->SendWindowMessage<CS_Status>(
WaitForStartupMessage, nullptr, nullptr);
*status = result;
if (*status != CS_OK)
if (*status != CS_OK) {
return false;
}
if (!m_properties_cached) {
*status = CS_SOURCE_IS_DISCONNECTED;
return false;
@@ -883,10 +884,12 @@ CS_StatusValue UsbCameraImpl::DeviceCmdSetMode(
}
bool UsbCameraImpl::DeviceStreamOn() {
if (m_streaming)
if (m_streaming) {
return false;
if (!m_deviceValid)
}
if (!m_deviceValid) {
return false;
}
m_streaming = true;
m_sourceReader->ReadSample(MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL,
NULL, NULL);

2
cscore/src/main/native/windows/UsbCameraImpl.h
View File

@@ -45,7 +45,7 @@ class UsbCameraImpl : public SourceImpl,
Telemetry& telemetry, int deviceId);
~UsbCameraImpl() override;
void Start();
void Start() override;
// Property functions
void SetProperty(int property, int value, CS_Status* status) override;