From dbd1f1781e53994454f7e385c744b448d308cd70 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 7 Mar 2018 01:14:21 -0800 Subject: [PATCH] Ran wpiformat (#126) --- examples/usbstream/usbstream.cpp | 12 +++++++----- src/main/native/cpp/Telemetry.cpp | 9 ++++----- src/main/native/cpp/cscore_c.cpp | 4 +++- src/main/native/include/cscore_c.h | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/examples/usbstream/usbstream.cpp b/examples/usbstream/usbstream.cpp index f5bdb59f74..e33e54e98b 100644 --- a/examples/usbstream/usbstream.cpp +++ b/examples/usbstream/usbstream.cpp @@ -22,11 +22,13 @@ int main() { mjpegServer.SetSource(camera); CS_Status status = 0; - cs::AddListener([&](const cs::RawEvent& event) { - llvm::outs() << "FPS=" << camera.GetActualFPS() - << " MBPS=" << (camera.GetActualDataRate() / - 1000000.0) << '\n'; - }, cs::RawEvent::kTelemetryUpdated, false, &status); + cs::AddListener( + [&](const cs::RawEvent& event) { + llvm::outs() << "FPS=" << camera.GetActualFPS() + << " MBPS=" << (camera.GetActualDataRate() / 1000000.0) + << '\n'; + }, + cs::RawEvent::kTelemetryUpdated, false, &status); cs::SetTelemetryPeriod(1.0); std::getchar(); diff --git a/src/main/native/cpp/Telemetry.cpp b/src/main/native/cpp/Telemetry.cpp index f8925294a9..04dd7d9ff4 100644 --- a/src/main/native/cpp/Telemetry.cpp +++ b/src/main/native/cpp/Telemetry.cpp @@ -15,7 +15,6 @@ #include "Handle.h" #include "Notifier.h" -#include "Telemetry.h" #include "cscore_cpp.h" using namespace cs; @@ -123,8 +122,8 @@ void Telemetry::RecordSourceBytes(const SourceImpl& source, int quantity) { if (!thr) return; auto handleData = Sources::GetInstance().Find(source); thr->m_current[std::make_pair(Handle{handleData.first, Handle::kSource}, - static_cast(CS_SOURCE_BYTES_RECEIVED))] - += quantity; + static_cast(CS_SOURCE_BYTES_RECEIVED))] += + quantity; } void Telemetry::RecordSourceFrames(const SourceImpl& source, int quantity) { @@ -132,6 +131,6 @@ void Telemetry::RecordSourceFrames(const SourceImpl& source, int quantity) { if (!thr) return; auto handleData = Sources::GetInstance().Find(source); thr->m_current[std::make_pair(Handle{handleData.first, Handle::kSource}, - static_cast(CS_SOURCE_FRAMES_RECEIVED))] - += quantity; + static_cast(CS_SOURCE_FRAMES_RECEIVED))] += + quantity; } diff --git a/src/main/native/cpp/cscore_c.cpp b/src/main/native/cpp/cscore_c.cpp index 15634af813..aea42fb34b 100644 --- a/src/main/native/cpp/cscore_c.cpp +++ b/src/main/native/cpp/cscore_c.cpp @@ -298,7 +298,9 @@ int CS_NotifierDestroyed(void) { return cs::NotifierDestroyed(); } void CS_SetTelemetryPeriod(double seconds) { cs::SetTelemetryPeriod(seconds); } -double CS_GetTelemetryElapsedTime() { return cs::GetTelemetryElapsedTime(); } +double CS_GetTelemetryElapsedTime(void) { + return cs::GetTelemetryElapsedTime(); +} int64_t CS_GetTelemetryValue(CS_Handle handle, CS_TelemetryKind kind, CS_Status* status) { diff --git a/src/main/native/include/cscore_c.h b/src/main/native/include/cscore_c.h index d58ed688f2..da3043ce94 100644 --- a/src/main/native/include/cscore_c.h +++ b/src/main/native/include/cscore_c.h @@ -352,7 +352,7 @@ int CS_NotifierDestroyed(void); // Telemetry Functions // void CS_SetTelemetryPeriod(double seconds); -double CS_GetTelemetryElapsedTime(); +double CS_GetTelemetryElapsedTime(void); int64_t CS_GetTelemetryValue(CS_Handle handle, CS_TelemetryKind kind, CS_Status* status); double CS_GetTelemetryAverageValue(CS_Handle handle, CS_TelemetryKind kind,