diff -r 0004e923f486 -r 97dcae98e602 fmradio/fmradioengine/src/fmradioengine.cpp --- a/fmradio/fmradioengine/src/fmradioengine.cpp Tue Apr 27 16:38:14 2010 +0300 +++ b/fmradio/fmradioengine/src/fmradioengine.cpp Tue May 11 16:13:56 2010 +0300 @@ -37,7 +37,8 @@ #include "fmradiopubsub.h" #include "fmradiordsreceiver.h" #include "fmradiordsreceiversimulator.h" -#include "fmradioaccessoryobserver.h" +#include "fmradioaccessoryconnection.h" + #ifndef __ACCESSORY_FW #include "fmradioenginedosserverobserver.h" #endif @@ -146,10 +147,10 @@ iInCall = ETrue; } // accessory observer - iHeadsetObserver = CFMRadioAccessoryObserver::NewL(); + iHeadsetObserver = CFMRadioAccessoryConnection::NewL(); iHeadsetObserver->SetObserver( this ); // Set audio output to current setting - if ( iHeadsetObserver->IsHeadsetAccessoryConnected() ) + if ( iHeadsetObserver->WiredHeadsetConnected() ) { SetAudioOutput( EFMRadioOutputHeadset ); } @@ -836,7 +837,7 @@ if ( KErrNone == tempError ) { - if ( !iHeadsetObserver->IsHeadsetAccessoryConnected() ) + if ( !iHeadsetObserver->WiredHeadsetConnected() ) { iRadioSettings->SetAudioOutput( EFMRadioOutputIHF ); } @@ -1898,7 +1899,7 @@ FTRACE( FPrint( _L("CRadioEngine::IsAudioRoutingPossible()" ) ) ); TBool isAudioRoutingPossible = EFalse; - TBool headsetConnected = iHeadsetObserver->IsHeadsetAccessoryConnected(); + TBool headsetConnected = iHeadsetObserver->WiredHeadsetConnected(); TBool radioOn = iRadioSettings->IsRadioOn(); if ( headsetConnected && radioOn )