--- a/app/app.pro	Fri Mar 19 09:28:13 2010 +0200
+++ b/app/app.pro	Fri Apr 16 14:56:30 2010 +0300
@@ -45,32 +45,19 @@
 
 # Input
 LIBS += -lecom.dll \
-    -lmpxplaybackutility.dll \
-    -lmpxcollectionutility.dll \
-    -lmpxcommon.dll \
     -lestor.dll  \
     -lfbscli.dll \
     -lxqplugins.dll \
     -lmpxviewframeworkqt.dll \
-    -lhbcore.dll \
-    -lhbwidgets.dll \
-    -lhbtools.dll \
-    -lremconcoreapi.dll \
-    -lremconinterfacebase.dll \
     -lxqserviceutil \
-    -lmusicfetcher
+    -lmusicfetcher \
+    -lmpengine
     
     
 SOURCES += src/main.cpp \
-           src/mpmainwindow.cpp \
-           src/mpmediakeyhandler.cpp \
-           src/mpmediakeyhandler_p.cpp \
-           src/mpmediakeyremconresponse.cpp
+           src/mpmainwindow.cpp
            
-HEADERS =  inc/mpmainwindow.h \
-           inc/mpmediakeyhandler.h \
-           inc/mpmediakeyhandler_p.h\
-           inc/mpmediakeyremconresponse.h
+HEADERS =  inc/mpmainwindow.h
 
 MMP_RULES+=EXPORTUNFROZEN
 
@@ -80,4 +67,6 @@
     DEPLOYMENT += addImages
     }
     
-RESOURCES += resources/musiplayerapp.qrc
\ No newline at end of file
+RESOURCES += resources/musiplayerapp.qrc
+
+TRANSLATIONS = musicplayer.ts
\ No newline at end of file

--- a/app/inc/mpmainwindow.h	Fri Mar 19 09:28:13 2010 +0200
+++ b/app/inc/mpmainwindow.h	Fri Apr 16 14:56:30 2010 +0300
@@ -25,7 +25,6 @@
 
 // Forward declarations
 class MpxViewPlugin;
-class MpMediaKeyHandler;
 class MusicFetcher;
 
 // Class declaration
@@ -38,7 +37,9 @@
 
     enum ViewType {
         CollectionView = 1,
-        PlaybackView };
+        PlaybackView,
+        SettingsView,
+        DetailsView };
 
     MpMainWindow();
     ~MpMainWindow();
@@ -48,6 +49,8 @@
 
 public slots:
     void handleCommand( int commandCode );
+    void handleLibraryUpdated();
+    void handleExitApplication();
 
 private:
     void activateView(ViewType);
@@ -55,10 +58,11 @@
     void disconnectView();
 
 private:
-    MpMediaKeyHandler     *mMediaKeyHandler;      // Own
 
     MpxViewPlugin         *mCollectionViewPlugin; // Not own
     MpxViewPlugin         *mPlaybackViewPlugin;   // Not own
+    MpxViewPlugin         *mSettingsViewPlugin;   // Not own
+    MpxViewPlugin         *mDetailsViewPlugin;    // Not own
     MpxViewPlugin         *mCurrentViewPlugin;    // Not own
     MpxViewPlugin         *mPreviousViewPlugin;   // Not own
     MusicFetcher		  *mMusicFetcher; 		  // Own

--- a/app/inc/mpmediakeyhandler.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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: Music Player media key handler.
-*
-*/
-
-#ifndef MPMEDIAKEYHANDLER_H
-#define MPMEDIAKEYHANDLER_H
-
-#include <qobject>
-
-class MpMediaKeyHandlerPrivate;
-
-class MpMediaKeyHandler : public QObject
-{
-    Q_OBJECT
-
-    friend class MpMediaKeyHandlerPrivate;
-
-public:
-
-    explicit MpMediaKeyHandler( QObject *parent = 0 );
-    virtual ~MpMediaKeyHandler();
-
-signals:
-
-    void volumeChanged( int volume );
-    void errorOccured( int error );
-
-private:
-
-    Q_DISABLE_COPY(MpMediaKeyHandler)
-    MpMediaKeyHandlerPrivate *d_ptr;
-
-};
-
-#endif // MPMEDIAKEYHANDLER_H

--- a/app/inc/mpmediakeyhandler_p.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +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: Music Player media key handler - private implementation.
-*
-*/
-
-#ifndef MPMEDIAKEYHANDLER_P_H
-#define MPMEDIAKEYHANDLER_P_H
-
-
-#include <remconcoreapitargetobserver.h>
-#include <mpxplaybackobserver.h>
-#include <mpxplaybackframeworkdefs.h>
-
-class CRemConInterfaceSelector;
-class MMPXPlaybackUtility;
-class MpMediaKeyHandler;
-class MpMediaKeyRemConResponse;
-
-class MpMediaKeyHandlerPrivate : public MRemConCoreApiTargetObserver,
-                                 public MMPXPlaybackCallback
-{
-public:
-
-    MpMediaKeyHandlerPrivate( MpMediaKeyHandler *wrapper );
-    virtual ~MpMediaKeyHandlerPrivate();
-
-    void init();
-
-// From MRemConCoreApiTargetObserver
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A command has been received.
-     *
-     * @param aOperationId The operation ID of the command.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoCommand(
-        TRemConCoreApiOperationId aOperationId,
-        TRemConCoreApiButtonAction aButtonAct );
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A 'play' command has been received.
-     *
-     * @param aSpeed The playback speed.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoPlay(
-        TRemConCoreApiPlaybackSpeed aSpeed,
-        TRemConCoreApiButtonAction aButtonAct );
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A 'tune function' command has been received.
-     *
-     * @param aTwoPart Determine which channel to be used.
-     * @param aMajorChannel The major channel number.
-     * @param aMinorChannel The minor channel number.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoTuneFunction(
-        TBool aTwoPart,
-        TUint aMajorChannel,
-        TUint aMinorChannel,
-        TRemConCoreApiButtonAction aButtonAct );
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A 'select disk function' has been received.
-     *
-     * @param aDisk The disk.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoSelectDiskFunction(
-        TUint aDisk,
-        TRemConCoreApiButtonAction aButtonAct );
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A 'select AV input function' has been received.
-     *
-     * @param aAvInputSignalNumber The AV input.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoSelectAvInputFunction(
-        TUint8 aAvInputSignalNumber,
-        TRemConCoreApiButtonAction aButtonAct );
-
-    /**
-     * From MRemConCoreApiTargetObserver
-     * A 'select audio input function' has been received.
-     *
-     * @param aAudioInputSignalNumber The audio input.
-     * @param aButtonAct The button action associated with the command.
-     */
-    void MrccatoSelectAudioInputFunction(
-        TUint8 aAudioInputSignalNumber,
-        TRemConCoreApiButtonAction aButtonAct );
-
-// from base class MMPXPlaybackCallback
-
-    /**
-     * From MMPXPlaybackCallback
-     * Handle playback property
-     *
-     * @param aProperty the property
-     * @param aValue the value of the property
-     * @param aError error code
-     */
-    void HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError );
-
-    /**
-     * From MMPXPlaybackCallback
-     * Method is called continously until aComplete=ETrue, signifying that
-     * it is done and there will be no more callbacks
-     * Only new items are passed each time
-     *
-     * @param aPlayer UID of the subplayer
-     * @param aSubPlayers a list of sub players
-     * @param aComplete ETrue no more sub players. EFalse more subplayer
-     *                  expected
-     * @param aError error code
-     */
-    void HandleSubPlayerNamesL(
-        TUid aPlayer,
-        const MDesCArray* aSubPlayers,
-        TBool aComplete,
-        TInt aError );
-
-    /**
-     * From MMPXPlaybackCallback
-     * Handle media properties
-     *
-     * @param aMedia media
-     * @param aError error code
-     */
-    void HandleMediaL( const CMPXMedia& aMedia, TInt aError );
-
-private:
-
-    void DoInitL();
-    void SendCommand( TMPXPlaybackCommand aCommandId );
-    void DoSendCommandL( TMPXPlaybackCommand aCommandId );
-
-    /**
-     * Callback for timer
-     *
-     * @param aPtr Pointer pass to this callback function.
-     * @return Zero if callback function doesn't need to be called again.
-     *         Otherwise, non-zero.
-     */
-    static TInt TimerCallback( TAny* aPtr );
-
-    /**
-     * Handle repeat event
-     */
-    void HandleRepeatEvent();
-
-private:
-
-    MpMediaKeyHandler *q_ptr;
-
-    CRemConInterfaceSelector    *iInterfaceSelector;   // owned
-    MpMediaKeyRemConResponse    *iResponseHandler;     // owned
-    CPeriodic                   *iTimer;               // owned
-
-    MMPXPlaybackUtility         *iPlaybackUtility;
-
-    TBool                       iIncreaseVol;
-
-};
-
-#endif // MPMEDIAKEYHANDLER_P_H

--- a/app/inc/mpmediakeyremconresponse.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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: Music Player media key handler.
-*              Helper class for sending response back to Remote Controller Framework.
-*
-*/
-
-#ifndef MPMEDIAKEYREMCONKEYRESPONSE_H
-#define MPMEDIAKEYREMCONKEYRESPONSE_H
-
-#include <remconcoreapitarget.h>
-
-
-NONSHARABLE_CLASS( MpMediaKeyRemConResponse ) : public CActive
-{
-public:
-
-    /**
-     * Two-phased constructor.
-     *
-     * @since 3.0
-     * @param aRemConCoreApiTarget RemCon core target object.
-     * @return Pointer to newly created object.
-     */
-    static MpMediaKeyRemConResponse* NewL( CRemConCoreApiTarget& aRemConCoreApiTarget );
-
-    /**
-     * Destructor.
-     */
-    virtual ~MpMediaKeyRemConResponse();
-
-    /**
-     * Send the any key response back to Remcon server
-     *
-     * @since 3.0
-     * @param aOperationId RemCon operation Id.
-     */
-    void CompleteAnyKey( TRemConCoreApiOperationId aOperationId );
-
-private:
-
-    /**
-     * C++ default constructor.
-     */
-    MpMediaKeyRemConResponse( CRemConCoreApiTarget& aRemConCoreApiTarget );
-
-// from base class CActive
-
-    /**
-     * From CActive
-     * Handles an active object's request completion event.
-     */
-    void RunL();
-
-    /**
-     * From CActive
-     * Implements cancellation of an outstanding request.
-     */
-    void DoCancel();
-
-private:    // Data
-
-    // Response array.
-    RArray<TRemConCoreApiOperationId> iResponseArray;   // Own
-    CRemConCoreApiTarget& iRemConCoreApiTarget;         // Not own
-};
-
-#endif  // MPMEDIAKEYREMCONKEYRESPONSE_H
-
-// End of File

--- a/app/rom/musicplayer_resources.iby	Fri Mar 19 09:28:13 2010 +0200
+++ b/app/rom/musicplayer_resources.iby	Fri Apr 16 14:56:30 2010 +0300
@@ -21,6 +21,6 @@
 #include <data_caging_paths_for_iby.hrh>
 
 data = DATAZ_\APP_RESOURCE_DIR\musicplayer.rsc      APP_RESOURCE_DIR\musicplayer.rsc 
-//data = DATAZ_\QT_TRANSLATIONS_DIR\musicplayer.qm    QT_TRANSLATIONS_DIR\musicplayer.qm 
+data = DATAZ_\QT_TRANSLATIONS_DIR\musicplayer.qm    QT_TRANSLATIONS_DIR\musicplayer.qm 
 
 #endif	// MUSICPLAYER_RESOURCES_IBY
\ No newline at end of file

--- a/app/src/mpmainwindow.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ b/app/src/mpmainwindow.cpp	Fri Apr 16 14:56:30 2010 +0300
@@ -22,18 +22,20 @@
 #include <xqpluginloader.h>
 #include <xqplugininfo.h>
 #include <xqserviceutil.h>
+#include <QTranslator>
+#include <QLocale>
 
 #include "mpmainwindow.h"
-#include "mpmediakeyhandler.h"
 #include "mpcommondefs.h"
 #include "mpviewbase.h"
 #include "musicfetcher.h"
+#include "mpengine.h"
 #include "mptrace.h"
 
 /*!
    \class MpMainWindow
    \brief The MpMainWindow class provides Main Window functionalities.
-   
+
    MpMainWindow handles activation of views
 
 */
@@ -44,9 +46,10 @@
 
 MpMainWindow::MpMainWindow()
     : MpxViewFramework(),
-      mMediaKeyHandler(0),
       mCollectionViewPlugin(0),
       mPlaybackViewPlugin(0),
+      mSettingsViewPlugin(0),
+      mDetailsViewPlugin(0),
       mCurrentViewPlugin(0),
       mPreviousViewPlugin(0),
       mMusicFetcher(0)
@@ -60,7 +63,6 @@
 MpMainWindow::~MpMainWindow()
 {
     TX_ENTRY
-    delete mMediaKeyHandler;
     delete mMusicFetcher;
 
     if (mCollectionViewPlugin) {
@@ -71,6 +73,14 @@
         mPlaybackViewPlugin->destroyView();
         delete mPlaybackViewPlugin;
     }
+    if (mSettingsViewPlugin) {
+        mSettingsViewPlugin->destroyView();
+        delete mSettingsViewPlugin;
+    }
+    if (mDetailsViewPlugin) {
+        mDetailsViewPlugin->destroyView();
+        delete mDetailsViewPlugin;
+    }
 
     TX_EXIT
 }
@@ -83,6 +93,18 @@
 {
     TX_ENTRY
 
+    //Load musicplayer translator
+    QTranslator translator;
+    QString lang = QLocale::system().name();
+    QString path = QString("z:/resource/qt/translations/");
+
+    bool translatorLoaded = false;
+    translatorLoaded = translator.load(path + "musicplayer_" + lang);
+    TX_LOG_ARGS("Loading musicplayer translator ok=" << translatorLoaded);
+    if ( translatorLoaded ) {
+        qApp->installTranslator( &translator );
+    }
+
 #ifdef _DEBUG
     QList<XQPluginInfo> impls;
     XQPluginLoader::listImplementations("org.nokia.mmdt.MpxViewPlugin/1.0", impls);
@@ -97,8 +119,7 @@
         // Set the Collection View and Playback View to fetcher mode
         mMusicFetcher = new MusicFetcher();
     }
-    
-    setViewSwitchingEnabled(false);
+
     XQPluginLoader collectionLoader(MpCommon::KCollectionViewUid);
     XQPluginLoader playbackLoader(MpCommon::KPlaybackViewUid);
 
@@ -119,7 +140,7 @@
             TX_LOG_ARGS("connection error: " << err);
         }
         else {
-            collectionView->setTitle("Music");
+            collectionView->setTitle(hbTrId("txt_mus_title_music"));
         }
         // Collection view is the default view.
         activateView(MpMainWindow::CollectionView);
@@ -142,11 +163,14 @@
             TX_LOG_ARGS("connection error: " << err);
         }
         else {
-            playbackView->setTitle("Music");
+            playbackView->setTitle(hbTrId("txt_mus_title_music"));
         }
     }
 
-    mMediaKeyHandler = new MpMediaKeyHandler();
+    MpEngine *engine = MpEngine::instance();
+    connect( engine, SIGNAL( libraryRefreshed() ), this, SLOT( handleLibraryUpdated() ) );
+    connect( engine, SIGNAL( exitApplication() ), this, SLOT( handleExitApplication() ) );
+
     TX_EXIT
 }
 
@@ -165,7 +189,7 @@
 void MpMainWindow::handleCommand( int commandCode )
 {
     TX_ENTRY_ARGS("commandCode=" << commandCode );
-    
+
     switch ( commandCode ) {
         case MpCommon::Exit:
             if ( mCurrentViewPlugin ) {
@@ -179,6 +203,12 @@
         case MpCommon::ActivatePlaybackView:
             activateView(PlaybackView);
             break;
+        case MpCommon::ActivateSettingsView:
+            activateView(SettingsView);
+            break;
+        case MpCommon::ActivateDetailsView:
+            activateView(DetailsView);
+            break;
     }
     TX_EXIT
 }
@@ -191,7 +221,7 @@
     TX_ENTRY_ARGS("viewType=" << viewType );
 
     if ( mCurrentViewPlugin ) {
-        
+
         disconnectView();
         mCurrentViewPlugin->deactivateView();
         mPreviousViewPlugin = mCurrentViewPlugin;
@@ -204,6 +234,30 @@
     else if ( viewType == MpMainWindow::PlaybackView && mPlaybackViewPlugin ) {
         mCurrentViewPlugin = mPlaybackViewPlugin;
     }
+    else if ( viewType == MpMainWindow::SettingsView ) {
+        if ( mSettingsViewPlugin ) {
+            mCurrentViewPlugin = mSettingsViewPlugin;
+        }
+		else {
+			XQPluginLoader settingsLoader( MpCommon::KSettingsViewUid );
+            QObject* settingsInstance = settingsLoader.instance();
+            mSettingsViewPlugin = qobject_cast<MpxViewPlugin*>( settingsInstance )->viewPlugin();
+            mSettingsViewPlugin->createView();
+            mCurrentViewPlugin = mSettingsViewPlugin;
+        }
+    }
+    else if ( viewType == MpMainWindow::DetailsView ) {
+        if ( mDetailsViewPlugin ) {
+            mCurrentViewPlugin = mDetailsViewPlugin;
+        }
+        else {
+            XQPluginLoader detailsLoader( MpCommon::KDetailsViewUid );
+            QObject* detailsInstance = detailsLoader.instance();
+            mDetailsViewPlugin = qobject_cast<MpxViewPlugin*>( detailsInstance )->viewPlugin();
+            mDetailsViewPlugin->createView();
+            mCurrentViewPlugin = mDetailsViewPlugin;
+        }
+    }
 
     if ( mCurrentViewPlugin ) {
         addView( mCurrentViewPlugin->getView() );
@@ -257,3 +311,38 @@
     TX_EXIT
 }
 
+/*!
+ Slot to be called when Library has changed.
+ */
+void MpMainWindow::handleLibraryUpdated()
+{
+    TX_ENTRY
+
+    // If library changed while playing back, always return to AllSongs collection view.
+    if ( mPlaybackViewPlugin &&
+         mCurrentViewPlugin == mPlaybackViewPlugin &&
+         mCollectionViewPlugin ) {
+
+        activateView( CollectionView );
+        MpViewBase* collectionView = reinterpret_cast<MpViewBase*>(mCollectionViewPlugin->getView());
+        collectionView->setDefaultView();
+    }
+
+    TX_EXIT
+}
+
+/*!
+ Slot to be called when application must exit.
+ */
+void MpMainWindow::handleExitApplication()
+{
+    TX_ENTRY
+
+    if ( mCurrentViewPlugin ) {
+        disconnectView();
+    }
+    qApp->quit();
+
+    TX_EXIT
+}
+

--- a/app/src/mpmediakeyhandler.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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: Music Player media key handler.
-*
-*/
-
-#include "mpmediakeyhandler.h"
-#include "mpmediakeyhandler_p.h"
-#include "mptrace.h"
-
-// ---------------------------------------------------------------------------
-// MpMediaKeyHandler()
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyHandler::MpMediaKeyHandler( QObject *parent )
-    : QObject(parent)
-{
-    TX_ENTRY
-    d_ptr = new MpMediaKeyHandlerPrivate(this);
-    d_ptr->init();
-    TX_EXIT
-}
-
-// ---------------------------------------------------------------------------
-// ~MpMediaKeyHandler()
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyHandler::~MpMediaKeyHandler()
-{
-    TX_ENTRY
-    delete d_ptr;
-    TX_EXIT
-}
-

--- a/app/src/mpmediakeyhandler_p.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,438 +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: Music Player media key handler - private implementation.
-*
-*/
-
-#include "mpmediakeyhandler_p.h"
-#include "mpmediakeyhandler.h"
-#include "mpmediakeyremconresponse.h"
-#include "mpcommondefs.h"
-
-//symbian header files
-#include <remconcoreapitarget.h>
-#include <remconinterfaceselector.h>
-
-//mpx header files
-#include <mpxplaybackutility.h>
-#include <mpxplaybackcommanddefs.h>
-#include <mpxplaybackmessagedefs.h>
-#include <mpxlog.h>
-
-const TInt KFirstTimerExpiryInterval( 1 ); // Expire immediately
-const TInt KTimerExpiryInterval( 1000000/6 );
-
-// ---------------------------------------------------------------------------
-// MpMediaKeyHandlerPrivate()
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyHandlerPrivate::MpMediaKeyHandlerPrivate( MpMediaKeyHandler *wrapper )
-    : q_ptr( wrapper ),
-      iInterfaceSelector(NULL),
-      iResponseHandler(NULL),
-      iTimer(NULL),
-      iPlaybackUtility(NULL)
-{
-}
-
-// ---------------------------------------------------------------------------
-// ~MpMediaKeyHandlerPrivate()
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyHandlerPrivate::~MpMediaKeyHandlerPrivate()
-{
-    if ( iPlaybackUtility ) {
-        //TRAP_IGNORE( iPlaybackUtility->RemoveObserverL( *this ) );
-        iPlaybackUtility->Close();
-    }
-
-    delete iResponseHandler;
-    delete iInterfaceSelector;
-
-    if ( iTimer ) {
-        iTimer->Cancel();
-        delete iTimer;
-    }
-
-}
-
-// ---------------------------------------------------------------------------
-// init
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::init()
-{
-    TRAPD(err, DoInitL());
-    if ( err != KErrNone ) {
-        emit q_ptr->errorOccured(err);
-    }
-  
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A command has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoCommand(
-    TRemConCoreApiOperationId aOperationId,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    MPX_DEBUG3( "MpMediaKeyHandlerPrivate::MrccatoCommand(aOperationId=%d, aButtonAct=%d)",
-        aOperationId, aButtonAct );
-
-    switch ( aOperationId ) {
-    case ERemConCoreApiPausePlayFunction:
-        if ( aButtonAct == ERemConCoreApiButtonClick ) {
-            SendCommand( EPbCmdPlayPause );
-        }
-        break;
-    case ERemConCoreApiPlay:
-        if ( aButtonAct == ERemConCoreApiButtonClick
-             || aButtonAct == ERemConCoreApiButtonPress ) {
-            SendCommand( EPbCmdPlay );
-        }
-        break;
-    case ERemConCoreApiStop:
-        if ( aButtonAct == ERemConCoreApiButtonClick
-             || aButtonAct == ERemConCoreApiButtonPress ) {
-            SendCommand( EPbCmdStop );
-        }
-        break;
-    case ERemConCoreApiPause:
-        if ( aButtonAct == ERemConCoreApiButtonClick
-             || aButtonAct == ERemConCoreApiButtonPress ) {
-            SendCommand( EPbCmdPause );
-        }
-        break;
-    case ERemConCoreApiRewind:
-        switch ( aButtonAct ) {
-        case ERemConCoreApiButtonPress:
-            SendCommand( EPbCmdStartSeekBackward );
-            break;
-        case ERemConCoreApiButtonRelease:
-            SendCommand( EPbCmdStopSeeking );
-            break;
-        default:
-            break;
-        }
-        break;
-    case ERemConCoreApiFastForward:
-        switch ( aButtonAct ) {
-        case ERemConCoreApiButtonPress:
-            SendCommand( EPbCmdStartSeekForward );
-            break;
-        case ERemConCoreApiButtonRelease:
-            SendCommand( EPbCmdStopSeeking );
-            break;
-        default:
-            break;
-        }
-        break;
-    case ERemConCoreApiBackward:
-        if ( aButtonAct == ERemConCoreApiButtonClick ) {
-            SendCommand( EPbCmdPrevious );
-        }
-        break;
-    case ERemConCoreApiForward:
-        if ( aButtonAct == ERemConCoreApiButtonClick ) {
-            SendCommand( EPbCmdNext );
-        }
-        break;
-    case ERemConCoreApiVolumeUp:
-        iTimer->Cancel();
-        iIncreaseVol = ETrue;
-        switch ( aButtonAct ) {
-        case ERemConCoreApiButtonPress:
-            //Start Timer
-            iTimer->Start(
-                KFirstTimerExpiryInterval,
-                KTimerExpiryInterval,
-                TCallBack( TimerCallback, this ) );
-            break;
-        case ERemConCoreApiButtonClick:
-            SendCommand( EPbCmdIncreaseVolume );
-            break;
-        case ERemConCoreApiButtonRelease:
-        default:
-            break;
-        }
-        break;
-    case ERemConCoreApiVolumeDown:
-        iTimer->Cancel();
-        iIncreaseVol = EFalse;
-        switch ( aButtonAct ) {
-        case ERemConCoreApiButtonPress:
-            //Start Timer
-            iTimer->Start(
-                KFirstTimerExpiryInterval,
-                KTimerExpiryInterval,
-                TCallBack( TimerCallback, this ) );
-            break;
-        case ERemConCoreApiButtonClick:
-            SendCommand( EPbCmdDecreaseVolume );
-            break;
-        case ERemConCoreApiButtonRelease:
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    iResponseHandler->CompleteAnyKey( aOperationId );
-  
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A 'play' command has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoPlay(
-    TRemConCoreApiPlaybackSpeed aSpeed,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    MPX_DEBUG2( "MpMediaKeyHandlerPrivate::MrccatoPlay(aButtonAct=%d)", aButtonAct );
-    Q_UNUSED(aSpeed);
-
-    if ( ( aButtonAct == ERemConCoreApiButtonClick ) ||
-        ( aButtonAct == ERemConCoreApiButtonPress ) )
-        {
-        SendCommand( EPbCmdPlay );
-        }
-    iResponseHandler->CompleteAnyKey( ERemConCoreApiPlay );
-
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A 'tune function' command has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoTuneFunction(
-    TBool aTwoPart,
-    TUint aMajorChannel,
-    TUint aMinorChannel,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    Q_UNUSED(aTwoPart);
-    Q_UNUSED(aMajorChannel);
-    Q_UNUSED(aMinorChannel);
-    Q_UNUSED(aButtonAct);
-
-    iResponseHandler->CompleteAnyKey( ERemConCoreApiTuneFunction );
- 
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A 'select disk function' has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoSelectDiskFunction(
-    TUint aDisk,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    Q_UNUSED(aDisk);
-    Q_UNUSED(aButtonAct);
-
-    iResponseHandler->CompleteAnyKey( ERemConCoreApiSelectDiskFunction );
- 
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A 'select AV input function' has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoSelectAvInputFunction(
-    TUint8 aAvInputSignalNumber,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    Q_UNUSED(aAvInputSignalNumber);
-    Q_UNUSED(aButtonAct);
-
-    iResponseHandler->CompleteAnyKey( ERemConCoreApiSelectAvInputFunction );
-   
-}
-
-// ---------------------------------------------------------------------------
-// From MRemConCoreApiTargetObserver
-// A 'select audio input function' has been received.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::MrccatoSelectAudioInputFunction(
-    TUint8 aAudioInputSignalNumber,
-    TRemConCoreApiButtonAction aButtonAct )
-{
-    Q_UNUSED(aAudioInputSignalNumber);
-    Q_UNUSED(aButtonAct);
-
-    iResponseHandler->CompleteAnyKey( ERemConCoreApiSelectAudioInputFunction );
-    
-}
-
-// ---------------------------------------------------------------------------
-// From MMPXPlaybackCallback
-// Handle playback property.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::HandlePropertyL(
-    TMPXPlaybackProperty aProperty,
-    TInt aValue,
-    TInt aError )
-{
-    MPX_FUNC( "MpMediaKeyHandlerPrivate::DoHandlePropertyL" );
-    MPX_DEBUG4( "MpMediaKeyHandlerPrivate::HandlePropertyL - Property(%d); Value(%d); Error(%d)", aProperty, aValue, aError );
-
-    if ( KErrNone == aError ) {
-        switch ( aProperty  ) {
-        case EPbPropertyVolume:
-            q_ptr->emit volumeChanged(aValue);
-            break;
-        case EPbPropertyPosition:
-        case EPbPropertyMaxVolume:
-        case EPbPropertyMute:
-        default:
-            break;
-        }
-    }
-    
-}
-
-// ---------------------------------------------------------------------------
-// From MMPXPlaybackCallback
-// HandleSubPlayerNamesL
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::HandleSubPlayerNamesL(
-    TUid aPlayer,
-    const MDesCArray* aSubPlayers,
-    TBool aComplete,
-    TInt aError )
-{
-    MPX_FUNC( "MpMediaKeyHandlerPrivate::HandleSubPlayerNamesL" );
-    Q_UNUSED(aPlayer);
-    Q_UNUSED(aSubPlayers);
-    Q_UNUSED(aComplete);
-    Q_UNUSED(aError);
-    
-}
-
-// ---------------------------------------------------------------------------
-// From MMPXPlaybackCallback
-// Handle media properties.
-// Notes: The client is responsible for delete the object of aMedia.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::HandleMediaL(
-    const CMPXMedia& aMedia,
-    TInt aError )
-{
-    MPX_FUNC( "MpMediaKeyHandlerPrivate::DoHandleMediaL" );
-    Q_UNUSED(aMedia);
-    Q_UNUSED(aError);
-    
-}
-
-// ---------------------------------------------------------------------------
-// DoInitL()
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::DoInitL()
-{
-    // Register to remote control framework
-    iInterfaceSelector = CRemConInterfaceSelector::NewL();
-    CRemConCoreApiTarget *coreTarget = CRemConCoreApiTarget::NewL( *iInterfaceSelector, *this );
-    CleanupStack::PushL( coreTarget );
-    iInterfaceSelector->OpenTargetL();
-    iResponseHandler = MpMediaKeyRemConResponse::NewL( *coreTarget );
-    CleanupStack::Pop(coreTarget);
-
-    // Timer for implementing repeat
-    iTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-
-    // Get the playback utility instance from engine.
-    iPlaybackUtility = MMPXPlaybackUtility::UtilityL( TUid::Uid(MpCommon::KMusicPlayerUid) );
-    //iPlaybackUtility->AddObserverL( *this );
-   
-}
-
-// ---------------------------------------------------------------------------
-// Send command to playback utility.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::SendCommand( TMPXPlaybackCommand aCommandId )
-{
-    MPX_FUNC( "MpMediaKeyHandlerPrivate::SendCommand" );
-    TRAP_IGNORE( DoSendCommandL( aCommandId ) );
-   
-}
-
-// ---------------------------------------------------------------------------
-// Send command to playback utility.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::DoSendCommandL( TMPXPlaybackCommand aCommandId )
-{
-    MPX_FUNC( "MpMediaKeyHandlerPrivate::DoFilterAndSendCommandL" );
-
-    TMPXPlaybackState playerState( iPlaybackUtility->StateL() );
-
-    switch ( aCommandId ) {
-    case EPbCmdIncreaseVolume:
-        if ( EPbStatePlaying == playerState ) {
-            iPlaybackUtility->CommandL( EPbCmdIncreaseVolume );
-        }
-        break;
-    case EPbCmdDecreaseVolume:
-        if ( EPbStatePlaying == playerState ) {
-            iPlaybackUtility->CommandL( EPbCmdDecreaseVolume );
-        }
-        break;
-    default:
-        break;
-    }
-  
-}
-
-// ---------------------------------------------------------------------------
-// Callback for timer
-// ---------------------------------------------------------------------------
-//
-TInt MpMediaKeyHandlerPrivate::TimerCallback( TAny* aPtr )
-{
-	  
-    static_cast<MpMediaKeyHandlerPrivate*>( aPtr )->HandleRepeatEvent();
-    
-  
-    return KErrNone;
-}
-
-// ---------------------------------------------------------------------------
-// Handle repeat event
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyHandlerPrivate::HandleRepeatEvent()
-{
-	  
-    if ( iIncreaseVol ) {
-        SendCommand( EPbCmdIncreaseVolume );
-    }
-    else {
-        SendCommand( EPbCmdDecreaseVolume );
-    }
-   
-}

--- a/app/src/mpmediakeyremconresponse.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +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: Music Player media key handler.
-*              Helper class for sending response back to Remote Controller Framework.
-*
-*/
-
-// INCLUDE FILES
-#include "mpmediakeyremconresponse.h"
-#include "mpxlog.h"
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyRemConResponse::MpMediaKeyRemConResponse(
-    CRemConCoreApiTarget& aRemConCoreApiTarget )
-    : CActive( CActive::EPriorityStandard ),
-      iRemConCoreApiTarget( aRemConCoreApiTarget )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyRemConResponse* MpMediaKeyRemConResponse::NewL(
-    CRemConCoreApiTarget& aRemConCoreApiTarget )
-    {
-    MpMediaKeyRemConResponse* self =
-        new (ELeave) MpMediaKeyRemConResponse( aRemConCoreApiTarget );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//
-MpMediaKeyRemConResponse::~MpMediaKeyRemConResponse()
-    {
-    Cancel();
-    iResponseArray.Close();
-    }
-
-// ---------------------------------------------------------------------------
-// Send the any key response back to Remcon server
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyRemConResponse::CompleteAnyKey(
-    TRemConCoreApiOperationId aOperationId )
-    {
-    if ( !IsActive() )
-        {
-        switch ( aOperationId )
-            {
-            case ERemConCoreApiVolumeUp:
-                {
-                iRemConCoreApiTarget.VolumeUpResponse( iStatus, KErrNone );
-                SetActive();
-                break;
-                }
-            case ERemConCoreApiVolumeDown:
-                {
-                iRemConCoreApiTarget.VolumeDownResponse( iStatus, KErrNone );
-                SetActive();
-                break;
-                }
-            default:
-                {
-                TInt error = KErrNone;
-                iRemConCoreApiTarget.SendResponse(
-                    iStatus, aOperationId, error );
-                SetActive();
-                break;
-                }
-            }
-        }
-    // already active. Append to array and complete later.
-    else
-        {
-        iResponseArray.Append( aOperationId );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Implements cancellation of an outstanding request.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyRemConResponse::DoCancel()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// Handles an active object's request completion event.
-// ---------------------------------------------------------------------------
-//
-void MpMediaKeyRemConResponse::RunL()
-    {
-    MPX_DEBUG2( "MpMediaKeyRemConResponse.RunL() -- iStatus=%d", iStatus.Int() );
-
-    // if any existing -> Send response
-    if ( iResponseArray.Count() )
-        {
-        CompleteAnyKey( iResponseArray[0] );
-        // Remove already completed key
-        iResponseArray.Remove( 0 );
-        iResponseArray.Compress();
-        }
-    }
-
-// End of File

--- a/app/tsrc/unittest_app.pro	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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: 
-#
-
-TEMPLATE = subdirs
-SUBDIRS  = unittest_mpmediakeyhandler \
-           unittest_mpcodescanner \
-
-CONFIG += ordered

--- a/app/tsrc/unittest_mpmediakeyhandler/inc/unittest_mpmediakeyhandler.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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: Unit test for mpmediakeyhandler
-*
-*/
-
-#ifndef TESTMPMEDIAKEYHANDLER_H
-#define TESTMPMEDIAKEYHANDLER_H
-
-#include <QtTest/QtTest>
-
-class MpMediaKeyHandler;
-class MpMediaKeyHandlerPrivate;
-
-class TestMpMediaKeyHandler : public QObject
-{
-    Q_OBJECT
-
-public:
-    
-    TestMpMediaKeyHandler();
-    virtual ~TestMpMediaKeyHandler();
-
-// from QtTest
-public slots:
-
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-// internal
-private slots:
-
-    void testConstructor();
-    void testDestructor();
-    void testConstructorFail();
-    void testDestructorFail();
-    void testCommandVolumeUpKey();
-    void testCommandVolumeDownKey();
-    void testCommandPlayKey();
-    void testCommandPauseKey();
-    void testCommandPlayPauseKey();
-    void testCommandStopKey();
-    void testCommandFastForwardKeyPress();
-    void testCommandFastForwardKeyRelease();
-    void testCommandRewindKeyPress();
-    void testCommandRewindKeyRelease();
-    void testCommandForwardKey();
-    void testCommandBackwardKey();
-    
-    void testPlay();
-    void testAudioInputFunction();
-    void testSelectAvInputFunction();
-    void testSelectDiskFunction();
-    void testTuneFunction();
-
-private:
-    
-    MpMediaKeyHandler           *mTest;
-    MpMediaKeyHandlerPrivate    *mTestPrivate;
-
-};
-
-#endif  // TESTMPMEDIAKEYHANDLER_H
-
-
-
-

--- a/app/tsrc/unittest_mpmediakeyhandler/src/unittest_mpmediakeyhandler.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,396 +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: Unit test for mpmediakeyhandler
-*
-*/
-
-#include <QSignalSpy>
-#include <QMetaType>
-#include <hbapplication.h>
-#include <hbmainwindow.h>
-#include <e32debug.h>
-
-#include "unittest_mpmediakeyhandler.h"
-#include "mpcommondefs.h"
-#include "stub/inc/mpxplaybackutility.h"
-#include "stub/inc/remconcoreapitarget.h"
-#include "stub/inc/remconinterfaceselector.h"
-
-
-// Do this so we can access all member variables.
-#define private public
-#include "mpmediakeyhandler.h"
-#include "mpmediakeyhandler_p.h"
-#undef private
-
-
-/*!
- Make our test case a stand-alone executable that runs all the test functions.
- */
-int main(int argc, char *argv[])
-{
-    HbApplication app(argc, argv);
-    HbMainWindow window;
-
-    TestMpMediaKeyHandler tv;
-
-    char *pass[3];
-    pass[0] = argv[0];
-    pass[1] = "-o";
-    pass[2] = "c:\\data\\unittest_mpmediakeyhandler.txt";
-
-    int res = QTest::qExec(&tv, 3, pass);
-
-    return res;
-}
-
-TestMpMediaKeyHandler::TestMpMediaKeyHandler()
-    : mTest(0)
-{
-}
-
-TestMpMediaKeyHandler::~TestMpMediaKeyHandler()
-{
-    delete mTest;
-}
-
-/*!
- Called before the first testfunction is executed.
- */
-void TestMpMediaKeyHandler::initTestCase()
-{
-    RDebug::Print(_L("initTestCase()"));
-}
-
-/*!
- Called after the last testfunction was executed.
- */
-void TestMpMediaKeyHandler::cleanupTestCase()
-{
-    RDebug::Print(_L("cleanupTestCase()"));
-}
-
-/*!
- Called before each testfunction is executed.
- */
-void TestMpMediaKeyHandler::init()
-{
-    RDebug::Print(_L(">>init()"));
-    mTest = new MpMediaKeyHandler();
-    mTestPrivate = mTest->d_ptr;
-    RDebug::Print(_L("<<init()"));
-}
-
-/*!
- Called after every testfunction.
- */
-void TestMpMediaKeyHandler::cleanup()
-{
-    if (mTest)
-    {
-        delete mTest;
-        mTest = 0;
-        mTestPrivate = 0;
-    }
-}
-
-void TestMpMediaKeyHandler::testConstructor()
-{
-    RDebug::Print(_L(">>testConstructor()"));
-    
-    QVERIFY(mTest != 0);
-    QVERIFY(mTestPrivate != 0);
-    QVERIFY(mTestPrivate->iInterfaceSelector != 0);
-    QVERIFY(mTestPrivate->iResponseHandler != 0);
-    QVERIFY(mTestPrivate->iPlaybackUtility != 0);
-    
-    RDebug::Print(_L("<<testConstructor()"));
-}
-
-void TestMpMediaKeyHandler::testDestructor()
-{
-    RDebug::Print(_L(">>testDestructor()"));
-    
-    // it is been observed that CRemConCoreApiTarget is not being deleted by anyone
-    // the creator claim it does not own it, while others never claim the ownership neither
-    cleanup();
-    QVERIFY(mTest == 0);
-    QCOMPARE(MMPXPlaybackUtility::getCount(), 0);
-    QCOMPARE(CRemConCoreApiTarget::getCount(), 0);
-    QCOMPARE(CRemConInterfaceSelector::getCount(), 0);
-    
-    RDebug::Print(_L("<<testDestructor()"));
-}
-
-void TestMpMediaKeyHandler::testConstructorFail()
-{
-    RDebug::Print(_L(">>testConstructorFail()"));
-
-    // errorOccured signal cannot be connected until mediakeyhandler is created,
-    // and error during construction cannot be feedback.
-    // solution should be to seperate construction/init
-    cleanup();
-    CRemConInterfaceSelector::setNewLLeave();
-    init();
-    QSignalSpy spy1(mTest, SIGNAL(errorOccured(int)));
-    QVERIFY(mTest != 0);
-    //QCOMPARE(spy1.count(), 1);    // failed if comment in
-    
-    cleanup();
-    CRemConInterfaceSelector::setOpenTargetLLeave();
-    init();
-    QSignalSpy spy2(mTest, SIGNAL(errorOccured(int)));
-    QVERIFY(mTest != 0);
-    //QCOMPARE(spy2.count(), 1);    // failed if comment in
-    
-    cleanup();
-    CRemConCoreApiTarget::setNewLLeave();
-    init();
-    QSignalSpy spy3(mTest, SIGNAL(errorOccured(int)));
-    QVERIFY(mTest != 0);
-    //QCOMPARE(spy3.count(), 1);    // failed if comment in
-
-    cleanup();
-    MMPXPlaybackUtility::setNewLLeave();
-    init();
-    QSignalSpy spy4(mTest, SIGNAL(errorOccured(int)));
-    QVERIFY(mTest != 0);
-    //QCOMPARE(spy4.count(), 1);    // failed if comment in
-    
-    cleanup();
-    MMPXPlaybackUtility::setAddObserverLLeave();
-    init();
-    QSignalSpy spy5(mTest, SIGNAL(errorOccured(int)));
-    QVERIFY(mTest != 0);
-    //QCOMPARE(spy5.count(), 1);    // failed if comment in
-    
-    RDebug::Print(_L("<<testConstructorFail()"));
-}
-
-void TestMpMediaKeyHandler::testDestructorFail()
-{
-    RDebug::Print(_L(">>testDestructorFail()"));
-    
-    MMPXPlaybackUtility::setRemoveObserverLLeave();
-    cleanup();
-    QVERIFY(mTest == 0);
-    QCOMPARE(MMPXPlaybackUtility::getCount(), 0);
-    QCOMPARE(CRemConCoreApiTarget::getCount(), 0);
-    QCOMPARE(CRemConInterfaceSelector::getCount(), 0);
-    
-    RDebug::Print(_L("<<testDestructorFail()"));
-}
-
-void TestMpMediaKeyHandler::testCommandVolumeUpKey()
-{
-    RDebug::Print(_L(">>testCommandVolumeUpKey()"));
-    
-    // volumeChanged signal would not emit until mediakeyhandler is not added as an observer to MMPXPlaybackUtility
-    QSignalSpy spy(mTest, SIGNAL(volumeChanged(int)));
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    MMPXPlaybackUtility::setPlaying();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiVolumeUp, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    QCOMPARE(spy.count(), 1);
-    
-    // impossible to stub out the CPeriodic class which is part of the Press/Release handling
-    // hence, those logic could not be tested 
-    
-    RDebug::Print(_L("<<testCommandVolumeUpKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandVolumeDownKey()
-{
-    RDebug::Print(_L(">>testCommandVolumeDownKey()"));
-    
-    // volumeChanged signal would not emit until mediakeyhandler is not added as an observer to MMPXPlaybackUtility
-    QSignalSpy spy(mTest, SIGNAL(volumeChanged(int)));
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    MMPXPlaybackUtility::setPlaying();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiVolumeDown, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    QCOMPARE(spy.count(), 1);
-    
-    // impossible to stub out the CPeriodic class which is part of the Press/Release handling
-    // hence, those logic could not be tested
-    
-    RDebug::Print(_L("<<testCommandVolumeDownKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandPlayKey()
-{
-    RDebug::Print(_L(">>testCommandPlayKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiPlay, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandPlayKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandPauseKey()
-{
-    RDebug::Print(_L(">>testCommandPauseKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiPause, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-        
-    RDebug::Print(_L("<<testCommandPauseKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandPlayPauseKey()
-{
-    RDebug::Print(_L(">>testCommandPlayPauseKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiPausePlayFunction, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandPlayPauseKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandStopKey()
-{
-    RDebug::Print(_L(">>testCommandStopKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiStop, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandStopKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandFastForwardKeyPress()
-{
-    RDebug::Print(_L(">>testCommandFastForwardKeyPress()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiFastForward, ERemConCoreApiButtonPress);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandFastForwardKeyPress()"));
-}
-
-void TestMpMediaKeyHandler::testCommandFastForwardKeyRelease()
-{
-    RDebug::Print(_L(">>testCommandFastForwardKeyRelease()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiFastForward, ERemConCoreApiButtonRelease);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandFastForwardKeyRelease()"));
-}
-
-void TestMpMediaKeyHandler::testCommandRewindKeyPress()
-{
-    RDebug::Print(_L(">>testCommandRewindKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiRewind, ERemConCoreApiButtonPress);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandRewindKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandRewindKeyRelease()
-{
-    RDebug::Print(_L(">>testCommandRewindKeyRelease()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiRewind, ERemConCoreApiButtonRelease);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandRewindKeyRelease()"));
-}
-
-void TestMpMediaKeyHandler::testCommandForwardKey()
-{
-    RDebug::Print(_L(">>testCommandForwardKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiForward, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandForwardKey()"));
-}
-
-void TestMpMediaKeyHandler::testCommandBackwardKey()
-{
-    RDebug::Print(_L(">>testCommandBackwardKey()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoCommand(ERemConCoreApiBackward, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testCommandBackwardKey()"));
-}
-
-void TestMpMediaKeyHandler::testPlay()
-{
-    RDebug::Print(_L(">>testPlay()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoPlay(ERemConCoreApiPlaybackSpeedX1, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-    
-    RDebug::Print(_L("<<testPlay()"));
-}
-
-void TestMpMediaKeyHandler::testAudioInputFunction()
-{
-    RDebug::Print(_L(">>testAudioInputFunction()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoSelectAudioInputFunction(0, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-        
-    RDebug::Print(_L("<<testAudioInputFunction()"));
-}
-
-void TestMpMediaKeyHandler::testSelectAvInputFunction()
-{
-    RDebug::Print(_L(">>testSelectAvInputFunction()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoSelectAvInputFunction(0, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-
-    RDebug::Print(_L("<<testSelectAvInputFunction()"));
-}
-
-void TestMpMediaKeyHandler::testSelectDiskFunction()
-{
-    RDebug::Print(_L(">>testSelectDiskFunction()"));
-    
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoSelectDiskFunction(0, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-
-    RDebug::Print(_L("<<testSelectDiskFunction()"));
-}
-
-void TestMpMediaKeyHandler::testTuneFunction()
-{
-    RDebug::Print(_L(">>testTuneFunction()"));
-
-    int oldCount = CRemConCoreApiTarget::getSendResponseCount();
-    mTestPrivate->MrccatoTuneFunction(ETrue, 0, 1, ERemConCoreApiButtonClick);
-    QCOMPARE(CRemConCoreApiTarget::getSendResponseCount(), oldCount+1);
-
-    RDebug::Print(_L("<<testTuneFunction()"));
-}
-
-// End of file

--- a/app/tsrc/unittest_mpmediakeyhandler/stub/inc/mpxplaybackutility.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +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: mpxplaybackutility stub for testing mpmediakeyhandler
-*
-*/
-
-
-#ifndef MMPXPLAYBACKUTILITY_H
-#define MMPXPLAYBACKUTILITY_H
-
-
-#include <mpxplaybackframeworkdefs.h>   // KPbModeDefault, TMPXPlaybackCommand
-#include <e32base.h>                    // CBase
-
-
-class MpMediaKeyHandlerPrivate;
-
-class MMPXPlaybackUtility : public CActive
-    {
-    
-public:
-    
-    static int getCount();
-    static void setNewLLeave();
-    static void NewLLeaveIfDesiredL();
-    static void setAddObserverLLeave();
-    static void AddObserverLLeaveIfDesiredL();
-    static void setRemoveObserverLLeave();
-    static void RemoveObserverLLeaveIfDesiredL();
-    static void setCommandLLeave();
-    static void CommandLLeaveIfDesiredL();
-    static void setStateLLeave();
-    static void StateLLeaveIfDesiredL();
-    static void setPlaying();
-    
-public:
-
-    static MMPXPlaybackUtility* UtilityL(const TUid& aModeId = KPbModeDefault);
-    virtual ~MMPXPlaybackUtility();
-
-    void Close();
-    void AddObserverL(MpMediaKeyHandlerPrivate& aObs);
-    void RemoveObserverL(MpMediaKeyHandlerPrivate& aObs);
-    void CommandL(TMPXPlaybackCommand aCmd, TInt aData = 0);
-    
-    TMPXPlaybackState StateL() const;    
-
-protected:
-
-    // from CActive
-    virtual void DoCancel();
-    virtual void RunL();
-    
-private:
-    
-    MMPXPlaybackUtility();
-    
-private:
-
-    MpMediaKeyHandlerPrivate*   iObserver;
-    TInt                        iVolume;
-    TBool                       iVolumeUp;
-    
-    };
-
-#endif      // MMPXPLAYBACKUTILITY_H
-
-// End of File

--- a/app/tsrc/unittest_mpmediakeyhandler/stub/inc/remconcoreapitarget.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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: remconcoreapitarget stub for testing mpmediakeyhandler
-*
-*/
-
-
-#ifndef REMCONCOREAPITARGET_H
-#define REMCONCOREAPITARGET_H
-
-
-#include <remconcoreapi.h>  // TRemConCoreApiOperationId 
-
-
-class CRemConInterfaceSelector;
-class MRemConCoreApiTargetObserver;
-
-class CRemConCoreApiTarget : public CActive
-    {
-
-public:
-    
-    static int getCount();
-    static void setNewLLeave();
-    static void NewLLeaveIfDesiredL();
-    static int getSendResponseCount();
-    
-public:
-
-    static CRemConCoreApiTarget* NewL(CRemConInterfaceSelector& aInterfaceSelector, MRemConCoreApiTargetObserver& aObserver);
-    virtual ~CRemConCoreApiTarget();
-
-    void VolumeUpResponse(TRequestStatus& aStatus, TInt aError);
-    void VolumeDownResponse(TRequestStatus& aStatus, TInt aError);
-    void SendResponse(TRequestStatus& aStatus, TRemConCoreApiOperationId aOperationId, TInt aError);    
-
-protected:
-
-    // from CActive
-    virtual void DoCancel();
-    virtual void RunL();
-    
-private:
-    
-    CRemConCoreApiTarget();
-    
-private:
-
-    TRequestStatus*             iClientStatus;
-    
-    };
-
-#endif      // REMCONCOREAPITARGET_H
-
-// End of File

--- a/app/tsrc/unittest_mpmediakeyhandler/stub/inc/remconinterfaceselector.h	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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: remconinterfaceselector stub for testing mpmediakeyhandler
-*
-*/
-
-
-#ifndef REMCONINTERFACESELECTOR_H
-#define REMCONINTERFACESELECTOR_H
-
-
-#include <e32base.h>
-
-
-class CRemConInterfaceSelector : public CBase
-    {
-
-public:
-    
-    static int getCount();
-    static void setNewLLeave();
-    static void NewLLeaveIfDesiredL();
-    static void setOpenTargetLLeave();
-    static void OpenTargetLLeaveIfDesiredL();
-    
-public:
-
-    static CRemConInterfaceSelector* NewL();
-    virtual ~CRemConInterfaceSelector();
-
-    void OpenTargetL();
-
-private:
-    
-    CRemConInterfaceSelector();
-    
-    };
-
-#endif      // REMCONINTERFACESELECTOR_H
-
-// End of File

--- a/app/tsrc/unittest_mpmediakeyhandler/stub/src/mpxplaybackutility.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
-* Copyright (c) 2006 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: mpxplaybackutility stub for testing MpNowPlayingBackEnd
-*
-*/
-
-
-#include <mpxplaybackcommanddefs.h>
-#include <e32debug.h>
-
-#include "stub/inc/mpxplaybackutility.h"
-#include "mpmediakeyhandler_p.h"
-
-
-int gMMPXPlaybackUtilityCount = 0;
-bool gMMPXPlaybackUtilityNewLLeave = false;
-bool gMMPXPlaybackUtilityAddObserverLLeave = false;
-bool gMMPXPlaybackUtilityRemoveObserverLLeave = false;
-bool gMMPXPlaybackUtilityCommandLLeave = false;
-bool gMMPXPlaybackUtilityStateLLeave = false;
-TMPXPlaybackState gMMPXPlaybackUtilityState = EPbStateNotInitialised;
-
-
-//static functions start
-
-int MMPXPlaybackUtility::getCount()
-{
-    return gMMPXPlaybackUtilityCount;
-}
-
-void MMPXPlaybackUtility::setNewLLeave()
-{
-    gMMPXPlaybackUtilityNewLLeave = true;
-}
-
-void MMPXPlaybackUtility::NewLLeaveIfDesiredL()
-{
-    if (gMMPXPlaybackUtilityNewLLeave)
-    {
-        RDebug::Print(_L("MMPXPlaybackUtility::NewLLeaveIfDesiredL Leave"));
-        gMMPXPlaybackUtilityNewLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-void MMPXPlaybackUtility::setAddObserverLLeave()
-{
-    gMMPXPlaybackUtilityAddObserverLLeave = true;
-}
-
-void MMPXPlaybackUtility::AddObserverLLeaveIfDesiredL()
-{
-    if (gMMPXPlaybackUtilityAddObserverLLeave)
-    {
-        RDebug::Print(_L("MMPXPlaybackUtility::AddObserverLLeaveIfDesiredL Leave"));
-        gMMPXPlaybackUtilityAddObserverLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-void MMPXPlaybackUtility::setRemoveObserverLLeave()
-{
-    gMMPXPlaybackUtilityRemoveObserverLLeave = true;
-}
-
-void MMPXPlaybackUtility::RemoveObserverLLeaveIfDesiredL()
-{
-    if (gMMPXPlaybackUtilityRemoveObserverLLeave)
-    {
-        RDebug::Print(_L("MMPXPlaybackUtility::RemoveObserverLLeaveIfDesiredL Leave"));
-        gMMPXPlaybackUtilityRemoveObserverLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-void MMPXPlaybackUtility::setCommandLLeave()
-{
-    gMMPXPlaybackUtilityCommandLLeave = true;
-}
-
-void MMPXPlaybackUtility::CommandLLeaveIfDesiredL()
-{
-    if (gMMPXPlaybackUtilityCommandLLeave)
-    {
-        RDebug::Print(_L("MMPXPlaybackUtility::CommandLLeaveIfDesiredL Leave"));
-        gMMPXPlaybackUtilityCommandLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-void MMPXPlaybackUtility::setStateLLeave()
-{
-    gMMPXPlaybackUtilityStateLLeave = true;
-}
-
-void MMPXPlaybackUtility::StateLLeaveIfDesiredL()
-{
-    if (gMMPXPlaybackUtilityStateLLeave)
-    {
-        RDebug::Print(_L("MMPXPlaybackUtility::StateLLeaveIfDesiredL Leave"));
-        gMMPXPlaybackUtilityStateLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-void MMPXPlaybackUtility::setPlaying()
-{
-    gMMPXPlaybackUtilityState = EPbStatePlaying;
-}
-
-//static functions end
-
-MMPXPlaybackUtility::MMPXPlaybackUtility()
-    : CActive(EPriorityStandard),
-      iObserver(NULL),
-      iVolume(5),
-      iVolumeUp(ETrue)
-{
-    gMMPXPlaybackUtilityState = EPbStateNotInitialised;
-}
-
-MMPXPlaybackUtility::~MMPXPlaybackUtility()
-{
-}
-
-MMPXPlaybackUtility* MMPXPlaybackUtility::UtilityL(const TUid& /*aModeId*/)
-{
-    RDebug::Print(_L("stub MMPXPlaybackUtility::UtilityL"));
-    MMPXPlaybackUtility::NewLLeaveIfDesiredL();
-    gMMPXPlaybackUtilityCount++;
-    static MMPXPlaybackUtility playbackUtilility;
-    return &playbackUtilility;
-}
-
-void MMPXPlaybackUtility::Close()
-{
-    iObserver = NULL;
-    gMMPXPlaybackUtilityCount--;
-}
-
-void MMPXPlaybackUtility::AddObserverL(MpMediaKeyHandlerPrivate& aObs)
-{
-    MMPXPlaybackUtility::AddObserverLLeaveIfDesiredL();
-    iObserver = &aObs;
-}
-
-void MMPXPlaybackUtility::RemoveObserverL(MpMediaKeyHandlerPrivate& /*aObs*/)
-{
-    MMPXPlaybackUtility::RemoveObserverLLeaveIfDesiredL();
-    iObserver = NULL;
-}
-
-void MMPXPlaybackUtility::CommandL(TMPXPlaybackCommand aCmd, TInt /*aData*/)
-{
-    RDebug::Print(_L(">>MMPXPlaybackUtility::CommandL"));
-    
-    MMPXPlaybackUtility::CommandLLeaveIfDesiredL();
-    
-    if (IsActive())
-        User::Leave(KErrNotReady);
-    else
-    {
-        if ((aCmd == EPbCmdIncreaseVolume) || (aCmd == EPbCmdDecreaseVolume))
-        {
-            if (aCmd == EPbCmdIncreaseVolume)
-                iVolumeUp = ETrue;
-            else
-                iVolumeUp = EFalse;
-            
-            // stub should not be async
-            /*TRequestStatus* status = &iStatus;
-            User::RequestComplete(status, KErrNone);
-            SetActive();*/
-            
-            RunL();
-        }
-    }
-    
-    RDebug::Print(_L("<<MMPXPlaybackUtility::CommandL"));
-}
-
-TMPXPlaybackState MMPXPlaybackUtility::StateL() const
-{
-    MMPXPlaybackUtility::StateLLeaveIfDesiredL();
-    return gMMPXPlaybackUtilityState;
-}
-
-void MMPXPlaybackUtility::DoCancel()
-{
-}
-
-void MMPXPlaybackUtility::RunL()
-{
-    RDebug::Print(_L(">>MMPXPlaybackUtility::RunL"));
-    
-    TInt err = KErrNone;
-    
-    if (iVolumeUp)
-    {
-        if (iVolume < 10)
-            iVolume++;
-        else
-            err = KErrArgument;
-    }
-    else
-    {
-        if (iVolume > 0)
-            iVolume--;
-        else
-            err = KErrArgument;
-    }
-    
-    if (iObserver)
-        iObserver->HandlePropertyL(EPbPropertyVolume, iVolume, err);
-    
-    RDebug::Print(_L("<<MMPXPlaybackUtility::RunL"));
-}
-
-//end of file

--- a/app/tsrc/unittest_mpmediakeyhandler/stub/src/remconcoreapitarget.cpp	Fri Mar 19 09:28:13 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
-* Copyright (c) 2006 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: remconcoreapitarget stub for testing MpNowPlayingBackEnd
-*
-*/
-
-
-#include <e32debug.h>
-
-#include "stub/inc/remconcoreapitarget.h"
-
-
-int gCRemConCoreApiTargetCount = 0;
-bool gCRemConCoreApiTargetNewLLeave = false;
-int gCRemConCoreApiTargetSendResponseCount = 0;
-
-
-//static functions start
-
-int CRemConCoreApiTarget::getCount()
-{
-    return gCRemConCoreApiTargetCount;
-}
-
-void CRemConCoreApiTarget::setNewLLeave()
-{
-    gCRemConCoreApiTargetNewLLeave = true;
-}
-
-void CRemConCoreApiTarget::NewLLeaveIfDesiredL()
-{
-    if (gCRemConCoreApiTargetNewLLeave)
-    {
-        RDebug::Print(_L("CRemConCoreApiTarget::NewLLeaveIfDesiredL Leave"));
-        gCRemConCoreApiTargetNewLLeave = false;
-        User::Leave(KErrGeneral);
-    }
-}
-
-int CRemConCoreApiTarget::getSendResponseCount()
-{
-    return gCRemConCoreApiTargetSendResponseCount;
-}
-
-//static functions end
-
-
-CRemConCoreApiTarget::CRemConCoreApiTarget()
-    : CActive(EPriorityStandard),
-      iClientStatus(NULL)
-{
-    gCRemConCoreApiTargetCount++;
-}
-
-CRemConCoreApiTarget::~CRemConCoreApiTarget()
-{
-    gCRemConCoreApiTargetCount--;
-    gCRemConCoreApiTargetSendResponseCount = 0;
-}
-
-CRemConCoreApiTarget* CRemConCoreApiTarget::NewL(CRemConInterfaceSelector& /*aInterfaceSelector*/, MRemConCoreApiTargetObserver& /*aObserver*/)
-{
-    RDebug::Print(_L("stub CRemConCoreApiTarget::NewL"));
-    CRemConCoreApiTarget::NewLLeaveIfDesiredL();
-    CRemConCoreApiTarget* self = new(ELeave) CRemConCoreApiTarget();
-    return self;
-}
-
-
-void CRemConCoreApiTarget::VolumeUpResponse(TRequestStatus& aStatus, TInt /*aError*/)
-{
-    RDebug::Print(_L(">>CRemConCoreApiTarget::VolumeUpResponse"));
-    
-    iClientStatus = &aStatus;
-    gCRemConCoreApiTargetSendResponseCount++;
-    
-    // stub should not be async
-    /*TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-    SetActive();*/
-    
-    RunL();
-    
-    RDebug::Print(_L("<<CRemConCoreApiTarget::VolumeUpResponse"));
-}
-
-void CRemConCoreApiTarget::VolumeDownResponse(TRequestStatus& aStatus, TInt /*aError*/)
-{
-    RDebug::Print(_L(">>CRemConCoreApiTarget::VolumeDownResponse"));
-    
-    iClientStatus = &aStatus;
-    gCRemConCoreApiTargetSendResponseCount++;
-    
-    // stub should not be async
-    /*TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-    SetActive();*/
-    
-    RunL();
-    
-    RDebug::Print(_L("<<CRemConCoreApiTarget::VolumeDownResponse"));
-}
-
-void CRemConCoreApiTarget::SendResponse(TRequestStatus& aStatus, TRemConCoreApiOperationId /*aOperationId*/, TInt /*aError*/)
-{
-    RDebug::Print(_L(">>CRemConCoreApiTarget::SendResponse"));
-    
-    iClientStatus = &aStatus;
-    gCRemConCoreApiTargetSendResponseCount++;
-    
-    // stub should not be async
-    /*TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-    SetActive();*/
-
-    RunL();
-    
-    RDebug::Print(_L("<<CRemConCoreApiTarget::SendResponse"));
-}
-
-void CRemConCoreApiTarget::DoCancel()
-{
-}
-
-void CRemConCoreApiTarget::RunL()
-{
-    RDebug::Print(_L(">>CRemConCoreApiTarget::RunL"));
-    User::RequestComplete(iClientStatus, KErrNone);
-    RDebug::Print(_L("<<CRemConCoreApiTarget::RunL"));
-}
-
-//end of file