=== libs/libmythtv/eitscanner.h
==================================================================
|
|
|
34 | 34 | void StartPassiveScan(ChannelBase*, EITSource*, bool ignore_source); |
35 | 35 | void StopPassiveScan(void); |
36 | 36 | |
| 37 | #if 0 |
37 | 38 | void StartActiveScan(TVRec*, uint max_seconds_per_source, |
38 | 39 | bool ignore_source); |
39 | 40 | |
40 | 41 | void StopActiveScan(void); |
| 42 | #endif |
41 | 43 | |
42 | 44 | private: |
43 | 45 | void TeardownAll(void); |
… |
… |
|
56 | 58 | |
57 | 59 | TVRec *rec; |
58 | 60 | bool activeScan; |
| 61 | #if 0 |
59 | 62 | QDateTime activeScanNextTrig; |
60 | 63 | uint activeScanTrigTime; |
61 | 64 | QStringList activeScanChannels; |
62 | 65 | QStringList::iterator activeScanNextChan; |
| 66 | #endif |
63 | 67 | |
64 | 68 | bool ignore_source; |
65 | 69 | |
=== libs/libmythtv/tv_rec.cpp
==================================================================
|
|
|
726 | 726 | // to avoid race condition with it's tuning requests. |
727 | 727 | if (HasFlags(kFlagEITScannerRunning)) |
728 | 728 | { |
729 | | scanner->StopActiveScan(); |
| 729 | scanner->StopPassiveScan(); |
730 | 730 | ClearFlags(kFlagEITScannerRunning); |
731 | 731 | } |
732 | 732 | |
… |
… |
|
1380 | 1380 | "for all sources on this card."); |
1381 | 1381 | eitScanStartTime = eitScanStartTime.addYears(1); |
1382 | 1382 | } |
| 1383 | /* |
1383 | 1384 | else |
1384 | 1385 | { |
1385 | 1386 | uint ttMin = gContext->GetNumSetting("EITTransportTimeout", 5); |
… |
… |
|
1388 | 1389 | SetFlags(kFlagEITScannerRunning); |
1389 | 1390 | eitScanStartTime = QDateTime::currentDateTime().addYears(1); |
1390 | 1391 | } |
| 1392 | */ |
1391 | 1393 | } |
1392 | 1394 | |
1393 | 1395 | // We should be no more than a few thousand milliseconds, |
… |
… |
|
3540 | 3542 | |
3541 | 3543 | if (!(request.flags & kFlagEITScan) && HasFlags(kFlagEITScannerRunning)) |
3542 | 3544 | { |
3543 | | scanner->StopActiveScan(); |
| 3545 | scanner->StopPassiveScan(); |
3544 | 3546 | ClearFlags(kFlagEITScannerRunning); |
3545 | 3547 | } |
3546 | 3548 | |
=== libs/libmythtv/eitscanner.cpp
==================================================================
|
|
|
41 | 41 | |
42 | 42 | void EITScanner::TeardownAll(void) |
43 | 43 | { |
44 | | StopActiveScan(); |
| 44 | StopPassiveScan(); |
45 | 45 | if (!exitThread) |
46 | 46 | { |
47 | 47 | exitThread = true; |
… |
… |
|
114 | 114 | RescheduleRecordings(); |
115 | 115 | } |
116 | 116 | |
| 117 | #if 0 |
117 | 118 | if (activeScan && (QDateTime::currentDateTime() > activeScanNextTrig)) |
118 | 119 | { |
119 | 120 | // if there have been any new events, tell scheduler to run. |
… |
… |
|
140 | 141 | .addSecs(activeScanTrigTime); |
141 | 142 | activeScanNextChan++; |
142 | 143 | } |
| 144 | #endif |
143 | 145 | |
144 | 146 | exitThreadCond.wait(200); // sleep up to 200 ms. |
145 | 147 | } |
… |
… |
|
209 | 211 | eitHelper->SetSourceID(0); |
210 | 212 | } |
211 | 213 | |
| 214 | #if 0 |
212 | 215 | void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source, |
213 | 216 | bool _ignore_source) |
214 | 217 | { |
… |
… |
|
272 | 275 | rec = NULL; |
273 | 276 | StopPassiveScan(); |
274 | 277 | } |
| 278 | #endif |