diff -r 2f88a7d66f50 -r 53b7818cd282 bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h --- a/bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h Tue May 11 16:23:08 2010 +0300 +++ b/bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h Tue May 25 12:53:11 2010 +0300 @@ -92,6 +92,8 @@ TInt GetLocalMaxVolume(); TInt GetCurrentLocalVolume(); + + TInt GetCurrentRemoteVolume(); void AccessoryChangedVolume(TInt aVolumeInPhoneScale); @@ -106,18 +108,18 @@ virtual void RegisterVolumeChangeNotification(); private: - void SetPhoneVolume(); + void SetPhoneVolume(TInt aRemoteVol); + TInt GetPhoneVolume(TInt &aVol); private: // New methods /** * To be implemented by the specialization class. */ - virtual void AdjustRemoteVolume(TInt aVolume) = 0; - - protected: - virtual TInt GetPhoneVolume(TInt &aVol); - + virtual void AdjustRemoteVolume(TInt aVolume) = 0; + virtual TInt RoundRemoteVolume(TInt aPrevPhVol); + virtual void ScalePhoneVolume(TInt& aVolume); + private: // Data RProperty iVolLevelProperty; // owned RProperty iVolKeyEventProperty; // owned