Ticket #713: perchanneloffs.diff

diff -cr mythtv.orig/libs/libmythtv/channelsettings.cpp mythtv/libs/libmythtv/channelsettings.cpp
*** mythtv.orig/libs/libmythtv/channelsettings.cpp      2005-11-25 19:23:05.000000000 -0800
--- mythtv/libs/libmythtv/channelsettings.cpp   2005-11-25 19:40:05.000000000 -0800
***************
*** 21,26 ****
--- 21,39 ----
      };
  };
  
+ class TimeOffset: public LineEditSetting, public CSetting {
+ public:
+     TimeOffset(const ChannelID& id):
+         LineEditSetting(), CSetting(id, "tmoffset") {
+         setLabel(QObject::tr("Time Offset"));
+         setHelpText(QObject::tr("Offset (in seconds) to apply to the program "
+                                 "guide data in listings.  This can be used "
+                                 "when the listings for a particular channel "
+                                 "are in a different time zone. (Works for "
+                                 "DataDirect listings only.)"));
+     };
+ };
+ 
  class Channum: public LineEditSetting, public CSetting {
  public:
      Channum(const ChannelID& id):
***************
*** 284,289 ****
--- 297,303 ----
      connect(source,SIGNAL(valueChanged(const QString&)),this,SLOT(sourceChanged(const QString&)));
  #else
      addChild(new XmltvID(id));
+     addChild(new TimeOffset(id));
  #endif
  };
  
diff -cr mythtv.orig/libs/libmythtv/dbcheck.cpp mythtv/libs/libmythtv/dbcheck.cpp
*** mythtv.orig/libs/libmythtv/dbcheck.cpp      2005-11-25 19:23:01.000000000 -0800
--- mythtv/libs/libmythtv/dbcheck.cpp   2005-11-25 19:44:07.000000000 -0800
***************
*** 10,16 ****
  #include "mythdbcon.h"
  
  /// This is the DB schema version expected by the running MythTV instance.
! const QString currentDatabaseVersion = "1110";
  
  static bool UpdateDBVersionNumber(const QString &newnumber);
  static bool performActualUpdate(const QString updates[], QString version,
--- 10,16 ----
  #include "mythdbcon.h"
  
  /// This is the DB schema version expected by the running MythTV instance.
! const QString currentDatabaseVersion = "1111";
  
  static bool UpdateDBVersionNumber(const QString &newnumber);
  static bool performActualUpdate(const QString updates[], QString version,
***************
*** 241,246 ****
--- 241,251 ----
  The 'xmltvid' field is used to identify this channel to the listings
  provider.
  
+ The 'tmoffset' field is used to apply an offset (in seconds) from the listings
+ provided by the provider to a new time in the MythTV program guide database.
+ This is very handy when the listings provider has listings which are offset
+ by a few hours on individual channels with the rest of them being correct.
+ 
  The 'recpriority' field is used tell the scheduler from which of two 
  otherwise equivalent programs on two different channels should be 
  prefered, a higher number means this channel is more preferred.
***************
*** 2385,2390 ****
--- 2390,2406 ----
              return false;
      }
  
+     if (dbver == "1110")
+     {
+         const QString updates[] = {
+             "ALTER TABLE channel ADD COLUMN tmoffset INT NOT NULL default '0';",
+             ""
+         };
+ 
+         if (!performActualUpdate(updates, "1111", dbver))
+             return false;
+     }
+ 
  // Drop xvmc_buffer_settings table in 0.20
  // Drop dvb_dmx_buf_size and dvb_pkt_buf_size columns of channel in 0.20
  
Only in mythtv/libs/libmythtv: .dbcheck.cpp.swp
diff -cr mythtv.orig/programs/mythfilldatabase/filldata.cpp mythtv/programs/mythfilldatabase/filldata.cpp
*** mythtv.orig/programs/mythfilldatabase/filldata.cpp  2005-11-25 19:23:06.000000000 -0800
--- mythtv/programs/mythfilldatabase/filldata.cpp       2005-11-25 19:29:50.000000000 -0800
***************
*** 986,992 ****
                      "hdtv, closecaptioned, partnumber, parttotal, seriesid, "
                      "originalairdate, colorcode, syndicatedepisodenumber, "
                      "programid) "
!                     "SELECT chanid, starttime, endtime, "
                      "title, subtitle, description, "
                      "showtype, dd_genre.class, category_type, "
                      "airdate, stars, previouslyshown, stereo, subtitled, "
--- 986,994 ----
                      "hdtv, closecaptioned, partnumber, parttotal, seriesid, "
                      "originalairdate, colorcode, syndicatedepisodenumber, "
                      "programid) "
!                     "SELECT chanid,"
!                     "DATE_ADD(starttime, INTERVAL (SELECT tmoffset from channel where dd_v_program.chanid = channel.chanid) SECOND), "
!                     "DATE_ADD(endtime, INTERVAL (SELECT tmoffset from channel where dd_v_program.chanid = channel.chanid) SECOND), "
                      "title, subtitle, description, "
                      "showtype, dd_genre.class, category_type, "
                      "airdate, stars, previouslyshown, stereo, subtitled, "
***************
*** 2247,2253 ****
          int chanid = 0;
  
          query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
!                       "xmltvid = :XMLTVID;"); 
          query.bindValue(":ID", id);
          query.bindValue(":XMLTVID", mapiter.key());
  
--- 2249,2255 ----
          int chanid = 0;
  
          query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
!                       "xmltvid = :XMLTVID;");
          query.bindValue(":ID", id);
          query.bindValue(":XMLTVID", mapiter.key());