Minor mythzoneminder changes for std::chrono.

MythTV · Jan 25, 2021 · 4aee859 · 4aee859
1 parent b55f6c7
commit 4aee859
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/mythplugins/mythzoneminder/mythzmserver/main.cpp b/mythplugins/mythzoneminder/mythzmserver/main.cpp
@@ -305,7 +305,7 @@ int main(int argc, char **argv)
     while (!quit)
     {
         // the maximum time select() should wait
-        struct timeval timeout {DB_CHECK_TIME, 0};
+        struct timeval timeout {DB_CHECK_TIME.count(), 0};
 
         read_fds = master; // copy it
         int res = select(fdmax+1, &read_fds, nullptr, nullptr, &timeout);

diff --git a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
@@ -91,7 +91,7 @@ int     g_majorVersion = 0;
 int     g_minorVersion = 0;
 int     g_revisionVersion = 0;
 
-time_t  g_lastDBKick = 0;
+TimePoint  g_lastDBKick {};
 
 // returns true if the ZM version >= the requested version
 bool checkVersion(int major, int minor, int revision)
@@ -200,13 +200,13 @@ void connectToDatabase(void)
 
 void kickDatabase(bool debug)
 {
-    if (time(nullptr) < g_lastDBKick + DB_CHECK_TIME)
+    if (Clock::now() < g_lastDBKick + DB_CHECK_TIME)
         return;
 
     if (debug)
         std::cout << "Kicking database connection" << std::endl;
 
-    g_lastDBKick = time(nullptr);
+    g_lastDBKick = Clock::now();
 
     if (mysql_query(&g_dbConn, "SELECT NULL;") == 0)
     {

diff --git a/mythplugins/mythzoneminder/mythzmserver/zmserver.h b/mythplugins/mythzoneminder/mythzmserver/zmserver.h
@@ -16,13 +16,17 @@
 #ifndef ZMSERVER_H
 #define ZMSERVER_H
 
+#include <chrono>
 #include <cstdint>
 #include <map>
 #include <mysql/mysql.h>
 #include <sstream>
 #include <string>
 #include <unistd.h>
 #include <vector>
+using namespace std::chrono_literals;
+using Clock = std::chrono::system_clock;
+using TimePoint = std::chrono::time_point<Clock>;
 
 // the maximum image size we are ever likely to get from ZM
 #define MAX_IMAGE_SIZE  (2048*1536*3)
@@ -47,8 +51,8 @@ extern int     g_majorVersion;
 extern int     g_minorVersion;
 extern int     g_revisionVersion;
 
-#define DB_CHECK_TIME 60
-extern time_t  g_lastDBKick;
+static constexpr std::chrono::seconds DB_CHECK_TIME { 60s };
+extern TimePoint g_lastDBKick;
 
 const std::string FUNCTION_MONITOR = "Monitor";
 const std::string FUNCTION_MODECT  = "Modect";

diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
@@ -30,7 +30,7 @@
 // the maximum image size we are ever likely to get from ZM
 #define MAX_IMAGE_SIZE  (2048*1536*3)
 
-const int FRAME_UPDATE_TIME = 1000 / 10;  // try to update the frame 10 times a second
+static constexpr std::chrono::milliseconds FRAME_UPDATE_TIME { 100ms };  // try to update the frame 10 times a second
 
 ZMLivePlayer::ZMLivePlayer(MythScreenStack *parent, bool isMiniPlayer)
              :MythScreenType(parent, "zmliveview"),

diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmminiplayer.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmminiplayer.cpp
@@ -19,7 +19,7 @@
 // the maximum image size we are ever likely to get from ZM
 #define MAX_IMAGE_SIZE  (2048*1536*3)
 
-const int FRAME_UPDATE_TIME = 1000 / 10;  // try to update the frame 10 times a second
+static constexpr std::chrono::milliseconds FRAME_UPDATE_TIME { 100ms };  // try to update the frame 10 times a second
 
 ZMMiniPlayer::ZMMiniPlayer(MythScreenStack *parent)
           : ZMLivePlayer(parent, true),