Ticket #12424: 0011-MythUI-Signal-when-image-loaded.patch

mythtv/libs/libmythui/mythuiimage.cpp

@@ -1036 +1036 @@
     if (isAnimation)
         Clear();
 
+    bool complete = true;
+
     QString imagelabel;
 
     int j = 0;
@@ -1161 +1163 @@
         }
 
         ++j;
+
+        // Load is complete if no image is loading in background
+        complete &= !do_background_load;
     }
 
+    if (complete)
+        emit LoadComplete();
+
     return true;
 }
 
@@ -1594 +1602 @@
         if (le->GetParent() != this)
             return;
 
-        image  = le->GetImage();
-        number = le->GetNumber();
-        filename = le->GetFilename();
+        image           = le->GetImage();
+        number          = le->GetNumber();
+        filename        = le->GetFilename();
         animationFrames = le->GetAnimationFrames();
-        aborted = le->GetAbortState();
+        aborted         = le->GetAbortState();
 
         m_runningThreads--;
 
         d->m_UpdateLock.lockForRead();
+        QString propFilename = m_imageProperties.filename;
+        d->m_UpdateLock.unlock();
 
         // 1) We aborted loading the image for some reason (e.g. two requests
         //    for same image)
         // 2) Filename changed since we started this image, so abort to avoid
         // rendering two different images in quick succession which causes
         // unsightly flickering
-        if (aborted ||
-            (le->GetBasefile() != m_imageProperties.filename))
+        if (aborted || (le->GetBasefile() != propFilename))
         {
-            d->m_UpdateLock.unlock();
-
             if (aborted)
                 LOG(VB_GUI, LOG_DEBUG, QString("Aborted loading image %1")
                                                                 .arg(filename));
@@ -1635 +1642 @@
 
                 delete animationFrames;
             }
-
-            return;
         }
-
-        d->m_UpdateLock.unlock();
-
-        if (animationFrames)
+        else if (animationFrames)
         {
             SetAnimationFrames(*animationFrames);
 
             delete animationFrames;
-
-            return;
         }
-
-        if (image)
+        else if (image)
         {
             // We don't clear until we have the new image ready to display to
             // avoid unsightly flashing. This isn't currently supported for
@@ -1687 +1686 @@
             d->m_UpdateLock.lockForWrite();
             m_LastDisplay = QTime::currentTime();
             d->m_UpdateLock.unlock();
-
-            return;
+        }
+        else
+        {
+            // No Images were loaded, so trigger Reset to default
+            Reset();
         }
 
-        // No Images were loaded, so trigger Reset to default
-        Reset();
+        emit LoadComplete();
     }
 }
 

mythtv/libs/libmythui/mythuiimage.h

@@ -87 +87 @@
  */
 class MUI_PUBLIC MythUIImage : public MythUIType
 {
+    Q_OBJECT
+
   public:
     MythUIImage(const QString &filepattern, int low, int high, int delayms,
                 MythUIType *parent, const QString &name);
@@ -126 +128 @@
 
     void SetOrientation(int orientation);
 
+  signals:
+    void LoadComplete();
+
   protected:
     virtual void DrawSelf(MythPainter *p, int xoffset, int yoffset,
                           int alphaMod, QRect clipRect);