merge from latest s60 bugfixes

    - fix audio routing compile on 3.1
      (videoplayer audio routing is not supported on )
    - Added menu for player example audio endpoint selection
    - SwEvent capability to player example, device was complaining about it
    - Removed member double deleting from S60MediaPlayerService.
    - Fix S60AudioPlayerSession and S60VideoPlayerSession crash after playing file again or playing next file from playlist.
    - Fix S60AudioPlayerSession::doLoadL, S60VideoPlayerSession::doLoadL and S60VideoPlayerSession::doLoadURLL function
    - Fix activeEndpointChanged signaling in S60AudioPlayerSession and S60VideoPlayerSession
    - added couple NULL checks
    - Fixes for merge errors in commit ccc5a8b68a74b6a6e134b7020cdbc7ac0706b9f5.
    -Fixed supported sampleRates retrieval to be based on passed settings.
    -Fix task for audio recording when encoding was done with wrong codec when another format was selected. Error handling added.

Conflicts:

	examples/player/player.cpp
	plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp

1 files changed, 1 insertions, 2 deletions

diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
index 52d5b7b9ac..b77b89cfc1 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
@@ -468,8 +468,7 @@ void S60AudioCaptureSession::populateAudioCodecsDataL()
     
     // default samplerates
     m_supportedSampleRates << 96000 << 88200 << 64000 << 48000 << 44100 << 32000 << 24000 << 22050 << 16000 << 12000 << 11025 << 8000;
-    m_captureState = EInitialized;
-    if (m_controllerIdMap.contains("audio/wav") && m_captureState != EInitialized) {            
+    if (m_controllerIdMap.contains("audio/wav")) {            
         TMdaFileClipLocation location;   
         location.iName = KAudioDummyFile();
         TMdaWavClipFormat format;