diff -r 43824b19ee35 -r 837dcc42fd6a bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h --- a/bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h Fri May 14 16:01:46 2010 +0300 +++ b/bluetoothengine/btsac/btrcc/inc/btrccVolumeLevelControllerBase.h Thu May 27 13:01:44 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