--- a/app/app.pro	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/app.pro	Wed Aug 18 09:46:20 2010 +0300
@@ -23,15 +23,13 @@
     TARGET.EPOCSTACKSIZE = 0x14000
     TARGET.EPOCHEAPSIZE = 0x020000 0x1F00000
     TARGET.CAPABILITY = CAP_APPLICATION NetworkControl DRM
-    SKINICON = qtg_large_music_player
+    SKINICON = qtg_large_music
 
     BLD_INF_RULES.prj_exports += \
-        "../sis/musicplayer_stub.sis          /epoc32/data/z/system/install/musicplayer_stub.sis" \
-        "resources/musicplayer.docml          /epoc32/release/winscw/udeb/Z/resource/hb/splashml/musicplayer.docml" \
-        "resources/musicplayer.splashml       /epoc32/release/winscw/udeb/Z/resource/hb/splashml/musicplayer.splashml" \
-        "resources/musicplayer.docml          /epoc32/data/Z/resource/hb/splashml/musicplayer.docml" \
-        "resources/musicplayer.splashml       /epoc32/data/Z/resource/hb/splashml/musicplayer.splashml"
-
+        "../sis/musicplayer_stub.sis          z:/system/install/musicplayer_stub.sis" \
+        "resources/musicplayer.docml          z:/resource/hb/splashml/musicplayer.docml" \
+        "resources/musicplayer.splashml       z:/resource/hb/splashml/musicplayer.splashml"
+    MMP_RULES += SMPSAFE
 }
 
 # Service provider specific configuration.
@@ -59,7 +57,8 @@
         -lxqserviceutil \
         -lmusicservices \
         -lmpsettingsmanager \
-        -lmpengine
+        -lmpengine \
+        -lmpmediacontroller
 
 # Input
 HEADERS += inc/mpmainwindow.h \

--- a/app/inc/mpglobalpopuphandler.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/inc/mpglobalpopuphandler.h	Wed Aug 18 09:46:20 2010 +0300
@@ -47,7 +47,6 @@
     void launchUnableToCotinueDueUsb();
     void launchUsbBlockingNote();
     void closeUsbBlockingNote();
-    void launchRefreshLibraryRequest();
     void launchMTPInfoDialog();
     void hanldeMTPInfoDialogFinished( HbAction *selectedAction );
 

--- a/app/inc/mpmainwindow.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/inc/mpmainwindow.h	Wed Aug 18 09:46:20 2010 +0300
@@ -30,6 +30,7 @@
 class MusicServices;
 class MpGlobalPopupHandler;
 class HbActivityManager;
+class MpMediaController;
 
 // Class declaration
 class MpMainWindow: public MpxViewFramework
@@ -90,7 +91,8 @@
     MusicServices         *mMusicServices;         // Own
     MpGlobalPopupHandler  *mPopupHandler;          // Own
     bool                   mUserExit;
-    HbActivityManager     *mActivityManager;       //Not Own
+    HbActivityManager     *mActivityManager;       // Not Own
+    MpMediaController     *mMpMediaController;     // Own
 
 };
 

--- a/app/rom/musicplayer.iby	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/rom/musicplayer.iby	Wed Aug 18 09:46:20 2010 +0300
@@ -21,7 +21,6 @@
 #include <data_caging_paths_for_iby.hrh>
 
 S60_APP_EXE(musicplayer)
-data = ZRESOURCE\apps\musicplayer.mif                      APP_RESOURCE_DIR\musicplayer.mif
 data = ZPRIVATE\10003A3F\import\APPS\musicplayer_reg.rsc   PRIVATE\10003a3f\import\apps\musicplayer_reg.rsc
 
 data = ZSYSTEM\install\musicplayer_stub.sis          system\install\musicplayer_stub.sis

--- a/app/src/mpglobalpopuphandler.cpp	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/src/mpglobalpopuphandler.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -65,7 +65,6 @@
     connect( mMpEngine, SIGNAL( unableToCotinueDueUSB() ), this, SLOT( launchUnableToCotinueDueUsb() ) );
     connect( mMpEngine, SIGNAL( usbSynchronizationStarted() ), this, SLOT( launchUsbBlockingNote() ) );
     connect( mMpEngine, SIGNAL( usbSynchronizationFinished() ), this, SLOT( closeUsbBlockingNote() ) );
-    connect( mMpEngine, SIGNAL( libraryRefreshNeeded() ), this, SLOT( launchRefreshLibraryRequest() ) );
     TX_EXIT
 }
 
@@ -139,7 +138,7 @@
     if ( mOutstandingPopup && ( mOutstandingPopup->objectName() == KScanProgressDialog ) ) {
         HbProgressDialog *dialog = qobject_cast<HbProgressDialog *>( mOutstandingPopup );
         QString added;
-        added = hbTrId( "txt_mus_info_ln_songs_added" , count );
+        added = hbTrId( "txt_mus_info_ln_songs_found" , count );
         dialog->setText( added );
     }
     TX_EXIT
@@ -153,6 +152,7 @@
 void MpGlobalPopupHandler::handleScanFinished( int error, int itemsAdded )
 {
     TX_ENTRY_ARGS("error: " << error << " Items added: " << itemsAdded )
+
     if ( mOutstandingPopup && ( mOutstandingPopup->objectName() == KScanProgressDialog ) ) {
         HbProgressDialog *dialog = qobject_cast<HbProgressDialog *>( mOutstandingPopup );
         disconnect( dialog, SIGNAL( aboutToClose() ), this, SLOT( outstandingPopupClosing() ) );
@@ -162,7 +162,7 @@
 
     switch( error ) {
         case MpSongScanner::ScanErrorNone :
-            launchScanFinishedDialog( true, itemsAdded );
+            launchScanFinishedDialog( true , itemsAdded );
             break;
         case MpSongScanner::ScanGeneralError :
             launchScanFinishedDialog( false, itemsAdded );
@@ -223,31 +223,9 @@
 }
 
 /*!
- Slot called when MpEngine emits libraryRefreshNeeded() signal
- */
-void MpGlobalPopupHandler::launchRefreshLibraryRequest()
-{
-    HbAction *action;
-    HbMessageBox *promptRefresh = new HbMessageBox( HbMessageBox::MessageTypeQuestion );
-    promptRefresh->setText( hbTrId( "txt_mus_info_music_may_need_to_be_refreshed" ) );
-    promptRefresh->setTimeout( HbPopup::NoTimeout );
-    promptRefresh->setModal( true );
-    promptRefresh->clearActions();
-    action = new HbAction( hbTrId( "txt_common_button_yes" ) );
-    action->setObjectName( KYes );
-    connect( action, SIGNAL( triggered() ), mMpEngine, SLOT( refreshLibrary() ) );
-    promptRefresh->addAction( action );
-    action = new HbAction( hbTrId( "txt_common_button_no" ) );
-    action->setObjectName( KNo );
-    promptRefresh->addAction( action );
-    promptRefresh->setAttribute( Qt::WA_DeleteOnClose );
-    promptRefresh->setObjectName( KPromptRefresh );
-    setOutstandingPopup( promptRefresh );
-    promptRefresh->show();
-}
-
-/*!
   Slot to launch the MTP educating info dialog
+  This dialog would be displayed after any manual refresh (from options menu),
+  or after a refreshing originated by USBMassStorage disconnection.
  */
 void MpGlobalPopupHandler::launchMTPInfoDialog()
 {
@@ -302,23 +280,25 @@
  \internal
  Launches Scan Finished Notification.
  */
-void MpGlobalPopupHandler::launchScanFinishedDialog( bool ok, int itemsAdded )
+void MpGlobalPopupHandler::launchScanFinishedDialog( bool ok , int itemsAdded )
 {
-    QString added;
     HbNotificationDialog *finishedDialog = new HbNotificationDialog();
     finishedDialog->setModal(true);
-    added = hbTrId( "txt_mus_dpopinfo_ln_songs_added", itemsAdded );
-    finishedDialog->setText( added );
     finishedDialog->setAttribute( Qt::WA_DeleteOnClose );
     finishedDialog->setObjectName( KScanFinished );
     // Connect aboutToClose with outstandingPopupClosing() first, and then with launchMTPInfoDialog
     // in order to get finishDialog cleared before MtpInfoDialog is launched.
     setOutstandingPopup( finishedDialog );
 
+    // Educating user (of MTP information) dialog is displayed
+    // only when the following conditions are met:
+    // 1. A "manual" refresh operation completes successfully
+    // 2. Refresh operation finds at least one new item
+
     if( ok ) {
         finishedDialog->setIcon( HbIcon( QString("qtg_large_ok") ) );
         finishedDialog->setTitle( hbTrId( "txt_mus_dpophead_refresh_complete" ) );
-        if ( MpSettingsManager::showMtpInfo() && !mMpSongScanner->isAutomaticScan() ) {
+        if ( MpSettingsManager::showMtpInfo() && !mMpSongScanner->isAutomaticScan() && itemsAdded ) {
             connect( finishedDialog, SIGNAL( aboutToClose() ), this, SLOT( launchMTPInfoDialog() ) );
         }
     }

--- a/app/src/mpmainwindow.cpp	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/src/mpmainwindow.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -31,6 +31,7 @@
 #include "mpenginefactory.h"
 #include "mpsettingsmanager.h"
 #include "mpglobalpopuphandler.h"
+#include "mpmediacontroller.h"
 #include "mptrace.h"
 
 const QString MUSIC_MAIN_VIEW = "MusicMainView";
@@ -60,7 +61,8 @@
       mMusicServices(0),
       mPopupHandler(0),
       mUserExit( false ),
-      mActivityManager(0)
+      mActivityManager(0),
+      mMpMediaController(0)
 {
     TX_LOG
 }
@@ -94,7 +96,10 @@
     if (mMediaWallViewPlugin) {
         mMediaWallViewPlugin->destroyView();
         delete mMediaWallViewPlugin;
-    }    
+    }
+
+    delete mMpMediaController;
+
     MpEngineFactory::close();
 
 
@@ -183,6 +188,7 @@
         mActivityManager->removeActivity( MUSIC_NOW_PLAYING_VIEW );
         connect( app, SIGNAL( activate() ), this , SLOT( handleActivity() ) );
         connect( app, SIGNAL( aboutToQuit() ), this, SLOT( saveActivity() ) );
+        mMpMediaController = new MpMediaController();
         emit applicationReady();
         
     }
@@ -226,6 +232,9 @@
         case MpCommon::ActivateDetailsView:
             activateView(DetailsView);
             break;
+        case MpCommon::ActivatePreviousView:
+            activateView(mVerticalViewType);
+            break;
     }
     TX_EXIT
 }
@@ -272,7 +281,7 @@
     Q_ASSERT( mCurrentViewPlugin );
 
     if ( mCurrentViewPlugin ) {
-        if ( viewType != MediaWallView  ) {
+        if ( viewType != MediaWallView && viewType != DetailsView ) {
             mVerticalViewType = viewType;
         }
         addView( reinterpret_cast<HbView*>( mCurrentViewPlugin->getView() ) );
@@ -319,11 +328,13 @@
 {
     TX_ENTRY
 
-    // If library changed while playing back, always return to AllSongs collection view.
-    if ( mPlaybackViewPlugin &&
-         mCurrentViewPlugin == mPlaybackViewPlugin &&
-         mCollectionViewPlugin ) {
-
+    // Data might have changed, so other views than Collection or MediaWall are not valid any more.
+    if ( mCurrentViewPlugin == mMediaWallViewPlugin ) {
+        if ( mVerticalViewType != CollectionView ) {
+            mVerticalViewType = CollectionView;
+        }
+    }
+    else if ( mCollectionViewPlugin && mCurrentViewPlugin != mCollectionViewPlugin ) {
         activateView( CollectionView );
         MpViewBase* collectionView = reinterpret_cast<MpViewBase*>(mCollectionViewPlugin->getView());
         collectionView->setDefaultView();
@@ -390,6 +401,7 @@
         Q_ASSERT_X(false, "MpMainWindow::initializeServiceView", "undefined service");
         break;
     }
+    mMpMediaController = new MpMediaController();
     emit applicationReady();
 }
 
@@ -520,6 +532,7 @@
     TX_ENTRY
     QVariantHash activityData = data.toHash();
     QByteArray serializedRestorePath = activityData.value( "restorePath" ).toByteArray();
+    connect( MpEngineFactory::sharedEngine(), SIGNAL( restorePathFailed() ), this, SLOT( handleRestorePathFailed() ) );
     MpEngineFactory::sharedEngine()->loadActivityData( serializedRestorePath );
     TX_EXIT
 }

--- a/app/src/mpmtpinfolink.cpp	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/src/mpmtpinfolink.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -88,7 +88,7 @@
 {
     TX_ENTRY
     QString url = MpSettingsManager::instance()->mtpInfoUrl();
-    QString text = HbParameterLengthLimiter( "txt_mus_info_please_note_that_using_media_transfer" ).arg( url );
+    QString text = HbParameterLengthLimiter( hbTrId("txt_mus_info_note_that_using_nokia_ovi_suite_mode") ).arg( url );
     QString htmlLink = "<a href=\"" + url + "\">" + url + "</a>" ;
     text.replace( url, htmlLink );
     text = "<p>" + text + "</p>" ;

--- a/app/tsrc/tsrc.pro	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/tsrc/tsrc.pro	Wed Aug 18 09:46:20 2010 +0300
@@ -11,10 +11,13 @@
 #
 # Contributors:
 #
-# Description: 
+# Description: Music Player app unit test project file.
 #
 
 TEMPLATE = subdirs
 
-SUBDIRS = unittest_mpmtpinfolink
+# SUBDIRS += unittest_mpmtpinfolink
+# SUBDIRS += unittest_mpglobalpopuphandler
 
+CONFIG += ordered
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/inc/unittest_mpglobalpopuphandler.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,59 @@
+/*
+* 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 MpGlobalPopupHandler
+*
+*/
+
+#ifndef TESTMPGLOBALPOPUPHANDLER_H
+#define TESTMPGLOBALPOPUPHANDLER_H
+
+#include <QtTest/QtTest>
+
+class MpGlobalPopupHandler;
+
+class TestMpGlobalPopupHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    TestMpGlobalPopupHandler();
+    ~TestMpGlobalPopupHandler();
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+    
+private slots:
+    void testHandleLibraryAboutToUpdate(); 
+    void testScanCountChanged();
+    void testHandleScanFinished();
+    void testLaunchUnableToCotinueDueUsb();
+    void testLaunchUsbBlockingNote();
+    void testLaunchMTPInfoDialog();
+    void testOutstandingPopupClosing();
+    void testLaunchScanFinishedDialog();
+    void testLaunchDiskFullDialog();
+    void testSetOutstandingPopup(); 
+
+private:
+
+    MpGlobalPopupHandler          *mTest;
+    QTranslator                   *mMpTranslator; 
+
+};
+
+#endif  // TESTMPGLOBALPOPUPHANDLER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/src/unittest_mpglobalpopuphandler.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,253 @@
+/*
+* 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 MpMediaWallDocumentLoader
+*/
+
+#include "unittest_mpglobalpopuphandler.h"
+#include "mpsongscanner.h"
+#include "mpengine.h"
+#include <hbpopup.h>
+#include <hbprogressdialog.h>
+#include <hbnotificationdialog.h>
+#include <hblabel.h>
+#include <QTranslator>
+#include <QLocale>
+
+/*
+* Following methods were skipped on purpose since theres nothing valuable to test
+* CloseUsbBlockingNote()
+* HanldeMTPInfoDialogFinished
+*/
+
+// Do this so we can access all member variables.
+#define private public
+#include "mpglobalpopuphandler.h"
+#undef private
+
+#include "../../../src/mpglobalpopuphandler.cpp"
+
+/*!
+ Make our test case a stand-alone executable that runs all the test functions.
+ */
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    TestMpGlobalPopupHandler tv;
+
+    if ( argc > 1 ) {
+        return QTest::qExec( &tv, argc, argv);
+    }
+    else {
+        char *pass[3];
+        pass[0] = argv[0];
+        pass[1] = "-o";
+        pass[2] = "c:\\data\\unittest_mpglobalpopuphandler.txt";
+
+        return QTest::qExec(&tv, 3, pass);
+    }
+}
+
+TestMpGlobalPopupHandler::TestMpGlobalPopupHandler()
+    : mTest(0),      
+      mMpTranslator(0)
+{
+}
+
+TestMpGlobalPopupHandler::~TestMpGlobalPopupHandler()
+{
+    delete mTest;
+    delete mMpTranslator;
+}
+
+/*!
+ Called before the first testfunction is executed.
+ */
+void TestMpGlobalPopupHandler::initTestCase()
+{
+    QString lang = QLocale::system().name();
+    QString path = QString("z:/resource/qt/translations/");
+    bool translatorLoaded = false;
+
+    mMpTranslator = new QTranslator(this);
+    translatorLoaded = mMpTranslator->load(path + "musicplayer_" + lang);
+    if ( translatorLoaded ) {
+        qApp->installTranslator(mMpTranslator);
+    }
+}
+
+/*!
+ Called after the last testfunction was executed.
+ */
+void TestMpGlobalPopupHandler::cleanupTestCase()
+{
+}
+
+/*!
+ Called before each testfunction is executed.
+ */
+void TestMpGlobalPopupHandler::init()
+{
+    mTest = new MpGlobalPopupHandler( new QObject() );
+}
+
+/*!
+ Called after every testfunction.
+ */
+void TestMpGlobalPopupHandler::cleanup()
+{
+    delete mTest;
+    mTest = 0;
+}
+
+/*!
+ test handleLibraryAboutToUpdate
+ */
+void TestMpGlobalPopupHandler::testHandleLibraryAboutToUpdate() 
+{
+    mTest->mMpSongScanner = 0;
+    mTest->mMpEngine->mSongScanner = new MpSongScanner();
+    
+    mTest->handleLibraryAboutToUpdate();
+    QCOMPARE( mTest->mMpSongScanner,  mTest->mMpEngine->mSongScanner );    
+}
+
+/*!
+  test scanCountChanged
+ */
+void TestMpGlobalPopupHandler::testScanCountChanged() 
+{
+    HbProgressDialog* dialog = new HbProgressDialog( HbProgressDialog::WaitDialog );
+    dialog->setModal( true );
+    dialog->setText( QString("") );
+    dialog->setObjectName( KScanProgressDialog );
+        
+    mTest->mOutstandingPopup = dialog;
+    
+    mTest->scanCountChanged( 2 );
+    HbProgressDialog *dialogNew = qobject_cast<HbProgressDialog *>( mTest->mOutstandingPopup );
+    QCOMPARE( dialogNew->text(),  hbTrId( "txt_mus_info_ln_songs_found" , 2 ));  
+
+}
+
+/*!
+  test handleScanFinished
+ */
+void TestMpGlobalPopupHandler::testHandleScanFinished() 
+{
+    HbProgressDialog* dialog = new HbProgressDialog( HbProgressDialog::WaitDialog );
+    dialog->setModal( true );
+    HbLabel *title = new HbLabel( hbTrId( "testScanCountChanged" ) );
+    title->setFontSpec(HbFontSpec(HbFontSpec::Primary));
+
+    dialog->setHeadingWidget( title );
+    dialog->setText( QString("") );
+    dialog->setObjectName( KScanProgressDialog );
+        
+    mTest->mOutstandingPopup = dialog;    
+    mTest->handleScanFinished( MpSongScanner::ScanErrorNone, 0 );
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KScanFinished );    
+    QVERIFY( qobject_cast<HbNotificationDialog *>( mTest->mOutstandingPopup )->title() == hbTrId( "txt_mus_dpophead_refresh_complete" ) );
+    
+    mTest->mOutstandingPopup = dialog;
+    mTest->handleScanFinished( MpSongScanner::ScanGeneralError, 0 );
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KScanFinished );
+    QVERIFY( qobject_cast<HbNotificationDialog *>( mTest->mOutstandingPopup )->title() == hbTrId( "txt_mus_dpophead_refresh_cancelled" ) );
+    
+    mTest->mOutstandingPopup = dialog;
+    mTest->handleScanFinished( MpSongScanner::ScanErrorDiskFull, 0 );
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KDiskFullDialog );
+
+}
+
+/*!
+  test launchUnableToCotinueDueUsb
+ */
+void TestMpGlobalPopupHandler::testLaunchUnableToCotinueDueUsb()
+{
+    mTest->launchUnableToCotinueDueUsb();
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KUnableToContinueDueUSB );
+}
+
+/*!
+  test launchUsbBlockingNote
+ */
+void TestMpGlobalPopupHandler::testLaunchUsbBlockingNote()
+{
+    mTest->launchUsbBlockingNote();
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KUsbBlockingNote );
+}
+
+
+/*!
+  test launchMTPInfoDialog
+ */
+void TestMpGlobalPopupHandler::testLaunchMTPInfoDialog()
+{
+    mTest->launchMTPInfoDialog();
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KMTPInfoDialog );
+}
+
+
+/*!
+  test outstandingPopupClosing
+ */
+void TestMpGlobalPopupHandler::testOutstandingPopupClosing()
+{
+    HbPopup *dialog = new HbPopup();
+    connect( dialog, SIGNAL( aboutToClose() ), mTest, SLOT( outstandingPopupClosing() ) );
+    mTest->mOutstandingPopup = dialog; 
+    
+    dialog->close();
+    delete dialog;
+    QVERIFY( mTest->mOutstandingPopup == 0 );       
+}
+
+/*!
+  test launchScanFinishedDialog
+ */
+void TestMpGlobalPopupHandler::testLaunchScanFinishedDialog()
+{
+    mTest->launchScanFinishedDialog( true, 1 );
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KScanFinished );
+    QVERIFY( qobject_cast<HbNotificationDialog *>( mTest->mOutstandingPopup )->title() == hbTrId( "txt_mus_dpophead_refresh_complete" ) );
+
+    mTest->launchScanFinishedDialog( false, 1 );
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KScanFinished );
+    QVERIFY( qobject_cast<HbNotificationDialog *>( mTest->mOutstandingPopup )->title() == hbTrId( "txt_mus_dpophead_refresh_cancelled" ) );
+}
+
+
+/*!
+  test launchDiskFullDialog
+ */
+
+void TestMpGlobalPopupHandler::testLaunchDiskFullDialog() 
+{
+    mTest->launchDiskFullDialog();
+    QVERIFY( mTest->mOutstandingPopup->objectName() == KDiskFullDialog );
+}
+
+/*!
+  test setOutstandingPopup
+ */
+void TestMpGlobalPopupHandler::testSetOutstandingPopup() 
+{
+    HbPopup *dialog = new HbPopup();
+    mTest->mOutstandingPopup = 0;    
+    mTest->setOutstandingPopup( dialog );    
+    QVERIFY( mTest->mOutstandingPopup == dialog );
+}
+
+
+// End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/inc/mpengine.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,58 @@
+/*
+* 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: mpengine stub
+*
+*/
+
+#ifndef MPENGINE_H
+#define MPENGINE_H
+
+#include <QObject>
+
+class MpSongScanner;
+
+class MpEngine : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum EngineMode{
+        StandAlone,
+        Fetch,
+        Embedded,
+        MediaBrowsing
+    };
+    friend class MpEngineFactory;
+    
+public:     
+    MpSongScanner *songScanner();    
+
+private:
+    explicit MpEngine();
+    void initialize( TUid hostUid, EngineMode mode);
+    
+signals:
+    void libraryAboutToUpdate();    
+    void unableToCotinueDueUSB();
+    void usbSynchronizationStarted();
+    void usbSynchronizationFinished();
+
+public:
+    virtual ~MpEngine();
+    
+public:
+    MpSongScanner                        *mSongScanner;          
+};
+
+#endif // MPENGINE_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/inc/mpenginefactory.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,46 @@
+/*
+* 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: MpEngineFactory stub 
+*
+*/
+
+#ifndef MPENGINEFACTORY_H
+#define MPENGINEFACTORY_H
+
+#include <QObject>
+#include "mpcommondefs.h"
+#include "mpengine.h"
+
+class MpEngineFactory : QObject
+{
+    Q_OBJECT
+private:
+    explicit MpEngineFactory();
+
+public:
+    virtual ~MpEngineFactory();
+    static MpEngineFactory * instance();    
+    static MpEngine *sharedEngine();
+    static MpEngine *createIsolatedEngine( MpEngine::EngineMode mode );
+    static void close();
+    static MpEngine *createSharedEngine( TUid uid = TUid::Uid( MpCommon::KMusicPlayerUid ), MpEngine::EngineMode mode = MpEngine::StandAlone );
+
+    
+private:    
+    MpEngine             *mSharedEngine;
+    QList<MpEngine *>    mEngines;
+};
+
+
+#endif // MPENGINEFACTORY_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/inc/mpmtpinfolink.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* 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 MTP info link.
+*
+*/
+
+
+#ifndef MPMTPINFOLINK_H
+#define MPMTPINFOLINK_H
+
+#include <hblabel.h>
+
+class MpMtpInfoLink: public HbLabel
+{
+    Q_OBJECT
+
+public:
+    explicit MpMtpInfoLink();
+    virtual ~MpMtpInfoLink();
+};
+
+#endif // MPMTPINFOLINK_H
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/inc/mpsettingsmanager.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* 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: MpSettingsManager stub for testing MpMtpInfoLink.
+*
+*/
+
+#ifndef MPSETTINGSMANAGER_H
+#define MPSETTINGSMANAGER_H
+
+#include<QObject>
+#include <QtGlobal>
+
+class  MpSettingsManager: public QObject
+{
+    
+Q_OBJECT
+
+private:
+    explicit MpSettingsManager();
+
+public:
+    virtual ~MpSettingsManager();
+    static MpSettingsManager *instance();
+    static void SetUrl( QString url );
+    static QString mtpInfoUrl();
+    static bool showMtpInfo();
+    static void stopShowingMtpInfo();
+
+public:
+    QString mMtpInfoUrl;
+    bool    mShowMtpInfo;
+
+private:
+    Q_DISABLE_COPY(MpSettingsManager)
+};
+
+#endif    // MPSETTINGSMANAGER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/inc/mpsongscanner.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* 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: stub for song scanner.
+*
+*/
+
+
+#ifndef MPSONGSCANNER_H
+#define MPSONGSCANNER_H
+
+class MpMpxHarvesterFrameworkWrapper;
+
+#include <QObject>
+
+class MpSongScanner : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum ScanError{
+        ScanErrorNone,
+        ScanGeneralError,
+        ScanErrorDiskFull,
+        ScanInterrupted
+    };
+    
+    MpSongScanner();
+    virtual ~MpSongScanner();
+
+    void scan( bool automaticScan );
+    bool isAutomaticScan();
+    
+signals:
+    void scanStarted();
+    void scanCountChanged( int count );
+    void scanFinished( int error, int itemsAdded );    
+
+public:
+    bool                                 mAutomaticScan;
+};
+
+#endif // MPSONGSCANNER_H
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/src/mpengine.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* 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: Stub for mpengine.
+*
+*/
+
+#include "mpengine.h"
+#include "mpsongscanner.h" 
+
+MpEngine::MpEngine()
+{
+
+}
+
+/*!
+ Destructs music player engine.
+ */
+MpEngine::~MpEngine()
+{
+
+}
+
+/*!
+ Initialize engine
+ */
+void MpEngine::initialize( TUid hostUid, EngineMode mode )
+{
+    Q_UNUSED( hostUid );
+    Q_UNUSED( mode );
+}
+
+/*!
+ \
+ Returs the current songScanner instance
+ */
+MpSongScanner *MpEngine::songScanner()
+{
+    return mSongScanner;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/src/mpenginefactory.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,96 @@
+/*
+* 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: MpEngineFactory stub for testing MpNowPlayingWidget
+*
+*/
+
+
+#include "mpenginefactory.h"
+
+
+/*!
+ *  Stub function
+ */
+MpEngineFactory::MpEngineFactory()
+    : mSharedEngine( 0 )
+{
+}
+
+/*!
+ *  Stub function
+ */
+MpEngineFactory::~MpEngineFactory()
+{
+}
+
+/*!
+ *  Stub function
+ */
+MpEngineFactory * MpEngineFactory::instance()
+{
+    static MpEngineFactory instance;
+    return &instance;
+}
+
+/*!
+ *  Stub function
+ */
+MpEngine *MpEngineFactory::sharedEngine()
+{
+    if ( !instance()->mSharedEngine ) {
+        instance()->mSharedEngine = new MpEngine();
+    }
+    return instance()->mSharedEngine;
+}
+
+/*!
+ Returns an instance to an isolated engine with \a mode.
+ */
+MpEngine *MpEngineFactory::createIsolatedEngine( MpEngine::EngineMode mode )
+{
+    instance()->mEngines.append( new MpEngine() );
+    instance()->mEngines.last()->initialize( TUid::Uid( MpCommon::KMusicPlayerUid + instance()->mEngines.count() ), mode );
+    return instance()->mEngines.last();
+}
+
+/*!
+ Closes all engines created on this process.
+ */
+void MpEngineFactory::close()
+{
+    if ( instance()->mSharedEngine ) {
+        delete instance()->mSharedEngine;
+        instance()->mSharedEngine = 0;
+        
+    }
+    MpEngine *ptr;
+    foreach ( ptr, instance()->mEngines ) {
+        delete ptr;
+        ptr = 0;
+    }
+}
+
+/*!
+ Returns an instance to an engine with \a hostUid, and \a mode, if the shared engine is 
+ already created parameters are ignored.
+ */
+MpEngine *MpEngineFactory::createSharedEngine( TUid hostUid , MpEngine::EngineMode mode )
+{
+    if ( !instance()->mSharedEngine ) {
+        instance()->mSharedEngine = new MpEngine();
+        instance()->mSharedEngine->initialize( hostUid, mode );
+    }
+    return instance()->mSharedEngine;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/src/mpmtpinfolink.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* 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 MTP info link. This class is used to provide a link
+*              to educate the user about MTP after a successful manual refresh.
+*              Basically this class inherits from HbLabel and catches mouse events,
+*              when clicked it opens a url already specified in settings.
+*
+*/
+
+
+#include "mpmtpinfolink.h"
+
+
+/*!
+ Constructs MpMtpInfoLink.
+ */
+MpMtpInfoLink::MpMtpInfoLink()
+{
+}
+
+/*!
+ Destructs the MpMtpInfoLink.
+ */
+MpMtpInfoLink::~MpMtpInfoLink()
+{
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/src/mpsettingsmanager.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,72 @@
+/*
+* 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: MpSettingsManager stub for testing MpMtpInfoLink.
+*
+*/
+
+#include "mpsettingsmanager.h"
+
+
+/*!
+ Constructs the MP Settings Manager.
+ */
+MpSettingsManager::MpSettingsManager()
+{
+    mMtpInfoUrl = QString( "http://nokia.com/" );
+}
+
+/*!
+ Destructs the settings manager.
+ */
+MpSettingsManager::~MpSettingsManager()
+{
+}
+
+/*!
+ Returns the singleton instance to the settings manager.
+ */
+MpSettingsManager * MpSettingsManager::instance()
+{
+    static MpSettingsManager instance;
+    return &instance;
+}
+
+void MpSettingsManager::SetUrl( QString url )
+{
+    instance()->mMtpInfoUrl = url;
+}
+
+/*!
+ Returns mtp info url.
+ */
+QString MpSettingsManager::mtpInfoUrl()
+{
+    return instance()->mMtpInfoUrl;
+}
+
+/*!
+ Returns wheter mtp info should be showed.
+ */
+bool MpSettingsManager::showMtpInfo()
+{
+    return instance()->mShowMtpInfo;
+}
+
+/*!
+ Slot to be called to stop showing mtp info.
+ */
+void MpSettingsManager::stopShowingMtpInfo()
+{
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/stub/src/mpsongscanner.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,47 @@
+/*
+* 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: stub for song scanner.
+*
+*/
+
+#include "../inc/mpsongscanner.h"
+
+/*!
+ Constructs the song scanner.
+ */
+MpSongScanner::MpSongScanner()
+{
+
+}
+
+/*!
+ Destructs the song scanner.
+ */
+MpSongScanner::~MpSongScanner()
+{
+}
+
+/*!
+ Initiates song scanning.
+ */
+void MpSongScanner::scan( bool /*automaticScan*/ )
+{
+
+}
+
+bool MpSongScanner::isAutomaticScan() 
+{
+    return mAutomaticScan;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/tsrc/unittest_mpglobalpopuphandler/unittest_mpglobalpopuphandler.pro	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,48 @@
+#
+# 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: mpglobalpopuphandler unit test project file.
+#
+
+TEMPLATE = app
+CONFIG += qtestlib hb symbian_test
+TARGET = unittest_mpglobalpopuphandler
+TARGET.CAPABILITY = CAP_APPLICATION
+
+DEPENDPATH += .
+INCLUDEPATH += . \
+               stub/inc \
+               ../../inc \
+               ../../../inc
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE 
+
+LIBS += -lestor.dll \
+        -lfbscli.dll \
+
+HEADERS += inc/unittest_mpglobalpopuphandler.h \
+		   ../../inc/mpglobalpopuphandler.h \	
+		   stub/inc/mpmtpinfolink.h \
+		   stub/inc/mpsongscanner.h \
+		   stub/inc/mpenginefactory.h \
+		   stub/inc/mpsettingsmanager.h \
+	       stub/inc/mpengine.h \
+               
+SOURCES += src/unittest_mpglobalpopuphandler.cpp \ 		   
+		   #../../src/mpglobalpopuphandler.cpp \
+		   stub/src/mpmtpinfolink.cpp \
+		   stub/src/mpsongscanner.cpp \
+		   stub/src/mpenginefactory.cpp \
+		   stub/src/mpsettingsmanager.cpp \
+		   stub/src/mpengine.cpp \
+	       
+	       
\ No newline at end of file

--- a/app/tsrc/unittest_mpmtpinfolink/inc/unittest_mpmtpinfolink.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/tsrc/unittest_mpmtpinfolink/inc/unittest_mpmtpinfolink.h	Wed Aug 18 09:46:20 2010 +0300
@@ -20,6 +20,7 @@
 
 #include <QtTest/QtTest>
 
+class QTranslator;
 class MpMtpInfoLink;
 
 class TestMpMtpInfoLink : public QObject
@@ -45,7 +46,9 @@
     void testSetMtpInfoText();
 
 private:
+
     MpMtpInfoLink  *mTest;
+    QTranslator    *mMpTranslator; // Own
 
 };
 

--- a/app/tsrc/unittest_mpmtpinfolink/src/unittest_mpmtpinfolink.cpp	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/tsrc/unittest_mpmtpinfolink/src/unittest_mpmtpinfolink.cpp	Wed Aug 18 09:46:20 2010 +0300
@@ -16,6 +16,8 @@
 */
 
 #include <QGraphicsSceneMouseEvent>
+#include <QTranslator>
+#include <QLocale>
 
 #include "stub/inc/hblabel.h"
 #include "stub/inc/qdesktopservices.h"
@@ -55,13 +57,15 @@
 }
 
 TestMpMtpInfoLink::TestMpMtpInfoLink()
-    : mTest( 0 )
+    : mTest(0),
+      mMpTranslator(0)
 {
 }
 
 TestMpMtpInfoLink::~TestMpMtpInfoLink()
 {
     delete mTest;
+    delete mMpTranslator;
 }
 
 /*!
@@ -69,6 +73,15 @@
  */
 void TestMpMtpInfoLink::initTestCase()
 {
+    QString lang = QLocale::system().name();
+    QString path = QString("z:/resource/qt/translations/");
+    bool translatorLoaded = false;
+
+    mMpTranslator = new QTranslator(this);
+    translatorLoaded = mMpTranslator->load(path + "musicplayer_" + lang);
+    if ( translatorLoaded ) {
+        qApp->installTranslator(mMpTranslator);
+    }
 }
 
 /*!

--- a/app/tsrc/unittest_mpmtpinfolink/unittest_mpmtpinfolink.pro	Tue Jul 06 14:13:36 2010 +0300
+++ b/app/tsrc/unittest_mpmtpinfolink/unittest_mpmtpinfolink.pro	Wed Aug 18 09:46:20 2010 +0300
@@ -11,12 +11,11 @@
 #
 # Contributors:
 #
-# Description: 
+# Description: mpmtpinfolink unit test project file.
 #
 
 TEMPLATE = app
-CONFIG += qtestlib
-CONFIG += symbian_test
+CONFIG += qtestlib hb symbian_test
 TARGET = unittest_mpmtpinfolink
 TARGET.CAPABILITY = CAP_APPLICATION
 
@@ -24,7 +23,6 @@
 INCLUDEPATH += . \
                ../../inc \
                ../../../inc
-
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 LIBS += -lestor.dll \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/mpalbumcoverwidget.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 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:  Album Cover Widget for Music Player Media Wall.
+*
+*/
+#ifndef MPALBUMCOVERWIDGET_H
+#define MPALBUMCOVERWIDGET_H
+
+#include <QPixmap>
+#include <QGesture>
+
+#include <hbwidget.h>
+#include <hbicon.h>
+
+#ifdef BUILD_MPALBUMCOVERWIDGET
+#define MPALBUMCOVERWIDGET_EXPORT Q_DECL_EXPORT
+#else
+#define MPALBUMCOVERWIDGET_EXPORT Q_DECL_IMPORT
+#endif
+
+class MPALBUMCOVERWIDGET_EXPORT MpAlbumCoverWidget : public HbWidget
+
+{
+    Q_OBJECT
+
+public:
+
+    MpAlbumCoverWidget( QGraphicsItem *parent = 0 );
+    virtual ~MpAlbumCoverWidget();
+    void setIcon(const HbIcon &icon );
+    void setDefaultIcon( const HbIcon &icon );
+    void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, 
+                QWidget *widget = 0 );
+    void gestureEvent(QGestureEvent *event);
+
+signals:
+
+    void clicked();
+    
+private:
+
+    void mousePressEvent( QGraphicsSceneMouseEvent *event );
+    void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
+    
+private:
+    
+    HbIcon    mIcon;
+    HbIcon    mDefaultIcon;
+    QPixmap   mPixmap;
+};
+
+
+#endif //MPALBUMCOVERWIDGET_H
+
+// EOF

--- a/inc/mpcommondefs.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/inc/mpcommondefs.h	Wed Aug 18 09:46:20 2010 +0300
@@ -20,6 +20,8 @@
 #ifndef MPCOMMONDEFS_H
 #define MPCOMMONDEFS_H
 
+#include <QMetaType>
+
 namespace MpCommon
 {
     // UID definition
@@ -40,7 +42,8 @@
         ActivateCollectionView,
         ActivatePlaybackView,
         ActivateSettingsView,
-        ActivateDetailsView
+        ActivateDetailsView,
+        ActivatePreviousView
     };
 
     /*!
@@ -62,6 +65,18 @@
         TBoneThumb,
         MediaWallThumb,
     };
+    
+    /*!
+    Volume property, used in MpMpxPlaybackFramework and MpVolumeSlider.
+    */
+    enum MpVolumeProperty{
+        MaxVolume,
+        Volume,
+        MuteState
+    };
 }
 
+    // Register MpVolumeProperty so can be used in signal and slot connection
+    Q_DECLARE_METATYPE( MpCommon::MpVolumeProperty )
+
 #endif	// MPCOMMONDEFS_H

--- a/inc/mpengine.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/inc/mpengine.h	Wed Aug 18 09:46:20 2010 +0300
@@ -27,10 +27,8 @@
 class QStringList;
 class MpMpxHarvesterFrameworkWrapper;
 class MpSongScanner;
-class MpMediaKeyHandler;
 class MpMpxCollectionFrameworkWrapper;
 class MpMpxPlaybackFrameworkWrapper;
-class MpMpxDetailsFrameworkWrapper;
 class MpMpxCollectionData;
 class MpPlaybackData;
 class MpSongData;
@@ -110,7 +108,7 @@
 
     // Details related
     MpSongData *songData();
-    void retrieveSong();
+    void retrieveSongDetails( int index = -1 );
 
     // Audio Effects related
     int balance();
@@ -135,7 +133,6 @@
     void unableToCotinueDueUSB();
     void usbSynchronizationStarted();
     void usbSynchronizationFinished();
-    void libraryRefreshNeeded();
 
     // Collection related
     void collectionPlaylistOpened();
@@ -148,6 +145,9 @@
     void containerContentsChanged();
     void restorePathFailed();
 
+    // Playback related
+    void volumePropertyChanged( MpCommon::MpVolumeProperty property, int value );
+
     // Equalizer related
     void equalizerReady();
 
@@ -170,6 +170,8 @@
     // Playback related
     void playEmbedded( QString aFilename );
     void playEmbedded( const XQSharableFile&  file );
+    void play();
+    void pause();
     void playPause();
     void stop();
     void skipForward();
@@ -180,6 +182,14 @@
     void setPosition( int position );
     void setShuffle( bool mode );
     void setRepeat( bool mode );
+    void getMaxVolume();
+    void getVolume();
+    void increaseVolume();
+    void decreaseVolume();
+    void setVolume( int value );
+    void getMuteState();
+    void mute();
+    void unmute();
 
     // Audio Effects related
     void setBalance( int balance );
@@ -207,7 +217,6 @@
     // Harvesting related
     MpMpxHarvesterFrameworkWrapper       *mMpxHarvesterWrapper;  // Own
     MpSongScanner                        *mSongScanner;          // Own
-    MpMediaKeyHandler                    *mMediaKeyHandler;      // Own
 
     // Collection related
     MpMpxCollectionFrameworkWrapper      *mMpxCollectionWrapper; //Own
@@ -215,9 +224,6 @@
     // Playback related
     MpMpxPlaybackFrameworkWrapper        *mMpxPlaybackWrapper; //Own
 
-    // Details related
-    MpMpxDetailsFrameworkWrapper         *mMpxDetailsWrapper;  // Own
-
     // Audio Effects related
     MpAudioEffectsFrameworkWrapper       *mAudioEffectsWrapper; // Own
 
@@ -225,9 +231,12 @@
     MpEqualizerFrameworkWrapper          *mEqualizerWrapper; // Own
     int                                  mCurrentPresetIndex;
 
+    MpSongData                           *mSongData;            // Owned
+
     // General
     UsbBlockingState                     mUsbBlockingState;
-    UsbBlockingState                     mPreviousUsbState;    
+    UsbBlockingState                     mPreviousUsbState;
+    bool                                 mHandleMediaCommands;
     TUid                                 mHostUid;
 };
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/mpmediacontroller.h	Wed Aug 18 09:46:20 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* 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 Controller.
+*
+*/
+
+#ifndef MPMEDIACONTROLLER_H
+#define MPMEDIACONTROLLER_H
+
+#include <QObject>
+#include <QtGlobal>
+
+class MpMediaKeyHandler;
+class MpVolumeSlider;
+
+#ifdef BUILD_MPMEDIACONTROLLER
+#define BUILD_MPMEDIACONTROLLER_EXPORT Q_DECL_EXPORT
+#else
+#define BUILD_MPMEDIACONTROLLER_EXPORT Q_DECL_IMPORT
+#endif
+class  BUILD_MPMEDIACONTROLLER_EXPORT MpMediaController: public QObject
+{
+
+Q_OBJECT
+
+public:
+
+    explicit MpMediaController( QObject *parent = 0 );
+    virtual ~MpMediaController();
+
+private:
+    Q_DISABLE_COPY(MpMediaController)
+    MpMediaKeyHandler           *mMpMediaKeyHandler;    // own
+    MpVolumeSlider              *mMpVolumeSlider;       // own
+};
+
+#endif    // MPMEDIACONTROLLER_H

--- a/inc/mpplaybackdata.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/inc/mpplaybackdata.h	Wed Aug 18 09:46:20 2010 +0300
@@ -104,7 +104,6 @@
     int                      mAlbumId;
     int                      mId;
     HbIcon                   mAlbumArt;
-    HbIcon                   mDefaultAlbumArt;
     SimplifiedState          mPlaybackState;
     bool                     mRealAudio;
 

--- a/inc/mpsongdata.h	Tue Jul 06 14:13:36 2010 +0300
+++ b/inc/mpsongdata.h	Wed Aug 18 09:46:20 2010 +0300
@@ -22,9 +22,10 @@
 #include <QString>
 #include <QPixmap>
 
-//forward declartions
+class MpSongDataPrivate;
+class CMPXMedia;
+class HbIcon;
 class ThumbnailManager;
-class HbIcon;
 
 #if defined(BUILD_MPDATA_LIB)
 #define MPDATA_EXPORT Q_DECL_EXPORT
@@ -37,41 +38,11 @@
 {
     Q_OBJECT
 
+    friend class MpSongDataPrivate;
+
 public:
     explicit MpSongData( QObject *parent=0 );
     virtual ~MpSongData();
-    
-    bool setTitle( const QString &title );
-    bool setAlbum( const QString &album );
-    bool setArtist( const QString &artist );
-    bool setComment( const QString &comment );
-    void setAlbumArtUri( const QString &albumArtUri );
-    bool setYear( int date );
-    bool setGenre( const QString &genre );
-    bool setComposer( const QString &compoer );
-    bool setAlbumTrack( const QString &albumtrack );
-    void setLink( const QString &link );
-    bool setFileName( const QString &fileName );
-    bool setMimeType( const QString &mimeType );
-    bool setDuration( int duration );
-    bool setBitRate( int bitRate);
-    bool setSampleRate( int sampleRate );
-    bool setSize( int size );
-    bool setModified( const QString &modified );
-    bool setCopyright( const QString &copyright );
-    bool setMusicURL( const QString &musicURL );
-    bool setDrmProtected( bool drmProtected );
-    
-    // inform details view when basic information is ready to accelerate UI update
-    void commitPlaybackInfo();
-    // inform details view when details information is ready
-    void commitSongDetailInfo();
-    void removeAlbumArtFile() const; //TODO: Remove when base64 starts to work
-
-public slots:
-    void thumbnailReady( const QPixmap& pixmap, void *data, int id, int error );
-    
-    int reservedLength() const { return mLink.length() + mTitle.length() + mArtist.length(); }
 
     QString title() const;
     QString album() const;
@@ -83,7 +54,6 @@
     QString composer() const;
     QString albumTrack() const;
     QString link() const;
-    
     QString fileName() const;
     QString mimeType() const;
     QString duration() const;
@@ -94,42 +64,31 @@
     QString copyright() const;
     QString musicURL() const;
     bool isDrmProtected() const;
-    
+
     QString albumArtBase64() const;
+    void removeAlbumArtFile() const; //TODO: Remove when base64 starts to work
+
+    void setLink( const QString &link );
+    void setMpxMedia( const CMPXMedia& aMedia );
 
 signals:
+
     void albumArtReady();
     void playbackInfoChanged();
-	void songDetailInfoChanged();	
+    void songDetailInfoChanged();
+
+public slots:
+
+    int reservedLength() const;
+    void thumbnailReady( QPixmap pixmap, void *data, int id, int error );
 
 private:
-    QString                  mTitle;
-    QString                  mAlbum;
-    QString                  mArtist;
-    QString                  mComment;
-    QString                  mComposer;
-    QString                  mGenre;
-    QString                  mYear;
-    QString                  mAlbumTrack;
-    HbIcon                   *mAlbumArt;
-    ThumbnailManager         *mThumbnailManager; //owned
-    TInt                     mReqId;
-    QString                  currentAAUri; 
-    HbIcon                   *mDefaultAlbumArt;
-    QString                  mLink;
-    QString                  mFileName;
-    QString                  mMimeType;
-    QString                  mDuration;
-    QString                  mBitRate;
-    QString                  mSampleRate;
-    QString                  mSize;
-    QString                  mModified;
-    QString                  mCopyright;
-    QString                  mMusicURL;
-    QString                  mTempAlbumArt; //TODO: Remove when base64 starts to work
-    bool                     mDrmProtected;
-    
+
     Q_DISABLE_COPY(MpSongData)
+    MpSongDataPrivate   *d_ptr;
+    ThumbnailManager    *mThumbnailManager; // Owned
+
 };
 
 #endif // MPSONGDATA_H
+

--- a/layers.sysdef.xml	Tue Jul 06 14:13:36 2010 +0300
+++ b/layers.sysdef.xml	Wed Aug 18 09:46:20 2010 +0300
@@ -17,6 +17,17 @@
 				<unit unitID="musicplayer_group" mrp="" bldFile="&layer_real_source_path;" name="musicplayer_group" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
 			</module>
     </layer>
-
+ 
+    <layer name="qt_unit_test_layer">
+			<module name="musicplayer_tsrc">
+				<unit unitID="musicplayer_tsrc" bldFile="&layer_real_source_path;/tsrc" name="musicplayer_tsrc" proFile="tsrc.pro" mrp="" filter=""/>
+			</module>
+	</layer>
+	
+    <layer name="pref_test_layer">
+		<module name="musicplayer_tsrc_group">
+			<unit unitID="musicplayer_tsrc_group" bldFile="&layer_real_source_path;/tsrc" name="musicplayer_tsrc_group" proFile="tsrc.pro" mrp="" filter="TA_MUSICPLAYER"/>
+		</module> 
+    </layer>  
   </systemModel>
 </SystemDefinition>
\ No newline at end of file