Skip to content

Buildfix #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brfransen wants to merge 4 commits into
base: openpht-1.9
Choose a base branch
from
Open

Buildfix #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77b1dd4
add libplist 2
brfransen Jan 19, 2022
2e2be75
Compatibility with libmicrohttpd 0.9.71
brfransen Jan 19, 2022
72ee4f5
fixes for newer clang
brfransen Jan 19, 2022
77d1ce3
update to ffmpeg 2.8.18
brfransen Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xbmc/filesystem/MythFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ bool CMythFile::SkipNext()
{
HandleEvents();
if(m_recorder)
return m_dll->recorder_is_recording(m_recorder) > 0;
return m_dll->recorder_is_recording(m_recorder) > (void *)0;
Copy link
Member

@Risca Risca Feb 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've always preferred the implicit conversion of pointers to boolean. E.g.;

return !!m_dll->recorder_is_recording(m_recorder);

or

if (CGUIDialogNumeric::ShowAndGetTime(time, heading ? heading : g_localizeStrings.Get(21420)))

but this works too ^^


return false;
}
Expand Down
4 changes: 2 additions & 2 deletions xbmc/guilib/GUIEditControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void CGUIEditControl::OnClick()
dateTime.SetFromDBTime(utf8);
SYSTEMTIME time;
dateTime.GetAsSystemTime(time);
if (CGUIDialogNumeric::ShowAndGetTime(time, heading > 0 ? heading : g_localizeStrings.Get(21420)))
if (CGUIDialogNumeric::ShowAndGetTime(time, heading > (void *)0 ? heading : g_localizeStrings.Get(21420)))
{
dateTime = CDateTime(time);
utf8 = dateTime.GetAsLocalizedTime("", false);
Expand All @@ -311,7 +311,7 @@ void CGUIEditControl::OnClick()
dateTime = CDateTime(2000, 1, 1, 0, 0, 0);
SYSTEMTIME date;
dateTime.GetAsSystemTime(date);
if (CGUIDialogNumeric::ShowAndGetDate(date, heading > 0 ? heading : g_localizeStrings.Get(21420)))
if (CGUIDialogNumeric::ShowAndGetDate(date, heading > (void *)0 ? heading : g_localizeStrings.Get(21420)))
{
dateTime = CDateTime(date);
utf8 = dateTime.GetAsDBDate();
Expand Down
2 changes: 1 addition & 1 deletion xbmc/settings/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void CSettings::GetSources(const TiXmlElement* pRootElement, const CStdString& s
if (pChild)
{
pChild = pChild->FirstChild();
while (pChild > 0)
while (pChild > (void *)0)
{
CStdString strValue = pChild->Value();
if (strValue == "source" || strValue == "bookmark") // "bookmark" left in for backwards compatibility
Expand Down
4 changes: 2 additions & 2 deletions xbmc/utils/RssReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXmlNode, int iFeed)
if (m_tagSet.empty())
AddTag("title");

while (itemNode > 0)
while (itemNode > (void *)0)
{
TiXmlNode* childNode = itemNode->FirstChild();
mTagElements.clear();
while (childNode > 0)
while (childNode > (void *)0)
{
CStdString strName = childNode->Value();

Expand Down