Changed MeasureName(N) to work dynamically

This commit is contained in:
Birunthan Mohanathas
2012-07-18 17:55:32 +03:00
parent a0a0c61e79
commit ea124f5ccd
3 changed files with 24 additions and 20 deletions

View File

@ -233,10 +233,7 @@ void CMeter::ReadOptions(CConfigParser& parser, const WCHAR* section)
parser.SetStyleTemplate(style);
}
if (!m_Initialized)
{
BindMeasures(parser, section);
}
BindMeasures(parser, section);
int oldX = m_X;
std::wstring& x = (std::wstring&)parser.ReadString(section, L"X", L"0");
@ -437,14 +434,16 @@ bool CMeter::Update()
}
/*
** Reads and binds the primary MeasureName.
** Reads and binds the primary MeasureName. This must always be called in overridden
** BindMeasures() implementations.
**
*/
bool CMeter::BindPrimaryMeasure(CConfigParser& parser, const WCHAR* section, bool optional)
{
m_Measures.clear();
const std::wstring& measureName = parser.ReadString(section, L"MeasureName", L"");
// The meter is not bound to anything
CMeasure* measure = parser.GetMeasure(measureName);
if (measure)
{