20 changes: 10 additions & 10 deletions mythtv/libs/libmythtv/mpeg/atsctables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,9 @@ QString TerrestrialVirtualChannelTable::ChannelString(uint chan) const

str.append(QString(" pnum(%1) ").arg(ProgramNumber(chan)));
str.append(QString("ETM_loc(%1) ").arg(ETMlocation(chan)));
str.append(QString("access_ctrl(%1) ").arg(IsAccessControlled(chan)));
str.append(QString("hidden(%1) ").arg(IsHidden(chan)));
str.append(QString("hide_guide(%1) ").arg(IsHiddenInGuide(chan)));
str.append(QString("access_ctrl(%1) ").arg(static_cast<int>(IsAccessControlled(chan))));
str.append(QString("hidden(%1) ").arg(static_cast<int>(IsHidden(chan))));
str.append(QString("hide_guide(%1) ").arg(static_cast<int>(IsHiddenInGuide(chan))));
str.append(QString("service_type(%1)\n").arg(ServiceTypeString(chan)));

str.append(QString(" source_id(%1)\n").arg(SourceID(chan)));
Expand Down Expand Up @@ -421,14 +421,14 @@ QString CableVirtualChannelTable::ChannelString(uint chan) const

str.append(QString(" pnum(%1) ").arg(ProgramNumber(chan)));
str.append(QString("ETM_loc(%1) ").arg(ETMlocation(chan)));
str.append(QString("access_ctrl(%1) ").arg(IsAccessControlled(chan)));
str.append(QString("hidden(%1) ").arg(IsHidden(chan)));
str.append(QString("hide_guide(%1) ").arg(IsHiddenInGuide(chan)));
str.append(QString("access_ctrl(%1) ").arg(static_cast<int>(IsAccessControlled(chan))));
str.append(QString("hidden(%1) ").arg(static_cast<int>(IsHidden(chan))));
str.append(QString("hide_guide(%1) ").arg(static_cast<int>(IsHiddenInGuide(chan))));
str.append(QString("service_type(%1)\n").arg(ServiceTypeString(chan)));

str.append(QString(" source_id(%1) ").arg(SourceID(chan)));
str.append(QString("path_select(%1) ").arg(IsPathSelect(chan)));
str.append(QString("out_of_band(%1)\n").arg(IsOutOfBand(chan)));
str.append(QString("path_select(%1) ").arg(static_cast<int>(IsPathSelect(chan))));
str.append(QString("out_of_band(%1)\n").arg(static_cast<int>(IsOutOfBand(chan))));

if (0 != DescriptorsLength(chan))
{
Expand Down Expand Up @@ -477,7 +477,7 @@ QString ExtendedTextTable::toString(void) const
QString("Extended Text Table -- sourceID(%1) eventID(%2) "
"ettID(%3) isChannelETM(%4) isEventETM(%5)\n%6")
.arg(SourceID()).arg(EventID()).arg(ExtendedTextTableID())
.arg(IsChannelETM()).arg(IsEventETM())
.arg(static_cast<int>(IsChannelETM())).arg(static_cast<int>(IsEventETM()))
.arg(ExtendedTextMessage().toString());
return str;
}
Expand Down Expand Up @@ -527,7 +527,7 @@ QString SystemTimeTable::toString(void) const
QString("System Time Section GPSTime(%1) GPS2UTC_Offset(%2) ")
.arg(SystemTimeGPS().toString(Qt::ISODate)).arg(GPSOffset());
str.append(QString("DS(%3) Day(%4) Hour(%5)\n")
.arg(InDaylightSavingsTime())
.arg(static_cast<int>(InDaylightSavingsTime()))
.arg(DayDaylightSavingsStarts())
.arg(HourDaylightSavingsStarts()));
return str;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ class CountryAvailabilityDescriptor : public MPEGDescriptor
QString toString(void) const override // MPEGDescriptor
{
return QString("CountryAvailabilityDescriptor: Available(%1) in (%2)")
.arg(IsAvailable()).arg(CountryNames());
.arg(static_cast<int>(IsAvailable())).arg(CountryNames());
}
};

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/dvbtables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ QString NetworkInformationTable::toString(void) const
QString str = QString("NIT: NetID(%1) transports(%2)\n")
.arg(NetworkID()).arg(TransportStreamCount());
str.append(QString("Section (%1) Last Section (%2) IsCurrent (%3)\n")
.arg(Section()).arg(LastSection()).arg(IsCurrent()));
.arg(Section()).arg(LastSection()).arg(static_cast<int>(IsCurrent())));

if (0 != NetworkDescriptorsLength())
{
Expand Down Expand Up @@ -131,7 +131,7 @@ QString ServiceDescriptionTable::toString(void) const
.arg(TSID(), 0, 16).arg(OriginalNetworkID(), 0, 16)
.arg(ServiceCount());
str.append(QString("Section (%1) Last Section (%2) IsCurrent (%3)\n")
.arg(Section()).arg(LastSection()).arg(IsCurrent()));
.arg(Section()).arg(LastSection()).arg(static_cast<int>(IsCurrent())));

for (uint i = 0; i < ServiceCount(); i++)
{
Expand Down Expand Up @@ -204,7 +204,7 @@ QString BouquetAssociationTable::toString(void) const
.arg(BouquetID(), 0, 16).arg(TransportStreamCount());

str.append(QString("Section (%1) Last Section (%2) IsCurrent (%3)\n")
.arg(Section()).arg(LastSection()).arg(IsCurrent()));
.arg(Section()).arg(LastSection()).arg(static_cast<int>(IsCurrent())));

if (0 != BouquetDescriptorsLength())
{
Expand Down
10 changes: 7 additions & 3 deletions mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -733,9 +733,13 @@ QString AVCVideoDescriptor::toString() const
return QString("AVC Video: IDC prof(%1) IDC level(%2) sets(%3%4%5) "
"compat(%6) still(%7) 24hr(%8) FramePacking(%9)")
.arg(ProfileIDC()).arg(LevelIDC())
.arg(ConstaintSet0()).arg(ConstaintSet1()).arg(ConstaintSet2())
.arg(AVCCompatible()).arg(AVCStill()).arg(AVC24HourPicture())
.arg(FramePackingSEINotPresentFlag());
.arg(static_cast<int>(ConstaintSet0()))
.arg(static_cast<int>(ConstaintSet1()))
.arg(static_cast<int>(ConstaintSet2()))
.arg(AVCCompatible())
.arg(static_cast<int>(AVCStill()))
.arg(static_cast<int>(AVC24HourPicture()))
.arg(static_cast<int>(FramePackingSEINotPresentFlag()));
}

QString HEVCVideoDescriptor::toString() const
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mpeg/mpegtables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ QString PSIPTable::toString(void) const
.arg(TableIDExtension(), 0, 16));
str.append(QString(" version(%1) current(%2) "
"section(%3) last_section(%4)\n")
.arg(Version()).arg(IsCurrent())
.arg(Version()).arg(static_cast<int>(IsCurrent()))
.arg(Section()).arg(LastSection()));
if ((TableID() >= TableID::MGT) && (TableID() <= TableID::SRM))
{
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/sctedescriptors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class FrameRateDescriptor : public MPEGDescriptor
{
return QString("FrameRateDescriptor: "
"MultipleFrameRates(%1) MaximumFrameRate(%2)")
.arg(MultipleFrameRates())
.arg(static_cast<int>(MultipleFrameRates()))
.arg(FrameRate());
}
};
Expand All @@ -97,8 +97,8 @@ class ExtendedVideoDescriptor : public MPEGDescriptor
{
return QString("ExtendedVideoDescriptor: "
"CatalogModeFlag(%1) VideoIncludesSetup(%2)")
.arg(CatalogModeFlag())
.arg(VideoIncludesSetup());
.arg(static_cast<int>(CatalogModeFlag()))
.arg(static_cast<int>(VideoIncludesSetup()));
}
};

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mpeg/sctetables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ QString VirtualChannelMapSubtable::toStringXML(uint indent_level) const
else
{
str += QString("cds_reference=\"%1\" ").arg(CDSReference(i));
str += QString("scrampled=\"%1\" ").arg(Scrambled(i));
str += QString("scrampled=\"%1\" ").arg(static_cast<int>(Scrambled(i)));
str += "\n" + indent_2;
str += QString(R"(video_standard="%1" video_standard_desc="%2" )")
.arg(VideoStandard(i)).arg(VideoStandardString(i));
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/mpeg/tspacket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ QString TSPacket::toString() const
str.append(QString("raw: 0x%1 0x%2 0x%3 0x%4\n")
.arg(int(data()[0]),0,16).arg(int(data()[1]),0,16)
.arg(int(data()[2]),0,16).arg(int(data()[3]),0,16));
str.append(QString(" inSync: %1\n").arg(HasSync()));
str.append(QString(" transportError: %1\n").arg(TransportError()));
str.append(QString(" payloadStart: %1\n").arg(PayloadStart()));
str.append(QString(" priority: %1\n").arg(Priority()));
str.append(QString(" inSync: %1\n").arg(static_cast<int>(HasSync())));
str.append(QString(" transportError: %1\n").arg(static_cast<int>(TransportError())));
str.append(QString(" payloadStart: %1\n").arg(static_cast<int>(PayloadStart())));
str.append(QString(" priority: %1\n").arg(static_cast<int>(Priority())));
str.append(QString(" pid: %1\n").arg(PID()));
str.append(QString(" scrambled (if>1): %1\n")
.arg(ScramblingControl()));
Expand Down
8 changes: 5 additions & 3 deletions mythtv/libs/libmythtv/mythiowrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,12 @@ int mythfile_exists(const char *path, const char *file)
LOG(VB_FILE, LOG_DEBUG, QString("mythfile_exists('%1', '%2')")
.arg(path).arg(file));

bool ret = false;
if (strncmp(path, "myth://", 7) == 0)
return RemoteFile::Exists(QString("%1/%2").arg(path).arg(file));

return QFile::exists(QString("%1/%2").arg(path).arg(file));
ret = RemoteFile::Exists(QString("%1/%2").arg(path).arg(file));
else
ret = QFile::exists(QString("%1/%2").arg(path).arg(file));
return static_cast<int>(ret);
}

//////////////////////////////////////////////////////////////////////////////
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/opengl/mythvaapiinterop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@ VASurfaceID MythVAAPIInterop::Deinterlace(VideoFrame *Frame, VASurfaceID Current

// add another frame
MythAVFrame sourceframe;
sourceframe->top_field_first = Frame->interlaced_reversed ? !Frame->top_field_first : Frame->top_field_first;
sourceframe->top_field_first =
static_cast<int>(Frame->interlaced_reversed ? !Frame->top_field_first : Frame->top_field_first);
sourceframe->interlaced_frame = 1;
sourceframe->data[3] = Frame->buf;
sourceframe->buf[0] = av_buffer_ref(reinterpret_cast<AVBufferRef*>(Frame->priv[0]));
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/opengl/mythvdpauinterop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ vector<MythVideoTexture*> MythVDPAUInterop::Acquire(MythRenderOpenGL *Context,

// Render surface
m_helper->MixerRender(m_mixer, surface, m_outputSurface, Scan,
Frame->interlaced_reversed ? !Frame->top_field_first :
Frame->top_field_first, m_referenceFrames);
static_cast<int>(Frame->interlaced_reversed ? !Frame->top_field_first :
Frame->top_field_first), m_referenceFrames);
return m_openglTextures[DUMMY_INTEROP_ID];
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/ExternalSignalMonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void ExternalSignalMonitor::UpdateValues(void)
{
QMutexLocker locker(&m_statusLock);
m_signalStrength.SetValue(strength);
m_signalLock.SetValue(is_locked);
m_signalLock.SetValue(static_cast<int>(is_locked));
}

EmitStatus();
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/analogsignalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void AnalogSignalMonitor::UpdateValues(void)

{
QMutexLocker locker(&m_statusLock);
m_signalLock.SetValue(isLocked);
m_signalLock.SetValue(static_cast<int>(isLocked));
if (isLocked)
m_signalStrength.SetValue(100);
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/cetonsignalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void CetonSignalMonitor::UpdateValues(void)
{
QMutexLocker locker(&m_statusLock);
m_signalStrength.SetValue(sig);
m_signalLock.SetValue(true);
m_signalLock.SetValue(static_cast<int>(true));
// TODO add some way to indicate if there is actually a lock
isLocked = m_signalLock.IsGood();
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/dvbchannel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ int DVBChannel::GetChanID() const

while (query.next())
{
found += query.value(1).toInt() > 0;
found += static_cast<int>(query.value(1).toInt() > 0);
if (id == -1 || found)
id = query.value(0).toInt();
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/hdhrsignalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void HDHRSignalMonitor::UpdateValues(void)
{
QMutexLocker locker(&m_statusLock);
m_signalStrength.SetValue(sig);
m_signalLock.SetValue(status.lock_supported);
m_signalLock.SetValue(static_cast<int>(status.lock_supported));
isLocked = m_signalLock.IsGood();
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/scriptsignalmonitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ScriptSignalMonitor : public SignalMonitor
uint64_t _flags = 0) :
SignalMonitor(db_cardnum, _channel, _release_stream, _flags)
{
m_signalLock.SetValue(true);
m_signalLock.SetValue(static_cast<int>(true));
m_signalStrength.SetValue(100);
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/vbitext/vbi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ pll_add(struct vbi *vbi, int n, int err)
void
vbi_pll_reset(struct vbi *vbi, int fine_tune)
{
vbi->pll_fixed = fine_tune >= -PLL_ADJUST && fine_tune <= PLL_ADJUST;
vbi->pll_fixed = static_cast<int>(fine_tune >= -PLL_ADJUST && fine_tune <= PLL_ADJUST);

vbi->pll_err = 0;
vbi->pll_lerr = 0;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/remoteencoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ bool RemoteEncoder::Setup(void)
LOG(VB_NETWORK, LOG_DEBUG, "RemoteEncoder::Setup(): Connecting...");

QString ann = QString("ANN Playback %1 %2")
.arg(gCoreContext->GetHostName()).arg(false);
.arg(gCoreContext->GetHostName()).arg(static_cast<int>(false));

m_controlSock = gCoreContext->ConnectCommandSocket(
m_remotehost, m_remoteport, ann);
Expand Down Expand Up @@ -402,7 +402,7 @@ void RemoteEncoder::SetLiveRecording(bool recording)
{
QStringList strlist( QString("QUERY_RECORDER %1").arg(m_recordernum) );
strlist << "SET_LIVE_RECORDING";
strlist << QString::number(recording);
strlist << QString::number(static_cast<int>(recording));

SendReceiveStringList(strlist);
}
Expand Down
14 changes: 7 additions & 7 deletions mythtv/libs/libmythtv/subtitlescreen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,24 +217,24 @@ static QString fontToString(MythFontProperties *f)
.arg(f->GetFace()->family())
.arg(f->GetFace()->pixelSize())
.arg(srtColorString(f->color()))
.arg(f->GetFace()->italic())
.arg(static_cast<int>(f->GetFace()->italic()))
.arg(f->GetFace()->weight())
.arg(f->GetFace()->underline());
.arg(static_cast<int>(f->GetFace()->underline()));
QPoint offset;
QColor color;
int alpha = 0;
int size = 0;
f->GetShadow(offset, color, alpha);
result += QString(" shadow=%1 shadowoffset=%2 "
"shadowcolor=%3 shadowalpha=%4")
.arg(f->hasShadow())
.arg(static_cast<int>(f->hasShadow()))
.arg(QString("(%1,%2)").arg(offset.x()).arg(offset.y()))
.arg(srtColorString(color))
.arg(alpha);
f->GetOutline(color, size, alpha);
result += QString(" outline=%1 outlinecolor=%2 "
"outlinesize=%3 outlinealpha=%4")
.arg(f->hasOutline())
.arg(static_cast<int>(f->hasOutline()))
.arg(srtColorString(color))
.arg(size)
.arg(alpha);
Expand Down Expand Up @@ -690,9 +690,9 @@ QString FormattedTextChunk::ToLogString(void) const
.arg(m_format.m_offset)
.arg(m_format.m_penSize);
str += QString("it=%1 ul=%2 bf=%3 ")
.arg(m_format.m_italics)
.arg(m_format.m_underline)
.arg(m_format.m_boldface);
.arg(static_cast<int>(m_format.m_italics))
.arg(static_cast<int>(m_format.m_underline))
.arg(static_cast<int>(m_format.m_boldface));
str += QString("font=%1 ").arg(m_format.m_fontTag);
str += QString(" text='%1'").arg(m_text);
return str;
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/tv_play.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ void TV::InitFromDB(void)

RecordingRule record;
record.LoadTemplate("Default");
m_dbAutoexpireDefault = record.m_autoExpire;
m_dbAutoexpireDefault = static_cast<uint>(record.m_autoExpire);

if (m_dbUseChannelGroups)
{
Expand Down Expand Up @@ -10220,10 +10220,10 @@ void TV::ShowOSDAlreadyEditing(PlayerContext *ctx)

QString message = tr("This program is currently being edited");
osd->DialogShow(OSD_DLG_EDITING, message);
QString def = QString("DIALOG_EDITING_CONTINUE_%1").arg(was_paused);
QString def = QString("DIALOG_EDITING_CONTINUE_%1").arg(static_cast<int>(was_paused));
osd->DialogAddButton(tr("Continue Editing"), def, false, true);
osd->DialogAddButton(tr("Do not edit"),
QString("DIALOG_EDITING_STOP_%1").arg(was_paused));
QString("DIALOG_EDITING_STOP_%1").arg(static_cast<int>(was_paused)));
osd->DialogBack("", def, true);
}
ReturnOSDLock(ctx, osd);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/tvremoteutil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ bool RemoteRecordPending(uint inputid, const ProgramInfo *pginfo,
QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(inputid));
strlist << "RECORD_PENDING";
strlist << QString::number(secsleft);
strlist << QString::number(hasLater);
strlist << QString::number(static_cast<int>(hasLater));
pginfo->ToStringList(strlist);

if (!gCoreContext->SendReceiveStringList(strlist) || strlist.empty())
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/videocolourspace.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ VideoColourSpace::VideoColourSpace(VideoColourSpace *Parent)
m_dbSettings[kPictureAttribute_Contrast] = gCoreContext->GetNumSetting("PlaybackContrast", 50);
m_dbSettings[kPictureAttribute_Colour] = gCoreContext->GetNumSetting("PlaybackColour", 50);
m_dbSettings[kPictureAttribute_Hue] = gCoreContext->GetNumSetting("PlaybackHue", 0);
m_dbSettings[kPictureAttribute_Range] = gCoreContext->GetBoolSetting("GUIRGBLevels", true);
m_dbSettings[kPictureAttribute_Range] = static_cast<int>(gCoreContext->GetBoolSetting("GUIRGBLevels", true));
m_primariesMode = toPrimariesMode(gCoreContext->GetSetting("ColourPrimariesMode", "auto"));
}

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/lirc_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1514,9 +1514,9 @@ static int lirc_iscode(struct lirc_config_entry *scan, char *remote,
/* no remote/button specified */
if(scan->code==nullptr)
{
return rep==0 ||
(scan->rep>0 && rep>scan->rep_delay &&
((rep-scan->rep_delay-1)%scan->rep)==0);
return static_cast<int>(rep==0 ||
(scan->rep>0 && rep>scan->rep_delay &&
((rep-scan->rep_delay-1)%scan->rep)==0));
}

/* remote/button match? */
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythfontproperties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ void MythFontProperties::CalcHash(void)

m_hash = QString("%1%2%3%4").arg(m_face.toString())
.arg(m_brush.color().name())
.arg(m_hasShadow)
.arg(m_hasOutline);
.arg(static_cast<int>(m_hasShadow))
.arg(static_cast<int>(m_hasOutline));

if (m_hasShadow)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythnotification.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void MythNotification::ToStringList(void)
m_extradata.clear();

m_extradata << QString::number(Type())
<< QString::number(m_fullScreen)
<< QString::number(static_cast<int>(m_fullScreen))
<< m_description
<< QString::number(m_duration)
<< m_style
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuibuttonlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ bool MythUIButtonList::DistributeButtons(void)

// Set m_topPosition so arrows are displayed correctly.
if (m_scrollStyle == ScrollCenter || m_scrollStyle == ScrollGroupCenter)
m_topPosition = m_itemsVisible < m_itemCount;
m_topPosition = static_cast<int>(m_itemsVisible < m_itemCount);
else
m_topPosition = first_item;

Expand Down
6 changes: 4 additions & 2 deletions mythtv/libs/libmythui/platforms/mythdisplayx11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ void MythDisplayX11::GetEDID(MythXDisplay *mDisplay)

while (rroutput)
{
Atom edidproperty = XInternAtom(mDisplay->GetDisplay(), RR_PROPERTY_RANDR_EDID, false);
Atom edidproperty = XInternAtom(mDisplay->GetDisplay(), RR_PROPERTY_RANDR_EDID,
static_cast<Bool>(false));
if (!edidproperty)
break;

Expand Down Expand Up @@ -321,7 +322,8 @@ void MythDisplayX11::GetEDID(MythXDisplay *mDisplay)
unsigned long nitems = 0;
unsigned char* data = nullptr;
if (XRRGetOutputProperty(mDisplay->GetDisplay(), rroutput, edidproperty,
0, 128, false, false, AnyPropertyType, &actualtype,
0, 128, static_cast<Bool>(false), static_cast<Bool>(false),
AnyPropertyType, &actualtype,
&actualformat, &nitems, &bytesafter, &data) == Success)
{
if (actualtype == XA_INTEGER && actualformat == 8)
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/screensaver-x11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ScreenSaverX11Private

DPMSInfo(m_display->GetDisplay(), &power_level, &m_dpmsenabled);

if (m_dpmsenabled)
if (static_cast<bool>(m_dpmsenabled))
LOG(VB_GENERAL, LOG_INFO, LOC + "DPMS is active.");
else
LOG(VB_GENERAL, LOG_INFO, LOC + "DPMS is disabled.");
Expand All @@ -94,7 +94,7 @@ class ScreenSaverX11Private
return m_xscreensaverRunning;
}

bool IsDPMSEnabled(void) const { return m_dpmsenabled; }
bool IsDPMSEnabled(void) const { return static_cast<bool>(m_dpmsenabled); }

void StopTimer(void)
{
Expand Down Expand Up @@ -219,7 +219,7 @@ class ScreenSaverX11Private
bool m_dpmsaware {false};
bool m_dpmsdeactivated {false}; ///< true if we disabled DPMS
bool m_xscreensaverRunning {false};
BOOL m_dpmsenabled {false};
BOOL m_dpmsenabled {static_cast<BOOL>(false)};

int m_timeoutInterval {-1};
QTimer *m_resetTimer {nullptr};
Expand Down Expand Up @@ -311,7 +311,7 @@ bool ScreenSaverX11::Asleep(void)
if (d->DeactivatedDPMS())
return false;

BOOL on = false;
BOOL on = static_cast<BOOL>(false);
CARD16 power_level = DPMSModeOn;

if (d->m_display)
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/msocketdevice.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ bool MSocketDevice::broadcast() const
*/
void MSocketDevice::setBroadcast(bool enable)
{
setOption(Broadcast, enable);
setOption(Broadcast, static_cast<int>(enable));
}

/*!
Expand Down Expand Up @@ -455,7 +455,7 @@ bool MSocketDevice::addressReusable() const
*/
void MSocketDevice::setAddressReusable(bool enable)
{
setOption(ReuseAddress, enable);
setOption(ReuseAddress, static_cast<int>(enable));
}


Expand All @@ -476,7 +476,7 @@ bool MSocketDevice::keepalive() const
*/
void MSocketDevice::setKeepalive(bool enable)
{
setOption(Keepalive, enable);
setOption(Keepalive, static_cast<int>(enable));
}


Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythbackend/mainserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5306,7 +5306,7 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
{
strlist << fsInfo.getHostname();
strlist << fsInfo.getPath();
strlist << QString::number(fsInfo.isLocal());
strlist << QString::number(static_cast<int>(fsInfo.isLocal()));
strlist << QString::number(fsInfo.getFSysID());
strlist << QString::number(fsInfo.getGroupID());
strlist << QString::number(fsInfo.getBlockSize());
Expand Down Expand Up @@ -6269,7 +6269,7 @@ void MainServer::HandleMusicFindAlbumArt(const QStringList &slist, PlaybackSock
AlbumArtImage *image = images->getImageAt(x);
strlist.append(QString("%1").arg(image->m_id));
strlist.append(QString("%1").arg((int)image->m_imageType));
strlist.append(QString("%1").arg(image->m_embedded));
strlist.append(QString("%1").arg(static_cast<int>(image->m_embedded)));
strlist.append(image->m_description);
strlist.append(image->m_filename);
strlist.append(image->m_hostname);
Expand Down Expand Up @@ -7108,11 +7108,11 @@ void MainServer::HandleFileTransferQuery(QStringList &slist,
{
bool isopen = ft->isOpen();

retlist << QString::number(isopen);
retlist << QString::number(static_cast<int>(isopen));
}
else if (command == "REOPEN")
{
retlist << QString::number(ft->ReOpen(slist[2]));
retlist << QString::number(static_cast<int>(ft->ReOpen(slist[2])));
}
else if (command == "DONE")
{
Expand All @@ -7129,7 +7129,7 @@ void MainServer::HandleFileTransferQuery(QStringList &slist,
{
// return size and if the file is not opened for writing
retlist << QString::number(ft->GetFileSize());
retlist << QString::number(!gCoreContext->IsRegisteredFileForWrite(ft->GetFileName()));
retlist << QString::number(static_cast<int>(!gCoreContext->IsRegisteredFileForWrite(ft->GetFileName())));
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions mythtv/programs/mythbackend/playbacksock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ QStringList PlaybackSock::GetSGFileList(QString &host, QString &groupname,
strlist << host;
strlist << groupname;
strlist << directory;
strlist << QString::number(fileNamesOnly);
strlist << QString::number(static_cast<int>(fileNamesOnly));

SendReceiveStringList(strlist);

Expand Down Expand Up @@ -491,7 +491,7 @@ void PlaybackSock::RecordPending(int capturecardnum, const ProgramInfo *pginfo,
QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(capturecardnum));
strlist << "RECORD_PENDING";
strlist << QString::number(secsleft);
strlist << QString::number(hasLater);
strlist << QString::number(static_cast<int>(hasLater));
pginfo->ToStringList(strlist);

SendReceiveStringList(strlist);
Expand Down Expand Up @@ -526,7 +526,7 @@ void PlaybackSock::CancelNextRecording(int capturecardnum, bool cancel)
.arg(capturecardnum));

strlist << "CANCEL_NEXT_RECORDING";
strlist << QString::number(cancel);
strlist << QString::number(static_cast<int>(cancel));

SendReceiveStringList(strlist);
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/scheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ void Scheduler::GetAllPending(QStringList &strList) const
RecList retlist;
bool hasconflicts = GetAllPending(retlist);

strList << QString::number(hasconflicts);
strList << QString::number(static_cast<int>(hasconflicts));
strList << QString::number(retlist.size());

while (!retlist.empty())
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/services/frontend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ bool Frontend::PlayVideo(const QString &Id, bool UseBookmark)
<< metadata->GetInetRef() << QString::number(metadata->GetLength())
<< QString::number(metadata->GetYear())
<< QString::number(metadata->GetID())
<< QString::number(UseBookmark);
<< QString::number(static_cast<int>(UseBookmark));

auto *me = new MythEvent(ACTION_HANDLEMEDIA, args);
qApp->postEvent(GetMythMainWindow(), me);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfrontend/videofilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,12 @@ bool VideoFilterSettings::matches_filter(const VideoMetadata &mdata) const

if (matches && m_browse != kBrowseFilterAll)
{
matches = (mdata.GetBrowse() == m_browse);
matches = (static_cast<int>(mdata.GetBrowse()) == m_browse);
}

if (matches && m_watched != kWatchedFilterAll)
{
matches = (mdata.GetWatched() == m_watched);
matches = (static_cast<int>(mdata.GetWatched()) == m_watched);
}

if (matches && m_inetRef != kInetRefFilterAll)
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythtranscode/external/replex/element.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ void fix_video_count(sequence_t *s, uint64_t *frame, uint64_t origpts, uint64_t

pdiff = ptsdiff(origpts,pts);
ddiff = ptsdiff(origdts,dts);
psig = pdiff > 0;
dsig = ddiff > 0;
psig = static_cast<int>(pdiff > 0);
dsig = static_cast<int>(ddiff > 0);
if (!psig) pdiff = -pdiff;
if (!dsig) ddiff = -ddiff;

Expand Down
13 changes: 7 additions & 6 deletions mythtv/programs/mythtranscode/mpeg2fix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ int64_t PTSOffsetQueue::Get(int idx, AVPacket *pkt)
while (m_offset[idx].count() > 1 && !done)
{
it = ++m_offset[idx].begin();
if ((((*it).type == 0) && (pkt->pts >= (*it).pos_pts) /* PTS type */) ||
if (((static_cast<int>((*it).type) == 0) &&
(pkt->pts >= (*it).pos_pts) /* PTS type */) ||
(((*it).type) /* Pos type */ &&
((pkt->pos >= (*it).pos_pts) || (pkt->duration > (*it).framenum))))
{
Expand Down Expand Up @@ -676,8 +677,8 @@ int MPEG2fixup::AddFrame(MPEG2frame *f)
rb = &m_rx.m_vrBuf;
rbi = &m_rx.m_indexVrbuf;
iu.frame = GetFrameTypeN(f);
iu.seq_header = f->m_isSequence;
iu.gop = f->m_isGop;
iu.seq_header = static_cast<uint8_t>(f->m_isSequence);
iu.gop = static_cast<uint8_t>(f->m_isGop);

iu.gop_off = f->m_gopPos - f->m_pkt.data;
iu.frame_off = f->m_framePos - f->m_pkt.data;
Expand Down Expand Up @@ -1352,7 +1353,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt)
m_vFrame.append(m_unreadFrames.dequeue());
if (m_realFileEnd && !m_unreadFrames.count())
m_fileEnd = true;
return m_fileEnd;
return static_cast<int>(m_fileEnd);
}

while (!done)
Expand Down Expand Up @@ -1768,7 +1769,7 @@ int MPEG2fixup::ConvertToI(FrameList *orderedFrames, int headPos)
foreach (auto & of, *orderedFrames)
{
int i = GetFrameNum(of);
if ((spare = DecodeToFrame(i, headPos == 0)) == nullptr)
if ((spare = DecodeToFrame(i, static_cast<int>(headPos == 0))) == nullptr)
{
LOG(VB_GENERAL, LOG_WARNING,
QString("ConvertToI skipping undecoded frame #%1").arg(i));
Expand Down Expand Up @@ -2084,7 +2085,7 @@ int MPEG2fixup::Start()
origaPTS[it.key()] = af->first()->m_pkt.pts * 300;
//expectedPTS[it.key()] = udiff2x33(af->first()->m_pkt.pts, initPTS);
af_dlta_cnt[it.key()] = 0;
cutState[it.key()] = m_discard;
cutState[it.key()] = static_cast<int>(m_discard);
}

ShowRangeMap(&m_delMap, "Cutlist:");
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythutil/jobutils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static int QueueJob(const MythUtilCommandLineParser &cmdline)

bool result = JobQueue::QueueJob(jobType,
pginfo.GetChanID(), pginfo.GetRecordingStartTime(), "", "", "",
rebuildSeektable, JOB_QUEUED, QDateTime());
static_cast<int>(rebuildSeektable), JOB_QUEUED, QDateTime());

if (result)
{
Expand Down