Ticket #9633: osdprogressbar.diff

mythtv/libs/libmyth/programinfo.cpp

@@ -113 +113 @@
     endts(startts),
     recstartts(startts),
     recendts(startts),
+    elapsedpercent(0),
 
     stars(0.0f),
 
@@ -188 +189 @@
     endts(other.endts),
     recstartts(other.recstartts),
     recendts(other.recendts),
+    elapsedpercent(other.elapsedpercent),
 
     stars(other.stars),
 
@@ -475 +477 @@
     const QDateTime &_endts,
     const QDateTime &_recstartts,
     const QDateTime &_recendts,
+    uint16_t _elapsedpercent,
 
     const QString &_seriesid,
     const QString &_programid,
@@ -523 +526 @@
     endts(_endts),
     recstartts(_recstartts),
     recendts(_recendts),
+    elapsedpercent(_elapsedpercent),
 
     stars(clamp(_stars, 0.0f, 1.0f)),
 
@@ -892 +896 @@
     endts = other.endts;
     recstartts = other.recstartts;
     recendts = other.recendts;
+    elapsedpercent = other.elapsedpercent;
 
     stars = other.stars;
 
@@ -1328 +1333 @@
             progMap["startdate"] = startts.toString("yyyy");
             progMap["recstartdate"] = startts.toString("yyyy");
         }
+        progMap["elapsedpercent"] = QString("-1");
     }
     else // if (IsRecording())
     {
@@ -1339 +1345 @@
         progMap["recstartdate"] = recstartts.toString(shortDateFormat);
         progMap["recendtime"] = recendts.toString(timeFormat);
         progMap["recenddate"] = recendts.toString(shortDateFormat);
+        progMap["elapsedpercent"] = QString("%1").arg(elapsedpercent);
     }
 
     progMap["timedate"] = recstartts.date().toString(dateFormat) + ", " +
@@ -4115 +4122 @@
         "    program.airdate, program.stars, program.originalairdate, "
         "    program.category_type, oldrecstatus.recordid, "
         "    oldrecstatus.rectype, oldrecstatus.recstatus, "
-        "    oldrecstatus.findid "
+        "    oldrecstatus.findid, "
+        "    CASE WHEN CURRENT_TIMESTAMP < program.starttime THEN 0 "
+        "         WHEN CURRENT_TIMESTAMP > program.endtime THEN 1000 "
+        "         ELSE 1000.0 * ((CURRENT_TIMESTAMP - program.starttime) / (program.endtime - program.starttime)) "
+        "    END as elapsedpercent "
         "FROM program "
         "LEFT JOIN channel ON program.chanid = channel.chanid "
         "LEFT JOIN oldrecorded AS oldrecstatus ON "
@@ -4187 +4198 @@
                 query.value(2).toDateTime(), // endts
                 query.value(1).toDateTime(), // recstartts
                 query.value(2).toDateTime(), // recendts
+                query.value(23).toUInt(), //elapsedpercent
 
                 query.value(13).toString(), // seriesid
                 query.value(14).toString(), // programid

mythtv/libs/libmyth/programinfo.h

@@ -171 +171 @@
                 const QDateTime &endts,
                 const QDateTime &recstartts,
                 const QDateTime &recendts,
+                uint16_t elapsedpercent,
 
                 const QString &seriesid,
                 const QString &programid,
@@ -632 +633 @@
     QDateTime endts;
     QDateTime recstartts;
     QDateTime recendts;
+    uint16_t elapsedpercent;
 
     float stars; ///< Rating, range [0..1]
     QDate originalAirDate;

mythtv/libs/libmythtv/osd.cpp

@@ -448 +448 @@
             screenshot->SetFilename(screenshotpath);
             screenshot->Load(false);
         }
+        MythUIProgressBar *bar = dynamic_cast<MythUIProgressBar *> (win->GetChild("elapsedpercent"));
+        if (bar)
+        {
+            int percent = map["elapsedpercent"].toInt();
+            bar->SetVisible((percent != -1));
+            bar->SetStart(0);
+            bar->SetTotal(1000);
+            bar->SetUsed(percent);
+        }
     }
 
     win->SetVisible(true);