Ticket #5276: zoneminder_monitor_function_v2.patch

mythzmserver/zmserver.h

@@ -147 +147 @@
     void handleDeleteEventList(vector<string> tokens);
     void handleGetEventDates(vector<string> tokens);
     void handleRunZMAudit(void);
+    void handleSetMonitorFunction(vector<string> tokens);
 
     bool                 m_debug;
     int                  m_sock;

mythzmserver/zmserver.cpp

@@ -55 +55 @@
 #define ERROR_FILE_OPEN        "Cannot open event file"
 #define ERROR_INVALID_MONITOR  "Invalid Monitor"
 #define ERROR_INVALID_POINTERS "Cannot get shared memory pointers"
+#define ERROR_INVALID_MONITOR_FUNCTION  "Invalid Monitor Function"
 
 MYSQL   g_dbConn;
 string  g_zmversion = "";
@@ -303 +304 @@
         handleDeleteEventList(tokens);
     else if (tokens[0] == "RUN_ZMAUDIT")
         handleRunZMAudit();
+     else if (tokens[0] == "SET_MONITOR_FUNCTION")
+        handleSetMonitorFunction(tokens);
     else
         send("UNKNOWN_COMMAND");
 }
@@ -1402 +1405 @@
 
     return result;
 }
+
+void ZMServer::handleSetMonitorFunction(vector<string> tokens)
+{
+    if (tokens.size() != 3)
+    {
+        sendError(ERROR_TOKEN_COUNT);
+        return;
+    }
+
+    string monitorID(tokens[1]);
+    string function(tokens[2]);
+
+    if (m_debug)
+        cout << "Updating monitor function. Monitor: " << monitorID << " to perform function: " << function << endl;
+
+    // Check validity of input passed to server. Does monitor exist && is function ok
+    if (m_monitors.find(atoi(monitorID.c_str())) == m_monitors.end())
+    {
+        sendError(ERROR_INVALID_MONITOR);
+        return;
+    }
+
+    if (function != "None" && function != "Monitor" &&
+        function != "Modect" && function != "Nodect" &&
+        function != "Record" && function != "Mocord")
+    {
+        sendError(ERROR_INVALID_MONITOR_FUNCTION);
+        return;
+    }
+
+    string sql("UPDATE Monitors ");
+    sql += "SET Function = '" + function + "' ";
+    sql += "WHERE Id = '" + monitorID + "'";
+
+    if (mysql_query(&g_dbConn, sql.c_str()))
+    {
+        fprintf(stderr, "%s\n", mysql_error(&g_dbConn));
+        sendError(ERROR_MYSQL_QUERY);
+        return;
+    }
+
+    if (m_debug)
+        cout << "Updating monitor function complete" << endl;
+
+    string outStr("");
+    ADD_STR(outStr, "OK")
+    send(outStr);
+}
+

mythzoneminder/zmconsole.cpp

@@ -177 +177 @@
         {
             handled = false;
         }
+        else if (action == "SELECT")
+        {
+            showMenu();
+        }
         else
             handled = false;
     }
@@ -185 +189 @@
         MythThemedDialog::keyPressEvent(e);
 }
 
+void ZMConsole::showMenu()
+{
+    menu = new MythPopupBox(GetMythMainWindow(),"popupMenu");
+
+    QButton *temp = menu->addButton(tr("Monitor"), this,
+                                        SLOT(setFunctionMonitor()));
+    menu->addButton(tr("Modect"), this,
+                                    SLOT(setFunctionModect()));
+    menu->addButton(tr("Record"), this,
+                                    SLOT(setFunctionRecord()));
+    menu->addButton(tr("Mocord"), this,
+                                    SLOT(setFunctionMocord()));
+    menu->addButton(tr("Nodect"), this,
+                                    SLOT(setFunctionNodect()));
+    menu->addButton(tr("None"), this,
+                                    SLOT(setFunctionNone()));
+
+    menu->addButton(tr("Cancel"), this, SLOT(cancelMenu()));
+    temp->setFocus();
+
+    menu->ShowPopup(this, SLOT(cancelMenu()));
+}
+
+void ZMConsole::cancelMenu()
+{
+    if (menu) 
+    {
+        menu->deleteLater();
+        menu=NULL;
+    }
+}
+
+void ZMConsole::setFunctionMonitor()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_MONITOR);
+}
+
+void ZMConsole::setFunctionModect()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_MODECT);
+}
+
+void ZMConsole::setFunctionNodect()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_NODECT);
+}
+
+void ZMConsole::setFunctionRecord()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_RECORD);
+}
+
+void ZMConsole::setFunctionMocord()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_MOCORD);
+}
+
+void ZMConsole::setFunctionNone()
+{
+    cancelMenu();
+    setMonitorFunction(FUNCTION_NONE);
+}
+
 UITextType* ZMConsole::getTextType(QString name)
 {
     UITextType* type = getUITextType(name);
@@ -284 +356 @@
         updateMonitorList();
     }
 }
+
+void ZMConsole::setMonitorFunction(const QString &function)
+{
+    if (class ZMClient *zm = ZMClient::get())
+    {
+        zm->getMonitorList(m_monitorList);
+
+        Monitor *currentMonitor = NULL;
+
+        if (m_currentMonitor < (int) m_monitorList->size())
+            currentMonitor = m_monitorList->at(m_currentMonitor);
+
+        if (currentMonitor == NULL)
+        {
+            VERBOSE(VB_IMPORTANT, "Monitor not found error");
+            return;
+        }
+
+        zm->setMonitorFunction(currentMonitor->id, function);
+        updateStatus();
+    }
+}
+

mythzoneminder/zmconsole.h

@@ -40 +40 @@
     void getDaemonStatus();
     void getMonitorStatus(void);
 
+    void setFunctionMonitor();
+    void setFunctionModect();
+    void setFunctionNodect();
+    void setFunctionRecord();
+    void setFunctionMocord();
+    void setFunctionNone();
+
+    void showMenu();
+    void cancelMenu();
+
   private:
     void wireUpTheme(void);
     UITextType* getTextType(QString name);
@@ -48 +58 @@
     void monitorListDown(bool page);
     void monitorListUp(bool page);
 
+    void setMonitorFunction(const QString &function);
+
     int                m_currentMonitor;
     int                m_monitorListSize;
     vector<Monitor *> *m_monitorList;
     UIListType        *m_monitor_list;
 
+    MythPopupBox      *menu;
+
     UITextType        *m_status_text;
     UITextType        *m_time_text;
     UITextType        *m_date_text;

mythzoneminder/zmclient.cpp

@@ -655 +655 @@
                 .arg(item->name).arg(item->id).arg(item->palette));
     }
 }
+
+void ZMClient::setMonitorFunction(int monitorID, const QString &function)
+{
+    QStringList strList("SET_MONITOR_FUNCTION");
+    strList << QString::number(monitorID);
+    strList << function;
+
+    VERBOSE(VB_GENERAL, "ZMClient::setMonitorFunction : " + strList[0] + strList[1] + strList[2]);
+
+    if (!sendReceiveStringList(strList))
+        return;
+
+    bool bOK;
+    strList[1].toInt(&bOK);
+    if (!bOK)
+    {
+        VERBOSE(VB_IMPORTANT, "ZMClient received bad int in setMonitorFunction()");
+        return;
+    }
+}
+

mythzoneminder/zmdefines.h

@@ -19 +19 @@
 #include <qstring.h>
 #include <qrect.h>
 
+const QString FUNCTION_MONITOR = "Monitor";
+const QString FUNCTION_MODECT  = "Modect";
+const QString FUNCTION_NODECT  = "Nodect";
+const QString FUNCTION_RECORD  = "Record";
+const QString FUNCTION_MOCORD  = "Mocord";
+const QString FUNCTION_NONE    = "None";
+
 // event details
 typedef struct
 {

mythzoneminder/zmclient.h

@@ -62 +62 @@
     void getMonitorList(vector<Monitor*> *monitorList);
     void getEventDates(const QString &monitorName, bool oldestFirst, 
                        QStringList &dateList);
+    void setMonitorFunction(int monitorID, const QString &function);
 
   private slots:
     void restartConnection(void);  // Try to re-establish the connection to