Update Mythbackend Service API for SendMessage timeout.

MythTV · Jan 6, 2012 · 181529f · 181529f
1 parent 4d1c372
commit 181529f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/mythtv/html/js/util.qjs b/mythtv/html/js/util.qjs
@@ -179,9 +179,10 @@ function sendMessage() {
     var message = $("#message").val();
     var address = $("#address").val();
     var port    = $("#port").val();
+    var timeout = $("#timeout").val();
 
     $.post("/Myth/SendMessage",
-        { Message: message, Address: address, udpPort: port },
+        { Message: message, Address: address, udpPort: port, Timeout: timeout },
         function(data) {
             result = 1;
         }).error(function(data) {

diff --git a/mythtv/html/misc/message.html b/mythtv/html/misc/message.html
@@ -19,6 +19,10 @@ <h3><a href="javascript:void(0)">Advanced Settings</a></h3>
                     <td><input id='port' size=10 value='6948'>
                     </td>
                 </tr>
+                <tr><th align=right>Timeout:</th>
+                    <td><input id='timeout' size=10 value='0'>
+                    </td>
+                </tr>
             </table>
             </p>
         </div>

diff --git a/mythtv/libs/libmythservicecontracts/services/mythServices.h b/mythtv/libs/libmythservicecontracts/services/mythServices.h
@@ -116,7 +116,8 @@ class SERVICE_PUBLIC MythServices : public Service  //, public QScriptable ???
 
         virtual bool                SendMessage         ( const QString &Message,
                                                           const QString &Address,
-                                                          int   udpPort ) = 0;
+                                                          int   udpPort,
+                                                          int   Timeout ) = 0;
 
         virtual bool                BackupDatabase      ( void ) = 0;
 

diff --git a/mythtv/programs/mythbackend/services/myth.cpp b/mythtv/programs/mythbackend/services/myth.cpp
@@ -585,16 +585,21 @@ bool Myth::TestDBSettings( const QString &sHostName,
 
 bool Myth::SendMessage( const QString &sMessage,
                         const QString &sAddress,
-                        int   udpPort)
+                        int   udpPort,
+                        int   Timeout)
 {
     bool bResult = false;
 
     if (sMessage.isEmpty())
         return bResult;
 
+    if (Timeout < 0 || Timeout > 999)
+        Timeout = 0;
+
     QString xmlMessage =
         "<mythmessage version=\"1\">\n"
         "  <text>" + sMessage + "</text>\n"
+        "  <timeout>" + QString::number(Timeout) + "</timeout>\n"
         "</mythmessage>";
 
     QHostAddress address = QHostAddress::Broadcast;

diff --git a/mythtv/programs/mythbackend/services/myth.h b/mythtv/programs/mythbackend/services/myth.h
@@ -75,7 +75,8 @@ class Myth : public MythServices
 
         bool                SendMessage         ( const QString &Message,
                                                   const QString &Address,
-                                                  int   udpPort);
+                                                  int   udpPort,
+                                                  int   Timeout);
 
         bool                BackupDatabase      ( void );
 
@@ -178,9 +179,10 @@ class ScriptableMyth : public QObject
 
         bool SendMessage( const QString &Message,
                           const QString &Address,
-                          int   udpPort)
+                          int   udpPort,
+                          int   Timeout)
         {
-            return m_obj.SendMessage( Message, Address, udpPort );
+            return m_obj.SendMessage( Message, Address, udpPort, Timeout );
         }
 
         bool BackupDatabase( void )