Ticket #9633: 0001-ProgressBar-OSD-Patch-v4.patch

File 0001-ProgressBar-OSD-Patch-v4.patch, 1.9 KB (added by Markus Schulz <msc@…>, 13 years ago)

new version

  • mythtv/libs/libmyth/programinfo.cpp 

    commit dbc068f64df2857c8dca85ecabed9a2b5300ee64
Author: Markus Schulz <Markus Schulz msc@antzsystem.de>
Date:   Wed Aug 24 20:17:41 2011 +0200

    ProgressBar OSD Patch v4.

diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index b4b73f1..a3ffa75 100644
    a b void ProgramInfo::ToMap(InfoMap &progMap, 
    13961396        progMap["recstartdate"] = MythDateTimeToString(recstartts, kDateShort);
    13971397        progMap["recendtime"] = MythDateTimeToString(recendts, kTime);
    13981398        progMap["recenddate"] = MythDateTimeToString(recendts, kDateShort);
     1399        progMap["startts"] = QString("%1").arg(startts.toTime_t());
     1400        progMap["endts"] = QString("%1").arg(endts.toTime_t());
    13991401    }
    14001402
    14011403    progMap["timedate"] = MythDateTimeToString(recstartts,

  • mythtv/libs/libmythtv/osd.cpp 

    diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp
index 0fc6687..b11396b 100644
    a b void OSD::SetText(const QString &window, QHash<QString,QString> &map, 
    453453            screenshot->SetFilename(screenshotpath);
    454454            screenshot->Load(false);
    455455        }
     456        MythUIProgressBar *bar = dynamic_cast<MythUIProgressBar *> (win->GetChild("elapsedpercent"));
     457        if (bar)
     458        {
     459          int startts = map["startts"].toInt();
     460          int endts = map["endts"].toInt();
     461          int nowts = QDateTime::currentDateTime ().toTime_t();
     462          if (startts > nowts) {
     463            bar->SetUsed(0);
     464          } else if (endts < nowts) {
     465            bar->SetUsed(1000);
     466          } else {
     467            bar->SetUsed( 1000 * (nowts - startts) / (endts - startts) );
     468          }
     469            bar->SetVisible((startts != 0));
     470            bar->SetStart(0);
     471            bar->SetTotal(1000);
     472        }
    456473    }
    457474
    458475    win->SetVisible(true);