# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284544034 -10800
# Node ID 53984cc2f70a8688de49cdf5198a3612a9e99f60
# Parent  999b2818a0eb7cbce7e303a62cfc0d3311d08930
Revision: 201035
Kit: 201036

diff -r 999b2818a0eb -r 53984cc2f70a mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp
--- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp	Tue Sep 14 22:21:33 2010 +0300
+++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Src/AMRAudioPlayControllerPlugin.cpp	Wed Sep 15 12:47:14 2010 +0300
@@ -51,14 +51,13 @@
     {
     CAdvancedAudioPlayController::ConstructL();
 
-	iAudioResource = CAMRAudioPlayControllerResource::NewL();
+	  iAudioResource = CAMRAudioPlayControllerResource::NewL();
     TAapProperties aapProperties = iAudioResource->PropertiesL();
     iSharedBufferMaxNum = aapProperties.iSharedBufferMaxNum;
     iSharedBufferMaxSize = aapProperties.iSharedBufferMaxSize;
     iMetaDataSupport = aapProperties.iMetaDataSupport;
-    iSharedBufferMaxSizeForNonSeekableSrc = aapProperties.iSharedBufferMaxSizeForNonSeekableSrc;
-	iAudioUtility = CAMRAudioControllerUtility::NewL();
-	iDecoderBuilder = CAMRAudioPlayControllerDecoderBuilder::NewL();
+	  iAudioUtility = CAMRAudioControllerUtility::NewL();
+  	iDecoderBuilder = CAMRAudioPlayControllerDecoderBuilder::NewL();
     }
 
 // -----------------------------------------------------------------------------
@@ -104,19 +103,7 @@
 void CAMRAudioPlayControllerPlugin::DoAddDataSourceL()
     {
     DP0(_L("CAMRAudioPlayControllerPlugin::DoAddDataSourceL"));
-        // ou1cimx1#205863
-    if (iSourceType != KUidMmfFileSource) 
-    	{
-	    DP0(_L("CAMRAudioPlayControllerPlugin::DoAddDataSourceL not file source"));        
-	    if (iSharedBufferMaxNum <= 2)
-	        {
-	        	iSharedBufferMaxNum = 3;
-	        }
-		 iSharedBufferMaxSize = iSharedBufferMaxSizeForNonSeekableSrc;
-	    DP2(_L("CAMRAudioPlayControllerPlugin::DoAddDataSourceL new iSharedBufferMaxNum[%d] iSharedBufferMaxSize[%d]"), iSharedBufferMaxNum, iSharedBufferMaxSize);
-    	}
-
-    }
+	  }
 
 // -----------------------------------------------------------------------------
 // CAMRAudioPlayControllerPlugin::DoAddDataSinkL
diff -r 999b2818a0eb -r 53984cc2f70a mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.cpp
--- a/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.cpp	Tue Sep 14 22:21:33 2010 +0300
+++ b/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.cpp	Wed Sep 15 12:47:14 2010 +0300
@@ -625,9 +625,7 @@
 	// NB KErrInUse, KErrDied OR KErrAccessDenied may be returned 
 	// to indicate that the sound device is in use  by another higher 
 	// priority client.
-	if (aError == KErrCancel || aError == KErrInUse || 
-	    aError == KErrDied || aError == KErrAccessDenied)
-		return;
+	
 
 	if (aError == KErrUnderflow)
 		aError = KErrNone;
diff -r 999b2818a0eb -r 53984cc2f70a mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/src/MmfAudioController.cpp
--- a/mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/src/MmfAudioController.cpp	Tue Sep 14 22:21:33 2010 +0300
+++ b/mmfenh/advancedaudiocontroller/wavplaycontrollerplugin/src/MmfAudioController.cpp	Wed Sep 15 12:47:14 2010 +0300
@@ -685,8 +685,10 @@
 					file->ExecuteIntent(ContentAccess::EStop);
 					}
 			//  datapath propogates stop to sink & source
+			iStoppingPlaying = ETrue;
 			iDataPath->Stop();
 			SetState(EStopped);
+			iStoppingPlaying = EFalse;
 			}
 		else
 			{
diff -r 999b2818a0eb -r 53984cc2f70a mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp
--- a/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp	Tue Sep 14 22:21:33 2010 +0300
+++ b/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp	Wed Sep 15 12:47:14 2010 +0300
@@ -1028,7 +1028,8 @@
                 }
             return EKeyWasConsumed;
             }
-        else if ( aKeyEvent.iCode == EKeyEnter )
+        else if ( aKeyEvent.iCode == EKeyEnter ||
+        	        aKeyEvent.iCode == EKeyDevice3 ) //Rocker Key pressed
             {
             const TInt index = iListBox->CurrentItemIndex();
             TPresetName preset = GetHighlightedPresetInListBox();