← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythtv/channelscan/channelscan_sm.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2009-09-08 23:08:37 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20090908230837-zrm2j6wutp76hwso
Tags: 0.22.0~trunk21742-0ubuntu1
* New upstream checkout (21742)
  - Fixes FTBFS on PPC. See changeset 21571 for more details.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/channelscan/channelscan_sm.cpp
496
496
        uint32_t netid = nit->OriginalNetworkID(i);
497
497
        uint32_t id    = netid << 16 | tsid;
498
498
 
499
 
        if (extend_transports.contains(id))
 
499
        if (ts_scanned.contains(id) || extend_transports.contains(id))
500
500
            continue;
501
501
 
502
502
        const desc_list_t& list =
1362
1362
    }
1363
1363
    else if (!extend_transports.isEmpty())
1364
1364
    {
 
1365
        --current;
1365
1366
        QMap<uint32_t,DTVMultiplex>::iterator it = extend_transports.begin();
1366
1367
        while (it != extend_transports.end())
1367
1368
        {
1372
1373
                VERBOSE(VB_CHANSCAN, LOC + "Adding " + name + " - " +
1373
1374
                        item.tuning.toString());
1374
1375
                scanTransports.push_back(item);
 
1376
                ts_scanned.insert(it.key());
1375
1377
            }
1376
1378
            ++it;
1377
1379
        }
1378
1380
        extend_transports.clear();
 
1381
        nextIt = current;
 
1382
        ++nextIt;
1379
1383
    }
1380
1384
    else
1381
1385
    {