diff -r 0707dd69d236 -r a42ed326b458 bluetoothengine/btsac/btrcc/src/btrccLinker.cpp --- a/bluetoothengine/btsac/btrcc/src/btrccLinker.cpp Fri Mar 12 15:43:23 2010 +0200 +++ b/bluetoothengine/btsac/btrcc/src/btrccLinker.cpp Mon Mar 15 12:41:15 2010 +0200 @@ -25,7 +25,6 @@ #include #include #include "btaudioremconpskeys.h" -#include "btrccLegacyVolumeLevelController.h" #include "btrccAbsoluteVolumeLevelController.h" #include "btrccLinker.h" #include "btrccplayerstarter.h" @@ -87,7 +86,6 @@ if (iAccObserver.IsAvrcpVolCTSupported()) { iAbsoluteVolController = CBTRCCAbsoluteVolumeLevelController::NewL(*iInterfaceSelector, *this); - iLegacyVolController = CBTRCCLegacyVolumeLevelController::NewL(*iInterfaceSelector, *this); } else { @@ -101,8 +99,6 @@ iRemConBatteryTgt = CRemConBatteryApiTarget::NewL(*iInterfaceSelector, *this); -// iBrowsingAdapter = CBTRCCBrowsingAdapter::NewL(*iInterfaceSelector); - if (iAccObserver.IsAvrcpVolCTSupported()) { iInterfaceSelector->OpenControllerL(); @@ -129,7 +125,6 @@ User::RequestComplete(iClientRequest, KErrAbort); delete iAbsoluteVolController; - delete iLegacyVolController; delete iPlayerStarter; Cancel(); iStateArray.ResetAndDestroy(); @@ -437,17 +432,18 @@ if (iAccObserver.IsAvrcpVolCTSupported()) { // Choose based on SDP result whether to create - // absolute controller or legacy controller. + // absolute controller or not. if(!iVolController) { if (iAccObserver.IsAbsoluteVolumeSupported(iRemoteAddr)) { iVolController = iAbsoluteVolController; + TRACE_INFO(_L("Absolute volume supported, taking it into use.")) } else - { - iVolController = iLegacyVolController; - } + { + TRACE_INFO(_L("No absolute volume supported, so no volume control.")) + } } } if (iVolController) @@ -466,6 +462,7 @@ if (iVolController) { iVolController->Stop(); + iVolController = NULL; } }