Ticket #3280: backend_functions.diff

Index: mythtv/programs/mythtv-setup/main.cpp
===================================================================
--- mythtv/programs/mythtv-setup/main.cpp    (revision 13185)
+++ mythtv/programs/mythtv-setup/main.cpp    (working copy)
@@ -36,7 +36,6 @@
 #include "checksetup.h"
 
 using namespace std;
-bool is_backend_running(void);
 
 void SetupMenuCallback(void* data, QString& selection) {
     (void)data;
@@ -291,9 +290,9 @@
         QObject::tr("Changing existing card inputs, deleting anything, "
                     "or scanning for channels may not work.");
 
-    bool backendIsRunning = false;
+    bool backendIsRunning = gContext->BackendIsRunning();
 
-    if (is_backend_running())
+    if (backendIsRunning)
     {
         int val = MythPopupBox::show2ButtonPopup(
             gContext->GetMainWindow(), QObject::tr("WARNING"),
@@ -344,40 +343,20 @@
     }
     while (haveProblems);
 
-    dia = new DialogBox(mainWindow,
+    if (gContext->IsMasterBackend())
+    {
+        dia = new DialogBox(mainWindow,
                         QObject::tr("Please run 'mythfilldatabase' "
                                     "to populate the database "
                                     "with channel information."));
-    dia->AddButton(QObject::tr("OK"));
-    dia->exec();
-    delete dia;
+        dia->AddButton(QObject::tr("OK"));
+        dia->exec();
+        delete dia;
+    }
 
     if (backendIsRunning)
         RemoteSendMessage("CLEAR_SETTINGS_CACHE");
 
     return 0;
 }
-
-bool is_backend_running(void)
-{
-#if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__)
-    char    *command = "ps -ax | grep -i mythbackend | grep -v grep > ";
-#else
-    char    *command = "ps -ae | grep mythbackend > ";
-#endif
-    QString tmp_file = "/tmp/backendrunning";
-    myth_system(command + tmp_file,
-                MYTH_SYSTEM_DONT_BLOCK_LIRC |
-                MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU);
-
-    FILE *fptr = fopen(tmp_file, "r");
-    if (!fptr)
-        return false;
-    char buf[1024];
-    int read_bytes = fread(buf, 1, 1024, fptr);
-    fclose(fptr);
-    unlink(tmp_file);
-
-    return read_bytes != 0;
-}
Index: mythtv/libs/libmyth/mythcontext.h
===================================================================
--- mythtv/libs/libmyth/mythcontext.h   (revision 13185)
+++ mythtv/libs/libmyth/mythcontext.h   (working copy)
@@ -261,6 +261,8 @@
     void SetBackend(bool backend);
     bool IsBackend(void);
     bool IsFrontendOnly(void);
+    bool IsMasterBackend(void);
+    bool BackendIsRunning(void);
 
     void BlockShutdown(void);
     void AllowShutdown(void);

Index: mythtv/libs/libmyth/mythcontext.cpp
===================================================================
--- mythtv/libs/libmyth/mythcontext.cpp (revision 13185)
+++ mythtv/libs/libmyth/mythcontext.cpp (working copy)
@@ -1057,6 +1085,31 @@
     return d->m_backend;
 }
 
+bool MythContext::IsMasterBackend(void)
+{
+    QString myip = gContext->GetSetting("BackendServerIP");
+    QString masterip = gContext->GetSetting("MasterServerIP");
+
+    bool ismaster = false;
+
+    if (masterip == myip)
+        ismaster = true;
+    return ismaster;
+}
+
+bool MythContext::BackendIsRunning(void)
+{
+#if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__)
+    char    *command = "ps -ax | grep -i mythbackend | grep -v grep > /dev/null";
+#else
+    char    *command = "ps -ae | grep mythbackend > /dev/null";
+#endif
+    bool res = myth_system(command,
+                MYTH_SYSTEM_DONT_BLOCK_LIRC |
+                MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU);
+    return !res;
+}
+
 bool MythContext::IsFrontendOnly(void)
 {
     // find out if a backend runs on this host...
Index: mythtv/programs/mythbackend/main.cpp
===================================================================
--- mythtv/programs/mythbackend/main.cpp        (revision 13185)
+++ mythtv/programs/mythbackend/main.cpp        (working copy)
@@ -570,10 +570,6 @@
     int port = gContext->GetNumSetting("BackendServerPort", 6543);
 
     QString myip = gContext->GetSetting("BackendServerIP");
-    QString masterip = gContext->GetSetting("MasterServerIP");
-
-    bool ismaster = false;
-
     if (myip.isNull() || myip.isEmpty())
     {
         cerr << "No setting found for this machine's BackendServerIP.\n"
@@ -582,12 +578,14 @@
         return BACKEND_EXIT_NO_IP_ADDRESS;
     }
 
-    if (masterip == myip)
+    bool ismaster = gContext->IsMasterBackend();
+
+
+    if (ismaster)
     {
         cerr << "Starting up as the master server.\n";
         gContext->LogEntry("mythbackend", LP_INFO,
                            "MythBackend started as master server", "");
-        ismaster = true;
 
         if (nosched)
             cerr << "********** The Scheduler has been DISABLED with "