Index: auddevlib_symbian.pcf
===================================================================
RCS file: /cvsroot/audio/device/auddevlib_symbian.pcf,v
retrieving revision 1.4
diff -w -u -b -r1.4 auddevlib_symbian.pcf
--- auddevlib_symbian.pcf	11 Oct 2005 20:42:09 -0000	1.4
+++ auddevlib_symbian.pcf	11 Oct 2005 22:59:46 -0000
@@ -38,6 +38,7 @@
 
 project.AddSources(
                    "platform/symbian/audsymbian.cpp",
+                   "platform/symbian/AudDevStatusObserver.cpp",
 		           "platform/symbian/audiosvr/audio_svr.cpp",
                    "platform/symbian/audiosvr/audio_svr_cntxt.cpp",
                    )
@@ -62,7 +63,3 @@
     project.AddIncludes("platform/symbian",
                         "platform/symbian/audiosvr",
                         "platform/symbian/audiosvr/mmf")
-
-if project.IsDefined("HELIX_FEATURE_SYMBIAN_MMF"):
-    project.AddSources("platform/symbian/AudDevStatusObserver.cpp")
-
Index: platform/symbian/audsymbian.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/symbian/audsymbian.cpp,v
retrieving revision 1.34
diff -w -u -b -r1.34 audsymbian.cpp
--- platform/symbian/audsymbian.cpp	11 Oct 2005 20:42:19 -0000	1.34
+++ platform/symbian/audsymbian.cpp	11 Oct 2005 22:59:46 -0000
@@ -62,10 +62,7 @@
 #include "audiosvr/audio_svr_cntxt.h"
 
 #include "audsymbian.h"
-
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
 #include "hxerror.h"
-#endif
 
 static UINT32 Scale(UINT32 v, UINT32 f0, UINT32 f1, UINT32 t0, UINT32 t1);
 
@@ -83,11 +80,9 @@
       m_uMinPlayerVolume(0),
       m_uMaxPlayerVolume(100),
       m_uMinDevVolume(0),
-      m_uMaxDevVolume(100)
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
-      ,m_pDevTakenNotifier(NULL)
-      ,m_pErrorMessages(NULL)
-#endif
+      m_uMaxDevVolume(100),
+      m_pDevTakenNotifier(NULL),
+      m_pErrorMessages(NULL)
 {
     CActiveScheduler::Add(this);
     TInt err = KErrNone;
@@ -99,10 +94,7 @@
 {
     Close(TRUE);
     m_iTimer.Close();
-
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
     HX_RELEASE(m_pErrorMessages);
-#endif
 }
 
 ULONG32 CHXAudioDevice::AddRef()
@@ -167,9 +159,7 @@
 
     if (m_pAudioStream)
     {
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
         CancelAudDeviceErrNotification();
-#endif
         m_pAudioStream->Close();
         m_pAudioServerContext->Stop();
         m_deviceOpen = false;
@@ -445,11 +435,8 @@
 
         {
             m_deviceOpen = true;
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
             res = RegisterAudDeviceErrNotification();
-#else
-            res = HXR_OK;
-#endif
+            
         }
     }
 
@@ -480,14 +467,11 @@
 //
 void CHXAudioDevice::Init(IUnknown* pContext)
 {
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
    HX_RELEASE(m_pErrorMessages);
    pContext->QueryInterface(IID_IHXErrorMessages, (void **)&m_pErrorMessages);
    HX_ASSERT(m_pErrorMessages != NULL);
-#endif
 }
 
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
 //
 // CHXAudioDevice::ReqDevStatusNotification()
 // Request Dev status notification (Activates active object) 
@@ -563,7 +547,7 @@
         m_pDevTakenNotifier = NULL;
     }
 }
-#endif // End of #ifdef HELIX_FEATURE_SYMBIAN_MMF
+
 //////////////////////////////////////////////////////////////////////
 // convenience methods ///////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
Index: pub/platform/symbian/audsymbian.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/symbian/audsymbian.h,v
retrieving revision 1.14
diff -w -u -b -r1.14 audsymbian.h
--- pub/platform/symbian/audsymbian.h	11 Oct 2005 20:42:29 -0000	1.14
+++ pub/platform/symbian/audsymbian.h	11 Oct 2005 22:59:46 -0000
@@ -57,11 +57,7 @@
 #include "auderrs.h"
 #include "hxaudply.h"
 #include "chxmapptrtoptr.h"
-
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
 #include "AudDevStatusObserver.h"
-_INTERFACE IHXErrorMessages;
-#endif
 
 #define MINIMUM_AUDIO_PUSHDOWN 1000
 //#define ENFORCE_MINIMUM_PUSHDOWN 
@@ -70,13 +66,11 @@
 class CHXSimpleList;
 class HXSymbianAudioClient;
 class HXSymbianAudioServerContext;
-
+_INTERFACE IHXErrorMessages;
 
 class CHXAudioDevice : public IHXAudioDevice
                        ,public CActive
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
                        ,public CHXAudDevStatusObserver
-#endif
 {
   public:
     CHXAudioDevice();
@@ -118,10 +112,8 @@
     virtual void RunL();
     virtual void DoCancel();
 
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
     // CHXAudDevStatusObserver methods
     void OnAudDevStatusChange(TInt status);
-#endif 
 
   protected:
 
@@ -141,11 +133,9 @@
     //helpers
     void DoSetTimer();
 
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
     HX_RESULT RegisterAudDeviceErrNotification();
     void CancelAudDeviceErrNotification();
     void ReqDevStatusNotification();
-#endif
 
     LONG32                          m_lRefCount;
     bool                            m_deviceOpen;
@@ -158,10 +148,8 @@
     UINT32                          m_uMinDevVolume;
     UINT32                          m_uMaxDevVolume;
     RTimer                          m_iTimer;
-#ifdef HELIX_FEATURE_SYMBIAN_MMF
     CHXAudDevTakenNotifier*         m_pDevTakenNotifier;
     IHXErrorMessages*               m_pErrorMessages;
-#endif
 };
 
 #endif  //_AudioOutSYMBIAN

Index: platform/symbian/chxavplayer.cpp
===================================================================
RCS file: /cvsroot/clientapps/symbianplayer/platform/symbian/chxavplayer.cpp,v
retrieving revision 1.51
diff -w -u -b -r1.51 chxavplayer.cpp
--- platform/symbian/chxavplayer.cpp	30 Mar 2005 17:05:36 -0000	1.51
+++ platform/symbian/chxavplayer.cpp	11 Oct 2005 23:02:01 -0000
@@ -1260,8 +1260,14 @@
     DPRINTF(SYMP_INFO, ("CHXAvPlayer::OnError(): code = 0x%08x(%s), user code = 0x%08x', sev = %u(%s)\n", ulHXCode, dbg::ErrorCode(ulHXCode), ulUserCode, unSeverity, dbg::SevCode(unSeverity)));
     if(!m_bAccessPointSetupFailed)
     {
+        // Filtering HXR_AUDIODEVICETAKEN err.
+        // This can be removed once player is capable of
+        // handling this error code.
+        if(ulHXCode != HXR_AUDIODEVICETAKEN)
+        {
         m_playerState.OnError(ulHXCode);
     }
+    }
     return HXR_OK;
 }