summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2012-01-03 22:17:51 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2012-01-03 22:17:51 (GMT)
commit8e9d2a04c28d1becd4c7526fb08ea1dd9e192144 (patch)
tree269c65e3be19f5a0f57ef707922b211d2880c76f
parent3a75bdf4d36467534d9aeaf8a6484ca625afbd04 (diff)
Per request from Devin, include error when FE_GET_INFO ioctl fails.
-rw-r--r--mythtv/libs/libmythtv/cardutil.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
index adedbf4..f980808 100644
--- a/mythtv/libs/libmythtv/cardutil.cpp
+++ b/mythtv/libs/libmythtv/cardutil.cpp
@@ -347,7 +347,7 @@ QStringList CardUtil::ProbeVideoDevices(const QString &rawtype)
if (result >= max_count)
{
- LOG(VB_GENERAL, LOG_WARNING,
+ LOG(VB_GENERAL, LOG_WARNING,
"Warning: may be > 50 HDHomerun devices");
}
@@ -410,7 +410,8 @@ QString CardUtil::ProbeDVBType(const QString &device)
if (err < 0)
{
close(fd_frontend);
- LOG(VB_GENERAL, LOG_ERR, "FE_GET_INFO ioctl failed (" + dvbdev + ").");
+ LOG(VB_GENERAL, LOG_ERR, QString("FE_GET_INFO ioctl failed (%1)")
+ .arg(dvbdev) + ENO);
return ret;
}
close(fd_frontend);
@@ -1822,7 +1823,7 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
if (ioctl(videofd, VIDIOCGCHAN, &test) != 0)
{
- LOG(VB_GENERAL, LOG_ERR, "ProbeV4LVideoInputs(): Error, " +
+ LOG(VB_GENERAL, LOG_ERR, "ProbeV4LVideoInputs(): Error, " +
QString("Could determine name of input #%1"
"\n\t\t\tNot adding it to the list.")
.arg(test.channel) + ENO);