Ticket #1728: 01_disable_active_eitscan.diff

File 01_disable_active_eitscan.diff, 3.0 KB (added by Janne <janne-mythtv@…>, 14 years ago)
  • libs/libmythtv/eitscanner.h

    === libs/libmythtv/eitscanner.h
    ==================================================================
     
    3434    void StartPassiveScan(ChannelBase*, EITSource*, bool ignore_source);
    3535    void StopPassiveScan(void);
    3636
     37#if 0
    3738    void StartActiveScan(TVRec*, uint max_seconds_per_source,
    3839                         bool ignore_source);
    3940
    4041    void StopActiveScan(void);       
     42#endif
    4143
    4244  private:
    4345    void TeardownAll(void);
     
    5658
    5759    TVRec           *rec;
    5860    bool             activeScan;
     61#if 0
    5962    QDateTime        activeScanNextTrig;
    6063    uint             activeScanTrigTime;
    6164    QStringList      activeScanChannels;
    6265    QStringList::iterator activeScanNextChan;
     66#endif
    6367
    6468    bool             ignore_source;
    6569
  • libs/libmythtv/tv_rec.cpp

    === libs/libmythtv/tv_rec.cpp
    ==================================================================
     
    726726    // to avoid race condition with it's tuning requests.
    727727    if (HasFlags(kFlagEITScannerRunning))
    728728    {
    729         scanner->StopActiveScan();
     729        scanner->StopPassiveScan();
    730730        ClearFlags(kFlagEITScannerRunning);
    731731    }
    732732
     
    13801380                        "for all sources on this card.");
    13811381                eitScanStartTime = eitScanStartTime.addYears(1);
    13821382            }
     1383/*
    13831384            else
    13841385            {
    13851386                uint ttMin = gContext->GetNumSetting("EITTransportTimeout", 5);
     
    13881389                SetFlags(kFlagEITScannerRunning);
    13891390                eitScanStartTime = QDateTime::currentDateTime().addYears(1);
    13901391            }
     1392*/
    13911393        }
    13921394
    13931395        // We should be no more than a few thousand milliseconds,
     
    35403542
    35413543    if (!(request.flags & kFlagEITScan) && HasFlags(kFlagEITScannerRunning))
    35423544    {
    3543         scanner->StopActiveScan();
     3545        scanner->StopPassiveScan();
    35443546        ClearFlags(kFlagEITScannerRunning);
    35453547    }
    35463548
  • libs/libmythtv/eitscanner.cpp

    === libs/libmythtv/eitscanner.cpp
    ==================================================================
     
    4141
    4242void EITScanner::TeardownAll(void)
    4343{
    44     StopActiveScan();
     44    StopPassiveScan();
    4545    if (!exitThread)
    4646    {
    4747        exitThread = true;
     
    114114            RescheduleRecordings();
    115115        }
    116116
     117#if 0
    117118        if (activeScan && (QDateTime::currentDateTime() > activeScanNextTrig))
    118119        {
    119120            // if there have been any new events, tell scheduler to run.
     
    140141                .addSecs(activeScanTrigTime);
    141142            activeScanNextChan++;
    142143        }
     144#endif
    143145
    144146        exitThreadCond.wait(200); // sleep up to 200 ms.
    145147    }
     
    209211    eitHelper->SetSourceID(0);
    210212}
    211213
     214#if 0
    212215void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source,
    213216                                 bool _ignore_source)
    214217{
     
    272275    rec = NULL;
    273276    StopPassiveScan();
    274277}
     278#endif