diff -r b23265fb36da -r 2f88a7d66f50 bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpoutgoingcommandhandler.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpoutgoingcommandhandler.cpp Tue Apr 27 16:49:44 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpoutgoingcommandhandler.cpp Tue May 11 16:23:08 2010 +0300 @@ -45,13 +45,13 @@ @return A fully constructed CRcpOutgoingCommandHandler. @leave System wide error codes. */ -CRcpOutgoingCommandHandler* CRcpOutgoingCommandHandler::NewL(CRemConBearerAvrcp& aBearer, +CRcpOutgoingCommandHandler* CRcpOutgoingCommandHandler::NewL(MRemConControlCommandInterface& aCommandInterface, MRemConBearerObserver& aObserver, CRcpRouter& aRouter, CDeltaTimer& aTimer) { LOG_STATIC_FUNC - CRcpOutgoingCommandHandler* handler = new(ELeave)CRcpOutgoingCommandHandler(aBearer, aObserver, aRouter, aTimer); + CRcpOutgoingCommandHandler* handler = new(ELeave)CRcpOutgoingCommandHandler(aCommandInterface, aObserver, aRouter, aTimer); return handler; } @@ -64,12 +64,12 @@ @return A partially constructed CRcpIncomingCommandHandler. @leave System wide error codes. */ -CRcpOutgoingCommandHandler::CRcpOutgoingCommandHandler(CRemConBearerAvrcp& aBearer, +CRcpOutgoingCommandHandler::CRcpOutgoingCommandHandler(MRemConControlCommandInterface& aCommandInterface, MRemConBearerObserver& aObserver, CRcpRouter& aRouter, CDeltaTimer& aTimer) : iCommandQueue(_FOFF(CControlCommand, iHandlingLink)), iNotifyCommandQueue(_FOFF(CControlCommand, iHandlingLink)), - iBearer(aBearer), iObserver(aObserver), iRouter(aRouter), iTimer(aTimer) + iCommandInterface(aCommandInterface), iObserver(aObserver), iRouter(aRouter), iTimer(aTimer) { LOG_FUNC } @@ -281,11 +281,11 @@ if ( aNotify ) {//This is a notify command - iBearer.MrccciNewNotifyResponse(*aCommand); + iCommandInterface.MrccciNewNotifyResponse(*aCommand); } else { - iBearer.MrccciNewResponse(*aCommand); + iCommandInterface.MrccciNewResponse(*aCommand); } } @@ -331,7 +331,7 @@ if(command) { command->SetNotifyVolumeChangeResult(command->Frame()); - iBearer.MrccciNewNotifyResponse(*command); + iCommandInterface.MrccciNewNotifyResponse(*command); } else { @@ -353,7 +353,7 @@ } } - iBearer.MrccciNewResponse(*command); + iCommandInterface.MrccciNewResponse(*command); } command->iHandlingLink.Deque(); @@ -578,7 +578,7 @@ aCommand.SetCoreButtonAction(ERemConCoreApiButtonRelease, ETrue); } - iBearer.MrccciNewResponse(aCommand); + iCommandInterface.MrccciNewResponse(aCommand); } } }