sync upstream lib cppmyth 2.17.0

janbar · Feb 8, 2024 · 62edc92 · 62edc92
1 parent fed5ef5
commit 62edc92
Show file tree

Hide file tree

Showing 24 changed files with 1,046 additions and 388 deletions.
diff --git a/lib/cppmyth/CMakeLists.txt b/lib/cppmyth/CMakeLists.txt
@@ -18,8 +18,8 @@ endif ()
 ###############################################################################
 # set lib version here
 set (PACKAGE_VERSION_MAJOR 2)
-set (PACKAGE_VERSION_MINOR 16)
-set (PACKAGE_VERSION_PATCH 4)
+set (PACKAGE_VERSION_MINOR 17)
+set (PACKAGE_VERSION_PATCH 0)
 
 set (PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH})
 set (PACKAGE_LIB_SOVERSION ${PACKAGE_VERSION_MAJOR})
@@ -142,7 +142,8 @@ file (GLOB SRC_FILES
   src/*.cpp)
 
 file (GLOB OS_SRC_FILES
-  src/private/os/threads/threadpool.cpp)
+  src/private/os/threads/threadpool.cpp
+  src/private/os/threads/latch.cpp))
 
 if (MSVC)
   list (APPEND OS_SRC_FILES

diff --git a/lib/cppmyth/src/local_config.h.in b/lib/cppmyth/src/local_config.h.in
@@ -29,4 +29,12 @@
 #undef LIBVERSION
 #define LIBVERSION "@PACKAGE_VERSION@"
 
+#if __cplusplus < 201103L
+#undef explicit
+#define explicit
+#undef nullptr
+#define nullptr NULL
+#endif
+
+
 #endif	/* CPPMYTH_CONFIG_H */
diff --git a/lib/cppmyth/src/mythfileplayback.cpp b/lib/cppmyth/src/mythfileplayback.cpp
@@ -22,7 +22,7 @@
 #include "mythfileplayback.h"
 #include "mythlivetvplayback.h"
 #include "private/debug.h"
-#include "private/os/threads/mutex.h"
+#include "private/os/threads/latch.h"
 #include "private/builtin.h"
 
 #include <limits>
@@ -50,7 +50,7 @@ FilePlayback::~FilePlayback()
 bool FilePlayback::Open()
 {
   // Begin critical section
-  OS::CLockGuard lock(*m_mutex);
+  OS::CWriteLock lock(*m_latch);
   if (ProtoPlayback::IsOpen())
     return true;
   return ProtoPlayback::Open();
@@ -59,15 +59,15 @@ bool FilePlayback::Open()
 void FilePlayback::Close()
 {
   // Begin critical section
-  OS::CLockGuard lock(*m_mutex);
+  OS::CWriteLock lock(*m_latch);
   CloseTransfer();
   ProtoPlayback::Close();
 }
 
 bool FilePlayback::OpenTransfer(const std::string& pathname, const std::string& sgname)
 {
   // Begin critical section
-  OS::CLockGuard lock(*m_mutex);
+  OS::CWriteLock lock(*m_latch);
   if (!ProtoPlayback::IsOpen())
     return false;
   CloseTransfer();
@@ -80,7 +80,7 @@ bool FilePlayback::OpenTransfer(const std::string& pathname, const std::string&
 void FilePlayback::CloseTransfer()
 {
   // Begin critical section
-  OS::CLockGuard lock(*m_mutex);
+  OS::CWriteLock lock(*m_latch);
   if (m_transfer)
   {
     TransferDone(*m_transfer);

diff --git a/lib/cppmyth/src/mythintrinsic.cpp b/lib/cppmyth/src/mythintrinsic.cpp
diff --git a/lib/cppmyth/src/mythintrinsic.h b/lib/cppmyth/src/mythintrinsic.h