--- a/package_definition.xml	Mon Oct 04 16:06:10 2010 +0300
+++ b/package_definition.xml	Fri Oct 15 12:58:46 2010 +0300
@@ -37,7 +37,7 @@
    </component>
    <component id="phoneuivoipextension" filter="s60" name="Phone UI">
     <unit bldFile="phoneapp/phoneuivoipextension/group"/>
-   </component>   
+   </component>
   </collection>
   <collection id="phoneengine" name="Phone Engine" level="engine">
    <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">

--- a/phone_plat/phone_application_commands_api/inc/phoneappcommands.hrh	Mon Oct 04 16:06:10 2010 +0300
+++ b/phone_plat/phone_application_commands_api/inc/phoneappcommands.hrh	Fri Oct 15 12:58:46 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -84,9 +84,6 @@
     EPhoneInCallCmdCancelSendingDtmfString,
     EPhoneInCallCmdContinueSendingDtmfString,
     EPhoneInCallCmdVoiceMode,
-    EPhoneInCallCmdSendToCallerMenu,    
-    EPhoneInCallCmdSendNew,
-    EPhoneInCallCmdSendFile,
     EPhoneInCallCmdDrop,
     EPhoneInCallCmdPrivate,
     EPhoneInCallCmdDialer,

--- a/phone_plat/telephony_menu_extension_api/inc/xqteluicommandextension.h	Mon Oct 04 16:06:10 2010 +0300
+++ b/phone_plat/telephony_menu_extension_api/inc/xqteluicommandextension.h	Fri Oct 15 12:58:46 2010 +0300
@@ -75,6 +75,10 @@
     class ToolBarCommand
         {
     public:
+        ToolBarCommand() :
+            mCommandId(0), mIsEnabled(false) {}
+        ToolBarCommand(int command, bool isEnabled) :
+            mCommandId(command), mIsEnabled(isEnabled) {}
         
         // Tool Bar command Id
         int mCommandId;
@@ -82,6 +86,10 @@
         // Is command enabled
         bool mIsEnabled;
 
+        // Comparison operator
+        bool operator==(const ToolBarCommand& c)
+            { return ((c.mCommandId == mCommandId) && 
+                    (c.mIsEnabled == mIsEnabled)); }
         };
     
     /*!

--- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatorfactory/group/ut_mediatorfactory.mmp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatorfactory/group/ut_mediatorfactory.mmp	Fri Oct 15 12:58:46 2010 +0300
@@ -57,3 +57,4 @@
 LIBRARY                 euser.lib
 LIBRARY                 phoneuiutils.lib
 
+SMPSAFE

--- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatormessagefactory/group/T_MediatorMessageFactory.mmp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatormessagefactory/group/T_MediatorMessageFactory.mmp	Fri Oct 15 12:58:46 2010 +0300
@@ -51,4 +51,4 @@
 LIBRARY                 EUnitUtil.lib
 LIBRARY                 euser.lib
 
-
+SMPSAFE

--- a/phoneapp/phonemediatorcenter/tsrc/ut_mediatorsender/group/T_MediatorSender.mmp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phonemediatorcenter/tsrc/ut_mediatorsender/group/T_MediatorSender.mmp	Fri Oct 15 12:58:46 2010 +0300
@@ -53,3 +53,5 @@
 LIBRARY                 EUnitUtil.lib
 LIBRARY                 euser.lib
 LIBRARY                 phoneuiutils.lib
+
+SMPSAFE

--- a/phoneapp/phoneringingtoneplayer/bwins/phoneringingtoneplayeru.def	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/bwins/phoneringingtoneplayeru.def	Fri Oct 15 12:58:46 2010 +0300
@@ -1,7 +1,7 @@
 EXPORTS
-	?StopPlaying@CPhoneRingingToneController@@QAEXXZ @ 1 NONAME ; void CPhoneRingingToneController::StopPlaying(void)
-	?PlayRingToneL@CPhoneRingingToneController@@QAEXPAVTPhoneCommandParam@@@Z @ 2 NONAME ; void CPhoneRingingToneController::PlayRingToneL(class TPhoneCommandParam *)
-	?NewL@CPhoneRingingToneController@@SAPAV1@XZ @ 3 NONAME ; class CPhoneRingingToneController * CPhoneRingingToneController::NewL(void)
-	?MuteRingingToneOnAnswer@CPhoneRingingToneController@@QAEXXZ @ 4 NONAME ; void CPhoneRingingToneController::MuteRingingToneOnAnswer(void)
-	?MuteRingingTone@CPhoneRingingToneController@@QAEXXZ @ 5 NONAME ; void CPhoneRingingToneController::MuteRingingTone(void)
+	?StopPlayingL@RPhoneToneClient@@QAEXXZ @ 1 NONAME ; void RPhoneToneClient::StopPlayingL(void)
+	??0RPhoneToneClient@@QAE@XZ @ 2 NONAME ; RPhoneToneClient::RPhoneToneClient(void)
+	?Connect@RPhoneToneClient@@QAEHXZ @ 3 NONAME ; int RPhoneToneClient::Connect(void)
+	??1RPhoneToneClient@@QAE@XZ @ 4 NONAME ; RPhoneToneClient::~RPhoneToneClient(void)
+	?PlayRingingToneL@RPhoneToneClient@@QAEXPAVTPhoneCommandParam@@@Z @ 5 NONAME ; void RPhoneToneClient::PlayRingingToneL(class TPhoneCommandParam *)
 

--- a/phoneapp/phoneringingtoneplayer/eabi/phoneringingtoneplayeru.def	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/eabi/phoneringingtoneplayeru.def	Fri Oct 15 12:58:46 2010 +0300
@@ -1,11 +1,9 @@
 EXPORTS
-	_ZN27CPhoneRingingToneController11StopPlayingEv @ 1 NONAME
-	_ZN27CPhoneRingingToneController13PlayRingToneLEP18TPhoneCommandParam @ 2 NONAME
-	_ZN27CPhoneRingingToneController15MuteRingingToneEv @ 3 NONAME
-	_ZN27CPhoneRingingToneController23MuteRingingToneOnAnswerEv @ 4 NONAME
-	_ZN27CPhoneRingingToneController4NewLEv @ 5 NONAME
-	_ZTI17CPhoneAudioPlayer @ 6 NONAME ; #<TI>#
-	_ZTI17CPhoneRingingTone @ 7 NONAME ; #<TI>#
-	_ZTV17CPhoneAudioPlayer @ 8 NONAME ; #<VT>#
-	_ZTV17CPhoneRingingTone @ 9 NONAME ; #<VT>#
+	_ZN16RPhoneToneClient12StopPlayingLEv @ 1 NONAME
+	_ZN16RPhoneToneClient16PlayRingingToneLEP18TPhoneCommandParam @ 2 NONAME
+	_ZN16RPhoneToneClient7ConnectEv @ 3 NONAME
+	_ZN16RPhoneToneClientC1Ev @ 4 NONAME
+	_ZN16RPhoneToneClientC2Ev @ 5 NONAME
+	_ZN16RPhoneToneClientD1Ev @ 6 NONAME
+	_ZN16RPhoneToneClientD2Ev @ 7 NONAME
 

--- a/phoneapp/phoneringingtoneplayer/group/bld.inf	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/group/bld.inf	Fri Oct 15 12:58:46 2010 +0300
@@ -22,7 +22,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../rom/phoneringingtoneplayer_stub.sis          /epoc32/data/z/system/install/phoneringingtoneplayer_stub.sis
+
 
 PRJ_MMPFILES
 phoneringingtoneplayer.mmp

--- a/phoneapp/phoneringingtoneplayer/group/phoneringingtoneplayer.mmp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneringingtoneplayer/group/phoneringingtoneplayer.mmp	Fri Oct 15 12:58:46 2010 +0300
@@ -18,13 +18,11 @@
 #include <platform_paths.hrh>
 
 // Capability assignment.
-CAPABILITY ALL -TCB
+CAPABILITY ALL -TCB 
 
 // Assign Vendor ID.
 VENDORID VID_DEFAULT
 
-VERSION 10.0
-
 TARGET          phoneringingtoneplayer.dll
 TARGETTYPE      dll
 UID             0x1000008d 0x2002134E
@@ -32,11 +30,10 @@
 SOURCEPATH      ../src
 
 
-SOURCE          cphoneaudioplayer.cpp
-SOURCE          cphoneringingtone.cpp
-SOURCE          cphoneringingtonecontroller.cpp
-SOURCE          cphoneringingtoneplayer.cpp 
-SOURCE          cphonettsplayer.cpp
+SOURCE          cphonetoneserver.cpp
+SOURCE          rphonetoneclient.cpp
+SOURCE          cphonetoneserversession.cpp
+SOURCE          cphonetoneserverplaybackcontroller.cpp
 
 /* Languages */
 LANG SC

--- a/phoneapp/phoneringingtoneplayer/inc/cphoneaudioplayer.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef CPHONEAUDIOPLAYER_H
-#define CPHONEAUDIOPLAYER_H
-
-// System includes
-#include <e32base.h>
-#include <mdaaudiosampleplayer.h>
-#include <mdaaudiotoneplayer.h>
-
-// Forward declarations
-class MPhoneAudioPlayerObserver;
-class C3DRingingToneInterface;
-class CPhoneRingingTone;
-class CAudioOutput;
- 
-/**
-*  Audio player for playing audio sample or tone file. 
-*
-*  @since 1.0
-*/
-class CPhoneAudioPlayer :
-    public CBase,
-    private MMdaAudioPlayerCallback,
-    private MMdaAudioToneObserver
-    {
-    public:
-
-        enum TAudioPlayerStatus
-            {
-            EToneLoading,
-            EToneReady,
-            ETonePlaying
-            };
-
-        enum TRingingType
-            {
-            ETypeRinging,
-            ETypeRingingOnce,
-            ETypeAscending
-            };
-
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param aRingingTone The ringing tone
-        * @param aPriority The priority for the playing
-        * @param aPreference The preference value
-        * @param aObserver Audio player observer
-        * @param aId The id of this audio player
-        * @param aMdaServer The reference to media server
-        * @param aExtSecNeeded ETrue if DRM extend security is needed
-        * @return The instance of the audio player.
-        */
-        static CPhoneAudioPlayer* NewL( 
-            const CPhoneRingingTone& aRingingTone, 
-            TInt aPriority, 
-            TUint aPreference,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aId = 0,
-            CMdaServer* aMdaServer = NULL,
-            TBool aExtSecNeeded = EFalse );
-
-        /**
-        * Two-phased constructor.
-        * @param aRingingTone The ringing tone
-        * @param aPriority The priority for the playing
-        * @param aPreference The preference value
-        * @param aObserver Audio player observer
-        * @param aId The id of this audio player
-        * @param aMdaServer The reference to media server
-        * @param aExtSecNeeded ETrue if DRM extend security is needed
-        * @return The instance of the audio player. NULL if the function fails.
-        */
-        static CPhoneAudioPlayer* New( 
-            const CPhoneRingingTone& aRingingTone, 
-            TInt aPriority, 
-            TUint aPreference,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aId = 0,
-            CMdaServer* aMdaServer = NULL,
-            TBool aExtSecNeeded = EFalse );
-            
-        /**
-        * Two-phased constructor.
-        * @param aFileName The ringing tone file name.
-        * @param aPriority The priority for the playing
-        * @param aPreference The preference value
-        * @param aObserver Audio player observer
-        * @param aId The id of this audio player
-        * @param aMdaServer The reference to media server
-        * @param aExtSecNeeded ETrue if DRM extend security is needed
-        * @return The instance of the audio player.
-        */
-        static CPhoneAudioPlayer* NewL( 
-            const TDesC& aFileName, 
-            TInt aPriority, 
-            TUint aPreference,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aId = 0,
-            CMdaServer* aMdaServer = NULL,
-            TBool aExtSecNeeded = EFalse );            
-
-        /**
-        * Two-phased constructor, take audio from descriptor.
-        *
-        * @param aSequence sequence to be played.
-        * @param aPriority priority of tone.
-        * @param aPreference preference of tone.
-        * @param aObserver observer.
-        * @param aId identifier, used in observer interface 
-        *            calls.
-        * @param aMdaServer The reference to media server
-        */
-        static CPhoneAudioPlayer* NewSeqL(
-            const TDesC8& aSequence,
-            TInt aPriority,
-            TUint aPreference,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aId = 0,
-            CMdaServer* aMdaServer = NULL );
-         
-        /**
-        * Two-phased constructor, takes Text-To-Speech text to be played.
-        * @since Series 60 3.0
-        * @param aText Text to be pronounced.
-        * @param aPriority priority of tone.
-        * @param aPreference preference of tone.
-        * @param aObserver observer.
-        * @param aId identifier, used in observer interface 
-        *            calls.
-        */        
-        static CPhoneAudioPlayer* NewTtsL(
-            const TDesC& aText,
-            TInt aPriority,
-            TUint aPreference,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aId = 0);
-        
-        /**
-        * Destructor.
-        */
-        ~CPhoneAudioPlayer();
-       
-    public: // new function
-
-        /**
-        * Play the audio file or tone
-        * @param aRingingType 
-        * @param aVolume take value from 1 to 10
-        * @param aTTsToBePlayed
-        */
-        void Play(
-            TRingingType aRingType,
-            TInt aVolume,
-            TBool aTTsToBePlayed );
-
-        /**
-        * Stop current file playing
-        */
-        void StopPlaying();
-        
-          
-        /**
-        * Sets new volumes and ramptimes.
-        * @param aVolume -volume to be set
-        * @param aRamptime -ramptime to be set.
-        */           
-        void SetNewVolumeAndRamptime( TInt aVolume, TInt aRamptime );
-        
-        /**
-        * Re starts playing.
-        */
-        void ReStartPlaying();
-        /**
-        * Enable or disable TTs playing.
-        * @param aTTsToBePlayed
-        */
-        void SetTTsToBePlayed( TBool aTTsToBePlayed );
-        
-        /**
-        * Sets volume level to zero.
-        * @since Series 60 3.1
-        */  
-        void MutePlaying();
-      
-
-    private: //from base class
-
-        /**
-        * from MMdaAudioPlayerCallback
-        */
-        virtual void MapcInitComplete(
-            TInt aError, 
-            const TTimeIntervalMicroSeconds& aDuration );
-
-        /**
-        * from MMdaAudioPlayerCallback
-        */
-        virtual void MapcPlayComplete( TInt aError );
-
-        /**
-        * from MMdaAudioToneObserver
-        */
-        virtual void MatoPrepareComplete(TInt aError);
-
-        /**
-        * from MMdaAudioToneObserver
-        */
-        virtual void MatoPlayComplete(TInt aError);
-        
-    private:
-
-        enum TAudioDataFormat
-            {
-            EFormatTone,
-            EFormatSample,
-            EFormatTts // Text-To-Speech
-            };
-
-        /**
-        * C++ constructor.
-        */
-        CPhoneAudioPlayer( 
-            TAudioDataFormat aDataFormat,
-            MPhoneAudioPlayerObserver& aObserver, 
-            TInt aPriority, 
-            TUint aPreference,
-            TInt aId );
-
-        /**
-        * Symbian OS constructor.
-        */
-        void ConstructL( 
-            const TDesC& aFileName, CMdaServer* aMdaServer );
-
-        /**
-        * Symbian OS constructor.
-        */
-        void ConstructSeqL( 
-            const TDesC8& aSequence,
-            CMdaServer* aMdaServer ); 
-
-        /**
-        * Symbian OS constructor for the Text-To-Speech option
-        * @since Series 60 3.0
-        */
-        void ConstructTtsL( 
-            const TDesC& aTtsText, 
-            TInt aPriority,
-            TUint aPreference );
-
-        /**
-        * Do the playing stuff
-        */
-        void DoPlay();
-
-        /**
-        * Ser tinging type properties
-        */
-        void SetRingingTypeProperties();
-
-        /**
-        * Call back function for timer
-        */
-        static TInt TimerCallBack( TAny* aAny );
-
-        /**
-        * Handle timer events
-        */
-        void HandleTimerEvent();
-        
-        /*
-        * Convert volume to the scale used by hardware
-        * @param aVolume volume to be altered
-        * @return TInt   new volume
-        */
-        TInt ConvertVolume( TInt aVolume );
-
-    private:    // Data  
-
-        // The format of audio data, audio sample file or tone file
-        TAudioDataFormat iFormat;
-
-        // Observer for error handling
-        MPhoneAudioPlayerObserver& iObserver;
-
-        // Priority. It's only used in playing tone file
-        const TInt iPriority; 
-        // Preference. Only used for tone file
-        const TUint iPreference; 
-
-        // Identifier number
-        TInt iId;
-
-        // Player for tone file.
-        CMdaAudioToneUtility* iTonePlayer;
-
-        // Player for audio file.
-        CMdaAudioPlayerUtility* iSamplePlayer;
-
-        // Player for the Text-To-Speech texts
-        CMdaAudioPlayerUtility* iTtsPlayer;
-
-        // The status of the player
-        TAudioPlayerStatus iPlayerStatus;
-
-        // How does the file played. It's only used if the player
-        // is playing the file
-        TRingingType iRingType;
-
-        // Volume
-        TInt iVolume;
-
-        // For ascending and descending used for set current volume
-        TInt iCurrentVolume;
-
-        // Used by sample player
-        TBool iToBePlaying;
-
-        // Store for sequence.
-        HBufC8* iSequence;
-        
-        // Store for the TTS source string
-        HBufC8* iTtsText;
-
-        // 3D Audio ringing tone plugin
-        C3DRingingToneInterface* i3DPlugin;
-        
-        // Flag to  indicate whether we need to play TTs or not
-        TBool iTTsToBePlayed;
-        
-        // Ringingtone output
-        CAudioOutput* iAudioOutput; 
-    };
-
-#endif      // CPHONEAUDIOPLAYER_H   
-            
-// End of File

--- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtone.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef CPHONERINGINGTONE_H
-#define CPHONERINGINGTONE_H
-
-// INCLUDES
-#include <e32base.h>
-#include <Profile.hrh>
-
-// CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-*  Ringing tone
-*  Wrapper for file name. In addtion, provides methods
-*  for ringing tone type identification. 
-*
-*  @lib Phone.app
-*  @since Series 60 3.1
-*/
-class CPhoneRingingTone : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param aFileName Ringing tone file name with path.
-        * @param aDrmInPlayback ETrue to use IsFileDrmProtected().
-        */
-        static CPhoneRingingTone* NewL( 
-            const TDesC& aFileName,
-            TBool aDrmInPlayback = EFalse );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CPhoneRingingTone();
-
-    public: // New functions
-        
-        
-        /**
-        * Sets the file name including path.
-        * @since Series 60 3.1
-        * @param aFileName file name plus path.
-        */
-        void SetFileName( const TDesC& aFileName );
-        
-        /**
-        * Returns file name including path.
-        * @since Series 60 3.1
-        * @return File name.
-        */
-        const TDesC& FileName() const;
-        
-        /**
-        * Returns MIME type.
-        * @since Series 60 3.1
-        * @return MIME type.
-        */
-        const TDesC& MimeType() const;
-        
-        /**
-        * Checks if video ringing tone.
-        * @since Series 60 3.1
-        * @return ETrue if video ringing tone.
-        */
-        TBool IsVideoRingingTone();
-        
-        /**
-        * Checks if the file is a DCF file.
-        * @since Series 60 3.1
-        * @return ETrue if files is DRM protected.
-        */
-        TBool IsFileDrmProtected() const;
-        
-        /**
-        * Checks if the file is in ROM.
-        * @since Series 60 3.1
-        */
-        TBool IsFileInRom() const;
-
-        /**
-        * Set profile's ringing type  
-        * @since Series 60 5.0
-        */        
-        void SetRingingType( TProfileRingingType aRingingType);
-
-        /**
-        * Return ringing type of current ringingtone  
-        * @since Series 60 5.0
-        */            
-        TProfileRingingType RingingType() const;        
-        
-        /**
-        * Set profile's ringingtone volume  
-        * @since Series 60 5.0
-        */            
-        void SetVolume( const TInt aVolume );
-        
-        /**
-        * Return volume of current ringingtone  
-        * @since Series 60 5.0
-        */         
-        TInt Volume() const;
-        
-        /**
-        * Set profile's TTS value
-        * @since Series 60 5.0
-        */         
-        void SetTtsToneToBePlayed( TBool aTtsToneToBePlayed );
-
-        /**
-        * Return TTS status of current profile  
-        * @since Series 60 5.0
-        */         
-        TBool TtsToneToBePlayed() const;       
-        
-        /**
-        * Checks if ringing tone file's size is larger than the size limit.
-        * If size limit is exceeded, default tone is played instead.
-        * @since 3.1
-        * @param aRingingTone  Tone to check.
-        * @return EFalse if the limit was exceeded and thus default tone played.
-        *         ETrue  if tone file's size was valid and the checked tone 
-        *                can be played.
-        */
-        TBool CheckAndHandleToneSizeLimit();
-        
-        /**
-        * Checks if ringing tone file's size is larger than the size limit.
-        * @since 3.1
-        * @param aFile   File to check.
-        *        aSizeLimitKB  the size limit in kB is set to this variable.
-        * @return KErrNone        if the file can be used as a ringing tone.
-        *         KErrTooBig        if the file size limit is exceeded.
-        *         Other error value if error happened during size checking.
-        */
-        TInt CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB );
-        
-        /**
-        * Reads from central repository the file size limit of following tones:
-        * -contact's personal ringing tone
-        * -voice call line1
-        * -voice call line2
-        * Value 0 means all sizes are allowed.
-        * @since 3.1
-        * @return leaves on error.
-        */
-        void GetMaxToneFileSize();      
-        
-    private:
-
-        /**
-        * Refresh MIME type. This must be called
-        * before using MimeType().
-        */
-        TInt RefreshMime();    
-        
-        /**
-        * Refresh MIME type.
-        */
-        void RefreshMimeL();
-        
-        /**
-        * Checks if file is located in video directory.
-        */
-        TBool IsFileInVideoDirectory() const;
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CPhoneRingingTone( TBool aDrmInPlayback );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( const TDesC& aFileName );
-
-    private:    // Data
-
-        // File name with path
-        HBufC* iFileName;
-        
-        // MIME type
-        HBufC* iMimeType;
-        
-        // Extended security
-        TBool iDrmInPlayback;
-        
-        TProfileRingingType iRingingType;
-    
-        TInt iVolume;
-        
-        // Voice call ringing tone file size max value.
-        TInt iToneFileSizeLimitKB;
-        
-        TBool iTtsToneToBePlayed;
-    };
-
-#endif      // CPHONERINGINGTONE_H   
-            
-// End of File

--- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtonecontroller.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef CPHONERINGINGTONECONTROLLER_H
-#define CPHONERINGINGTONECONTROLLER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <Profile.hrh>
-#include "mphoneaudioplayerobserver.h"
-#include "mphonevideoplayerobserver.h"
-#include "mphonecoveruiobserver.h"
-#include "cphoneaudioplayer.h"
-#include "mphonetimer.h"
-#include "mphonevideoplayer.h"
-#include "cphonemediatorsender.h"
-
-// FORWARD DECLARATIONS
-//class MPhoneRingingToneObserver;
-class CPhoneAudioPlayer;
-class CPhoneRingingtonePlayer;
-class CPhoneTTSPlayer;
-class MPhoneDisplayProvider;
-class CPhoneRingingTone;
-class TPhoneCommandParam;
-
-// CLASS DECLARATION
-
-/**
-* It implements ringing tone functionality. 
-* Note that when issuing Play-command to audio side, ALWAYS set the tone type
-* before the Play() is called. This is to ensure that correct tone is tried to
-* be played. 
-*
-* @since 1.0
-*/
-NONSHARABLE_CLASS(CPhoneRingingToneController) :
-    public CBase,
-    private MPhoneVideoPlayerObserver,
-    private MPhoneCoverUiObserver
-    {
-    public:
-        // States for this active object
-        enum TState
-            {
-            EIdleState,  
-            EDeletingAudioPlayer,
-            EDeletingVideoPlayer,
-            EPlayingDefaultVideo
-            };
-
-    public:
-        
-        /**
-        * Two-phased constructor.
-        * @return new instance.
-        */
-        IMPORT_C static CPhoneRingingToneController* NewL();
-        
-        /**
-        * Destructor.
-        */
-        ~CPhoneRingingToneController();
-
-        /**
-        * Play ring tone
-        * @param aCommandParam a command param
-        */
-        IMPORT_C void PlayRingToneL( TPhoneCommandParam *aCommandParam );
-
-        /**
-        * Stops playing the ringing tone.
-        * Method does not do anything if ringing tone is not playing.
-        */
-        IMPORT_C void StopPlaying();
-
-        /**
-        * Continues video playback ( and ringing tone ) with volume 0
-        * Stream not closed ( If music player was ongoing ) 
-        */
-        IMPORT_C void MuteRingingToneOnAnswer();
-          
-        /**
-        * Continues video playback with muted audio.
-        * Ringing tone is stopped.
-        */
-        IMPORT_C void MuteRingingTone();
-        
-          
-        /**
-        * Sets video player.
-        * @since Series 60 v3.2
-        * @param aVideoPlayer Video player reference.
-        */
-        void SetVideoPlayer( MPhoneVideoPlayer* aVideoPlayer );
-
-        /**
-        * Play video ring tone.
-        * @since Series 60 3.1
-        * @param aRingingTone Ringing tone to be played.
-        * @param aVolume Volume used to play the ringing tone.
-        * @param aRingingType Ringing type.
-        */
-        void PlayVideoRingingTone( 
-            const CPhoneRingingTone& aRingingTone, 
-            TInt aVolume, 
-            TProfileRingingType aRingingType,
-            TBool aPersonalTone = EFalse );
-
-        /**
-        * Checks if extended security required.
-        * @since Series 60 3.1
-        * @return ETrue if extended security is required.
-        */
-        TBool ExtendedSecurity() const;
-   
-   
-        /**
-        * Command when necessary Cover UI to play video ringing tone.
-        * return ETrue if Cover ui handle video ringing tone playing.
-        * return EFalse if Phone must handle video ringing tone playing.
-        */
-        TBool CoverUIPlayVideoRingingToneL( 
-            const CPhoneRingingTone& aRingingTone );
-
-        /**
-        * This function is called when Mediator receives response to the sent
-        * ShowMultiMediaRingingTone command.
-        * @param aStatus - Standard Symbian error code indicating the
-        *                  success of the command.
-        */
-        void ShowMultimediaRingingToneResponseL( TInt aStatus );
-
-    private: // from MPhoneVideoPlayerObserver
-
-        /**
-        * HandleVideoPlayerError
-        */
-        virtual void HandleVideoPlayerError( 
-            TPhoneVideoPlayerErrorEvent aEvent,
-            TInt aError );
-
-        /**
-        * HandleVideoPlayerInitComplete
-        */
-        virtual void HandleVideoPlayerInitComplete();
-
-        /**
-        * HandleVideoPlayerPlayingComplete
-        */
-        virtual void HandleVideoPlayerPlayingComplete();
-   
-    private: 
-        
-        /**
-        * C++ default constructor.
-        */
-        CPhoneRingingToneController();
-
-        /**
-        * By default Symbian OS constructor is private.
-        */
-        void ConstructL();
-
-
-        /**
-        * Convert ringing type from PhoneAppEnging to the ringing type in 
-        * MPhoneVideoPlayer.
-        * @since Series 60 3.1
-        * @param aRingingType the ringing type form PhoneAppEngine.
-        * @return ringing type of MPhoneVideoPlayer.
-        */
-        MPhoneVideoPlayer::TPlayMode ConvertVideoRingingType(
-            TProfileRingingType aRingingType );
-
-
-       /**
-        * Plays default L1 or L2 video ring tone asynchronously.
-        * @since Series 60 3.1
-        */
-        void PlayDefaultVideoAsync();
-
-        /**
-        * Deletes video player and plays default L1 or L2
-        * tone asynchronously.
-        * @since Series 60 3.1
-        */
-        void DeleteVideoPlayerAndPlayDefaultAsync();
-        
-        /**
-        * Mutes the ringing tone.
-        */
-        void DoMuteRingingTone();
-        
-        /**
-        * Play audio ring tone 
-        */
-        void PlayAudioRingTone( 
-            TInt aVolume, 
-            TProfileRingingType aRingingType );
-        
-
-    private:    // Data
-
-        // Audio/Video tone
-        CPhoneRingingTone* iAudioVideoRingingTone;
-
-        // Volume for backup tone playing.
-        TInt iVolume;
-
-        // Ringing type for backup tone playing.
-        TProfileRingingType iRingingType;
-
-        // Video ringing tone player
-        MPhoneVideoPlayer* iVideoPlayer;
-
-        // Pointer to Mediator Sender
-        CPhoneMediatorSender* iMediatorSender;
-
-        // Active Cover UI command EPhoneCoverUiShowMultimediaRingingTone
-        TBool iActiveCoverUICommand;
-        
-        // Flag. Indicates video scaling capability of the device.
-        TBool iArbitraryVideoScaling;
-        
-        CPhoneRingingtonePlayer* iRingingtonePlayer;
-        
-        CPhoneTTSPlayer* iTTSPlayer; 
-
-    };
-
-#endif      // CPHONERINGINGTONECONTROLLER_H
-            
-// End of File

--- a/phoneapp/phoneringingtoneplayer/inc/cphoneringingtoneplayer.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,371 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef CPHONERINGINGTONEPLAYER_H_
-#define CPHONERINGINGTONEPLAYER_H_
-
-// System includes
-#include <e32base.h>
-#include <Profile.hrh>
-
-// User includes
-#include "mphoneaudioplayerobserver.h"
-#include "cphoneaudioplayer.h"
-#include "mphonevideoplayer.h"
-#include "mphonecenrepobserver.h"
-#include "mphonetimer.h"
-
-// Forward declarations
-class CPhoneTimer;
-class CPhoneRingingTone;
-
-
-NONSHARABLE_CLASS(CPhoneRingingtonePlayer) : public CActive,
-                                             public MPhoneAudioPlayerObserver,
-                                             public MPhoneCenRepObserver,
-                                             private MPhoneTimer
-    {
-public:
-    CPhoneRingingtonePlayer();
-    virtual ~CPhoneRingingtonePlayer();
-    
-    
-    /**
-    * Two-phased constructor.
-    * @return new instance.
-    */
-     static CPhoneRingingtonePlayer* NewL();
-    
-     /**
-      * Playing ringing tone based on profile.
-      * @param aAudioVideoRingingTone
-      */     
-     void PlayProfileBasedTone( CPhoneRingingTone* aAudioVideoRingingTone );   
-     
-    /**
-     * Playing the Beep once.
-     * @param aVolume volume used to play the ringing tone.
-     */
-     void PlayBeepOnce( TInt aVolume );
-
-     /**
-     * Play silent tone. No_sound.wav will be played. If vibration alert
-     * is ON, it will vibrate.
-     */
-     void PlaySilentTone();
-
-     /**
-     * Play video ring tone.
-     * @since Series 60 3.1
-     * @param aRingingTone Ringing tone to be played.
-     * @param aVolume Volume used to play the ringing tone.
-     * @param aRingingType Ringing type.
-     */
-     void PlayVideoRingingTone( 
-         const CPhoneRingingTone& aRingingTone, 
-         TInt aVolume, 
-         TProfileRingingType aRingingType,
-         TBool aPersonalTone = EFalse );
-     
-     /**
-     * Play default tone.
-     * @param aVolume volume used for the playing.
-     * @param aRingingType ringing type.
-     */
-     void PlayDefaultTone( 
-         TInt aVolume, 
-         TProfileRingingType aRingingType );
-
-     /**
-     * Play backup tone.
-     * @param aVolume volume used for the playing.
-     * @param aRingingType ringing type.
-     */
-     void PlayBackupTone( 
-         TInt aVolume, 
-         TProfileRingingType aRingingType );
-     
-     /**
-     * Stops playing the ringing tone.
-     * Method does not do anything if ringing tone is not playing.
-     */
-     void StopPlaying();
-     
-     /** 
-     * Enumerates identifiers for each player:
-     * EPlayerAudio - audio
-     * EPlayerBeepOnce - beep once
-     * EPlayerSilent - silent
-     * EPlayerDefault - default
-     * EPlayerBackup - backup
-     *
-     * EPlayerFirst and EPlayerLast are alias
-     * to other identifiers.
-     * EPlayerFirst - first player
-     * EPlayerLast - last player
-     */
-     enum TPlayerId
-         {
-         EPlayerFirst,
-         EPlayerAudio = EPlayerFirst,
-         EPlayerBeepOnce,
-         EPlayerSilent,
-         EPlayerDefault,
-         EPlayerBackup,
-         EPlayerTts, 
-         EPlayerLast = EPlayerTts,
-         EPlayerCount
-         };     
-     
-     CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayer();
-     
-     void MuteActiveAudioPlayer();
-   
-public: // From MPhoneCenRepObserver
-
-    /**
-    * Handle the change of the setting from Central Repository
-    * @param aUid identifing the central repository UID.
-    * @param aId central repository ID.
-    */
-    virtual void HandleCenRepChangeL( 
-        const TUid& aUid,
-        const TUint aId );
-
-   
-     
-private:
-    
-    /**
-    * By default Symbian OS constructor is private.
-    */
-    void ConstructL();
-
-private: // CActive
-    
-    /**
-    * @see CActive::RunL.
-    */
-    void RunL();
-
-    /**
-    * @see CActive::DoCancel.
-    */
-    void DoCancel();
-    
-private: // from MPhoneAudioPlayerObserver
-    /**
-    * Handle the error of audio file player.
-    */
-    virtual void HandleAudioPlayerError( 
-        TPhoneAudioPlayerErrorEvent aEvent, 
-        TInt aError, 
-        TInt aId = KPhoneAudioPlayerNotSpecified );
-
-    /**
-    * Handle audio player initialize complete.
-    */
-    virtual void HandleAudioPlayerInitComplete(
-        TInt aId = KPhoneAudioPlayerNotSpecified );
-
-    /**
-    * Handle auido file playing complete successfully.
-    */
-    virtual void HandlePlayingComplete( 
-        TInt aId = KPhoneAudioPlayerNotSpecified );    
- 
-private:
-    
-    /**
-    * @see MPhoneTimer
-    */
-    virtual void HandleTimeOutL();
-    
-private:    
-    
-
-    // Indicate which tone is playing or need to be played:
-    // EIdle - idle,
-    // EAudioTonePlaying - audio playing,
-    // EBeepOnce - beep once playing,
-    // ESilentTonePlaying - silent tone playing,
-    // EDefaultTonePlaying - default tone playing,
-    // EBackupTonePlaying - backup tone playing,
-    // EVideoTonePlaying - playing video ringing tone
-    // ESilentVideoTonePlaying  - silent playing video ringing tone
-    // EPersonalVideoTonePlaying - personal playing video ringing tone
-    enum TTonePlayingStatus
-        {
-        EIdle,
-        EAudioTonePlaying,
-        EBeepOnce,
-        ESilentTonePlaying,
-        EDefaultTonePlaying,
-        EBackupTonePlaying,
-        EVideoTonePlaying,
-        ESilentVideoTonePlaying,
-        EPersonalVideoTonePlaying
-        };
-    
-    // States for this active object
-    enum TState
-        {
-        EIdleState,  
-        EDeletingAudioPlayer,
-        EDeletingVideoPlayer,
-        EPlayingDefaultVideo
-        };
-    
-    /**
-    * Deletes player asynchronoysly.
-    * @param aPlayer player to be deleted.
-    */
-    void DeletePlayerAsync(
-        TPlayerId aPlayer );
-    
-    /**
-    * Construct sequence players.
-    * @param aPlayer player to be constructed.
-    */
-    void ConstructSequencePlayer(
-        TPlayerId aPlayer );
-
-    /**
-    * Construct sequence players.
-    * @param aPlayer player to be constructed.
-    */
-    void ConstructSequencePlayerL(
-        TPlayerId aPlayer );     
-    
-    /**
-    * Construct backup tone player.
-    */
-    TInt ConstructBackupPlayer();
-    
-
-    /**
-    * Construct media server and backup tone player.
-    */
-    void ConstructBackupPlayerL();
-    
-    /**
-    * Default ringingtone from profile engine.
-    */
-    void ConstructDefaultPlayerL();
-      
-    /**
-    * Do construct tone.
-    * @param aRingingTone Ringing tone.
-    * @return The instance of the player. NULL is returned if it's failed.
-    */
-    CPhoneAudioPlayer* ConstructTonePlayer( 
-        const CPhoneRingingTone& aRingingTone,
-        TInt aId );
-    
-    /**
-    * Convert ringing type from PhoneAppEnging to the ringing type in 
-    * CPhoneAudioPlayer.
-    * @param aRingingType the ringing type form PhoneAppEngine.
-    * @return ringing type of CPhoneAudioPlayer.
-    */
-    CPhoneAudioPlayer::TRingingType ConvertRingingType(
-        TProfileRingingType aRingingType );
-
-    /**
-    * Convert ringing type from PhoneAppEnging to the ringing type in 
-    * MPhoneVideoPlayer.
-    * @since Series 60 3.1
-    * @param aRingingType the ringing type form PhoneAppEngine.
-    * @return ringing type of MPhoneVideoPlayer.
-    */
-    MPhoneVideoPlayer::TPlayMode ConvertVideoRingingType(
-        TProfileRingingType aRingingType );      
-
-    /**
-    * Cleanup players.
-    */
-    void CleanupPlayers();   
-    
-    /**
-    * Handle audio player error.
-    * @param aDelete ETrue if deletion of the player allowed, 
-    *                EFalse otherwise.
-    * @param aSync ETrue if synchronous deletion of players is allowed,
-    *              EFalse otherwise.
-    */
-    void DoHandlePlayerError(
-        TBool aDelete,
-        TBool aSync );
-    
-
-private:    // Data
-    
-    
-    // State of this active object
-    TState iState;
-    
-    // Player to be deleted asynchronously.
-    RPointerArray<CPhoneAudioPlayer> iAsyncDeletePlayers;
-    
-    // Current playing status.
-    TTonePlayingStatus iTonePlayingStatus;
-    
-    // Voice call ringing tone file size max value.
-    TInt iToneFileSizeLimitKB;   
-    
-    // DRM extend security
-    TBool iExtSecNeeded;
-    
-    // Volume for backup tone playing.
-    TInt iVolume;
-    
-    // Ringing type for backup tone playing.
-    TProfileRingingType iRingingType;
-    
-    // Audio ring tone player. Memory allocated during construction.
-    // After constructed, no leave may be caused during audio playing
-    CPhoneAudioPlayer* iAudioPlayer;
-
-    // Audio player for beep once.
-    CPhoneAudioPlayer* iBeepOncePlayer;
-
-    // Audio player for silent tone.
-    CPhoneAudioPlayer* iSilentPlayer;
-
-    // Default player.
-    CPhoneAudioPlayer* iDefaultPlayer;
-    
-    // Tts player.
-    CPhoneAudioPlayer* iTtsPlayer;
-
-    // Backup ringing tone. Incase all default player failed.
-    CPhoneAudioPlayer* iBackupPlayer;
-    
-    // Default player
-    CPhoneRingingTone* iDefaultRingingTone;     
-    
-    // Media server.
-    CMdaServer* iMdaServer;
-    
-    // Timer.
-    CPhoneTimer* iTimer;
-    
-    // Audio/Video tone
-    CPhoneRingingTone* iAudioVideoRingingTone;
-    };
-
-#endif /* CPHONERINGINGTONEPLAYER_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserver.h	Fri Oct 15 12:58:46 2010 +0300
@@ -0,0 +1,103 @@
+/*
+* Copyright (c) 2010-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Phone ringing tone server definitions.
+*
+*/
+
+
+#ifndef PHONETONESERVER_H
+#define PHONETONESERVER_H
+
+// INCLUDES
+#include <f32file.h>
+#include <Profile.hrh>
+#include <e32base.h>
+    
+#include "mphonetoneserver.h"
+
+// CONSTANTS
+const TInt KRingingToneSrvVersionMajor = 1;
+const TInt KRingingToneSrvVersionMinor = 0;
+const TInt KRingingToneSrvVersionBuild = 0;
+_LIT( KRingingToneServerName, "PhoneRingingToneSrv" );
+
+enum TRingingToneSrvOpcodes
+    {
+    EPlayAudioRingTone,
+    EStopPlaying
+    };
+
+// CLASS DECLARATION
+NONSHARABLE_CLASS( CPhoneToneServer ) : public CServer2, public MPhoneToneServer
+    {
+public:
+
+    static CPhoneToneServer* NewLC();
+
+    ~CPhoneToneServer();
+
+    
+    /**
+    * Thread entry function.
+    *
+    * @param aPtr
+    * @return new instance.
+    */    
+
+    static TInt ThreadEntryFunc( TAny* aPtr );
+
+public: 
+    
+    /**
+    * Derived from CServer2, creates a new session.
+    * @param aVersion It is the version of the client api.
+    * @param aMessage Connect message from Client.
+    * @see CServer2
+    * @return Returns a new session.
+    */          
+    CSession2* NewSessionL( const TVersion& aVersion,  
+                            const RMessage2& aMessage ) const;
+    
+    /**
+    * Runs server down.
+    * @see MPhoneToneServer
+    */    
+    virtual void RunDown() const;
+
+private:
+
+    CPhoneToneServer();
+
+    void ConstructL();
+
+private:
+
+    /**
+    * Runs server.
+    */
+    static void RunServerL();
+
+private:
+    
+    /*
+     * Server should be unique connectable to avoid IPC fuzzing. 
+     * However, NewSessionL is a const function,
+     * so we have to use mutable flag to define connection existence.
+     */
+    mutable TBool iHasConnection;
+};
+
+#endif   //  PHONETONESERVER_H
+
+// End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserverplaybackcontroller.h	Fri Oct 15 12:58:46 2010 +0300
@@ -0,0 +1,161 @@
+/*
+* Copyright (c) 2010-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Playback controller class for phone ringingtone server.
+*
+*/
+
+#ifndef CPHONETONESERVERPLAYBACKCONTROLLER_H
+#define CPHONETONESERVERPLAYBACKCONTROLLER_H
+
+#include <e32base.h>
+#include <mdaaudiosampleplayer.h>
+#include <mdaaudiotoneplayer.h>
+
+
+class MPhoneToneServer;
+
+
+NONSHARABLE_CLASS( CPhoneToneServerPlaybackController ) : public CTimer,
+    private MMdaAudioPlayerCallback,
+    private MMdaAudioToneObserver
+    {
+
+public:
+
+    static CPhoneToneServerPlaybackController* NewL();
+
+    ~CPhoneToneServerPlaybackController();
+
+    /**
+    * Plays tone set by control panel.
+    *
+    * @param aName file path of ringingtone
+    * @param aVolume volume of ringingtone
+    * @param aType type of ringtone e.g. ringing or silent    
+    */     
+    void PlayNormalToneL( const TFileName& aName, 
+                          TInt aVolume, 
+                          TProfileRingingType aType );
+    
+    /**
+    * Plays silent tone.
+    */     
+    void PlaySilentTone();
+        
+    /**
+    * Stops playing.
+    */     
+    void StopTone();
+
+private:    
+    
+    /**
+    * Plays profile based tone.
+    *    
+    */     
+    void PlayProfileTone();
+    
+    /**
+    * Plays default tone
+    *    
+    */      
+    void PlayDefaultTone();
+    
+    /**
+    * Converts volume level  
+    *
+    * @param aMaxVolume player's maximum volume
+    * @param aVolume requested volume level.
+    */     
+    TInt ConvertVolume( TInt aMaxVolume, TInt aVolume );
+    
+    /**
+    * Stops and deletes last used player.
+    *    
+    */     
+    void StopAndDeleteProfilePlayer();
+    
+
+    /**
+    * Checks that file uses rng file type
+    *
+    * @param aFile ringingtone file name
+    * @return TBool true when file uses rng file type.
+    */     
+    TBool IsRngL( const TDesC& aFile );   
+    
+private:
+
+    CPhoneToneServerPlaybackController();
+
+    void ConstructL();
+    
+private:
+
+    /**
+     * @see MMdaAudioPlayerCallback
+     */
+    void MapcInitComplete(
+        TInt aError, 
+        const TTimeIntervalMicroSeconds& aDuration );
+
+    /**
+     * @see MMdaAudioPlayerCallback
+     */
+    void MapcPlayComplete( TInt aError );
+
+    /**
+     * @see MMdaAudioToneObserver
+     */
+    void MatoPrepareComplete(TInt aError );
+
+    /**
+     * @see MMdaAudioToneObserver
+     */
+    void MatoPlayComplete(TInt aError);
+
+
+private: 
+
+    /**
+     * @see CActive
+     */
+    virtual void RunL();
+    
+    
+private:   
+
+    // Owned
+    CMdaAudioPlayerUtility* iDefaultPlayer;
+        
+    // Owned
+    CMdaAudioPlayerUtility* iProfileSamplePlayer;
+        
+    // Owned
+    CMdaAudioToneUtility* iProfileTonePlayer;
+    
+    // Owned
+    CMdaAudioToneUtility* iSilentPlayer;
+    
+    TProfileRingingType iRingingType;
+        
+    TBool iDefaultPlayerInitialized;
+    
+    TInt iVolume;
+  
+    };
+
+#endif // CPHONETONESERVERPLAYBACKCONTROLLER_H
+
+// End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneringingtoneplayer/inc/cphonetoneserversession.h	Fri Oct 15 12:58:46 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2010-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Session class for phone ringingtone server.
+*
+*/
+
+#ifndef CPHONETONESERVERSESSION_H
+#define CPHONETONESERVERSESSION_H
+
+#include <e32base.h>
+
+class MPhoneToneServer;
+class CPhoneToneServerPlaybackController;
+
+NONSHARABLE_CLASS( CPhoneToneServerSession ) : public CSession2
+    {
+public:
+
+    /**
+    * Two-phased constructor.
+    *
+    * @param aServer Interface for server.
+    * @return new instance.
+    */
+    static CPhoneToneServerSession* NewL( const MPhoneToneServer& aServer );
+    
+    ~CPhoneToneServerSession();
+
+protected:
+
+    /**
+    * From CSession2, it is called whenever request is processed.
+    * @param aMessage It is the request.
+    */
+    void ServiceL( const RMessage2& aMessage );
+
+private:
+
+    /**
+    * C++ default constructor.
+    *
+    * @param aServer Reference to server interface
+    */
+    CPhoneToneServerSession( const MPhoneToneServer& aServer );
+    
+    void ConstructL();
+    
+
+private:
+    
+    const MPhoneToneServer& iServer;
+    
+    //Owned.
+    CPhoneToneServerPlaybackController* iController;
+    };
+
+#endif  //CPHONETONESERVERSESSION_H
+
+// End of file

--- a/phoneapp/phoneringingtoneplayer/inc/cphonettsplayer.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef CPHONETTSPLAYER_H_
-#define CPHONETTSPLAYER_H_
-
-// System includes
-#include <e32base.h>
-#include <Profile.hrh>
-
-// User includes
-#include "cphonetimer.h"
-#include "cphoneaudioplayer.h"
-#include "mphoneaudioplayerobserver.h"
-
-// Forward declarations
-class CPhoneRingingTone;
-class CPhoneRingingtonePlayer;
-
-NONSHARABLE_CLASS(CPhoneTTSPlayer): public CBase,
-                        public MPhoneAudioPlayerObserver
-                       
-    {
-public:
-    CPhoneTTSPlayer(CPhoneRingingtonePlayer* aRingingtonePlayer);
-    virtual ~CPhoneTTSPlayer();
-    
-    /**
-    * Two-phased constructor.
-    * @return new instance.
-    */
-     static CPhoneTTSPlayer* NewL(CPhoneRingingtonePlayer* aRingingtonePlayer);
-    
-     
-public:
-    
-    /**
-    * Play TTS tone simultaneously with Personal or Default tones.
-    * This method does not command phone to play TTS immediately. Instead 
-    * it registers a request to play TTS, when Personal or default tones 
-    * are played.
-    *
-    * @since Series 60 3.0
-    * @param aTextToSay Text, that should be pronounced by the 
-    * Text-To-Speech engine. This is normal descriptor, no UTF-8 
-    * and no "(tts)" prefix
-    */
-    void PlayTtsTone(
-        const TDesC& aTextToSay,
-        CPhoneRingingTone* aAudioVideoRingingTone );
-    
-    void StopPlaying();
-   
-    
-    /**
-    * Checks if TTS component should be played for the current ringtone 
-    * playback and initializes the TTS playback. This method is to be 
-    * called from within PlayXXXXTone methods
-    * @since Series 60 3.0
-    * @param aRingingType ringing type
-    */
-    void AddTtsPlaybackIfNeeded();
-    
-    
-private: // from MPhoneAudioPlayerObserver
-    /**
-    * Handle the error of audio file player.
-    */
-    virtual void HandleAudioPlayerError( 
-        TPhoneAudioPlayerErrorEvent aEvent, 
-        TInt aError, 
-        TInt aId = KPhoneAudioPlayerNotSpecified );
-
-    /**
-    * Handle audio player initialize complete.
-    */
-    virtual void HandleAudioPlayerInitComplete(
-        TInt aId = KPhoneAudioPlayerNotSpecified );
-
-    /**
-    * Handle auido file playing complete successfully.
-    */
-    virtual void HandlePlayingComplete( 
-        TInt aId = KPhoneAudioPlayerNotSpecified );  
-    
-private:
-    
-    /**
-    * Enumerates how many times TTs is played
-    * ESaidOnce -once
-    * ESaidTwice twice 
-    */    
-    enum TTtsStatus
-        {
-        ESaidOnce,
-        ESaidTwice
-        };
-    
-    /**
-    * Wrapper of DoHandleTtsDelayTimeout, that can be used as TCallback. 
-    * Immediately passes control to DoHandleTtsDelayTimeout method.
-    * @since Series 60 3.0
-    * @param object Object to call DoHandleTtsDelayTimeout() on, . 
-    *        instance of CPhoneRingingTonePlayer.
-    * @return KErrNone.
-    */
-    static TInt HandleTtsDelayTimeout( TAny* object );
-    
-    /**
-    * It is called after TTS delay elapsed. Starts playing TTS.
-    */
-    void DoHandleTtsDelayTimeout();
-         
-    /**
-    * Returns currently active player which is used with TTS player.
-    * @return pointer to CPhoneAudioPlayer.
-    */
-    CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayerWithTTs();   
-     
-    /**
-    * TTs cases only. Calculates new volume and ramptimes
-    * for Ascending TTS ringing case and normal TTS ringing case.
-    * @param aStatus -status of TTs player.
-    */         
-    void SolveNewVolumeAndRamptime( TTtsStatus aStatus );   
-    
-    /**
-    * Retarts currently active ringingtone player.
-    */
-    void ReStartRingingTonePlayer();
-    
-    /**
-    * Convert ringing type from PhoneAppEnging to the ringing type in 
-    * CPhoneAudioPlayer.
-    * @param aRingingType the ringing type form PhoneAppEngine.
-    * @return ringing type of CPhoneAudioPlayer.
-    */
-    CPhoneAudioPlayer::TRingingType ConvertRingingType(
-        TProfileRingingType aRingingType );    
-        
-private:
-    
-    /**
-    * By default Symbian OS constructor is private.
-    */
-    void ConstructL();
-    
-private: 
-    
-    // Tts player.
-    CPhoneAudioPlayer* iTtsPlayer;
-    
-    // True if Tts is currently playing. Is different from 
-    // iTonePlayingStatus, because TTS is played in
-    // parallel with the other tone types
-    TBool iTtsTonePlaying;
-    
-    // Index of the TTS delay that is "executed" currently or is to be 
-    // "executed" after the current playing of the TTS tone. Is zero based
-    TInt iTtsDelayIndex;
-    
-    // True if TTS tone should be played when the next playing of the 
-    // default or personal tone is fired.
-    TBool iTtsToneToBePlayed;
-    
-    // Timer, that tracks delays before playing TTS
-    CPhoneTimer* iTtsDelayTimer;
-
-    // Number of times TTS tone should be played for the CURRENT ringtone
-    // If ringing tone is to be played just once, iTtsDelayCount == 1,
-    // otherwise iTtsDelayCount == KTtsDelayCount
-    TInt iTtsDelaysCount;
-    
-    // Counter for TTs timeouts
-    TInt iTTsTimeOutCounter;
-    
-    // RingingType for TtsPlayer only.
-    TProfileRingingType iTtsRingingType;
-    
-    // Volume of the text pronounced by the TTS engine
-    TInt iTtsVolume;
-    
-    CPhoneRingingtonePlayer* iRingingtonePlayer;
-    };
-
-#endif /* CPHONETTSPLAYER_H_ */

--- a/phoneapp/phoneringingtoneplayer/inc/mphoneaudioplayerobserver.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef MPHONEAUDIOPLAYEROBSERVER_H
-#define MPHONEAUDIOPLAYEROBSERVER_H
-
-// User includes
-#include "phoneconstants.h"
-
-// Class declaration
-
-/**
-*  Observer interface for audio player.
-*
-* @since 1.0
-*/
-class MPhoneAudioPlayerObserver
-    {
-    public:  // Constructors and destructor
-        
-        // Enumerates different failures.
-        //
-        // EAudioPlayerInitializingFailure - failure in initialising
-        // EAudioPlayerPlayingFailure - failure during playing
-        enum TPhoneAudioPlayerErrorEvent
-            {
-            EAudioPlayerInitializingFailure,
-            EAudioPlayerPlayingFailure
-            };
-        
-        /**
-        * Observe the error.
-        * @param aEvent the error event happend in initializing or playing.
-        * @param aError The error code return by audio server. Observer can 
-        *               handle  these two error code for recoverable 
-        *               and unrecoverable errors.
-        * @param aId Indicate which audio player is outof working.
-        */
-        virtual void HandleAudioPlayerError( 
-            TPhoneAudioPlayerErrorEvent aEvent,
-            TInt aError, 
-            TInt aId = KPhoneAudioPlayerNotSpecified ) = 0;
-
-        /**
-        * This function is called when audio player initialization complete.
-        * @param aId The id of the audio player.
-        */
-        virtual void HandleAudioPlayerInitComplete(
-            TInt aId = KPhoneAudioPlayerNotSpecified ) = 0;
-
-        /**
-        * This funciton is called after the playing complete successfully.
-        * @param aId The id of the audio player.
-        */
-        virtual void HandlePlayingComplete( 
-            TInt aId = KPhoneAudioPlayerNotSpecified ) = 0;
-    };
-
-#endif      // MPHONEAUDIOPLAYEROBSERVER_H   
-            
-// End of File

--- a/phoneapp/phoneringingtoneplayer/inc/mphonecoveruiobserver.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef MPHONECOVERUIOBSERVER_H
-#define MPHONECOVERUIOBSERVER_H
-
-// Class declaration
-
-/**
-*  Cover UI observer interface.
-*
-*/
-class MPhoneCoverUiObserver  
-    {
-    public:
-        
-        /**
-        * This function is called when Mediator receives response to the sent
-        * ShowMultiMediaRingingTone command.
-        * @param aStatus - Standard Symbian error code indicating the
-        *                  success of the command.
-        */
-        virtual void ShowMultimediaRingingToneResponseL( TInt aStatus ) = 0;
-    };
-
-#endif // MPHONECOVERUIOBSERVER_H   
-            
-// End of File

--- a/phoneapp/phoneringingtoneplayer/inc/mphoneringingtoneobserver.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-* 
-* Description:
-*
-*/
-
-#ifndef MPHONERINGINGTONEOBSERVER_H
-#define MPHONERINGINGTONEOBSERVER_H
-
-// INCLUDES
-#include <e32base.h>
-
-// CLASS DECLARATION
-
-/**
-*  Observer interface for ringing tone playing
-*
-* @since Series 60 3.1
-*/
-class MPhoneRingingToneObserver
-    {
-    public:  
-        /**
-        * Observer the ringing tone playing
-        * @param aPlayingAudio ETrue is ringing tone audio is playing.
-        * @param aPlayingVideo ETrue is ringing tone video is playing.
-        */
-        virtual void RingingTonePlaying( 
-            TBool aPlayingAudio,
-            TBool aPlayingVideo ) = 0;
-    };
-
-#endif      // MPHONERINGINGTONEOBSERVER_H   
-            
-// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneringingtoneplayer/inc/mphonetoneserver.h	Fri Oct 15 12:58:46 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2010-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Interface class for phone ringing tone server.
+*
+*/
+
+
+#ifndef MPHONETONESERVER_H
+#define MPHONETONESERVER_H
+
+// CLASS DECLARATION
+class MPhoneToneServer
+    {
+public:
+ 
+    virtual void RunDown() const = 0;
+ 
+    };
+
+#endif // MPHONETONESERVER_H
+
+// End of file

--- a/phoneapp/phoneringingtoneplayer/inc/mphonevideoplayer.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef M_PHONEVIDEOPLAYER_H
-#define M_PHONEVIDEOPLAYER_H
-
-// Forward declarations
-class MPhoneVideoPlayerObserver;
-
-/**
- *  Abstract video playing interface.
- *
- *
- *  @lib Phone.exe
- *  @since S60 v3.2
- */
-class MPhoneVideoPlayer
-    {
-public:
-    /**  Play modes */
-    enum TPlayMode
-        {
-        EPlayInLoop,
-        EPlayOnce,
-        EPlayAscending    
-        }; 
-
-public:
-    /**
-    * Plays given video ringing tone.
-    *
-    * @since S60 S60 v3.2
-    * @param aFileName File name.
-    * @param aPlayMode Playing mode.
-    * @param aVolumeLevel Playing volume, range: 0-10.
-    * @param aArbitraryScaling Set ETrue if arbitrary scaling supported.
-    * @param aObserver Observer for playback events.
-    */
-    virtual void PlayVideoRingTone( const TDesC& aFileName,
-                                    TPlayMode aPlayMode,
-                                    TInt aVolumeLevel,
-                                    TBool aArbitraryScaling,
-                                    MPhoneVideoPlayerObserver* aObserver ) = 0;
-    
-    /**
-    * Stops ringing.
-    *
-    * @since S60 S60 v3.2
-    */
-    virtual void StopVideoRingTone() = 0;
-    
-    /**
-    * Mutes ringing tone playing.
-    *
-    * @since S60 S60 v3.2
-    */    
-    virtual void MuteVideoRingTone() = 0;
-        
-    /**
-    * Cancels ringing tone playing.
-    *
-    * @since S60 S60 v3.2
-    */
-    virtual void CancelVideoRingTone() = 0;
-    };
-
-
-#endif // M_PHONEVIDEOPLAYER_H

--- a/phoneapp/phoneringingtoneplayer/inc/mphonevideoplayerobserver.h	Mon Oct 04 16:06:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef MPHONEVIDEOPLAYEROBSERVER_H
-#define MPHONEVIDEOPLAYEROBSERVER_H
-
-// Class declaration
-
-/**
-*  Video player observer interface.
-*
-*  @lib Phone.app
-*  @since Series 60 3.1
-*/
-class MPhoneVideoPlayerObserver  
-    {
-    public:
-        
-        // Enumerates different failure events.
-        //
-        enum TPhoneVideoPlayerErrorEvent
-            {
-            EVideoPlayerInitializingFailure, // Failure during initialization
-            EVideoPlayerPlayingFailure // Failure during playback
-            };
-        
-        /**
-        * This function is called for video player errors.
-        * @param aEvent The error event happend in initializing or playing.
-        * @param aError The error code return by MMF video player. 
-        */
-        virtual void HandleVideoPlayerError( 
-            TPhoneVideoPlayerErrorEvent aEvent,
-            TInt aError ) = 0;
-
-        /**
-        * This function is called when video player initialization complete
-        */
-        virtual void HandleVideoPlayerInitComplete() = 0;
-
-        /**
-        * This function is called after the playing completes successfully
-        */
-        virtual void HandleVideoPlayerPlayingComplete() = 0;
-    };
-
-#endif      // MPHONEVIDEOPLAYEROBSERVER_H   
-            
-// End of File