[SCM] kodi-pvr-hts/master: correct SetBoolSetting() method signature (oldValue should be boolean)
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:56 UTC 2016
The following commit has been merged in the master branch:
commit c7e9846cdfbb44f5a071c20d62e256a45d9ae75d
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date: Tue Jan 5 14:14:15 2016 +0200
correct SetBoolSetting() method signature (oldValue should be boolean)
diff --git a/src/tvheadend/Settings.cpp b/src/tvheadend/Settings.cpp
index 38c4d9e..34786fc 100644
--- a/src/tvheadend/Settings.cpp
+++ b/src/tvheadend/Settings.cpp
@@ -197,7 +197,7 @@ ADDON_STATUS Settings::SetIntSetting(int oldValue, const void *newValue)
return ADDON_STATUS_NEED_RESTART;
}
-ADDON_STATUS Settings::SetBoolSetting(int oldValue, const void *newValue)
+ADDON_STATUS Settings::SetBoolSetting(bool oldValue, const void *newValue)
{
if (oldValue == *(reinterpret_cast<const bool *>(newValue)))
return ADDON_STATUS_OK;
diff --git a/src/tvheadend/Settings.h b/src/tvheadend/Settings.h
index dd36dc8..c6f50d9 100644
--- a/src/tvheadend/Settings.h
+++ b/src/tvheadend/Settings.h
@@ -150,7 +150,7 @@ namespace tvheadend {
// @return ADDON_STATUS_OK if value has not changed, ADDON_STATUS_NEED_RESTART otherwise
static ADDON_STATUS SetStringSetting(const std::string &oldValue, const void *newValue);
static ADDON_STATUS SetIntSetting(int oldValue, const void *newValue);
- static ADDON_STATUS SetBoolSetting(int oldValue, const void *newValue);
+ static ADDON_STATUS SetBoolSetting(bool oldValue, const void *newValue);
std::string m_strHostname;
int m_iPortHTSP;
--
kodi-pvr-hts packaging
More information about the pkg-multimedia-commits
mailing list