Ticket #9391: mythtv-0-24-lcd-progress-time.diff

mythtv/libs/libmythdb/lcddevice.cpp

@@ -498 +498 @@
     sendToServer(QString("UPDATE_LEDS %1").arg(lcd_ledmask));
 }
 
-void LCD::setChannelProgress(float value)
+void LCD::setChannelProgress(QString time, float value)
 {
     if (!lcd_ready || !lcd_showchannel)
         return;
 
     value = std::min(std::max(0.0f, value), 1.0f);
-    sendToServer(QString("SET_CHANNEL_PROGRESS %1").arg(value));
+    sendToServer(QString("SET_CHANNEL_PROGRESS %1 %2").arg(quotedString(time)).arg(value));
 }
 
 void LCD::setGenericProgress(float value)

mythtv/libs/libmythdb/lcddevice.h

@@ -236 +236 @@
     // While watching Live/Recording/Pause Buffer, occasionaly describe how
     // much of the program has been seen (between 0.0 and 1.0)
     // (e.g. [current time - start time] / [end time - start time]  )
-    void setChannelProgress(float percentViewed);
+    void setChannelProgress(QString time, float percentViewed);
 
     // Show the Menu
     // QPtrList is a pointer to a bunch of menu items

mythtv/libs/libmythtv/tv_play.cpp

@@ -3000 +3000 @@
     if (lcd)
     {
         float progress = 0.0f;
+        QString lcd_time_string;
         bool showProgress = true;
 
         if (StateIsLiveTV(GetState(actx)))
@@ -3014 +3015 @@
         if (showProgress)
         {
             osdInfo info;
-            if (actx->CalcPlayerSliderPosition(info))
+            if (actx->CalcPlayerSliderPosition(info)) {
                 progress = info.values["position"] * 0.001f;
+
+                lcd_time_string = info.text["playedtime"] + " / " + info.text["totaltime"];
+                // if the string is longer than the LCD width, remove all spaces
+                if (lcd_time_string.length() > (int)lcd->getLCDWidth())
+                    lcd_time_string.remove(' ');
+            }
         }
-        lcd->setChannelProgress(progress);
+        lcd->setChannelProgress(lcd_time_string, progress);
     }
     ReturnPlayerLock(actx);
 

mythtv/programs/mythlcdserver/lcdprocclient.cpp

@@ -473 +473 @@
     setPriority("Channel", LOW);
     sendToServer("widget_add Channel topWidget string");
     sendToServer("widget_add Channel botWidget string");
+    sendToServer("widget_add Channel timeWidget string");
     sendToServer("widget_add Channel progressBar hbar");
 
     // The Generic Screen
@@ -1124 +1125 @@
         formatScrollingWidgets();
     }
 
+    channel_time = "";
     progress = 0.0;
     outputChannel();
 }
@@ -1679 +1681 @@
     }
 }
 
-void LCDProcClient::setChannelProgress(float value)
+void LCDProcClient::setChannelProgress(const QString &time, float value)
 {
     if (!lcd_ready)
         return;
 
     progress = value;
+    channel_time = time;
 
     if (progress < 0.0)
         progress = 0.0;
@@ -2160 +2163 @@
         aString += " ";
         aString += QString::number((int)rint(progress * lcdWidth * cellWidth));
         sendToServer(aString);
+
+        if (lcdHeight >= 4)
+            outputCenteredText("Channel", channel_time, "timeWidget", 3);
     }
     else
         sendToServer("widget_set Channel progressBar 1 1 0");
@@ -2313 +2319 @@
 {
     sendToServer("widget_del Channel progressBar");
     sendToServer("widget_del Channel topWidget");
+    sendToServer("widget_del Channel timeWidget");
     sendToServer("screen_del Channel");
 
     sendToServer("widget_del Generic progressBar");

mythtv/programs/mythlcdserver/lcdprocclient.h

@@ -43 +43 @@
     void setLevels(int numbLevels, float *values);
     void switchToChannel(QString channum = "", QString title = "", 
                          QString subtitle = "");
-    void setChannelProgress(float percentViewed);
+    void setChannelProgress(const QString &time, float percentViewed);
     void switchToMenu(QList<LCDMenuItem> *menuItems, QString app_name = "",
                       bool popMenu = true);
     void switchToGeneric(QList<LCDTextItem> *textItems);
@@ -169 +169 @@
 
     float EQlevels[10];
     float progress;
+    QString channel_time;
     /** true if the generic progress indicator is a busy
         (ie. doesn't have a known total steps */
     bool busy_progress;

mythtv/programs/mythlcdserver/lcdserver.cpp

@@ -579 +579 @@
 
     QString flat = tokens.join(" ");
 
-    if (tokens.count() != 2)
+    if (tokens.count() != 3)
     {
         VERBOSE(VB_IMPORTANT, "LCDServer: bad SET_CHANNEL_PROGRESS command: "
                 << flat);
@@ -588 +588 @@
     }
 
     bool bOK;
-    float progress = tokens[1].toFloat(&bOK);
+    float progress = tokens[2].toFloat(&bOK);
     if (!bOK)
     {
         VERBOSE(VB_IMPORTANT, "LCDServer: bad float value in "
@@ -598 +598 @@
     }
 
     if (m_lcd)
-        m_lcd->setChannelProgress(progress);
+        m_lcd->setChannelProgress(tokens[1], progress);
 
     sendMessage(socket, "OK");
 }