Ticket #4583: 4583-dbg-v1.patch

libs/libmythtv/remoteutil.h

@@ -86 +86 @@
 MPUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
 MPUBLIC void RemoteCancelNextRecording(uint cardid, bool cancel);
 MPUBLIC void RemoteGeneratePreviewPixmap(ProgramInfo *pginfo);
-MPUBLIC QString RemoteGetPreviewLastModified(ProgramInfo *pginfo);
+MPUBLIC QDateTime RemoteGetPreviewLastModified(ProgramInfo *pginfo);
 MPUBLIC void RemoteFillProginfo(ProgramInfo *pginfo,
                                 const QString &playbackhostname);
 MPUBLIC bool RemoteIsBusy(uint cardid, TunedInputInfo &busy_input);

libs/libmythtv/remoteutil.cpp

@@ -518 +518 @@
     gContext->SendReceiveStringList(strlist);
 }
     
-QString RemoteGetPreviewLastModified(ProgramInfo *pginfo)
+QDateTime RemoteGetPreviewLastModified(ProgramInfo *pginfo)
 {
-    QString retdatetime;
+    QDateTime retdatetime;
 
     QStringList strlist = "QUERY_PIXMAP_LASTMODIFIED"; 
     pginfo->ToStringList(strlist);
@@ -528 +528 @@
     if (!gContext->SendReceiveStringList(strlist))
         return retdatetime;
 
-    return strlist[0];
+    if (!strlist.empty() && strlist[0] != "BAD")
+    {
+        uint timet = strlist[0].toUInt();
+        retdatetime.setTime_t(timet);
+    }
+        
+    return retdatetime;
 }
 
 void RemoteFillProginfo(ProgramInfo *pginfo, const QString &playbackhostname)

libs/libmyth/mythcontext.h

@@ -125 +125 @@
  *       mythtv/bindings/python/MythTV.py (version number)
  *       mythtv/bindings/python/MythTV.py (layout)
  */
-#define MYTH_PROTO_VERSION "39"
+#define MYTH_PROTO_VERSION "40"
 
 /** \class MythContext
  *  \brief This class contains the runtime context for MythTV.

programs/mythfrontend/playbackbox.cpp

@@ -4436 +4436 @@
     }
     else
     {
-        QString filetime = RemoteGetPreviewLastModified(pginfo);
-        if (!filetime.isEmpty() && filetime.upper() != "BAD")
-            datetime = QDateTime::fromString(filetime, Qt::TextDate);
+        datetime = RemoteGetPreviewLastModified(pginfo);
     }
 
     return datetime;

programs/mythbackend/playbacksock.h

@@ -53 +53 @@
                                  long long          time,
                                  const QString     &outputFile,
                                  const QSize       &outputSize);
-    QString PixmapLastModified(const ProgramInfo *pginfo);
+    QDateTime PixmapLastModified(const ProgramInfo *pginfo);
     bool CheckFile(ProgramInfo *pginfo);
 
     bool IsBusy(int        capturecardnum,

programs/mythbackend/playbacksock.cpp

@@ -182 +182 @@
     return strlist;
 }
 
-QString PlaybackSock::PixmapLastModified(const ProgramInfo *pginfo)
+QDateTime PlaybackSock::PixmapLastModified(const ProgramInfo *pginfo)
 {
     QStringList strlist = QString("QUERY_PIXMAP_LASTMODIFIED");
     pginfo->ToStringList(strlist);
 
     SendReceiveStringList(strlist);
 
-    return strlist[0];
+    QDateTime datetime;
+    if (!strlist.empty() && strlist[0] != "BAD")
+    {
+        uint timet = strlist[0].toUInt();
+        datetime.setTime_t(timet);
+    }
+    return datetime;
 }
 
 bool PlaybackSock::CheckFile(ProgramInfo *pginfo)

programs/mythbackend/mainserver.cpp

@@ -3890 +3890 @@
 
         if (slave) 
         {
-             QString slavetime = slave->PixmapLastModified(pginfo);
+             QDateTime slavetime = slave->PixmapLastModified(pginfo);
              slave->DownRef();
 
-             strlist += slavetime;
+             strlist = (slavetime.isValid()) ?
+                 QString::number(slavetime.toTime_t()) : "BAD";
+
              SendResponse(pbssock, strlist);
              delete pginfo;
              return;
@@ -3923 +3925 @@
     if (finfo.exists())
     {
         lastmodified = finfo.lastModified();
-        strlist = lastmodified.toString(f);
+        strlist = QString::number(lastmodified.toTime_t());
     }
     else
         strlist = "BAD";