MythZoneMinder: add some initial support for ZoneMinder >= 1.26.0

Thanks to Warpme for testing the patch. Note: this bumps the MythZoneMinder protocol version so both the FE plugin and mythzmserver need to be updated.
MythTV · Oct 27, 2013 · 39401bf · 39401bf
1 parent 46eb6b4
commit 39401bf
Show file tree

Hide file tree

Showing 6 changed files with 341 additions and 194 deletions.
diff --git a/mythplugins/mythzoneminder/mythzmserver/main.cpp b/mythplugins/mythzoneminder/mythzmserver/main.cpp
@@ -209,9 +209,8 @@ int main(int argc, char **argv)
     loadZMConfig(zmconfig);
 
     // we support version 1.24.0 or later
-    int major, minor, revision;
-    sscanf(g_zmversion.c_str(), "%d.%d.%d", &major, &minor, &revision);
-    if (major >= 1 && minor >= 24 && revision >= 0)
+    sscanf(g_zmversion.c_str(), "%d.%d.%d", &g_majorVersion, &g_minorVersion, &g_revisionVersion);
+    if (checkVersion(1, 24, 0))
     {
         cout << "ZM is version '" << g_zmversion << "'" << endl;
     }