Ticket #7691: 7691-v3.patch

libs/libmythtv/jobqueue.cpp

@@ -2012 +2012 @@
                                .arg(comment)).toLocal8Bit();
                 }
 
-                MythEvent me("RECORDING_LIST_CHANGE");
-                gContext->dispatch(me);
-
                 program_info->SetTranscoded(TRANSCODING_COMPLETE);
             }
             else
@@ -2165 +2162 @@
         comment = tr("%n commercial break(s)", "", breaksFound);
         ChangeJobStatus(jobID, JOB_FINISHED, comment);
 
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
+        program_info->SendUpdateEvent();
 
         program_info->pathname = program_info->GetPlaybackURL();
         (new PreviewGenerator(program_info, PreviewGenerator::kLocal))->Run();
@@ -2284 +2280 @@
 
         ChangeJobStatus(jobID, JOB_FINISHED, "Successfully Completed.");
 
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
+        if (pginfo)
+            pginfo->SendUpdateEvent();
     }
 
     RemoveRunningJob(jobID);

libs/libmythtv/tv_rec.cpp

@@ -504 +504 @@
         curRecording->recordid = rcinfo->recordid;
         curRecording->recendts = rcinfo->recendts;
         curRecording->UpdateRecordingEnd();
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
 
         recordEndTime = curRecording->recendts.addSecs(post_roll_seconds);
 
@@ -785 +783 @@
 }
 
 /** \fn TVRec::StartedRecording(RecordingInfo *curRec)
- *  \brief Inserts a "curRec" into the database, and issues a
- *         "RECORDING_LIST_CHANGE" event.
+ *  \brief Inserts a "curRec" into the database
  *  \param curRec Recording to add to database.
  *  \sa ProgramInfo::StartedRecording(const QString&)
  */
@@ -801 +798 @@
 
     if (curRec->chancommfree != 0)
         curRec->SetCommFlagged(COMM_FLAG_COMMFREE);
-
-    MythEvent me("RECORDING_LIST_CHANGE");
-    gContext->dispatch(me);
 }
 
 /** \fn TVRec::FinishedRecording(RecordingInfo *curRec)
@@ -1069 +1063 @@
  *
  *   If killfile is true, the recording is deleted.
  *
- *   A "RECORDING_LIST_CHANGE" message is dispatched.
- *
  *   Finally, if there was a recording and it was not deleted,
  *   schedule any post-processing jobs.
  *
@@ -1140 +1132 @@
         curRecording = NULL;
     }
 
-    MythEvent me("RECORDING_LIST_CHANGE");
-    gContext->dispatch(me);
     pauseNotify = true;
 
     if (GetDTVChannel())

libs/libmythtv/recordinginfo.cpp

@@ -223 +223 @@
         MythDB::DBError("RecGroup update", query);
 
     recgroup = newrecgroup;
+
+    SendUpdateEvent();
 }
 
 /** \fn RecordingInfo::ApplyRecordPlayGroupChange(const QString &newplaygroup)
@@ -246 +248 @@
         MythDB::DBError("PlayGroup update", query);
 
     playgroup = newplaygroup;
+
+    SendUpdateEvent();
 }
 
 /** \fn RecordingInfo::ApplyStorageGroupChange(const QString &newstoragegroup)
@@ -269 +273 @@
         MythDB::DBError("StorageGroup update", query);
 
     storagegroup = newstoragegroup;
+
+    SendUpdateEvent();
 }
 
 /** \fn RecordingInfo::ApplyRecordRecTitleChange(const QString &newTitle, const QString &newSubtitle)
@@ -295 +301 @@
 
     title = newTitle;
     subtitle = newSubtitle;
+
+    SendUpdateEvent();
 }
 
 /** \brief Sets the transcoder profile for a recording
@@ -546 +554 @@
     query.bindValue(":START", startts);
     if (!query.exec() || !query.isActive())
         MythDB::DBError("Copy program ratings on record", query);
+
+    SendAddedEvent();
 }
 
 static bool insert_program(const RecordingInfo        *pg,
@@ -705 +715 @@
         VERBOSE(VB_GENERAL, QString("%1 %2").arg(msg).arg(details));
         gContext->LogEntry("scheduler", LP_NOTICE, msg, details);
     }
+
+    SendUpdateEvent();
 }
 
 /** \fn RecordingInfo::UpdateRecordingEnd(void)
@@ -724 +736 @@
 
     if (!query.exec())
         MythDB::DBError("UpdateRecordingEnd update", query);
+
+    SendUpdateEvent();
 }
 
 /** \fn RecordingInfo::ReactivateRecording(void)

libs/libmyth/programinfo.h

@@ -376 +376 @@
     // Translations for play,recording, & storage groups +
     static QString i18n(const QString&);
 
+    /// Sends event out that the ProgramInfo should be reloaded.
+    void SendUpdateEvent(void) const;
+    /// Sends event out that the ProgramInfo should be added to lists.
+    void SendAddedEvent(void) const;
+    /// Sends event out that the ProgramInfo should be delete from lists.
+    void SendDeletedEvent(void) const;
+
   protected:
     // Creates a basename from the start and end times
     QString CreateRecordBasename(const QString &ext) const;
-    /// Sends event out that the ProgramInfo should be reloaded.
-    void Update(void) const;
 
   public:
     // data

libs/libmyth/programinfo.cpp

@@ -1550 +1550 @@
         return false;
     }
 
-    Update();
+    SendUpdateEvent();
     return true;
 }
 
@@ -1673 +1673 @@
     if (!query.exec() || !query.isActive())
         MythDB::DBError("File size update", query);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::GetFilesize(void)
@@ -1759 +1759 @@
             MythDB::DBError("bookmark flag update", query);
     }
 
-    Update();
+    SendUpdateEvent();
 }
 
-void ProgramInfo::Update(void) const
+void ProgramInfo::SendUpdateEvent(void) const
 {
     QStringList list;
     ToStringList(list);
-    MythEvent me(QString("UPDATE_PROG_INFO"), list);
-    RemoteSendEvent(me);
+    RemoteSendEvent(MythEvent(QString("UPDATE_PROG_INFO"), list));
 }
 
+void ProgramInfo::SendAddedEvent(void) const
+{
+    QStringList list;
+    ToStringList(list);
+    RemoteSendEvent(MythEvent(QString("RECORDING_LIST_CHANGE ADD"), list));
+}
+
+void ProgramInfo::SendDeletedEvent(void) const
+{
+    QString msg = QString("RECORDING_LIST_CHANGE DELETE %1 %2")
+        .arg(chanid).arg(recstartts.toString(Qt::ISODate));
+    RemoteSendEvent(MythEvent(msg));
+}
+
 /** \brief Queries Latest bookmark timestamp from the database.
  *  If the timestamp has not been set this returns an invalid QDateTime.
  */
@@ -1897 +1910 @@
     if (!query.exec() || !query.isActive())
         MythDB::DBError("SetDVDBookmark updating", query);
 
-    Update();
+    SendUpdateEvent();
 }
 /** \fn ProgramInfo::SetWatchedFlag(bool) const
  *  \brief Set "watched" field in recorded/videometadata to "watchedFlag".
@@ -1958 +1971 @@
             MythDB::DBError("Set watched flag", query);
     }
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::IsEditing(void) const
@@ -2003 +2016 @@
     if (!query.exec() || !query.isActive())
         MythDB::DBError("Edit status update", query);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::SetDeleteFlag(bool) const
@@ -2029 +2042 @@
     if (!query.exec() || !query.isActive())
         MythDB::DBError("Set delete flag", query);
 
-    Update();
+    if (!deleteFlag)
+        SendAddedEvent();
 }
 
 /** \fn ProgramInfo::IsCommFlagged(void) const
@@ -2146 +2160 @@
     if(!query.exec() || !query.isActive())
         MythDB::DBError("Transcoded status update", query);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::SetCommFlagged(int) const
@@ -2168 +2182 @@
     if (!query.exec() || !query.isActive())
         MythDB::DBError("Commercial Flagged status update", query);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::SetPreserveEpisode(bool) const
@@ -2192 +2206 @@
     else
         UpdateLastDelete(false);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /**
@@ -2216 +2230 @@
     else if (updateDelete)
         UpdateLastDelete(true);
 
-    Update();
+    SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::UpdateLastDelete(bool) const
@@ -2344 +2358 @@
             MythDB::DBError("cutlist flag update", query);
     }
 
-    Update();
+    SendUpdateEvent();
 }
 
 void ProgramInfo::SetCommBreakList(frm_dir_map_t &frames) const
@@ -3489 +3503 @@
         recgroup = query.value(0).toString();
     }
 
-    Update();
+    SendUpdateEvent();
 }
 
 void ProgramInfo::MarkAsInUse(bool inuse, QString usedFor)
@@ -3528 +3542 @@
 
     if (!inuse)
     {
-        if (!gContext->IsBackend())
-            RemoteSendMessage("RECORDING_LIST_CHANGE");
         inUseForWhat.clear();
+        SendUpdateEvent();
         return;
     }
 
@@ -3593 +3606 @@
     query.bindValue(":RECHOST", hostname);
     query.bindValue(":RECDIR", recDir);
 
-    if (!query.exec() || !query.isActive())
+    if (!query.exec())
         MythDB::DBError("SetInUse", query);
 
     // Let others know we changed status
-    if (notifyOfChange && !gContext->IsBackend())
-        RemoteSendMessage("RECORDING_LIST_CHANGE");
+    if (notifyOfChange)
+        SendUpdateEvent();
 }
 
 /** \fn ProgramInfo::GetChannel(QString&,QString&) const

programs/mythfrontend/playbackbox.cpp

@@ -1137 +1137 @@
     }
 
     m_connected = FillList(m_fillListFromCache);
+    m_fillListFromCache = true;
 }
 
 bool PlaybackBox::FillList(bool useCachedData)
@@ -3661 +3662 @@
         if (message.left(21) == "RECORDING_LIST_CHANGE")
         {
             QStringList tokens = message.simplified().split(" ");
-            if (tokens.size() == 1)
+            if ((tokens.size() == 4) && (tokens[1] == "ADD"))
             {
-                m_fillListFromCache = false;
-                if (!m_fillListTimer->isActive())
-                {
-                    m_fillListTimer->stop();
-                    m_fillListTimer->setSingleShot(true);
-                    m_fillListTimer->start(1000);
-                }
+                ProgramInfo evinfo;
+                if (evinfo.FromStringList(me->ExtraDataList(), 0))
+                    HandleRecordingAddEvent(evinfo);
             }
-            else if ((tokens[1] == "DELETE") && (tokens.size() == 4))
+            if ((tokens.size() == 4) && (tokens[1] == "DELETE"))
             {
-                m_freeSpaceNeedsUpdate = true;
-                m_progCacheLock.lock();
-                if (!m_progCache)
-                {
-                    m_progCacheLock.unlock();
-                    m_freeSpaceNeedsUpdate = true;
-                    m_fillListFromCache = false;
-                    m_fillListTimer->stop();
-                    m_fillListTimer->setSingleShot(true);
-                    m_fillListTimer->start(1000);
-                    return;
-                }
-                vector<ProgramInfo *>::iterator i = m_progCache->begin();
-                for ( ; i != m_progCache->end(); ++i)
-                {
-                   if (((*i)->chanid == tokens[2]) &&
-                       ((*i)->recstartts.toString(Qt::ISODate) == tokens[3]))
-                   {
-                        // We've set this recording to be deleted locally
-                        // it's no longer in the recording list, so don't
-                        // trigger a list reload which would cause a UI lag
-                        if ((*i)->availableStatus != asPendingDelete
-                             || m_currentGroup == m_watchGroupLabel)
-                        {
-                            m_recordingList->RemoveItem(
-                                            m_recordingList->GetItemByData(
-                                                        qVariantFromValue(*i)));
-                            if (m_recordingList->GetCount() == 0)
-                                m_groupList->RemoveItem(
-                                            m_groupList->GetItemCurrent());
-                        }
-                        (*i)->availableStatus = asDeleted;
-                        m_progCacheLock.unlock();
-                        return;
-                   }
-                }
-
-                m_progCacheLock.unlock();
-                if (!m_fillListTimer->isActive())
-                {
-                    m_fillListFromCache = true;
-                    m_fillListTimer->stop();
-                    m_fillListTimer->setSingleShot(true);
-                    m_fillListTimer->start(1000);
-                }
+                uint chanid = tokens[2].toUInt();
+                QDateTime recstartts = QDateTime::fromString(tokens[3]);
+                if (chanid && recstartts.isValid())
+                    HandleRecordingRemoveEvent(chanid, recstartts);
             }
+            else
+            {
+                m_fillListFromCache = false;
+                ScheduleFillList();
+            }
         }
         else if (message.left(15) == "NETWORK_CONTROL")
         {
@@ -3758 +3719 @@
         {
             ProgramInfo evinfo;
             if (evinfo.FromStringList(me->ExtraDataList(), 0))
-            {
-                UpdateProgramInfo(evinfo);
+                HandleUpdateProgramInfoEvent(evinfo);
+        }
+    }
+    else
+        ScheduleCommon::customEvent(event);
+}
 
-                ProgramInfo *dst = findMatchingProg(&evinfo);
-                MythUIButtonListItem *item = NULL;
-                if (dst)
-                {
-                    item = m_recordingList->GetItemByData(
-                        qVariantFromValue(dst));
-                }
+void PlaybackBox::HandleRecordingRemoveEvent(
+    uint chanid, const QDateTime &recstartts)
+{
+    bool found = false;
 
-                if (item)
-                {
-                    MythUIButtonListItem *sel_item =
-                        m_recordingList->GetItemCurrent();
-                    UpdateProgramInfo(item, item == sel_item, true);
-                }
-                else
-                {
-                    VERBOSE(VB_IMPORTANT,
-                            "Got UPDATE_PROG_INFO, but the program "
-                            "is unknown to us.");
-                }
+    m_freeSpaceNeedsUpdate = true;
+
+    m_progCacheLock.lock();
+    if (m_progCache)
+    {
+        vector<ProgramInfo *>::iterator it = m_progCache->begin();
+        for ( ; it != m_progCache->end(); ++it)
+        {
+            if ((chanid     == (*it)->chanid.toUInt()) &&
+                (recstartts == (*it)->recstartts))
+            {
+                found = true;
+                break;
             }
-            else
+        }
+
+        if (it != m_progCache->end())
+        {
+            if (((*it)->availableStatus != asPendingDelete) ||
+                (m_currentGroup == m_watchGroupLabel))
             {
-                VERBOSE(VB_IMPORTANT, "Failed to parse UPDATE_PROG_INFO");
+                m_recordingList->RemoveItem(
+                    m_recordingList->GetItemByData(
+                        qVariantFromValue(*it)));
+                if (m_recordingList->GetCount() == 0)
+                    m_groupList->RemoveItem(
+                        m_groupList->GetItemCurrent());
             }
+            (*it)->availableStatus = asDeleted;
         }
     }
     else
-        ScheduleCommon::customEvent(event);
+    {
+        m_fillListFromCache = false;
+    }
+    m_progCacheLock.unlock();
+
+    if (!found)
+        ScheduleFillList();
 }
 
+void PlaybackBox::HandleRecordingAddEvent(const ProgramInfo &evinfo)
+{
+    m_progCacheLock.lock();
+    if (m_progCache)
+    {
+        vector<ProgramInfo *>::iterator it = m_progCache->begin();
+        for ( ; it != m_progCache->end(); ++it)
+        {
+            if ((evinfo.chanid     == (*it)->chanid) &&
+                (evinfo.recstartts == (*it)->recstartts))
+            {
+                **it = evinfo;
+                break;
+            }
+        }
+
+        if (it == m_progCache->end())
+            m_progCache->push_back(new ProgramInfo(evinfo));
+    }
+    m_progCacheLock.unlock();
+
+    ScheduleFillList();
+}
+
+void PlaybackBox::HandleUpdateProgramInfoEvent(const ProgramInfo &evinfo)
+{
+    ProgramInfo *dst = findMatchingProg(&evinfo);
+    QString old_recgroup;
+    if (dst)
+        old_recgroup = dst->recgroup;
+
+    UpdateProgramInfo(evinfo);
+
+    // If the program is not in the the recording lists, then it
+    // is either a program that was just removed from the "LiveTV"
+    // recording list and should possibly be displayed now, or it
+    // is still in the "LiveTV" recording group and we're not
+    // displaying programs in that group. Handle appropriately..
+    if (!dst)
+    {
+        if (evinfo.recgroup != "LiveTV")
+            ScheduleFillList();
+        return;
+    }
+
+    // If the recording group has changed, reload lists from the
+    // recently updated cache..
+    if (dst->recgroup != old_recgroup)
+    {
+        ScheduleFillList();
+        return;
+    }
+
+    MythUIButtonListItem *item =
+        m_recordingList->GetItemByData(qVariantFromValue(dst));
+
+    if (item)
+    {
+        MythUIButtonListItem *sel_item =
+            m_recordingList->GetItemCurrent();
+        UpdateProgramInfo(item, item == sel_item, true);
+    }
+    else
+    {
+        VERBOSE(VB_GENERAL, LOC +
+                QString("Got UPDATE_PROG_INFO event about a title unknown "
+                        "to us only in m_recordingList\n %1:%2")
+                .arg(evinfo.title).arg(evinfo.subtitle));
+    }
+}
+
+void PlaybackBox::ScheduleFillList(void)
+{
+    if (!m_fillListTimer->isActive())
+    {
+        m_fillListTimer->stop();
+        m_fillListTimer->setSingleShot(true);
+        m_fillListTimer->start(1000);
+    }
+}
+
 bool PlaybackBox::fileExists(ProgramInfo *pginfo)
 {
     if (pginfo)

programs/mythfrontend/playbackbox.h

@@ -327 +327 @@
     void clearProgramCache(void);
 
     void HandlePreviewEvent(const ProgramInfo &evinfo);
+    void HandleRecordingRemoveEvent(uint chanid, const QDateTime &recstartts);
+    void HandleRecordingAddEvent(const ProgramInfo &evinfo);
+    void HandleUpdateProgramInfoEvent(const ProgramInfo &evinfo);
+    void ScheduleFillList(void);
 
     void ShowMenu(void);
 

programs/mythbackend/mainserver.cpp

@@ -1519 +1519 @@
         (pginfo->filesize > 0) &&
         (!ds->forceMetadataDelete))
     {
-        VERBOSE(VB_IMPORTANT, QString("ERROR when trying to delete file: %1. File "
-                                "doesn't exist.  Database metadata"
-                                "will not be removed.")
-                                .arg(ds->filename));
+        VERBOSE(VB_IMPORTANT, QString(
+                    "ERROR when trying to delete file: %1. File "
+                    "doesn't exist.  Database metadata"
+                    "will not be removed.")
+                .arg(ds->filename));
         gContext->LogEntry("mythbackend", LP_WARNING, "Delete Recording",
                            QString("File %1 does not exist for %2 when trying "
                                    "to delete recording.")
-                                   .arg(ds->filename).arg(logInfo));
+                           .arg(ds->filename).arg(logInfo));
 
         pginfo->SetDeleteFlag(false);
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
-
         return;
     }
 
@@ -1577 +1575 @@
                                    .arg(ds->filename).arg(logInfo));
 
         pginfo->SetDeleteFlag(false);
-
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
-
         return;
     }
 
@@ -1715 +1709 @@
 
     // Notify the frontend so it can requery for Free Space
     QString msg = QString("RECORDING_LIST_CHANGE DELETE %1 %2")
-                          .arg(ds->chanid)
-                          .arg(ds->recstartts.toString(Qt::ISODate));
-    MythEvent me(msg);
-    gContext->dispatch(me);
+        .arg(ds->chanid).arg(ds->recstartts.toString(Qt::ISODate));
+    RemoteSendEvent(MythEvent(msg));
 
     // sleep a little to let frontends reload the recordings list
     sleep(3);
@@ -2109 +2101 @@
             DoHandleStopRecording(recinfo, NULL);
         QStringList outputlist( QString::number(0) );
         SendResponse(pbssock, outputlist);
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
         return;
     }
 
@@ -2233 +2223 @@
     // Tell MythTV frontends that the recording list needs to be updated.
     if ((fileExists) || (recinfo.filesize == 0) || (forceMetadataDelete))
     {
-        QString msg = QString("RECORDING_LIST_CHANGE DELETE %1 %2")
-                              .arg(recinfo.chanid)
-                              .arg(recinfo.recstartts.toString(Qt::ISODate));
-        MythEvent me(msg);
-        gContext->dispatch(me);
+        recinfo.SendDeletedEvent();
     }
 }
 
@@ -2264 +2250 @@
         recinfo.UpdateLastDelete(false);
         recinfo.SetAutoExpire(kDisableAutoExpire);
         ret = 0;
-        MythEvent me("RECORDING_LIST_CHANGE");
-        gContext->dispatch(me);
     }
 
     QStringList outputlist( QString::number(ret) );
@@ -4244 +4228 @@
 
     QString message = slist[1];
     QStringList extra_data;
-    for (uint i = 2; i < slist.size(); i++)
+    for (uint i = 2; i < (uint) slist.size(); i++)
         extra_data.push_back(slist[i]);
 
     if (extra_data.empty())

programs/mythlcdserver/lcdprocclient.cpp

@@ -2376 +2376 @@
     {
         MythEvent *me = (MythEvent *) e;
 
-        if (me->Message().left(21) == "RECORDING_LIST_CHANGE")
+        if (me->Message().left(21) == "RECORDING_LIST_CHANGE" ||
+            me->Message() == "UPDATE_PROG_INFO")
         {
             if (lcd_showrecstatus && !updateRecInfoTimer->isActive())
             {

programs/mythwelcome/welcomedialog.cpp

@@ -151 +151 @@
     {
         MythEvent *me = (MythEvent *) e;
 
-        if (me->Message().left(21) == "RECORDING_LIST_CHANGE")
+        if (me->Message().left(21) == "RECORDING_LIST_CHANGE" ||
+            me->Message() == "UPDATE_PROG_INFO")
         {
-            VERBOSE(VB_GENERAL, "MythWelcome received a RECORDING_LIST_CHANGE event");
+            VERBOSE(VB_GENERAL, "MythWelcome received a "
+                    "recording list change event");
 
             QMutexLocker lock(&m_RecListUpdateMuxtex);