← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/libmythtv/videosource.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/videosource.cpp
1534
1534
 
1535
1535
HDHomeRunDeviceIDList::HDHomeRunDeviceIDList(
1536
1536
    HDHomeRunDeviceID   *deviceid,
 
1537
    TransLabelSetting   *desc,
1537
1538
    HDHomeRunIP         *cardip,
1538
1539
    HDHomeRunTunerIndex *cardtuner,
1539
1540
    HDHomeRunDeviceList *devicelist) :
1540
1541
    _deviceid(deviceid),
 
1542
    _desc(desc),
1541
1543
    _cardip(cardip),
1542
1544
    _cardtuner(cardtuner),
1543
1545
    _devicelist(devicelist)
1650
1652
        // Update _cardip and cardtuner
1651
1653
        _cardip->setValue((*_devicelist)[v].cardip);
1652
1654
        _cardtuner->setValue(QString("%1").arg((*_devicelist)[v].cardtuner));
 
1655
        _desc->setValue((*_devicelist)[v].desc);
1653
1656
    }
1654
1657
    _oldValue = v;
1655
1658
};
1722
1725
    FillDeviceList();
1723
1726
 
1724
1727
    deviceid     = new HDHomeRunDeviceID(parent);
 
1728
    desc         = new TransLabelSetting();
 
1729
    desc->setLabel(tr("Description"));
1725
1730
    cardip       = new HDHomeRunIP();
1726
1731
    cardtuner    = new HDHomeRunTunerIndex();
1727
1732
    deviceidlist = new HDHomeRunDeviceIDList(
1728
 
        deviceid, cardip, cardtuner, &devicelist);
 
1733
        deviceid, desc, cardip, cardtuner, &devicelist);
1729
1734
 
1730
1735
    addChild(deviceidlist);
1731
1736
    addChild(deviceid);
 
1737
    addChild(desc);
1732
1738
    addChild(cardip);
1733
1739
    addChild(cardtuner);
1734
1740
 
1766
1772
 
1767
1773
        HDHomeRunDevice tmpdevice;
1768
1774
        tmpdevice.deviceid   = devid;
 
1775
        tmpdevice.desc       = CardUtil::GetHDHRdesc(devid);
1769
1776
        tmpdevice.cardip     = devip;
1770
1777
        tmpdevice.inuse      = false;
1771
1778
        tmpdevice.discovered = true;
1854
1861
        if (device_id == 0)
1855
1862
            tmpdevice.deviceid = "NOTFOUND";
1856
1863
        else
 
1864
        {
1857
1865
            tmpdevice.deviceid = QString("%1").arg(device_id, 8, 16);
 
1866
            tmpdevice.desc     = CardUtil::GetHDHRdesc(tmpdevice.deviceid);
 
1867
        }
1858
1868
 
1859
1869
        tmpdevice.deviceid = tmpdevice.deviceid.toUpper();
1860
1870
 
2447
2457
        setValue(index);
2448
2458
}
2449
2459
 
2450
 
class FreeToAir : public CheckBoxSetting, public CardInputDBStorage
2451
 
{
2452
 
  public:
2453
 
    FreeToAir(const CardInput &parent) :
2454
 
        CheckBoxSetting(this),
2455
 
        CardInputDBStorage(this, parent, "freetoaironly")
2456
 
    {
2457
 
        setValue(true);
2458
 
        setLabel(QObject::tr("Unencrypted channels only"));
2459
 
        setHelpText(QObject::tr(
2460
 
                        "If set, only unencrypted channels will be tuned to "
2461
 
                        "by MythTV or not be ignored by the MythTV channel "
2462
 
                        "scanner."));
2463
 
    };
2464
 
};
2465
 
 
2466
 
class RadioServices : public CheckBoxSetting, public CardInputDBStorage
2467
 
{
2468
 
  public:
2469
 
    RadioServices(const CardInput &parent) :
2470
 
        CheckBoxSetting(this),
2471
 
        CardInputDBStorage(this, parent, "radioservices")
2472
 
    {
2473
 
        setValue(true);
2474
 
        setLabel(QObject::tr("Allow audio only channels"));
2475
 
        setHelpText(QObject::tr(
2476
 
                        "If set, audio only channels will not be ignored "
2477
 
                        "by the MythTV channel scanner."));
2478
 
    };
2479
 
};
2480
 
 
2481
2460
class QuickTune : public ComboBoxSetting, public CardInputDBStorage
2482
2461
{
2483
2462
  public:
2630
2609
        basic->addChild(new ExternalChannelCommand(*this));
2631
2610
        basic->addChild(new PresetTuner(*this));
2632
2611
    }
2633
 
 
2634
 
    if (isDTVcard)
 
2612
    else
2635
2613
    {
2636
 
        // we place this in a group just so the margins match the DVB ones.
2637
2614
        ConfigurationGroup *chgroup =
2638
 
            new VerticalConfigurationGroup(false, false, true, true);
 
2615
            new HorizontalConfigurationGroup(false, false, true, true);
2639
2616
        chgroup->addChild(new QuickTune(*this));
2640
 
        chgroup->addChild(new FreeToAir(*this));
2641
 
        basic->addChild(chgroup);
2642
 
    }
2643
 
 
2644
 
    if (isDVBcard)
2645
 
    {
2646
 
        ConfigurationGroup *chgroup =
2647
 
            new HorizontalConfigurationGroup(false, false, true, true);
2648
 
        chgroup->addChild(new RadioServices(*this));
2649
 
        chgroup->addChild(new DishNetEIT(*this));
 
2617
        if (isDVBcard)
 
2618
            chgroup->addChild(new DishNetEIT(*this));
2650
2619
        basic->addChild(chgroup);
2651
2620
    }
2652
2621