FCL/sf/app/musicplayer: comparison app/src/mpmainwindow.cpp

equal deleted inserted replaced

-:560ce2306a17
+:f3930dda3342
 *
 */
 #include <hbapplication.h>
-#include <hbactivitymanager.h>
 #include <hbview.h>
 #include <mpxviewpluginqt.h>
 #include <xqpluginloader.h>
 #include <xqplugininfo.h>
 #include <xqserviceutil.h>
 #include <xqsharablefile.h>
+#include <afactivitystorage.h>
+#include <afactivation.h>
 #include "mpmainwindow.h"
 #include "mpviewbase.h"
 #include "musicservices.h"
 #include "mpenginefactory.h"
 mVerticalViewType( CollectionView ),
 mPreviousVerticalViewType( NoView ),
 mMusicServices(0),
 mPopupHandler(0),
 mUserExit( false ),
-mActivityManager(0),
+mMpMediaController(0),
-mMpMediaController(0)
+mActivityStorage(0)
 {
 TX_LOG
 }
 /*!
 mMediaWallViewPlugin->destroyView();
 delete mMediaWallViewPlugin;
 }
 delete mMpMediaController;
+delete mActivityStorage;
 MpEngineFactory::close();
 TX_EXIT
 /*!
 Initialize and activate the collection view
 */
-void MpMainWindow::initialize( ActivityMode mode )
+void MpMainWindow::initialize()
 {
 TX_ENTRY
 #ifdef _DEBUG
 QList<XQPluginInfo> impls;
 if ( XQServiceUtil::isService() ) {
 // Music Service mode
 // Set the Collection View and Playback View to fetcher mode
 mMusicServices = new MusicServices();
-int err = connect(mMusicServices, SIGNAL(serviceActive( TUid )), this, SLOT(initializeServiceView( TUid )));
+int err = connect(mMusicServices, SIGNAL(serviceActive( quint32 )), this, SLOT(initializeServiceView( quint32 )));
 TX_LOG_ARGS("connection error: " << err);
 XQServiceUtil::toBackground( false );
 }
+AfActivation *activation = new AfActivation( this );
+mActivityStorage = new AfActivityStorage;
 if ( !mMusicServices ) {
-HbApplication* app = qobject_cast<HbApplication*>(qApp);
+QVariantHash params = activation->parameters();
-QVariantHash params = app->activateParams();
+ActivityMode mode = !params.value( "activityname" ).toString().compare( MUSIC_NOW_PLAYING_VIEW ) ? MpMainWindow::MusicNowPlayingView : MpMainWindow::MusicMainView;
 MpEngineFactory::createSharedEngine();
 mPopupHandler = new MpGlobalPopupHandler( this );
-if( app->activateReason() == Hb::ActivationReasonActivity ) {
+if( activation->reason() == Af::ActivationReasonActivity ) {
 // Restoring an activity, not a fresh startup or a service
 // Activities from Task switcher only have one parameter
 if( params.count() == 1 ) {
-loadActivity( app->activateData() );
+loadActivity( mActivityStorage->activityData( activation->name() ) );
 }
 }
 if ( orientation() == Qt::Vertical ) {
 // If first startup ignore shuffleAll and send to collection view to refresh library
 if ( mode == MusicMainView  || MpSettingsManager::firstStartup() ) {
 }
 connect(this, SIGNAL( orientationChanged( Qt::Orientation ) ), SLOT( switchView( Qt::Orientation ) ) );
 connect( MpEngineFactory::sharedEngine(), SIGNAL( libraryUpdated() ), SLOT( handleLibraryUpdated() ) );
 MpEngineFactory::sharedEngine()->checkForSystemEvents();
 //Register to application manager to wait for activities and clear previous activities on the task switcher
-mActivityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
+qRegisterMetaType<Af::ActivationReason>( "Af::ActivationReason" );
-mActivityManager->waitActivity();
+connect( activation, SIGNAL( activated( Af::ActivationReason, QString, QVariantHash ) ), this, SLOT( loadActivityData( Af::ActivationReason, QString, QVariantHash ) ) );
-mActivityManager->removeActivity( MUSIC_MAIN_VIEW );
+connect( MpEngineFactory::sharedEngine(), SIGNAL( restorePathFailed() ), this, SLOT( handleRestorePathFailed() ) );
-mActivityManager->removeActivity( MUSIC_NOW_PLAYING_VIEW );
+mActivityStorage->removeActivity( MUSIC_MAIN_VIEW );
-connect( app, SIGNAL( activate() ), this , SLOT( handleActivity() ) );
+mActivityStorage->removeActivity( MUSIC_NOW_PLAYING_VIEW );
-connect( app, SIGNAL( aboutToQuit() ), this, SLOT( saveActivity() ) );
+connect( qApp, SIGNAL( aboutToQuit() ), this, SLOT( saveActivity() ) );
 mMpMediaController = new MpMediaController();
 emit applicationReady();
 }
 else {
 Reimp.
 */
 void 	MpMainWindow::keyPressEvent(QKeyEvent *event)
 {
 switch(event->key()) {
+//RND feature to rotate on emulator.
+#ifdef __WINS__
 case 16842753:
 case Qt::Key_Call:
 if (orientation () == Qt::Vertical) {
 setOrientation(Qt::Horizontal, false);
 }
 else {
 setOrientation(Qt::Vertical, false);
 }
 break;
+#endif // __WINS__
 default:
 HbMainWindow::keyPressEvent (event);
 break;
 }
 }
 /*!
 Slot to initialize the view that corresponds to the requested service
 */
-void MpMainWindow::initializeServiceView( TUid hostUid )
+void MpMainWindow::initializeServiceView( quint32 clientSecureId )
 {
 switch (mMusicServices->currentService()) {
 case MusicServices::EUriFetcher:
 {
-MpEngineFactory::createSharedEngine( hostUid , MpEngine::Fetch );
+MpEngineFactory::createSharedEngine( clientSecureId , MpEngine::Fetch );
 mPopupHandler = new MpGlobalPopupHandler( this );
 loadView( CollectionView, MpCommon::FetchView );
 MpViewBase* collectionView = reinterpret_cast<MpViewBase*>(mCollectionViewPlugin->getView());
 connect(collectionView, SIGNAL(songSelected(QString)), mMusicServices, SLOT(itemSelected(QString)));
 activateView( CollectionView );
 MpEngineFactory::sharedEngine()->checkForSystemEvents();
 break;
 }
 case MusicServices::EPlayback:
 {
-MpEngineFactory::createSharedEngine( hostUid , MpEngine::Embedded );
+MpEngineFactory::createSharedEngine( clientSecureId , MpEngine::Embedded );
 loadView(PlaybackView, MpCommon::EmbeddedView );
 MpViewBase* playbackView = reinterpret_cast<MpViewBase*>(mPlaybackViewPlugin->getView());
 connect(mMusicServices, SIGNAL(playReady(QString)), MpEngineFactory::sharedEngine(), SLOT(playEmbedded(QString)));
 connect(mMusicServices, SIGNAL(playReady(const XQSharableFile&)), MpEngineFactory::sharedEngine(), SLOT(playEmbedded(const XQSharableFile&)));
 connect(playbackView, SIGNAL(songSelected(QString)), mMusicServices, SLOT(itemSelected(QString)));
 activateView( PlaybackView );
 /*!
 Slot to handle activity switching once the stand alone instance is running and registered
 in the activity manager to wait for activities.
 Only running activity supported at the moment is "MusicNowPlayingView"
 */
-void MpMainWindow::handleActivity()
-{
+void MpMainWindow::loadActivityData( Af::ActivationReason reason, const QString &name, QVariantHash parameter )
-TX_ENTRY
+{
-HbApplication* app = qobject_cast<HbApplication*>(qApp);
+TX_ENTRY
-QString activityId = app->activateId();
+if( reason == Af::ActivationReasonActivity ) {
+QString activityId = name;
-if( !activityId.compare( MUSIC_NOW_PLAYING_VIEW ) ) {
+QVariantHash params = parameter;
-if ( orientation() == Qt::Vertical ) {
+if( !activityId.compare( MUSIC_NOW_PLAYING_VIEW ) ) {
-if( mVerticalViewType != PlaybackView ) {
+if( params.contains( "shuffle" ) ) {
-activateView( PlaybackView );
+if( !params.value( "shuffle" ).toString().compare( "yes" ) ) {
-}
+MpEngineFactory::sharedEngine()->shuffleAll();
 }
 }
+if ( orientation() == Qt::Vertical ) {
-mActivityManager->waitActivity();
+if( mVerticalViewType != PlaybackView ) {
+activateView( PlaybackView );
+}
+}
+}
+}
 TX_EXIT
 }
 /*!
 Slot to save activity upon exiting application
 activityParameters.insert( "screenshot", QPixmap::grabWidget( this, this->rect() ) );
 QVariantHash activityData;
 activityData.insert( "restorePath", serializedRestorePath );
-bool ok = mActivityManager->addActivity( activity , activityData, activityParameters );
+bool ok = mActivityStorage->saveActivity( activity , activityData, activityParameters );
 if ( !ok ){
 TX_LOG_ARGS( "Error: Add Failed; should never get here." );
 }
 TX_EXIT
 }
 void MpMainWindow::loadActivity( QVariant data )
 {
 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
 }

changeset 55	f3930dda3342
parent 51	560ce2306a17
child 59	cd9e40a08dda