12 changes: 6 additions & 6 deletions mythtv/libs/libmythtv/frequencytables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ TransportScanItem::TransportScanItem(uint sourceid,
const QString &_si_std,
QString _name,
uint _mplexid,
uint _timeoutTune)
std::chrono::milliseconds _timeoutTune)
: m_mplexid(_mplexid), m_friendlyName(std::move(_name)),
m_sourceID(sourceid),
m_timeoutTune(_timeoutTune)
Expand All @@ -42,7 +42,7 @@ TransportScanItem::TransportScanItem(uint sourceid,
TransportScanItem::TransportScanItem(uint _sourceid,
QString _name,
const DTVMultiplex &_tuning,
uint _timeoutTune)
std::chrono::milliseconds _timeoutTune)
: m_mplexid(0),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
Expand All @@ -55,7 +55,7 @@ TransportScanItem::TransportScanItem(uint _sourceid,
QString _name,
DTVTunerType _tuner_type,
const DTVTransport &_tuning,
uint _timeoutTune)
std::chrono::milliseconds _timeoutTune)
: m_mplexid(0),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
Expand Down Expand Up @@ -83,7 +83,7 @@ TransportScanItem::TransportScanItem(uint sourceid,
uint freqNum,
uint freq,
const FrequencyTable &ft,
uint timeoutTune)
std::chrono::milliseconds timeoutTune)
: m_mplexid(0), m_friendlyName(std::move(strFmt)),
m_friendlyNum(freqNum), m_sourceID(sourceid),
m_timeoutTune(timeoutTune)
Expand Down Expand Up @@ -130,7 +130,7 @@ TransportScanItem::TransportScanItem(uint _sourceid,
QString _name,
IPTVTuningData _tuning,
QString _channel,
uint _timeoutTune) :
std::chrono::milliseconds _timeoutTune) :
m_mplexid(0),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
Expand Down Expand Up @@ -175,7 +175,7 @@ QString TransportScanItem::toString() const
str += QString("sourceid(%1) " ).arg(m_sourceID);
str += QString("useTimer(%1) " ).arg(static_cast<int>(m_useTimer));
str += QString("scanning(%1) " ).arg(static_cast<int>(m_scanning));
str += QString("timeoutTune(%3 msec) " ).arg(m_timeoutTune);
str += QString("timeoutTune(%3 msec) " ).arg(m_timeoutTune.count());
str += "\n\t";
str += QString("frequency(%1) " ).arg(m_tuning.m_frequency);
str += QString("offset[0..2]: %1 %2 %3 ").arg(m_freqOffsets[0]).arg(m_freqOffsets[1]).arg(m_freqOffsets[2]);
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythtv/frequencytables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,32 +132,32 @@ class TransportScanItem
const QString &_si_std,
QString _name,
uint _mplexid,
uint _timeoutTune);
std::chrono::milliseconds _timeoutTune);

TransportScanItem(uint _sourceid,
QString _name,
const DTVMultiplex &_tuning,
uint _timeoutTune);
std::chrono::milliseconds _timeoutTune);

TransportScanItem(uint _sourceid,
QString _name,
DTVTunerType _tuner_type,
const DTVTransport &_tuning,
uint _timeoutTune);
std::chrono::milliseconds _timeoutTune);

TransportScanItem(uint _sourceid,
const QString &_si_std,
QString strFmt, /* fmt for info shown to user */
uint freqNum,
uint frequency, /* center frequency to use */
const FrequencyTable &ft, /* freq table to get info from */
uint _timeoutTune);
std::chrono::milliseconds _timeoutTune);

TransportScanItem(uint _sourceid,
QString _name,
IPTVTuningData _tuning,
QString _channel,
uint _timeoutTune);
std::chrono::milliseconds _timeoutTune);

uint offset_cnt() const
{ return (m_freqOffsets[2]) ? 3 : ((m_freqOffsets[1]) ? 2 : 1); }
Expand All @@ -179,7 +179,7 @@ class TransportScanItem

bool m_scanning {false}; // Probably unnecessary
std::array<int,3> m_freqOffsets {0,0,0}; // Frequency offsets
unsigned m_timeoutTune {1000}; // Timeout to tune to a frequency
std::chrono::milliseconds m_timeoutTune {1s}; ///< Timeout to tune to a frequency

DTVMultiplex m_tuning; // Tuning info
IPTVTuningData m_iptvTuning; // IPTV Tuning info
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,26 @@ DVBSignalMonitor::DVBSignalMonitor(int db_cardnum, DVBChannel* _channel,
// This value should probably come from the database...
int threshold = 0; // signal strength threshold

// Tuning timeout time for channel lock from database, minimum is 3000 ms
uint wait = 3000; // Minimum timeout time
uint signal_timeout = 0; // Not used
uint tuning_timeout = 0; // Maximum time for channel lock from card
// Tuning timeout time for channel lock from database, minimum is 3s
std::chrono::milliseconds wait = 3s; // Minimum timeout time
std::chrono::milliseconds signal_timeout = 0ms; // Not used
std::chrono::milliseconds tuning_timeout = 0ms; // Maximum time for channel lock from card
CardUtil::GetTimeouts(db_cardnum, signal_timeout, tuning_timeout);
if (tuning_timeout < wait)
{
LOG(VB_CHANNEL, LOG_DEBUG, LOC +
QString("Tuning timeout from database: %1 ms is too small, using %2 ms")
.arg(tuning_timeout).arg(wait));
.arg(tuning_timeout.count()).arg(wait.count()));
}
else
{
wait = tuning_timeout; // Use value from database
LOG(VB_CHANNEL, LOG_DEBUG, LOC +
QString("Tuning timeout: %1 ms").arg(wait));
QString("Tuning timeout: %1 ms").arg(wait.count()));
}

m_signalLock.SetTimeout(wait);
m_signalStrength.SetTimeout(wait);
m_signalLock.SetTimeout(wait.count());
m_signalStrength.SetTimeout(wait.count());
m_signalStrength.SetThreshold(threshold);

// This is incorrect for API 3.x but works better than int16_t range
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythbackend/services/capture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ int Capture::AddCaptureCard ( const QString &sVideoDevice,
sVBIDevice, sCardType, nAudioRateLimit,
sHostName, nDVBSWFilter, nDVBSatType, bDVBWaitForSeqStart,
bSkipBTAudio, bDVBOnDemand, nDVBDiSEqCType, nFirewireSpeed,
sFirewireModel, nFirewireConnection, nSignalTimeout,
nChannelTimeout, nDVBTuningDelay, nContrast, nBrightness,
sFirewireModel, nFirewireConnection, std::chrono::milliseconds(nSignalTimeout),
std::chrono::milliseconds(nChannelTimeout), nDVBTuningDelay, nContrast, nBrightness,
nColour, nHue, nDiSEqCId, bDVBEITScan);

if ( nResult < 1 )
Expand Down