--- a/radioengine/utils/src/cradiosystemeventdetector.cpp	Tue Jul 06 14:16:27 2010 +0300
+++ b/radioengine/utils/src/cradiosystemeventdetector.cpp	Wed Aug 18 09:49:03 2010 +0300
@@ -21,8 +21,9 @@
 
 #ifndef __WINS__
 
-#include <audiopolicypubsubdata.h>
-#include <audiosw_pubsubkeys.h>
+//#include <audiopolicypubsubdata.h>
+//#include <audiosw_pubsubkeys.h>
+#include <AudioClientsListPSKeys.h>
 
 #endif //__WINS__
 
@@ -36,7 +37,7 @@
 #include "mradiosystemeventdetectorobserver.h"
 
 /** Granularity for audio category arrays. */
-const TInt KVRAudioCategoryArrayGranularity = 3;
+//const TInt KVRAudioCategoryArrayGranularity = 3;
 
 // This has to be the last include. 
 #ifdef STUB_CONSTELLATION
@@ -84,9 +85,10 @@
                                                         CRadioPropertyObserver::ERadioPropertyInt );
     iCallStatusObserver->ActivateL();
     iIsCallActive = iCallStatusObserver->ValueInt() != EPSCTsyCallStateNone;
-
+/*
 #ifndef __WINS__
     // Define audio types for not resuming.
+    //TODO: Check these audio resume categories!
     iNoAutoResumeAudioCategories = RArray<TInt>( KVRAudioCategoryArrayGranularity );
     iNoAutoResumeAudioCategories.AppendL( ECatMediaPlayer );
     iNoAutoResumeAudioCategories.AppendL( ECatMobileTv );
@@ -96,6 +98,7 @@
     iAudioPolicyObserver = CRadioPropertyObserver::NewL( *this, KPSUidMMFAudioServer, KAudioPolicyAudioClients, CRadioPropertyObserver::ERadioPropertyByteArray );
     iAudioPolicyObserver->ActivateL();
 #endif
+*/
     }
 
 // ---------------------------------------------------------------------------
@@ -176,7 +179,7 @@
             TAudioClientList audioClients;
             audioClients.Copy( aValue );
             // Check all playing audios!
-            for ( TInt i = 0; i < audioClients().iNumOfProcesses ; i++ )
+            for ( TInt i = 0; i < audioClients().iNumOfProcesses ; ++i )
                 {
                 TInt cat = audioClients().iClientCategoryList[i];
                 LOG_FORMAT( "Check audio cat %x", cat );