Couple patches by Anduin Withers (myth_system(), cleanup in rankprogr…

…ams.cpp). git-svn-id: http://svn.mythtv.org/svn/trunk@2030 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Aug 13, 2003 · a4f7807 · a4f7807
1 parent 78fe75f
commit a4f7807
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 19 deletions.
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
@@ -38,8 +38,8 @@ using_alsa {
 
 using_lirc {
     DEFINES += USE_LIRC
-    HEADERS += lirc.h
-    SOURCES += lirc.cpp
+    HEADERS += lirc.h lircevent.h
+    SOURCES += lirc.cpp lircevent.cpp
 }
 
 INSTALLS += inc
diff --git a/mythtv/libs/libmyth/lircevent.cpp b/mythtv/libs/libmyth/lircevent.cpp
@@ -0,0 +1,40 @@
+#include <qapplication.h>
+#include <qstring.h>
+#include "mythcontext.h"
+
+#include "lircevent.h"
+
+LircEventLock::LircEventLock(bool lock_events) 
+             : events_locked(false)
+{
+    if (lock_events)
+        lock();
+}
+
+LircEventLock::~LircEventLock()
+{
+    if (events_locked)
+        unlock();
+}
+
+void LircEventLock::lock()
+{
+    MythMainWindow *mw = gContext->GetMainWindow();
+    if (mw)
+    {
+        events_locked = true;
+        QApplication::postEvent((QObject *)mw,
+			new LircMuteEvent(events_locked));
+    }
+}
+
+void LircEventLock::unlock()
+{
+    MythMainWindow *mw = gContext->GetMainWindow();
+    if (mw)
+    {
+        events_locked = false;
+        QApplication::postEvent((QObject *)mw,
+			new LircMuteEvent(events_locked));
+    }
+}
diff --git a/mythtv/libs/libmyth/lircevent.h b/mythtv/libs/libmyth/lircevent.h
@@ -2,6 +2,7 @@
 #define LIRCEVENT_H_
 
 const int kLircKeycodeEventType = 23423;
+const int kLircMuteEventType = 23424;
 
 class LircKeycodeEvent : public QCustomEvent 
 {
@@ -31,5 +32,32 @@ class LircKeycodeEvent : public QCustomEvent
     bool keydown;
 };
 
+class LircMuteEvent : public QCustomEvent
+{
+  public:
+    LircMuteEvent(bool mute_events) : QCustomEvent(kLircMuteEventType),
+            mute_lirc_events(mute_events) {}
+
+    bool eventsMuted()
+    {
+        return mute_lirc_events;
+    }
+
+  private:
+    bool mute_lirc_events;
+};
+
+class LircEventLock
+{
+  public:
+    LircEventLock(bool lock_events = true);
+    ~LircEventLock();
+    void lock();
+    void unlock();
+
+  private:
+    bool events_locked;
+};
+
 #endif
 
diff --git a/mythtv/libs/libmyth/mythcontext.h b/mythtv/libs/libmyth/mythcontext.h
@@ -52,7 +52,7 @@ class MythEvent : public QCustomEvent
     QString extradata;
 };
 
-#define MYTH_BINARY_VERSION "0.11.08062003-1"
+#define MYTH_BINARY_VERSION "0.11.08132003-1"
 #define MYTH_SCHEMA_VERSION "1003"
 
 extern bool print_verbose_messages;

diff --git a/mythtv/libs/libmyth/mythdialogs.cpp b/mythtv/libs/libmyth/mythdialogs.cpp
@@ -37,6 +37,7 @@ MythMainWindow::MythMainWindow(QWidget *parent, const char *name, bool modal)
               : QDialog(parent, name, modal)
 {
     Init();
+    ignore_lirc_keys = false;
 #ifdef USE_LIRC
     pthread_t lirc_tid;
     pthread_attr_t attr;
@@ -124,7 +125,7 @@ void MythMainWindow::keyPressEvent(QKeyEvent *e)
 void MythMainWindow::customEvent(QCustomEvent *ce)
 {
 #ifdef USE_LIRC
-    if (ce->type() == kLircKeycodeEventType) 
+    if (ce->type() == kLircKeycodeEventType && !ignore_lirc_keys) 
     {
         LircKeycodeEvent *lke = (LircKeycodeEvent *)ce;
         int keycode = lke->getKeycode();
@@ -173,6 +174,12 @@ void MythMainWindow::customEvent(QCustomEvent *ce)
                                            " your key mappings.\n";
         }
     }
+
+    if (ce->type() == kLircMuteEventType)
+    {
+        LircMuteEvent *lme = (LircMuteEvent *)ce;
+        ignore_lirc_keys = lme->eventsMuted();
+    }
 #endif
 }
 

diff --git a/mythtv/libs/libmyth/mythdialogs.h b/mythtv/libs/libmyth/mythdialogs.h
@@ -50,6 +50,8 @@ class MythMainWindow : public QDialog
     int screenwidth, screenheight;
 
     vector<QWidget *> widgetList;
+
+    bool ignore_lirc_keys;
 };
 
 class MythDialog : public QFrame

diff --git a/mythtv/libs/libmyth/themedmenu.cpp b/mythtv/libs/libmyth/themedmenu.cpp
@@ -1691,7 +1691,7 @@ void ThemedMenu::handleAction(QString &action)
     if (action.left(5) == "EXEC ")
     {
         QString rest = action.right(action.length() - 5);
-        system(rest);
+        myth_system(rest);
     }
     else if (action.left(7) == "EXECTV ")
     {
@@ -1707,7 +1707,7 @@ void ThemedMenu::handleAction(QString &action)
                                 (const char*)strlist[2],
                                 (const char*)strlist[3]);
 
-            system(rest);
+            myth_system(rest);
 
             strlist = QString("FREE_TUNER %1").arg(cardid);
             gContext->SendReceiveStringList(strlist);

diff --git a/mythtv/libs/libmyth/util.cpp b/mythtv/libs/libmyth/util.cpp
@@ -19,6 +19,10 @@ extern "C" {
 #include <qpainter.h>
 #include <qpixmap.h>
 
+#ifdef USE_LIRC
+#include "lircevent.h"
+#endif
+
 bool WriteStringList(QSocket *socket, QStringList &list)
 {
     QString str = list.join("[]:[]");
@@ -255,3 +259,12 @@ QRgb blendColors(QRgb source, QRgb add, int alpha)
     return qRgb(sred, sgreen, sblue);
 }
 
+int myth_system(const QString &command, int flags)
+{
+#ifdef USE_LIRC
+    LircEventLock lirc_lock(!(flags & MYTH_SYSTEM_DONT_BLOCK_LIRC));
+#endif
+
+    return system(command);
+}
+
diff --git a/mythtv/libs/libmyth/util.h b/mythtv/libs/libmyth/util.h
@@ -25,4 +25,7 @@ void GetMythTVGeometry(Display *dpy, int screen_num, int *x, int *y,
 
 QRgb blendColors(QRgb source, QRgb add, int alpha);
 
+#define MYTH_SYSTEM_DONT_BLOCK_LIRC (1)
+int myth_system(const QString &command, int flags = 0);
+
 #endif
diff --git a/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp b/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
@@ -1291,7 +1291,7 @@ void NuppelVideoPlayer::OutputVideoLoop(void)
             pthread_mutex_unlock(&video_buflock);
 
             //printf("video waiting for unpause\n");
-            usleep(5000);
+            usleep(frame_interval * 2);
             continue;
         }
         video_actually_paused = false;

diff --git a/mythtv/libs/libmythtv/programinfo.cpp b/mythtv/libs/libmythtv/programinfo.cpp
@@ -75,11 +75,17 @@ ProgramInfo::ProgramInfo(const ProgramInfo &other)
     record = NULL;
 }
 
-ProgramInfo::~ProgramInfo() {
+ProgramInfo::~ProgramInfo() 
+{
     if (record != NULL)
         delete record;
 }
 
+QString ProgramInfo::MakeUniqueKey(void)
+{
+    return title + ":" + chanid + ":" + startts.toString(Qt::ISODate);
+}
+
 void ProgramInfo::ToStringList(QStringList &list)
 {
     if (title == "")

diff --git a/mythtv/libs/libmythtv/programinfo.h b/mythtv/libs/libmythtv/programinfo.h
@@ -85,6 +85,8 @@ class ProgramInfo
     QString GetRecordBasename(void);
     QString GetRecordFilename(const QString &prefix);
 
+    QString MakeUniqueKey(void);
+
     int CalculateLength(void);
 
     void ToStringList(QStringList &list);

diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp
@@ -442,8 +442,7 @@ void RankPrograms::edit(void)
 
                 // also set the origRankData with new rank so we don't
                 // save to db again when we exit
-                QString key = progInfo->title + ":" + progInfo->chanid + ":" + 
-                              progInfo->startts.toString(Qt::ISODate);
+                QString key = progInfo->MakeUniqueKey(); 
                 origRankData[key] = progInfo->rank;
 
                 SortList();
@@ -503,8 +502,7 @@ void RankPrograms::saveRank(void)
     for (it = programData.begin(); it != programData.end(); ++it) 
     {
         ProgramRankInfo *progInfo = &(it.data());
-        QString key = progInfo->title + ":" + progInfo->chanid + ":" + 
-                      progInfo->startts.toString(Qt::ISODate);
+        QString key = progInfo->MakeUniqueKey(); 
 
         // if this program's rank changed from when we entered
         // save new value out to db
@@ -533,8 +531,7 @@ void RankPrograms::FillList(void)
 
         // save rank value in map so we don't have to save all program's
         // rank values when we exit
-        QString key = (*pgiter)->title + ":" + (*pgiter)->chanid + ":" + 
-                      (*pgiter)->startts.toString(Qt::ISODate);
+        QString key = (*pgiter)->MakeUniqueKey();
         origRankData[key] = (*pgiter)->rank;
 
         delete (*pgiter);
@@ -606,8 +603,7 @@ void RankPrograms::FillList(void)
             for (it = programData.begin(); it != programData.end(); ++it)
             {
                 ProgramRankInfo *progInfo = &(it.data());
-                QString keyB = progInfo->title + ":" + progInfo->chanid + ":" +
-                               progInfo->startts.toString(Qt::ISODate);
+                QString keyB = progInfo->MakeUniqueKey();
                 if(keyA == keyB)
                 {
                     progInfo->channelRank = channelRank;
@@ -757,9 +753,7 @@ void RankPrograms::updateList(QPainter *p)
                     {
                         ProgramRankInfo *progInfo = &(it.data());
 
-                        QString key = progInfo->title + ":" + 
-                                      progInfo->chanid + ":" +
-                                      progInfo->startts.toString(Qt::ISODate);
+                        QString key = progInfo->MakeUniqueKey(); 
 
                         int progRank = progInfo->rank.toInt();
                         int finalRank = progRank + progInfo->channelRank +