Bumped live555 version

martim01 · Jun 30, 2023 · 9f68d46 · 9f68d46
1 parent 17686ed
commit 9f68d46
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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<pml::restgoose::partData>& vData, const endpoint& theEndpoint, const userName& theUser)

diff --git 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);
     }
 }