From 9f68d46b2df862f38d37211ed5b97ed442cccfed Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Fri, 30 Jun 2023 10:26:15 +0100 Subject: [PATCH] Bumped live555 version --- .../live/BasicUsageEnvironment/BasicTaskScheduler.cpp | 3 ++- pambase/PamTaskScheduler.cpp | 6 ++++-- pambase/remoteapi.cpp | 9 +++------ pambase/wmbutton.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/external/live/BasicUsageEnvironment/BasicTaskScheduler.cpp b/external/live/BasicUsageEnvironment/BasicTaskScheduler.cpp index ce30f9e6..d0318c7e 100644 --- a/external/live/BasicUsageEnvironment/BasicTaskScheduler.cpp +++ b/external/live/BasicUsageEnvironment/BasicTaskScheduler.cpp @@ -188,7 +188,7 @@ void BasicTaskScheduler::SingleStep(unsigned maxDelayTime) { if (mask == 0) mask = 0x80000000; #ifndef NO_STD_LIB - if (fTriggersAwaitingHandling[i].test()) { + if (fTriggersAwaitingHandling[i].test_and_set()) { fTriggersAwaitingHandling[i].clear(); #else if (fTriggersAwaitingHandling[i]) { @@ -202,6 +202,7 @@ void BasicTaskScheduler::SingleStep(unsigned maxDelayTime) { fLastUsedTriggerNum = i; break; } + fTriggersAwaitingHandling[i].clear(); } while (i != fLastUsedTriggerNum); } diff --git a/pambase/PamTaskScheduler.cpp b/pambase/PamTaskScheduler.cpp index 84099682..dc76d7de 100644 --- a/pambase/PamTaskScheduler.cpp +++ b/pambase/PamTaskScheduler.cpp @@ -190,8 +190,7 @@ void PamTaskScheduler::SingleStep(unsigned maxDelayTime) { if (mask == 0) mask = 0x80000000; #ifndef NO_STD_LIB - if (fTriggersAwaitingHandling[i].test()) { - fTriggersAwaitingHandling[i].clear(); + if (fTriggersAwaitingHandling[i].test_and_set()) { #else if (fTriggersAwaitingHandling[i]) { fTriggersAwaitingHandling[i] = False; @@ -204,6 +203,9 @@ void PamTaskScheduler::SingleStep(unsigned maxDelayTime) { fLastUsedTriggerNum = i; break; } +#ifndef NO_STD_LIB + fTriggersAwaitingHandling[i].clear(); +#endif // NO_STD_LIB } while (i != fLastUsedTriggerNum); } diff --git a/pambase/remoteapi.cpp b/pambase/remoteapi.cpp index 2089046f..b511e2e5 100644 --- a/pambase/remoteapi.cpp +++ b/pambase/remoteapi.cpp @@ -247,12 +247,9 @@ pml::restgoose::response RemoteApi::WavEndpoint(const httpMethod& theMethod, con return DeleteWav(fn); } } - else - { - pml::restgoose::response resp(404); - resp.jsonData["wav"] = fnWanted.GetName().ToStdString(); - return resp; - } + pml::restgoose::response resp(404); + resp.jsonData["wav"] = fnWanted.GetName().ToStdString(); + return resp; } pml::restgoose::response RemoteApi::ExtraEndpoint(const httpMethod& theMethod, const query& theQuery, const std::vector& vData, const endpoint& theEndpoint, const userName& theUser) diff --git a/pambase/wmbutton.cpp b/pambase/wmbutton.cpp index bef870bc..581a6e7d 100644 --- a/pambase/wmbutton.cpp +++ b/pambase/wmbutton.cpp @@ -459,11 +459,11 @@ void wmButton::Draw(wxDC& dc) } if(m_nState != STATE_DISABLED) { - m_uiRect.Draw(dc, m_uiRect.GetLabel(), m_nBorderState, bmp); + m_uiRect.Draw(dc, m_uiRect.GetLabel(), uiRect::EDGE_ALL, m_nBorderState, bmp); } else { - m_uiRect.Draw(dc, m_uiRect.GetLabel(), uiRect::BORDER_FLAT, bmp); + m_uiRect.Draw(dc, m_uiRect.GetLabel(), uiRect::EDGE_ALL, uiRect::BORDER_FLAT, bmp); } }