chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

- Added ability to escape real variables and measures as follows: #*RealVar*# [*RealMeasure*]

Browse Source 
- NowPlayingPlugin: Addition change to r880 OpenPlayer fix
- Removing tolua++ generation package files
This commit is contained in:
Birunthan Mohanathas
2011-07-29 17:18:21 +00:00
parent d7dedcfc75
commit e74d6f4619
13 changed files with 77 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Library/ConfigParser.cpp
View File

@ -453,19 +453,28 @@ bool CConfigParser::ReplaceVariables(std::wstring& result)
end = result.find(L'#', pos + 1);
if (end != std::wstring::npos)
{
std::wstring strVariable = result.substr(pos + 1, end - (pos + 1));
std::wstring strValue;
if (GetVariable(strVariable, strValue))
if (result[pos + 1] == L'*' && result[end - 1] == L'*')
{
// Variable found, replace it with the value
result.replace(pos, end - pos + 1, strValue);
start = pos + strValue.length();
replaced = true;
result.erase(pos + 1, 1);
result.erase(end - 2, 1);
start = end - 1;
}
else
{
start = end;
std::wstring strVariable = result.substr(pos + 1, end - (pos + 1));
std::wstring strValue;
if (GetVariable(strVariable, strValue))
{
// Variable found, replace it with the value
result.replace(pos, end - pos + 1, strValue);
start = pos + strValue.length();
replaced = true;
}
else
{
start = end;
}
}
}
else
@ -510,21 +519,30 @@ bool CConfigParser::ReplaceMeasures(std::wstring& result)
pos2 = result.find(L'[', pos + 1);
if (pos2 == std::wstring::npos || end < pos2)
{
std::wstring var = result.substr(pos + 1, end - (pos + 1));
CMeasure* measure = GetMeasure(var);
if (measure)
if (result[pos + 1] == L'*' && result[end - 1] == L'*')
{
std::wstring value = measure->GetStringValue(AUTOSCALE_OFF, 1, -1, false);
// Measure found, replace it with the value
result.replace(pos, end - pos + 1, value);
start = pos + value.length();
replaced = true;
result.erase(pos + 1, 1);
result.erase(end - 2, 1);
start = end - 1;
}
else
{
start = end;
std::wstring var = result.substr(pos + 1, end - (pos + 1));
CMeasure* measure = GetMeasure(var);
if (measure)
{
std::wstring value = measure->GetStringValue(AUTOSCALE_OFF, 1, -1, false);
// Measure found, replace it with the value
result.replace(pos, end - pos + 1, value);
start = pos + value.length();
replaced = true;
}
else
{
start = end;
}
}
}
else