Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert tuner count fix for .24.

Looks like libhdhomerun in .24-fixes isn't new enough to support this.  Bummer.
  • Loading branch information...
commit ef79f360d1f326e10c60415a553e3f3695754dcc 1 parent 6fca6fa
Robert McNamara authored
View
10 mythtv/libs/libmythtv/cardutil.cpp
@@ -234,7 +234,7 @@ QStringList CardUtil::ProbeVideoDevices(const QString &rawtype)
return devs;
}
- if (result >= max_count)
+ if (result == 50)
{
VERBOSE(VB_IMPORTANT, "CardUtil::ProbeVideoDevices: "
"Warning: may be > 50 HDHomerun devices");
@@ -250,11 +250,9 @@ QStringList CardUtil::ProbeVideoDevices(const QString &rawtype)
.arg((result_list[i].ip_addr>> 8) & 0xFF)
.arg((result_list[i].ip_addr>> 0) & 0xFF);
- for (int tuner = 0; tuner < result_list[i].tuner_count; tuner++)
- {
- QString hdhrdev = id.toUpper() + " " + ip + " " + QString("%1").arg(tuner);
- devs.push_back(hdhrdev);
- }
+ QString hdhrdev = id.toUpper() + " " + ip;
+
+ devs.push_back(hdhrdev);
}
}
#endif // USING_HDHOMERUN
View
17 mythtv/libs/libmythtv/videosource.cpp
@@ -1337,6 +1337,8 @@ HDHomeRunTunerIndex::HDHomeRunTunerIndex()
{
setLabel(QObject::tr("Tuner"));
setEnabled(false);
+ addSelection("0");
+ addSelection("1");
connect(this, SIGNAL(valueChanged( const QString&)),
this, SLOT( UpdateDevices(const QString&)));
_oldValue = "";
@@ -1344,7 +1346,7 @@ HDHomeRunTunerIndex::HDHomeRunTunerIndex()
void HDHomeRunTunerIndex::setEnabled(bool e)
{
- TransLineEditSetting::setEnabled(e);
+ TransComboBoxSetting::setEnabled(e);
if (e) {
if (!_oldValue.isEmpty())
setValue(_oldValue);
@@ -1694,9 +1696,8 @@ void HDHomeRunConfigurationGroup::FillDeviceList(void)
{
QString dev = *it;
QStringList devinfo = dev.split(" ");
- QString devid = devinfo.at(0);
- QString devip = devinfo.at(1);
- QString devtuner = devinfo.at(2);
+ QString devid = devinfo.first();
+ QString devip = devinfo.last();
HDHomeRunDevice tmpdevice;
tmpdevice.deviceid = devid;
@@ -1704,7 +1705,13 @@ void HDHomeRunConfigurationGroup::FillDeviceList(void)
tmpdevice.cardip = devip;
tmpdevice.inuse = false;
tmpdevice.discovered = true;
- tmpdevice.cardtuner = devtuner;
+
+ tmpdevice.cardtuner = "0";
+ tmpdevice.mythdeviceid =
+ tmpdevice.deviceid + "-" + tmpdevice.cardtuner;
+ devicelist[tmpdevice.mythdeviceid] = tmpdevice;
+
+ tmpdevice.cardtuner = "1";
tmpdevice.mythdeviceid =
tmpdevice.deviceid + "-" + tmpdevice.cardtuner;
devicelist[tmpdevice.mythdeviceid] = tmpdevice;
View
2  mythtv/libs/libmythtv/videosource.h
@@ -823,7 +823,7 @@ class HDHomeRunIP : public TransLineEditSetting
QString _oldValue;
};
-class HDHomeRunTunerIndex : public TransLineEditSetting
+class HDHomeRunTunerIndex : public TransComboBoxSetting
{
Q_OBJECT
Please sign in to comment.
Something went wrong with that request. Please try again.