MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/tmcommon/src/tmactivitymanager.cpp

equal deleted inserted replaced

-:6257223ede8a
+:9d4d3445ce6e
 *
 */
 #include "tmactivitymanager.h"
 #include "thumbnaillog.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tmactivitymanagerTraces.h"
-#endif
 // ---------------------------------------------------------------------------
 // CTMActivityManager::NewL()
 // ---------------------------------------------------------------------------
 //
 CTMActivityManager* CTMActivityManager::NewL(MTMActivityManagerObserver* aObserver, TInt aTimeout)
 {
 TN_DEBUG1( "CTMActivityManager::NewL()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_NEWL, "CTMActivityManager::NewL" );
 CTMActivityManager* self = new (ELeave) CTMActivityManager(aObserver, aTimeout);
 CleanupStack::PushL(self);
 self->ConstructL();
 CleanupStack::Pop(self);
 //
 CTMActivityManager::CTMActivityManager(MTMActivityManagerObserver* aObserver, TInt aTimeout)
 : CActive(CActive::EPriorityHigh), iObserver(aObserver), iTimeout(aTimeout), iPreviousStatus(KErrNotFound)
 {
 TN_DEBUG1( "CTMActivityManager::CTMActivityManager()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_CTMACTIVITYMANAGER, "CTMActivityManager::CTMActivityManager" );
 CActiveScheduler::Add(this);
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 CTMActivityManager::~CTMActivityManager()
 {
 TN_DEBUG1( "CTMActivityManager::~CTMActivityManager()");
-OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_CTMACTIVITYMANAGER, "CTMActivityManager::~CTMActivityManager" );
 iObserver = NULL;
 Cancel();
 #ifdef MONITOR_LIGHTS
 // ---------------------------------------------------------------------------
 //
 void CTMActivityManager::ConstructL()
 {
 TN_DEBUG1( "CTMActivityManager::ConstructL()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_CONSTRUCTL, "CTMActivityManager::ConstructL" );
 iTimer.CreateLocal();
 iWatch = ENone;
 }
 // ---------------------------------------------------------------------------
 //
 void CTMActivityManager::SetTimeout(TInt aTimeout)
 {
 TN_DEBUG1( "CTMActivityManager::SetTimeout()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_SETTIMEOUT, "CTMActivityManager::SetTimeout" );
 iTimeout = aTimeout;
 Reset();
 }
 // ---------------------------------------------------------------------------
 //
 void CTMActivityManager::Reset()
 {
 TN_DEBUG1( "CTMActivityManager::Reset()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_RESET, "CTMActivityManager::Reset" );
 #ifdef MONITOR_LIGHTS
 delete iLight;
 iLight = NULL;
 #endif
 // CTMActivityManager::DoCancel()
 // ---------------------------------------------------------------------------
 void CTMActivityManager::DoCancel()
 {
 TN_DEBUG1( "CTMActivityManager::DoCancel()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_DOCANCEL, "CTMActivityManager::DoCancel" );
 #ifdef MONITOR_LIGHTS
 delete iLight;
 iLight = NULL;
 #endif
 // ---------------------------------------------------------------------------
 //
 void CTMActivityManager::Start()
 {
 TN_DEBUG1( "CTMActivityManager::Start()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_START, "CTMActivityManager::Start" );
 #ifdef MONITOR_LIGHTS
 if(!iLight)
 {
 TRAP_IGNORE(iLight = CHWRMLight::NewL(this));
 // ---------------------------------------------------------------------------
 //
 void CTMActivityManager::RunL()
 {
 TN_DEBUG4( "CTMActivityManager::RunL(0x%08x) %d, observer = 0x%08x", this, iStatus.Int(), iObserver);
-OstTrace1( TRACE_NORMAL, CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;this=%o", this );
-OstTrace1( TRACE_NORMAL, DUP5_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;iStatus.Int()=%d", iStatus.Int() );
 if(iFirstRound)
 {
 TN_DEBUG1( "CTMActivityManager::RunL() iFirstRound");
-OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - iFirstRound" );
 iFirstRound = EFalse;
 if (!IsActive())
 {
 iWatch = EWaitingForInactivity;
 iTimer.Inactivity(iStatus, iTimeout);
 {
 TInt inactivity = User::InactivityTime().Int();
 if (inactivity >= iTimeout)
 {
 TN_DEBUG1( "CTMActivityManager::RunL() inactive");
-OstTrace0( TRACE_NORMAL, DUP2_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - inactive" );
 NotifyObserver();
 if (!IsActive()) //observer might have called a Reset()
 {
 iTimer.Inactivity(iStatus,0);
 }
 }
 else if (iWatch == EWaitingForActivity)
 {
 TN_DEBUG1( "CTMActivityManager::RunL() active");
-OstTrace0( TRACE_NORMAL, DUP3_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - active" );
 NotifyObserver();
 if (!IsActive()) //observer might have called a Reset()
 {
 iTimer.Inactivity(iStatus,iTimeout);
 else
 {
 iWatch = ENone;
 }
 TN_DEBUG1( "CTMActivityManager::RunL() end");
-OstTrace0( TRACE_NORMAL, DUP4_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - end" );
 }
 // ---------------------------------------------------------------------------
 // CTMActivityManager::RunError()
 // ---------------------------------------------------------------------------
 //
 TInt CTMActivityManager::RunError(TInt aError)
 {
 TN_DEBUG2( "CTMActivityManager::RunError() %d", aError);
-OstTrace1( TRACE_NORMAL, CTMACTIVITYMANAGER_RUNERROR, "CTMActivityManager::RunError;aError=%d", aError );
 if (aError != KErrNone)
 {
 Reset();
 }
 //
 TBool CTMActivityManager::IsInactive()
 {
 #ifdef MONITOR_LIGHTS
 #ifdef _DEBUG
-TInt inactivityTime = User::InactivityTime().Int();
 TN_DEBUG3( "CTMActivityManager::IsInactive()= %d, iLights = %d", User::InactivityTime().Int(), iLights);
-OstTrace1( TRACE_NORMAL, DUP6_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;inactivityTime=%d", inactivityTime );
 #endif
 #else
-TInt inactivityTime = User::InactivityTime().Int();
 TN_DEBUG2( "CTMActivityManager::IsInactive()= %d", User::InactivityTime().Int());
-OstTrace1( TRACE_NORMAL, DUP7_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;inactivityTime=%d", inactivityTime );
 #endif
 //if lights are off or inactivity timer is less that target the device is not idle
 if( User::InactivityTime() >= TTimeIntervalSeconds(iTimeout)
 #ifdef MONITOR_LIGHTS
 || !iLights
 #endif
 )
 {
 TN_DEBUG1( "CTMActivityManager::IsInactive() ETrue");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_ISINACTIVE, "CTMActivityManager::IsInactive - ETrue" );
 return ETrue;
 }
 TN_DEBUG1( "CTMActivityManager::IsInactive() EFalse");
-OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_ISINACTIVE, "CTMActivityManager::IsInactive - EFalse" );
 return EFalse;
 }
 #ifdef MONITOR_LIGHTS
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CTMActivityManager::LightStatusChanged(TInt aTarget, CHWRMLight::TLightStatus aStatus)
 {
 TN_DEBUG3( "CTMActivityManager::LightStatusChanged() aTarget = %d, aStatus == %d", aTarget, aStatus);
-OstTraceExt2( TRACE_NORMAL, CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged;aTarget=%d;aStatus=%u", aTarget, aStatus );
 if(aTarget & CHWRMLight::EPrimaryDisplay)
 {
 if( aStatus == CHWRMLight::ELightOff )
 {
 TN_DEBUG1( "CTMActivityManager::LightStatusChanged() -- OFF");
-OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged - OFF" );
 iLights = EFalse;
 }
 else
 {
 TN_DEBUG1( "CTMActivityManager::LightStatusChanged() -- ON");
-OstTrace0( TRACE_NORMAL, DUP2_CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged - ON" );
 iLights = ETrue;
 }
 NotifyObserver();
 }
 // -----------------------------------------------------------------------------
 //
 void CTMActivityManager::NotifyObserver()
 {
 TN_DEBUG1( "void CTMAActivityManager::NotifyObserver()");
-OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_NOTIFYOBSERVER, "CTMActivityManager::NotifyObserver" );
 TBool status = IsInactive();
 if( iPreviousStatus != status )
 {

branch	RCL_3
changeset 22	9d4d3445ce6e
parent 21	6257223ede8a