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

wpilibc: Remove direct CameraServer dependency (#1989)

Browse Source 
This makes linking easier, particularly for third party vendors and other language wrappers.
This commit is contained in:
Thad House
2019-10-27 08:37:30 -07:00
committed by Peter Johnson
parent 8e333c0aad
commit 936627bd94
10 changed files with 142 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
View File

@@ -24,15 +24,10 @@ class DefaultCameraServerShared : public frc::CameraServerShared {
};
} // namespace
namespace frc {
static std::unique_ptr<CameraServerShared> cameraServerShared = nullptr;
static std::unique_ptr<frc::CameraServerShared> cameraServerShared = nullptr;
static wpi::mutex setLock;
void SetCameraServerShared(std::unique_ptr<CameraServerShared> shared) {
std::unique_lock lock(setLock);
cameraServerShared = std::move(shared);
}
namespace frc {
CameraServerShared* GetCameraServerShared() {
std::unique_lock lock(setLock);
if (!cameraServerShared) {
@@ -41,3 +36,10 @@ CameraServerShared* GetCameraServerShared() {
return cameraServerShared.get();
}
} // namespace frc
extern "C" {
void CameraServer_SetCameraServerShared(frc::CameraServerShared* shared) {
std::unique_lock lock(setLock);
cameraServerShared.reset(shared);
}
} // extern "C"