diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-11 09:16:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-11-22 10:47:14 +0100 |
| commit | 112b481a7f12ce89feeab58975a1a6ee0e614821 (patch) | |
| tree | d4ddbdf226232d7e9ad774c554661093bef76272 | |
| parent | 302f567e838b24f54a5da42f8b363ee523ac35e7 (diff) | |
OSL_TRACE -> SAL_INFO
Change-Id: I3c3dbe958fe50cc95b8427ac4daaca1a5bec784c
| -rw-r--r-- | slideshow/source/engine/eventqueue.cxx | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 12362c297c19..9e513b17b979 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -91,12 +91,12 @@ namespace slideshow { ::osl::MutexGuard aGuard( maMutex ); -#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS) - OSL_TRACE("adding at %f event [%s] at %x with delay %f\r", - mpTimer->getElapsedTime(), - OUStringToOString(rEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), - rEvent.get(), - rEvent->getActivationTime(0.0)); +#if OSL_DEBUG_LEVEL > 1 + SAL_INFO("slideshow.eventqueue", "adding event \"" << rEvent->GetDescription() + << "\" [" << rEvent.get() + << "] at " << mpTimer->getElapsedTime() + << " with delay " << rEvent->getActivationTime(0.0) + ); #endif ENSURE_OR_RETURN_FALSE( rEvent, "EventQueue::addEvent: event ptr NULL" ); @@ -119,12 +119,12 @@ namespace slideshow { ::osl::MutexGuard aGuard( maMutex ); -#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS) - OSL_TRACE("adding at %f event [%s] at %x for next round with delay %f\r", - mpTimer->getElapsedTime(), - OUStringToOString(rEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), - rEvent.get(), - rEvent->getActivationTime(0.0)); +#if OSL_DEBUG_LEVEL > 1 + SAL_INFO("slideshow.eventqueue", "adding event \"" << rEvent->GetDescription() + << "\" [" << rEvent.get() + << "] for the next round at " << mpTimer->getElapsedTime() + << " with delay " << rEvent->getActivationTime(0.0) + ); #endif ENSURE_OR_RETURN_FALSE( rEvent.get() != NULL, @@ -139,12 +139,12 @@ namespace slideshow { ::osl::MutexGuard aGuard( maMutex ); -#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS) - OSL_TRACE("adding at %f event [%s] at %x for execution when queue is empty with delay %f\r", - mpTimer->getElapsedTime(), - OUStringToOString(rpEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), - rpEvent.get(), - rpEvent->getActivationTime(0.0)); +#if OSL_DEBUG_LEVEL > 1 + SAL_INFO("slideshow.eventqueue", "adding event \"" << rpEvent->GetDescription() + << "\" [" << rpEvent.get() + << "] for execution when the queue is empty at " << mpTimer->getElapsedTime() + << " with delay " << rpEvent->getActivationTime(0.0) + ); #endif ENSURE_OR_RETURN_FALSE( @@ -227,16 +227,20 @@ namespace slideshow event.pEvent.get(), event.pEvent->getActivationTime(0.0) ); #endif -#if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS) - OSL_TRACE("firing at %f event [%s] at %x with delay %f\r", - mpTimer->getElapsedTime(), - OUStringToOString(event.pEvent->GetDescription(), - RTL_TEXTENCODING_UTF8).getStr(), - event.pEvent.get(), - event.pEvent->getActivationTime(0.0)); +#if OSL_DEBUG_LEVEL > 1 + SAL_INFO("slideshow.eventqueue", "firing event \"" + << event.pEvent->GetDescription() + << "\" [" << event.pEvent.get() + << "] at " << mpTimer->getElapsedTime() + << " with delay " << event.pEvent->getActivationTime(0.0) + ); #endif event.pEvent->fire(); + SAL_INFO("slideshow.eventqueue", "event \"" + << event.pEvent->GetDescription() + << "\" [" << event.pEvent.get() << "] fired" + ); } catch( uno::RuntimeException& ) { |