Skip to content

Commit

Permalink
cosmetics: indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
mkortstiege committed Jul 28, 2012
1 parent 156f826 commit 8105a41
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions xbmc/Application.cpp
Expand Up @@ -4912,42 +4912,42 @@ bool CApplication::OnMessage(CGUIMessage& message)
}

bool CApplication::ExecuteXBMCAction(std::string actionStr)
{
// see if it is a user set string
CLog::Log(LOGDEBUG,"%s : Translating %s", __FUNCTION__, actionStr.c_str());
CGUIInfoLabel info(actionStr, "");
actionStr = info.GetLabel(0);
CLog::Log(LOGDEBUG,"%s : To %s", __FUNCTION__, actionStr.c_str());

// user has asked for something to be executed
if (CBuiltins::HasCommand(actionStr))
CBuiltins::Execute(actionStr);
else
{
// try translating the action from our ButtonTranslator
int actionID;
if (CButtonTranslator::TranslateActionString(actionStr.c_str(), actionID))
{
// see if it is a user set string
CLog::Log(LOGDEBUG,"%s : Translating %s", __FUNCTION__, actionStr.c_str());
CGUIInfoLabel info(actionStr, "");
actionStr = info.GetLabel(0);
CLog::Log(LOGDEBUG,"%s : To %s", __FUNCTION__, actionStr.c_str());

// user has asked for something to be executed
if (CBuiltins::HasCommand(actionStr))
CBuiltins::Execute(actionStr);
else
{
// try translating the action from our ButtonTranslator
int actionID;
if (CButtonTranslator::TranslateActionString(actionStr.c_str(), actionID))
{
OnAction(CAction(actionID));
return true;
}
CFileItem item(actionStr, false);
OnAction(CAction(actionID));
return true;
}
CFileItem item(actionStr, false);
#ifdef HAS_PYTHON
if (item.IsPythonScript())
{ // a python script
g_pythonParser.evalFile(item.GetPath().c_str(),ADDON::AddonPtr());
}
else
if (item.IsPythonScript())
{ // a python script
g_pythonParser.evalFile(item.GetPath().c_str(),ADDON::AddonPtr());
}
else
#endif
if (item.IsAudio() || item.IsVideo())
{ // an audio or video file
PlayFile(item);
}
else
return false;
}
return true;
if (item.IsAudio() || item.IsVideo())
{ // an audio or video file
PlayFile(item);
}
else
return false;
}
return true;
}

void CApplication::Process()
{
Expand Down

0 comments on commit 8105a41

Please sign in to comment.