mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-03-31 12:25:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed waterfall recursive lock bug

Browse Source
This commit is contained in:
AlexandreRouma 2021-11-03 16:30:32 +01:00
parent d5becc5fc2
commit e6377d4f3d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/gui/widgets/waterfall.cpp
View File

@ -579,7 +579,7 @@ namespace ImGui {
} }
void WaterFall::setFastFFT(bool fastFFT) { void WaterFall::setFastFFT(bool fastFFT) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
_fastFFT = fastFFT; _fastFFT = fastFFT;
} }
@ -892,7 +892,7 @@ namespace ImGui {
} }
void WaterFall::updatePallette(float colors[][3], int colorCount) { void WaterFall::updatePallette(float colors[][3], int colorCount) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
for (int i = 0; i < WATERFALL_RESOLUTION; i++) { for (int i = 0; i < WATERFALL_RESOLUTION; i++) {
int lowerId = floorf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount); int lowerId = floorf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount);
int upperId = ceilf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount); int upperId = ceilf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount);
@ -908,7 +908,7 @@ namespace ImGui {
} }
void WaterFall::updatePalletteFromArray(float* colors, int colorCount) { void WaterFall::updatePalletteFromArray(float* colors, int colorCount) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
for (int i = 0; i < WATERFALL_RESOLUTION; i++) { for (int i = 0; i < WATERFALL_RESOLUTION; i++) {
int lowerId = floorf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount); int lowerId = floorf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount);
int upperId = ceilf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount); int upperId = ceilf(((float)i / (float)WATERFALL_RESOLUTION) * colorCount);
@ -969,7 +969,7 @@ namespace ImGui {
} }
void WaterFall::setViewBandwidth(double bandWidth) { void WaterFall::setViewBandwidth(double bandWidth) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
if (bandWidth == viewBandwidth) { if (bandWidth == viewBandwidth) {
return; return;
} }
@ -994,7 +994,7 @@ namespace ImGui {
} }
void WaterFall::setViewOffset(double offset) { void WaterFall::setViewOffset(double offset) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
if (offset == viewOffset) { if (offset == viewOffset) {
return; return;
} }
@ -1034,12 +1034,12 @@ namespace ImGui {
} }
void WaterFall::setFullWaterfallUpdate(bool fullUpdate) { void WaterFall::setFullWaterfallUpdate(bool fullUpdate) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
_fullUpdate = fullUpdate; _fullUpdate = fullUpdate;
} }
void WaterFall::setWaterfallMin(float min) { void WaterFall::setWaterfallMin(float min) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
if (min == waterfallMin) { if (min == waterfallMin) {
return; return;
} }
@ -1052,7 +1052,7 @@ namespace ImGui {
} }
void WaterFall::setWaterfallMax(float max) { void WaterFall::setWaterfallMax(float max) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
if (max == waterfallMax) { if (max == waterfallMax) {
return; return;
} }
@ -1080,8 +1080,8 @@ namespace ImGui {
} }
} }
void WaterFall::setRawFFTSize(int size, bool lock) { void WaterFall::setRawFFTSize(int size) {
std::lock_guard<std::mutex> lck(buf_mtx); std::lock_guard<std::recursive_mutex> lck(buf_mtx);
rawFFTSize = size; rawFFTSize = size;
int wfSize = std::max<int>(1, waterfallHeight); int wfSize = std::max<int>(1, waterfallHeight);
if (rawFFTs != NULL) { if (rawFFTs != NULL) {

4
core/src/gui/widgets/waterfall.h
View File

@ -124,7 +124,7 @@ namespace ImGui {
void setFFTHeight(int height); void setFFTHeight(int height);
int getFFTHeight(); int getFFTHeight();
void setRawFFTSize(int size, bool lock = true); void setRawFFTSize(int size);
void setFastFFT(bool fastFFT); void setFastFFT(bool fastFFT);
@ -227,7 +227,7 @@ namespace ImGui {
GLuint textureId; GLuint textureId;
std::mutex buf_mtx; std::recursive_mutex buf_mtx;
float vRange; float vRange;