diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
index e98c0b8..89c991b 100644
a
|
b
|
VBoxIP::VBoxIP() |
1648 | 1648 | |
1649 | 1649 | void VBoxIP::setEnabled(bool e) |
1650 | 1650 | { |
1651 | | GroupSetting::setEnabled(e); |
| 1651 | MythUITextEditSetting::setEnabled(e); |
1652 | 1652 | if (e) |
1653 | 1653 | { |
1654 | 1654 | if (!_oldValue.isEmpty()) |
… |
… |
VBoxTunerIndex::VBoxTunerIndex() |
1680 | 1680 | |
1681 | 1681 | void VBoxTunerIndex::setEnabled(bool e) |
1682 | 1682 | { |
1683 | | GroupSetting::setEnabled(e); |
| 1683 | MythUITextEditSetting::setEnabled(e); |
1684 | 1684 | if (e) { |
1685 | 1685 | if (!_oldValue.isEmpty()) |
1686 | 1686 | setValue(_oldValue); |
… |
… |
VBoxDeviceID::VBoxDeviceID(const CaptureCard &parent) : |
1706 | 1706 | { |
1707 | 1707 | setLabel(tr("Device ID")); |
1708 | 1708 | setHelpText(tr("Device ID of VBox device")); |
| 1709 | setEnabled(false); |
1709 | 1710 | } |
1710 | 1711 | |
1711 | 1712 | void VBoxDeviceID::SetIP(const QString &ip) |
… |
… |
VBoxDeviceIDList::VBoxDeviceIDList( |
1741 | 1742 | StandardSetting *desc, |
1742 | 1743 | VBoxIP *cardip, |
1743 | 1744 | VBoxTunerIndex *cardtuner, |
1744 | | VBoxDeviceList *devicelist) : |
| 1745 | VBoxDeviceList *devicelist, |
| 1746 | const CaptureCard &parent) : |
1745 | 1747 | _deviceid(deviceid), |
1746 | 1748 | _desc(desc), |
1747 | 1749 | _cardip(cardip), |
1748 | 1750 | _cardtuner(cardtuner), |
1749 | | _devicelist(devicelist) |
| 1751 | _devicelist(devicelist), |
| 1752 | m_parent(parent) |
1750 | 1753 | { |
1751 | 1754 | setLabel(QObject::tr("Available devices")); |
1752 | 1755 | setHelpText( |
… |
… |
void VBoxDeviceIDList::Load(void) |
1815 | 1818 | { |
1816 | 1819 | clearSelections(); |
1817 | 1820 | |
1818 | | fillSelections(_deviceid->getValue()); |
| 1821 | int cardid = m_parent.getCardID(); |
| 1822 | QString device = CardUtil::GetVideoDevice(cardid); |
| 1823 | fillSelections(device); |
1819 | 1824 | } |
1820 | 1825 | |
1821 | 1826 | void VBoxDeviceIDList::UpdateDevices(const QString &v) |
… |
… |
VBoxConfigurationGroup::VBoxConfigurationGroup |
2248 | 2253 | cardip = new VBoxIP(); |
2249 | 2254 | cardtuner = new VBoxTunerIndex(); |
2250 | 2255 | deviceidlist = new VBoxDeviceIDList( |
2251 | | deviceid, desc, cardip, cardtuner, &devicelist); |
| 2256 | deviceid, desc, cardip, cardtuner, &devicelist, parent); |
2252 | 2257 | |
2253 | 2258 | a_cardtype.addTargetedChild("VBOX", deviceidlist); |
2254 | 2259 | a_cardtype.addTargetedChild("VBOX", new EmptyAudioDevice(parent)); |
diff --git a/mythtv/libs/libmythtv/videosource.h b/mythtv/libs/libmythtv/videosource.h
index 19244e9..efaac00 100644
a
|
b
|
class HDHomeRunDeviceID : public MythUITextEditSetting |
977 | 977 | class VBoxDeviceID; |
978 | 978 | class VBoxTunerIndex; |
979 | 979 | |
980 | | class VBoxIP : public GroupSetting |
| 980 | class VBoxIP : public MythUITextEditSetting |
981 | 981 | { |
982 | 982 | Q_OBJECT |
983 | 983 | |
… |
… |
class VBoxIP : public GroupSetting |
998 | 998 | QString _oldValue; |
999 | 999 | }; |
1000 | 1000 | |
1001 | | class VBoxTunerIndex : public GroupSetting |
| 1001 | class VBoxTunerIndex : public MythUITextEditSetting |
1002 | 1002 | { |
1003 | 1003 | Q_OBJECT |
1004 | 1004 | |
… |
… |
class VBoxDeviceIDList : public TransMythUIComboBoxSetting |
1028 | 1028 | StandardSetting *desc, |
1029 | 1029 | VBoxIP *cardip, |
1030 | 1030 | VBoxTunerIndex *cardtuner, |
1031 | | VBoxDeviceList *devicelist); |
| 1031 | VBoxDeviceList *devicelist, |
| 1032 | const CaptureCard &parent); |
1032 | 1033 | |
1033 | 1034 | void fillSelections(const QString ¤t); |
1034 | 1035 | |
… |
… |
class VBoxDeviceIDList : public TransMythUIComboBoxSetting |
1043 | 1044 | VBoxIP *_cardip; |
1044 | 1045 | VBoxTunerIndex *_cardtuner; |
1045 | 1046 | VBoxDeviceList *_devicelist; |
| 1047 | const CaptureCard &m_parent; |
1046 | 1048 | |
1047 | 1049 | QString _oldValue; |
1048 | 1050 | }; |