Merged Audio branch to trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@560 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-06-24 17:19:34 +00:00
parent 06fb556e78
commit 17b8e10ed8
111 changed files with 8370 additions and 9779 deletions

View File

@@ -74,16 +74,16 @@ void ConsoleWidget::handleEvent(UEvent * anEvent)
{
if(logEvent->getCode() == ULogger::kFatal)
{
_timer.start(0);
QMetaObject::invokeMethod(&_timer, "start", Q_ARG(int, 0));
}
else
{
_timer.start(OLD_TIME);
QMetaObject::invokeMethod(&_timer, "start", Q_ARG(int, OLD_TIME));
}
}
else
{
_timer.start(0);
QMetaObject::invokeMethod(&_timer, "start", Q_ARG(int, 0));
}
if(logEvent->getCode() == ULogger::kFatal)