Ticket #1573: eit_2.diff
| File eit_2.diff, 8.1 KB (added by , 20 years ago) |
|---|
-
mythtv/libs/libmythtv/dbcheck.cpp
10 10 #include "mythdbcon.h" 11 11 12 12 /// This is the DB schema version expected by the running MythTV instance. 13 const QString currentDatabaseVersion = "113 4";13 const QString currentDatabaseVersion = "1135"; 14 14 15 15 static bool UpdateDBVersionNumber(const QString &newnumber); 16 16 static bool performActualUpdate(const QString updates[], QString version, … … 2168 2168 return false; 2169 2169 } 2170 2170 2171 if (dbver == "1134") 2172 { 2173 const QString updates[] = { 2174 // Dish Network 2175 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2176 " VALUES('dvb', 4102, 'force_guide_present', 'yes');", 2177 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2178 " VALUES('dvb', 4102, 'extended_guide_tid', '229');", 2179 2180 // Bell ExpressVu 2181 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2182 " VALUES('dvb', 256, 'force_guide_present', 'yes');", 2183 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2184 " VALUES('dvb', 256, 'guide_on_single_tid', 'yes');", 2185 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2186 " VALUES('dvb', 257, 'force_guide_present', 'yes');", 2187 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2188 " VALUES('dvb', 257, 'guide_on_single_tid', 'yes');", 2189 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2190 " VALUES('dvb', 256, 'standard_guide_tid', '4');", 2191 "INSERT INTO dtv_privatetypes (sitype, networkid, private_type, private_value)" 2192 " VALUES('dvb', 257, 'standard_guide_tid', '102');", 2193 "" 2194 }; 2195 2196 if (!performActualUpdate(updates, "1134", dbver)) 2197 return false; 2198 } 2199 2171 2200 //"ALTER TABLE capturecard DROP COLUMN dvb_recordts;" in 0.21 2172 2201 //"ALTER TABLE capturecard DROP COLUMN dvb_hw_decoder;" in 0.21 2173 2202 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22 -
mythtv/libs/libmythtv/eitscanner.h
28 28 void StopPassiveScan(void); 29 29 30 30 void StartActiveScan(TVRec*, uint max_seconds_per_source, 31 bool ignore_source );31 bool ignore_source, bool limit_transport=false); 32 32 33 33 void StopActiveScan(void); 34 34 -
mythtv/libs/libmythtv/tv_rec.cpp
1348 1348 { 1349 1349 uint ttMin = gContext->GetNumSetting("EITTransportTimeout", 5); 1350 1350 uint ignore = gContext->GetNumSetting("EITIgnoresSource", 0); 1351 scanner->StartActiveScan(this, ttMin * 60, ignore); 1351 uint tid_limit = gContext->GetNumSetting("EITCrawLimitTransports", 0); 1352 scanner->StartActiveScan(this, ttMin * 60, ignore, tid_limit); 1352 1353 SetFlags(kFlagEITScannerRunning); 1353 1354 eitScanStartTime = QDateTime::currentDateTime().addYears(1); 1354 1355 } -
mythtv/libs/libmythtv/eitscanner.cpp
184 184 } 185 185 186 186 void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source, 187 bool _ignore_source )187 bool _ignore_source, bool limit_transports) 188 188 { 189 189 rec = _rec; 190 190 ignore_source = _ignore_source; … … 193 193 { 194 194 // TODO get input name and use it in crawl. 195 195 MSqlQuery query(MSqlQuery::InitCon()); 196 query.prepare( 197 "SELECT min(channum) " 198 "FROM channel, cardinput, capturecard, videosource " 199 "WHERE cardinput.sourceid = channel.sourceid AND " 200 " videosource.sourceid = channel.sourceid AND " 201 " capturecard.cardid = cardinput.cardid AND " 202 " channel.mplexid IS NOT NULL AND " 203 " useonairguide = 1 AND " 204 " useeit = 1 AND " 205 " cardinput.cardid = :CARDID " 206 "GROUP BY mplexid " 207 "ORDER BY cardinput.sourceid, atscsrcid, mplexid"); 196 197 if (limit_transports) 198 query.prepare( 199 "SELECT MIN(channum), channel.mplexid " 200 "FROM channel, dtv_multiplex, dtv_privatetypes, videosource, " 201 "cardinput, capturecard " 202 "WHERE dtv_multiplex.networkid = dtv_privatetypes.networkid " 203 "AND videosource.sourceid = channel.sourceid " 204 "AND cardinput.sourceid = channel.sourceid " 205 "AND capturecard.cardid = cardinput.cardid " 206 "AND (private_type = 'extended_guide_tid' " 207 "OR private_type = 'standard_guide_tid') " 208 "AND private_value = transportid " 209 "AND channel.mplexid = dtv_multiplex.mplexid " 210 "AND useonairguide = 1 " 211 "AND useeit = 1 " 212 "AND cardinput.cardid = :CARDID " 213 "GROUP BY transportid"); 214 else 215 query.prepare( 216 "SELECT channum, mplexid " 217 "FROM channel, cardinput, capturecard, videosource " 218 "WHERE cardinput.sourceid = channel.sourceid AND " 219 " videosource.sourceid = channel.sourceid AND " 220 " capturecard.cardid = cardinput.cardid AND " 221 " channel.mplexid IS NOT NULL AND " 222 " useonairguide = 1 AND " 223 " useeit = 1 AND " 224 " cardinput.cardid = :CARDID " 225 "ORDER BY cardinput.sourceid, atscsrcid"); 226 208 227 query.bindValue(":CARDID", rec->GetCaptureCardNum()); 209 228 210 229 if (!query.exec() || !query.isActive()) -
mythtv/setup/backendsettings.cpp
226 226 return gc; 227 227 } 228 228 229 static GlobalCheckBox *EITCrawLimitTransports() 230 { 231 GlobalCheckBox *gc = new GlobalCheckBox("EITCrawLimitTransports"); 232 gc->setLabel(QObject::tr("EIT Craw Limits Transports")); 233 gc->setValue(false); 234 QString help = QObject::tr("If set, listings data collected during " 235 "idle times will only be for providers which " 236 "have extended guide information available on " 237 "selective transports."); 238 gc->setHelpText(help); 239 return gc; 240 }; 241 229 242 static GlobalCheckBox *MasterBackendOverride() 230 243 { 231 244 GlobalCheckBox *gc = new GlobalCheckBox("MasterBackendOverride"); … … 670 683 group2a1->setLabel(QObject::tr("EIT Scanner Options")); 671 684 group2a1->addChild(EITTransportTimeout()); 672 685 group2a1->addChild(EITIgnoresSource()); 686 group2a1->addChild(EITCrawLimitTransports()); 673 687 addChild(group2a1); 674 688 675 689 VerticalConfigurationGroup* group3 = new VerticalConfigurationGroup(false);
