m_logEnableAirtunes = false;
m_airTunesPort = 36666;
m_airPlayPort = 36667;
- m_initialized = true;
m_databaseMusic.Reset();
m_databaseVideo.Reset();
#endif
m_userAgent = g_sysinfo.GetUserAgent();
+
+ m_initialized = true;
}
bool CAdvancedSettings::Load()
int m_iEdlCommBreakAutowait; // seconds
int m_iEdlCommBreakAutowind; // seconds
- bool m_bFirstLoop;
int m_curlconnecttimeout;
int m_curllowspeedtime;
int m_curlretries;
vector<REFRESHRATE> refreshrates = g_Windowing.RefreshRates(resInfo.iScreen, resInfo.iScreenWidth, resInfo.iScreenHeight, resInfo.dwFlags);
bool match = false;
- for (vector<REFRESHRATE>::const_iterator refreshrate = refreshrates.begin(); refreshrate != refreshrates.end(); refreshrate++)
+ for (vector<REFRESHRATE>::const_iterator refreshrate = refreshrates.begin(); refreshrate != refreshrates.end(); ++refreshrate)
{
std::string screenmode = GetStringFromResolution((RESOLUTION)refreshrate->ResInfo_Index, refreshrate->RefreshRate);
if (!match && StringUtils::EqualsNoCase(((CSettingString*)setting)->GetValue(), screenmode))
{
std::map<RESOLUTION, RESOLUTION_INFO> resolutionInfos;
vector<RESOLUTION_WHR> resolutions = g_Windowing.ScreenResolutions(info.iScreen, info.fRefreshRate);
- for (vector<RESOLUTION_WHR>::const_iterator resolution = resolutions.begin(); resolution != resolutions.end(); resolution++)
+ for (vector<RESOLUTION_WHR>::const_iterator resolution = resolutions.begin(); resolution != resolutions.end(); ++resolution)
{
list.push_back(make_pair(
StringUtils::Format("%dx%d%s", resolution->width, resolution->height,
protected:
CDisplaySettings();
CDisplaySettings(const CDisplaySettings&);
- CDisplaySettings const& operator=(CDisplaySettings const&);
+ CDisplaySettings& operator=(CDisplaySettings const&);
virtual ~CDisplaySettings();
DisplayMode GetCurrentDisplayMode() const;
m_additionalSubtitleDirectoryChecked = 0;
m_musicNeedsUpdate = 0;
- m_musicNeedsUpdate = 0;
+ m_videoNeedsUpdate = 0;
}
CMediaSettings::~CMediaSettings()
protected:
CMediaSettings();
CMediaSettings(const CMediaSettings&);
- CMediaSettings const& operator=(CMediaSettings const&);
+ CMediaSettings& operator=(CMediaSettings const&);
virtual ~CMediaSettings();
static std::string GetWatchedContent(const std::string &content);
}
// NOTE: This function does NOT save the sources.xml file - you need to call SaveSources() separately.
-bool CMediaSourceSettings::UpdateSource(const std::string &strType, const std::string strOldName, const std::string &strUpdateChild, const std::string &strUpdateValue)
+bool CMediaSourceSettings::UpdateSource(const std::string &strType, const std::string &strOldName, const std::string &strUpdateChild, const std::string &strUpdateValue)
{
VECSOURCES *pShares = GetSources(strType);
if (pShares == NULL)
return false;
}
-bool CMediaSourceSettings::DeleteSource(const std::string &strType, const std::string &strName, const std::string strPath, bool virtualSource /* = false */)
+bool CMediaSourceSettings::DeleteSource(const std::string &strType, const std::string &strName, const std::string &strPath, bool virtualSource /* = false */)
{
VECSOURCES *pShares = GetSources(strType);
if (pShares == NULL)
{
// translate special tags
if (!strPath.empty() && strPath.at(0) == '$')
- {
- string strPathOld(strPath);
strPath = CUtil::TranslateSpecialSource(strPath);
- }
// need to check path validity again as CUtil::TranslateSpecialSource() may have failed
if (!strPath.empty())
else
{
// validate the paths
- for (vector<string>::const_iterator path = vecPaths.begin(); path != vecPaths.end(); path++)
+ for (vector<string>::const_iterator path = vecPaths.begin(); path != vecPaths.end(); ++path)
{
CURL url(*path);
string protocol = url.GetProtocol();
const std::string& GetDefaultSource(const std::string &type) const;
void SetDefaultSource(const std::string &type, const std::string &source);
- bool UpdateSource(const std::string &strType, const std::string strOldName, const std::string &strUpdateChild, const std::string &strUpdateValue);
- bool DeleteSource(const std::string &strType, const std::string &strName, const std::string strPath, bool virtualSource = false);
+ bool UpdateSource(const std::string &strType, const std::string &strOldName, const std::string &strUpdateChild, const std::string &strUpdateValue);
+ bool DeleteSource(const std::string &strType, const std::string &strName, const std::string &strPath, bool virtualSource = false);
bool AddShare(const std::string &type, const CMediaSource &share);
bool UpdateShare(const std::string &type, const std::string &oldName, const CMediaSource &share);
protected:
CMediaSourceSettings();
CMediaSourceSettings(const CMediaSourceSettings&);
- CMediaSourceSettings const& operator=(CMediaSourceSettings const&);
+ CMediaSourceSettings& operator=(CMediaSourceSettings const&);
virtual ~CMediaSourceSettings();
private:
{
//if the setting is an std::map, check if we got a valid value before assigning it
bool ok = false;
- for (StaticIntegerSettingOptions::const_iterator it = m_options.begin(); it != m_options.end(); it++)
+ for (StaticIntegerSettingOptions::const_iterator it = m_options.begin(); it != m_options.end(); ++it)
{
if (it->second == value)
{
m_optionsFiller = setting.m_optionsFiller;
}
-bool CSettingInt::fromString(const std::string &strValue, int &value) const
+bool CSettingInt::fromString(const std::string &strValue, int &value)
{
if (strValue.empty())
return false;
m_max = setting.m_max;
}
-bool CSettingNumber::fromString(const std::string &strValue, double &value) const
+bool CSettingNumber::fromString(const std::string &strValue, double &value)
{
if (strValue.empty())
return false;
private:
void copy(const CSettingInt &setting);
- bool fromString(const std::string &strValue, int &value) const;
+ static bool fromString(const std::string &strValue, int &value);
int m_value;
int m_default;
private:
virtual void copy(const CSettingNumber &setting);
- bool fromString(const std::string &strValue, double &value) const;
+ static bool fromString(const std::string &strValue, double &value);
double m_value;
double m_default;
{
bool ok = false;
for (CBooleanLogicOperations::const_iterator operation = m_operations.begin();
- operation != m_operations.end(); operation++)
+ operation != m_operations.end(); ++operation)
{
if (*operation == NULL)
continue;
}
for (CBooleanLogicValues::const_iterator value = m_values.begin();
- value != m_values.end(); value++)
+ value != m_values.end(); ++value)
{
if (*value == NULL)
continue;
m_conditions.insert(SettingConditionPair(identifier, condition));
}
-bool CSettingConditionsManager::Check(const std::string &condition, const std::string &value /* = "" */, const std::string settingId /* = "" */) const
+bool CSettingConditionsManager::Check(const std::string &condition, const std::string &value /* = "" */, const std::string &settingId /* = "" */) const
{
if (condition.empty())
return false;
void AddCondition(const std::string &condition);
void AddCondition(const std::string &identifier, SettingConditionCheck condition);
- bool Check(const std::string &condition, const std::string &value = "", const std::string settingId = "") const;
+ bool Check(const std::string &condition, const std::string &value = "", const std::string &settingId = "") const;
private:
CSettingConditionsManager(const CSettingConditionsManager&);
std::vector<std::string> attributeList = StringUtils::Split(strAttributes, ",");
int controlAttributes = SettingControlAttributeNone;
- for (std::vector<std::string>::const_iterator attribute = attributeList.begin(); attribute != attributeList.end(); attribute++)
+ for (std::vector<std::string>::const_iterator attribute = attributeList.begin(); attribute != attributeList.end(); ++attribute)
{
if (StringUtils::EqualsNoCase(*attribute, "hidden"))
controlAttributes |= (int)SettingControlAttributeHidden;
public:
CSettingDependencyCondition(CSettingsManager *settingsManager = NULL)
: CSettingConditionItem(settingsManager),
- m_operator(SettingDependencyOperatorEquals)
+ m_target(SettingDependencyTargetNone),
+ m_operator(SettingDependencyOperatorEquals)
{ }
virtual ~CSettingDependencyCondition() { }
if (positionId != NULL && strlen(positionId) > 0 && position >= 0)
{
- for (typename std::vector<T>::iterator it = items.begin(); it != items.end(); it++)
+ for (typename std::vector<T>::iterator it = items.begin(); it != items.end(); ++it)
{
if (!StringUtils::EqualsNoCase((*it)->GetId(), positionId))
continue;
typename std::vector<T>::iterator positionIt = it;
if (position == 1)
- positionIt++;
+ ++positionIt;
items.insert(positionIt, item);
return;
CSettingGroup::~CSettingGroup()
{
- for (SettingList::const_iterator setting = m_settings.begin(); setting != m_settings.end(); setting++)
+ for (SettingList::const_iterator setting = m_settings.begin(); setting != m_settings.end(); ++setting)
delete *setting;
m_settings.clear();
}
if (CSettingCategory::DeserializeIdentification(settingElement, settingId))
{
CSetting *setting = NULL;
- for (SettingList::iterator itSetting = m_settings.begin(); itSetting != m_settings.end(); itSetting++)
+ for (SettingList::iterator itSetting = m_settings.begin(); itSetting != m_settings.end(); ++itSetting)
{
if ((*itSetting)->GetId() == settingId)
{
{
SettingList settings;
- for (SettingList::const_iterator it = m_settings.begin(); it != m_settings.end(); it++)
+ for (SettingList::const_iterator it = m_settings.begin(); it != m_settings.end(); ++it)
{
if ((*it)->GetLevel() <= level && (*it)->IsVisible())
settings.push_back(*it);
CSettingCategory::~CSettingCategory()
{
- for (SettingGroupList::const_iterator it = m_groups.begin(); it != m_groups.end(); it++)
+ for (SettingGroupList::const_iterator it = m_groups.begin(); it != m_groups.end(); ++it)
delete *it;
m_groups.clear();
if (CSettingGroup::DeserializeIdentification(groupNode, groupId))
{
CSettingGroup *group = NULL;
- for (SettingGroupList::iterator itGroup = m_groups.begin(); itGroup != m_groups.end(); itGroup++)
+ for (SettingGroupList::iterator itGroup = m_groups.begin(); itGroup != m_groups.end(); ++itGroup)
{
if ((*itGroup)->GetId() == groupId)
{
{
SettingGroupList groups;
- for (SettingGroupList::const_iterator it = m_groups.begin(); it != m_groups.end(); it++)
+ for (SettingGroupList::const_iterator it = m_groups.begin(); it != m_groups.end(); ++it)
{
if ((*it)->IsVisible() && (*it)->GetSettings(level).size() > 0)
groups.push_back(*it);
CSettingSection::~CSettingSection()
{
- for (SettingCategoryList::const_iterator it = m_categories.begin(); it != m_categories.end(); it++)
+ for (SettingCategoryList::const_iterator it = m_categories.begin(); it != m_categories.end(); ++it)
delete *it;
m_categories.clear();
if (CSettingCategory::DeserializeIdentification(categoryNode, categoryId))
{
CSettingCategory *category = NULL;
- for (SettingCategoryList::iterator itCategory = m_categories.begin(); itCategory != m_categories.end(); itCategory++)
+ for (SettingCategoryList::iterator itCategory = m_categories.begin(); itCategory != m_categories.end(); ++itCategory)
{
if ((*itCategory)->GetId() == categoryId)
{
{
SettingCategoryList categories;
- for (SettingCategoryList::const_iterator it = m_categories.begin(); it != m_categories.end(); it++)
+ for (SettingCategoryList::const_iterator it = m_categories.begin(); it != m_categories.end(); ++it)
{
if ((*it)->IsVisible() && (*it)->GetGroups(level).size() > 0)
categories.push_back(*it);
// if necessary hide all the loaded settings
if (success && hide && loadedSettings != NULL)
{
- for(std::map<std::string, CSetting*>::const_iterator setting = loadedSettings->begin(); setting != loadedSettings->end(); setting++)
+ for(std::map<std::string, CSetting*>::const_iterator setting = loadedSettings->begin(); setting != loadedSettings->end(); ++setting)
setting->second->SetVisible(false);
delete loadedSettings;
m_sections[section->GetId()] = section;
// get all settings and add them to the settings map
- for (SettingCategoryList::const_iterator categoryIt = section->GetCategories().begin(); categoryIt != section->GetCategories().end(); categoryIt++)
+ for (SettingCategoryList::const_iterator categoryIt = section->GetCategories().begin(); categoryIt != section->GetCategories().end(); ++categoryIt)
{
(*categoryIt)->CheckVisible();
- for (SettingGroupList::const_iterator groupIt = (*categoryIt)->GetGroups().begin(); groupIt != (*categoryIt)->GetGroups().end(); groupIt++)
+ for (SettingGroupList::const_iterator groupIt = (*categoryIt)->GetGroups().begin(); groupIt != (*categoryIt)->GetGroups().end(); ++groupIt)
{
(*groupIt)->CheckVisible();
- for (SettingList::const_iterator settingIt = (*groupIt)->GetSettings().begin(); settingIt != (*groupIt)->GetSettings().end(); settingIt++)
+ for (SettingList::const_iterator settingIt = (*groupIt)->GetSettings().begin(); settingIt != (*groupIt)->GetSettings().end(); ++settingIt)
{
(*settingIt)->CheckVisible();
sectionNode = sectionNode->NextSibling(XML_SECTION);
}
- for (SettingMap::iterator itSettingDep = m_settings.begin(); itSettingDep != m_settings.end(); itSettingDep++)
+ for (SettingMap::iterator itSettingDep = m_settings.begin(); itSettingDep != m_settings.end(); ++itSettingDep)
{
if (itSettingDep->second.setting == NULL)
continue;
const SettingDependencies& deps = itSettingDep->second.setting->GetDependencies();
- for (SettingDependencies::const_iterator depIt = deps.begin(); depIt != deps.end(); depIt++)
+ for (SettingDependencies::const_iterator depIt = deps.begin(); depIt != deps.end(); ++depIt)
{
std::set<std::string> settingIds = depIt->GetSettings();
- for (std::set<std::string>::const_iterator itSettingId = settingIds.begin(); itSettingId != settingIds.end(); itSettingId++)
+ for (std::set<std::string>::const_iterator itSettingId = settingIds.begin(); itSettingId != settingIds.end(); ++itSettingId)
{
SettingMap::iterator setting = m_settings.find(*itSettingId);
if (setting == m_settings.end())
}
// save any ISubSettings implementations
- for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); it++)
+ for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); ++it)
{
if (!(*it)->Save(root))
return false;
// OnSettingChanging() and OnSettingChanged()
m_loaded = false;
- for (SettingMap::iterator setting = m_settings.begin(); setting != m_settings.end(); setting++)
+ for (SettingMap::iterator setting = m_settings.begin(); setting != m_settings.end(); ++setting)
setting->second.setting->Reset();
OnSettingsUnloaded();
Unload();
m_settings.clear();
- for (SettingSectionMap::iterator section = m_sections.begin(); section != m_sections.end(); section++)
+ for (SettingSectionMap::iterator section = m_sections.begin(); section != m_sections.end(); ++section)
delete section->second;
m_sections.clear();
OnSettingsCleared();
- for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); it++)
+ for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); ++it)
(*it)->Clear();
m_initialized = false;
if (callback == NULL)
return;
- for (std::set<std::string>::const_iterator settingIt = settingList.begin(); settingIt != settingList.end(); settingIt++)
+ for (std::set<std::string>::const_iterator settingIt = settingList.begin(); settingIt != settingList.end(); ++settingIt)
{
std::string id = *settingIt;
StringUtils::ToLower(id);
void CSettingsManager::UnregisterCallback(ISettingCallback *callback)
{
CSingleLock lock(m_critical);
- for (SettingMap::iterator settingIt = m_settings.begin(); settingIt != m_settings.end(); settingIt++)
+ for (SettingMap::iterator settingIt = m_settings.begin(); settingIt != m_settings.end(); ++settingIt)
settingIt->second.callbacks.erase(callback);
}
if (parent == NULL)
return false;
- for (SettingMap::const_iterator it = m_settings.begin(); it != m_settings.end(); it++)
+ for (SettingMap::const_iterator it = m_settings.begin(); it != m_settings.end(); ++it)
{
if (it->second.setting->GetType() == SettingTypeAction)
continue;
if (node == NULL)
return false;
- for (SettingMap::iterator it = m_settings.begin(); it != m_settings.end(); it++)
+ for (SettingMap::iterator it = m_settings.begin(); it != m_settings.end(); ++it)
{
if (LoadSetting(node, it->second.setting) && loadedSettings != NULL)
loadedSettings->insert(make_pair(it->first, it->second.setting));
for (CallbackSet::iterator callback = settingData.callbacks.begin();
callback != settingData.callbacks.end();
- callback++)
+ ++callback)
{
if (!(*callback)->OnSettingChanging(setting))
return false;
for (CallbackSet::iterator callback = settingData.callbacks.begin();
callback != settingData.callbacks.end();
- callback++)
+ ++callback)
(*callback)->OnSettingChanged(setting);
// now handle any settings which depend on the changed setting
const SettingDependencyMap& deps = GetDependencies(setting);
- for (SettingDependencyMap::const_iterator depsIt = deps.begin(); depsIt != deps.end(); depsIt++)
+ for (SettingDependencyMap::const_iterator depsIt = deps.begin(); depsIt != deps.end(); ++depsIt)
{
- for (SettingDependencies::const_iterator depIt = depsIt->second.begin(); depIt != depsIt->second.end(); depIt++)
+ for (SettingDependencies::const_iterator depIt = depsIt->second.begin(); depIt != depsIt->second.end(); ++depIt)
UpdateSettingByDependency(depsIt->first, *depIt);
}
}
for (CallbackSet::iterator callback = settingData.callbacks.begin();
callback != settingData.callbacks.end();
- callback++)
+ ++callback)
(*callback)->OnSettingAction(setting);
}
bool ret = false;
for (CallbackSet::iterator callback = settingData.callbacks.begin();
callback != settingData.callbacks.end();
- callback++)
+ ++callback)
ret |= (*callback)->OnSettingUpdate(setting, oldSettingId, oldSettingNode);
return ret;
for (CallbackSet::iterator callback = settingData.callbacks.begin();
callback != settingData.callbacks.end();
- callback++)
+ ++callback)
(*callback)->OnSettingPropertyChanged(setting, propertyName);
}
bool CSettingsManager::OnSettingsLoading()
{
CSingleLock lock(m_critical);
- for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); it++)
+ for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); ++it)
{
if (!(*it)->OnSettingsLoading())
return false;
void CSettingsManager::OnSettingsLoaded()
{
CSingleLock lock(m_critical);
- for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); it++)
+ for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); ++it)
(*it)->OnSettingsLoaded();
}
bool CSettingsManager::OnSettingsSaving() const
{
CSingleLock lock(m_critical);
- for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); it++)
+ for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); ++it)
{
if (!(*it)->OnSettingsSaving())
return false;
void CSettingsManager::OnSettingsSaved() const
{
CSingleLock lock(m_critical);
- for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); it++)
+ for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); ++it)
(*it)->OnSettingsSaved();
}
void CSettingsManager::OnSettingsCleared()
{
CSingleLock lock(m_critical);
- for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); it++)
+ for (SettingsHandlers::const_iterator it = m_settingsHandlers.begin(); it != m_settingsHandlers.end(); ++it)
(*it)->OnSettingsCleared();
}
bool CSettingsManager::Load(const TiXmlNode *settings)
{
bool ok = true;
- for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); it++)
+ for (std::set<ISubSettings*>::const_iterator it = m_subSettings.begin(); it != m_subSettings.end(); ++it)
ok &= (*it)->Load(settings);
return ok;
{
bool updated = false;
- for (SettingMap::iterator setting = m_settings.begin(); setting != m_settings.end(); setting++)
+ for (SettingMap::iterator setting = m_settings.begin(); setting != m_settings.end(); ++setting)
{
const std::set<CSettingUpdate>& updates = setting->second.setting->GetUpdates();
if (updates.empty())
continue;
- for (std::set<CSettingUpdate>::const_iterator update = updates.begin(); update != updates.end(); update++)
+ for (std::set<CSettingUpdate>::const_iterator update = updates.begin(); update != updates.end(); ++update)
updated |= UpdateSetting(root, setting->second.setting, *update);
}
bool Serialize(TiXmlNode *parent) const;
bool Deserialize(const TiXmlNode *node, std::map<std::string, CSetting*> *loadedSettings = NULL);
- bool LoadSetting(const TiXmlNode *node, CSetting *setting);
+ static bool LoadSetting(const TiXmlNode *node, CSetting *setting);
bool UpdateSettings(const TiXmlNode *root);
bool UpdateSetting(const TiXmlNode *node, CSetting *setting, const CSettingUpdate& update);
void UpdateSettingByDependency(const std::string &settingId, const CSettingDependency &dependency);
CSingleLock lock(m_critical);
// run through and see if we have this setting
- for (map<int, CSkinString>::const_iterator it = m_strings.begin(); it != m_strings.end(); it++)
+ for (map<int, CSkinString>::const_iterator it = m_strings.begin(); it != m_strings.end(); ++it)
{
if (StringUtils::EqualsNoCase(settingName, it->second.name))
return it->first;
CSingleLock lock(m_critical);
// run through and see if we have this setting
- for (map<int, CSkinBool>::const_iterator it = m_bools.begin(); it != m_bools.end(); it++)
+ for (map<int, CSkinBool>::const_iterator it = m_bools.begin(); it != m_bools.end(); ++it)
{
if (StringUtils::EqualsNoCase(settingName, it->second.name))
return it->first;
CSingleLock lock(m_critical);
// run through and see if we have this setting as a string
- for (map<int, CSkinString>::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+ for (map<int, CSkinString>::iterator it = m_strings.begin(); it != m_strings.end(); ++it)
{
if (StringUtils::EqualsNoCase(settingName, it->second.name))
{
}
// and now check for the skin bool
- for (map<int, CSkinBool>::iterator it = m_bools.begin(); it != m_bools.end(); it++)
+ for (map<int, CSkinBool>::iterator it = m_bools.begin(); it != m_bools.end(); ++it)
{
if (StringUtils::EqualsNoCase(settingName, it->second.name))
{
CSingleLock lock(m_critical);
// clear all the settings and strings from this skin.
- for (map<int, CSkinBool>::iterator it = m_bools.begin(); it != m_bools.end(); it++)
+ for (map<int, CSkinBool>::iterator it = m_bools.begin(); it != m_bools.end(); ++it)
{
if (StringUtils::StartsWith(it->second.name, currentSkin))
it->second.value = false;
}
- for (map<int, CSkinString>::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+ for (map<int, CSkinString>::iterator it = m_strings.begin(); it != m_strings.end(); ++it)
{
if (StringUtils::StartsWith(it->second.name, currentSkin))
it->second.value.clear();
protected:
CSkinSettings();
CSkinSettings(const CSkinSettings&);
- CSkinSettings const& operator=(CSkinSettings const&);
+ CSkinSettings& operator=(CSkinSettings const&);
virtual ~CSkinSettings();
std::string GetCurrentSkin() const;
: CGUIDialogSettings(WINDOW_DIALOG_CONTENT_SETTINGS, "DialogContentSettings.xml"), m_origContent(CONTENT_NONE)
{
m_bNeedSave = false;
+ m_bShowScanSettings = false;
+ m_bScanRecursive = false;
+ m_bUseDirNames = false;
+ m_bSingleItem = false;
+ m_bExclude = false;
+ m_bNoUpdate = false;
m_content = CONTENT_NONE;
m_vecItems = new CFileItemList;
}
if (pSettingString->GetOptionsType() == SettingOptionsTypeDynamic)
{
DynamicStringSettingOptions options = pSettingString->UpdateDynamicOptions();
- for (std::vector< std::pair<std::string, std::string> >::const_iterator option = options.begin(); option != options.end(); option++)
+ for (std::vector< std::pair<std::string, std::string> >::const_iterator option = options.begin(); option != options.end(); ++option)
m_pSpin->AddLabel(option->first, option->second);
m_pSpin->SetStringValue(pSettingString->GetValue());
case SettingOptionsTypeStatic:
{
const StaticIntegerSettingOptions& options = pSettingInt->GetOptions();
- for (StaticIntegerSettingOptions::const_iterator it = options.begin(); it != options.end(); it++)
+ for (StaticIntegerSettingOptions::const_iterator it = options.begin(); it != options.end(); ++it)
m_pSpin->AddLabel(g_localizeStrings.Get(it->first), it->second);
break;
case SettingOptionsTypeDynamic:
{
DynamicIntegerSettingOptions options = pSettingInt->UpdateDynamicOptions();
- for (DynamicIntegerSettingOptions::const_iterator option = options.begin(); option != options.end(); option++)
+ for (DynamicIntegerSettingOptions::const_iterator option = options.begin(); option != options.end(); ++option)
m_pSpin->AddLabel(option->first, option->second);
break;
if (pSettingString->GetOptionsType() == SettingOptionsTypeDynamic)
{
DynamicStringSettingOptions options = pSettingString->UpdateDynamicOptions();
- for (DynamicStringSettingOptions::const_iterator option = options.begin(); option != options.end(); option++)
+ for (DynamicStringSettingOptions::const_iterator option = options.begin(); option != options.end(); ++option)
{
CFileItemPtr pItem = GetItem(option->first, option->second);
case SettingOptionsTypeStatic:
{
const StaticIntegerSettingOptions& options = pSettingInt->GetOptions();
- for (StaticIntegerSettingOptions::const_iterator it = options.begin(); it != options.end(); it++)
+ for (StaticIntegerSettingOptions::const_iterator it = options.begin(); it != options.end(); ++it)
{
CFileItemPtr pItem = GetItem(g_localizeStrings.Get(it->first), it->second);
case SettingOptionsTypeDynamic:
{
DynamicIntegerSettingOptions options = pSettingInt->UpdateDynamicOptions();
- for (DynamicIntegerSettingOptions::const_iterator option = options.begin(); option != options.end(); option++)
+ for (DynamicIntegerSettingOptions::const_iterator option = options.begin(); option != options.end(); ++option)
{
CFileItemPtr pItem = GetItem(option->first, option->second);
VECSOURCES shares;
const std::vector<std::string>& sources = pathSetting->GetSources();
- for (std::vector<std::string>::const_iterator source = sources.begin(); source != sources.end(); source++)
+ for (std::vector<std::string>::const_iterator source = sources.begin(); source != sources.end(); ++source)
{
VECSOURCES *sources = CMediaSourceSettings::Get().GetSources(*source);
if (sources != NULL)
CGUIControlBaseSetting(int id, CSetting *pSetting);
virtual ~CGUIControlBaseSetting() {}
- int GetID() { return m_id; }
+ int GetID() const { return m_id; }
CSetting* GetSetting() { return m_pSetting; }
/*!
: CGUIWindow(WINDOW_SETTINGS_MYPICTURES, "SettingsCategory.xml"),
m_settings(CSettings::Get()),
m_iCategory(0), m_iSection(0),
+ m_pOriginalSpin(NULL),
+ m_pOriginalRadioButton(NULL),
+ m_pOriginalCategoryButton(NULL),
+ m_pOriginalButton(NULL),
+ m_pOriginalEdit(NULL),
+ m_pOriginalImage(NULL),
m_delayedTimer(this),
m_returningFromSkinLoad(false)
{
{
if (CGUIDialogYesNo::ShowAndGetInput(10041, 0, 10042, 0))
{
- for(vector<BaseSettingControlPtr>::iterator it = m_settingControls.begin(); it != m_settingControls.end(); it++)
+ for(vector<BaseSettingControlPtr>::iterator it = m_settingControls.begin(); it != m_settingControls.end(); ++it)
{
CSetting *setting = (*it)->GetSetting();
if (setting != NULL)
}
}
CGUIWindow::DoProcess(currentTime, dirtyregions);
- if (bAlphaFaded)
+ if (control && bAlphaFaded)
{
control->SetFocus(false);
if (control->GetControlType() == CGUIControl::GUICONTROL_BUTTON)
// go through the categories and create the necessary buttons
int buttonIdOffset = 0;
- for (SettingCategoryList::const_iterator category = m_categories.begin(); category != m_categories.end(); category++)
+ for (SettingCategoryList::const_iterator category = m_categories.begin(); category != m_categories.end(); ++category)
{
CGUIButtonControl *pButton = NULL;
if (m_pOriginalCategoryButton->GetControlType() == CGUIControl::GUICONTROL_TOGGLEBUTTON)
control->ClearAll();
}
- for (std::vector<BaseSettingControlPtr>::iterator control = m_settingControls.begin(); control != m_settingControls.end(); control++)
+ for (std::vector<BaseSettingControlPtr>::iterator control = m_settingControls.begin(); control != m_settingControls.end(); ++control)
(*control)->Clear();
m_settingControls.clear();
const SettingGroupList& groups = category->GetGroups(CViewStateSettings::Get().GetSettingLevel());
int iControlID = CONTROL_START_CONTROL;
bool first = true;
- for (SettingGroupList::const_iterator groupIt = groups.begin(); groupIt != groups.end(); groupIt++)
+ for (SettingGroupList::const_iterator groupIt = groups.begin(); groupIt != groups.end(); ++groupIt)
{
if (*groupIt == NULL)
continue;
else
AddSeparator(group->GetWidth(), iControlID);
- for (SettingList::const_iterator settingIt = settings.begin(); settingIt != settings.end(); settingIt++)
+ for (SettingList::const_iterator settingIt = settings.begin(); settingIt != settings.end(); ++settingIt)
{
CSetting *pSetting = *settingIt;
settingMap.insert(pSetting->GetId());
}
}
- if (settingMap.size() > 0)
+ if (!settingMap.empty())
m_settings.RegisterCallback(this, settingMap);
// update our settings (turns controls on/off as appropriate)
void CGUIWindowSettingsCategory::UpdateSettings()
{
- for (vector<BaseSettingControlPtr>::iterator it = m_settingControls.begin(); it != m_settingControls.end(); it++)
+ for (vector<BaseSettingControlPtr>::iterator it = m_settingControls.begin(); it != m_settingControls.end(); ++it)
{
BaseSettingControlPtr pSettingControl = *it;
CSetting *pSetting = pSettingControl->GetSetting();
void CGUIWindowSettingsCategory::OnClick(BaseSettingControlPtr pSettingControl)
{
- std::string strSetting = pSettingControl->GetSetting()->GetId();
-
// we need to first set the delayed setting and then execute OnClick()
// because OnClick() triggers OnSettingChanged() and there we need to
// know if the changed setting is delayed or not
BaseSettingControlPtr CGUIWindowSettingsCategory::GetSettingControl(const std::string &strSetting)
{
- for (vector<BaseSettingControlPtr>::iterator control = m_settingControls.begin(); control != m_settingControls.end(); control++)
+ for (vector<BaseSettingControlPtr>::iterator control = m_settingControls.begin(); control != m_settingControls.end(); ++control)
{
if ((*control)->GetSetting() != NULL && (*control)->GetSetting()->GetId() == strSetting)
return *control;
CGUIWindowSettingsScreenCalibration::CGUIWindowSettingsScreenCalibration(void)
: CGUIWindow(WINDOW_SCREEN_CALIBRATION, "SettingsScreenCalibration.xml")
{
+ m_iCurRes = 0;
+ m_iControl = 0;
+ m_fPixelRatioBoxHeight = 0.0f;
m_needsScaling = false; // we handle all the scaling
}
CGUIWindowTestPattern::CGUIWindowTestPattern(void)
: CGUIWindow(WINDOW_TEST_PATTERN, "")
{
+ m_pattern = 0;
+ m_bounceX = 0;
+ m_bounceY = 0;
+ m_bounceDirectionX = 0;
+ m_bounceDirectionY = 0;
+ m_blinkFrame = 0;
m_needsScaling = false;
}
projects / vuplus_xbmc / commitdiff