Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

artf4156: Replaced synchronization primitives with C++11 equivalents

Browse Source 
Change-Id: I90da739347e875efda2a29dd5484b6dda3cd4753
This commit is contained in:
Tyler Veness
2015-06-25 01:54:20 -07:00
committed by James Kuszmaul
parent 7f5ee01d3e
commit 3f59f3472a
61 changed files with 1293 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wpilibc/wpilibC++Devices/src/USBCamera.cpp
View File

@@ -76,7 +76,7 @@ USBCamera::USBCamera(std::string name, bool useJpeg)
m_useJpeg(useJpeg) {}
void USBCamera::OpenCamera() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
for (unsigned int i = 0; i < 3; i++) {
uInt32 id = 0;
// Can't use SAFE_IMAQ_CALL here because we only error on the third time
@@ -96,7 +96,7 @@ void USBCamera::OpenCamera() {
}
void USBCamera::CloseCamera() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (!m_open) return;
SAFE_IMAQ_CALL(IMAQdxCloseCamera, m_id);
m_id = 0;
@@ -104,7 +104,7 @@ void USBCamera::CloseCamera() {
}
void USBCamera::StartCapture() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (!m_open || m_active) return;
SAFE_IMAQ_CALL(IMAQdxConfigureGrab, m_id);
SAFE_IMAQ_CALL(IMAQdxStartAcquisition, m_id);
@@ -112,7 +112,7 @@ void USBCamera::StartCapture() {
}
void USBCamera::StopCapture() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (!m_open || !m_active) return;
SAFE_IMAQ_CALL(IMAQdxStopAcquisition, m_id);
SAFE_IMAQ_CALL(IMAQdxUnconfigureAcquisition, m_id);
@@ -120,7 +120,7 @@ void USBCamera::StopCapture() {
}
void USBCamera::UpdateSettings() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
bool wasActive = m_active;
if (wasActive) StopCapture();
@@ -214,7 +214,7 @@ void USBCamera::UpdateSettings() {
}
void USBCamera::SetFPS(double fps) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (m_fps != fps) {
m_needSettingsUpdate = true;
m_fps = fps;
@@ -222,7 +222,7 @@ void USBCamera::SetFPS(double fps) {
}
void USBCamera::SetSize(unsigned int width, unsigned int height) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (m_width != width || m_height != height) {
m_needSettingsUpdate = true;
m_width = width;
@@ -231,7 +231,7 @@ void USBCamera::SetSize(unsigned int width, unsigned int height) {
}
void USBCamera::SetBrightness(unsigned int brightness) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (m_brightness != brightness) {
m_needSettingsUpdate = true;
m_brightness = brightness;
@@ -239,12 +239,12 @@ void USBCamera::SetBrightness(unsigned int brightness) {
}
unsigned int USBCamera::GetBrightness() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
return m_brightness;
}
void USBCamera::SetWhiteBalanceAuto() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_whiteBalance = AUTO;
m_whiteBalanceValue = 0;
m_whiteBalanceValuePresent = false;
@@ -252,7 +252,7 @@ void USBCamera::SetWhiteBalanceAuto() {
}
void USBCamera::SetWhiteBalanceHoldCurrent() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_whiteBalance = MANUAL;
m_whiteBalanceValue = 0;
m_whiteBalanceValuePresent = false;
@@ -260,7 +260,7 @@ void USBCamera::SetWhiteBalanceHoldCurrent() {
}
void USBCamera::SetWhiteBalanceManual(unsigned int whiteBalance) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_whiteBalance = MANUAL;
m_whiteBalanceValue = whiteBalance;
m_whiteBalanceValuePresent = true;
@@ -268,7 +268,7 @@ void USBCamera::SetWhiteBalanceManual(unsigned int whiteBalance) {
}
void USBCamera::SetExposureAuto() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_exposure = AUTO;
m_exposureValue = 0;
m_exposureValuePresent = false;
@@ -276,7 +276,7 @@ void USBCamera::SetExposureAuto() {
}
void USBCamera::SetExposureHoldCurrent() {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_exposure = MANUAL;
m_exposureValue = 0;
m_exposureValuePresent = false;
@@ -284,7 +284,7 @@ void USBCamera::SetExposureHoldCurrent() {
}
void USBCamera::SetExposureManual(unsigned int level) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
m_exposure = MANUAL;
if (level > 100)
m_exposureValue = 100;
@@ -295,7 +295,7 @@ void USBCamera::SetExposureManual(unsigned int level) {
}
void USBCamera::GetImage(Image* image) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (m_needSettingsUpdate || m_useJpeg) {
m_needSettingsUpdate = false;
m_useJpeg = false;
@@ -308,7 +308,7 @@ void USBCamera::GetImage(Image* image) {
}
unsigned int USBCamera::GetImageData(void* buffer, unsigned int bufferSize) {
std::unique_lock<std::recursive_mutex> lock(m_mutex);
std::unique_lock<priority_recursive_mutex> lock(m_mutex);
if (m_needSettingsUpdate || !m_useJpeg) {
m_needSettingsUpdate = false;
m_useJpeg = true;