diff -r b67dd1fc57c5 -r 2ed61feeead6 mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.h --- a/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.h Fri May 14 18:19:45 2010 -0500 +++ b/mmfenh/advancedaudiocontroller/audiotonecontrollerplugin/src/mmfaudiotonecontroller.h Fri May 28 19:26:28 2010 -0500 @@ -28,6 +28,7 @@ #include #include +#include /** @@ -52,7 +53,8 @@ public MMMFAudioPlayDeviceCustomCommandImplementor, public MMMFAudioPlayControllerCustomCommandImplementor, public MDevSoundObserver, - public MMMFAudioPlayControllerSetRepeatsCustomCommandImplementor + public MMMFAudioPlayControllerSetRepeatsCustomCommandImplementor, + public MMMFDRMCustomCommandImplementor { public: static CMMFController* NewL(); @@ -109,6 +111,12 @@ //from MMMFAudioPlayControllerSetRepeatsCustomCommandImplementor virtual TInt MapcSetRepeats(TInt aRepeatNumberOfTimes, const TTimeIntervalMicroSeconds& aTrailingSilence); + + // From MMMFDRMCustomCommandImplementor + virtual TInt MdcExecuteIntent(ContentAccess::TIntent aIntent); + virtual TInt MdcEvaluateIntent(ContentAccess::TIntent aIntent); + virtual TInt MdcDisableAutomaticIntent(TBool aDisableAutoIntent); + virtual TInt MdcSetAgentProperty(ContentAccess::TAgentProperty aProperty, TInt aValue); public: @@ -141,7 +149,8 @@ TBool IsValidStateTransition( TControllerState aState ) const; TBool Invariant() const; TBool IsValidState( TControllerState aState ) const ; - TBool ResetPostCondition() const; + TBool ResetPostCondition() const; + void CalculateLeftRightBalance( TInt& aLeft, TInt& aRight, TInt aBalance ) const; void CalculateBalance( TInt& aBalance, TInt aLeft, TInt aRight ) const; @@ -177,6 +186,10 @@ /** Used to store message */ TMMFMessage* iMessage; + + TBool iDisableAutoIntent; + + MDataSink* iDataSink; };