Ticket #3910: mythshutdown-util-isRunning-18112007.patch

libs/libmyth/util.h

@@ -53 +53 @@
 MPUBLIC QRgb blendColors(QRgb source, QRgb add, int alpha);
 
 MPUBLIC uint myth_system(const QString &command, int flags = 0);
+MPUBLIC bool isRunning(QString program);
 
 MPUBLIC QString cutDownString(const QString &text, QFont *testFont, uint maxwidth);
 

libs/libmyth/util.cpp

@@ -281 +281 @@
     return GENERIC_EXIT_NOT_OK;
 }
 
+/** \fn isRunning(QString program)
+ *  \brief Returns boolean true/false depending on whether program is running.
+ */
+bool isRunning(QString program)
+{
+    QString sCommand = QString("ret=`ps cax | grep -c %1`; exit $ret").arg(program);
+    int res = system(sCommand.ascii());
+    if (WIFEXITED(res))
+        res = WEXITSTATUS(res);
+
+    return res;
+}
+
 /** \fn cutDownString(const QString&, QFont*, uint)
  *  \brief Returns a string based on "text" that fits within "maxwidth" pixels.
  */

programs/mythshutdown/main.cpp

@@ -15 +15 @@
 #include "libmythtv/programinfo.h"
 #include "libmythtv/jobqueue.h"
 #include "tv.h"
+#include "util.h"
 
 void setGlobalSetting(const QString &key, const QString &value)
 {
@@ -101 +102 @@
     return 0;
 }
 
-bool isRunning(QString program)
-{
-    QString sCommand = QString("ret=`ps cax | grep -c %1`; exit $ret").arg(program);
-    int res = system(sCommand.ascii());
-    if (WIFEXITED(res))
-        res = WEXITSTATUS(res);
-
-    return res;
-}
-
 QDateTime getDailyWakeupTime(QString sPeriod)
 {
     QString sTime = getGlobalSetting(sPeriod, "00:00");