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

equal deleted inserted replaced

-:a0afa279b8fe
+:eb79a7c355bf
 *
 * Description: Wrapper for mpx framework utilities.
 *
 */
-#include <QTranslator>
-#include <QLocale>
-#include <hbmessagebox.h>
-#include <hbprogressdialog.h>
-#include <hbaction.h>
-#include <hbinstance.h>
 #include <xqsharablefile.h>
 #include <EqualizerConstants.h>
 #include "mpengine.h"
 #include "mpmpxharvesterframeworkwrapper.h"
 #include "mpaudioeffectsframeworkwrapper.h"
 #include "mpequalizerframeworkwrapper.h"
 #include "mpmediakeyhandler.h"
 #include "mptrace.h"
 #include "mpsettingsmanager.h"
-#include "mpprogressdialoghandler.h"
+#include "mpsongscanner.h"
 /*!
 \class MpEngine
 \brief Engine for musicplayer - mpx framework utilities.
 Harvesting related signals
 -------------------------------------------------------------------------------
 */
 /*!
-\fn void scanStarted()
+\fn void libraryAboutToUpdate()
-This signal is emitted when scan operation is started.
+This signal is emitted when a scan operation has been requested or
+when MTP synchronization starts.
-*/
-/*!
-\fn void scanEnded()
-This signal is emitted when scan operation ends.
-*/
-/*!
-\fn void scanCountChanged( int count )
-This signal is emitted when scan count is updated.
 */
 /*!
 \fn void libraryUpdated()
-This signal is emitted when MpSongScannerHelper ends scanning,
+This signal is emitted when library has changed.
-or USB-MTP Synchronization finishes.
+\sa handleScanEnded()
-*/
+\sa handleDiskEvent()
+\sa handleUsbMtpEndEvent()
-/*!
-\fn void formatStarted()
+*/
-This signal is emitted when EMcMsgFormatStart is received from MPXCollectionUtility.
+/*!
+\fn void usbBlocked( bool blocked )
-*/
+This signal is emitted to update the usb blocking state
-/*!
+due a previous usb event received.
-\fn void formatEnded()
+\sa handleUsbEvent()
-This signal is emitted when EMcMsgFormatEnd is received from MPXCollectionUtility.
+*/
-*/
+/*!
-/*!
+\fn void unableToCotinueDueUSB()
-\fn void diskRemoved()
+This signal is emitted if usb blocking verification returns true.
-This signal is emitted when EMcMsgDiskRemoved is received from MPXCollectionUtility.
+\sa verifyUsbBlocking()
-*/
+*/
-/*!
-\fn void diskInserted()
+/*!
+\fn void usbSynchronizationStarted()
-This signal is emitted when EMcMsgDiskInserted is received from MPXCollectionUtility.
+This signal is emitted when usb is connected in MassStorage mode or MTP mode and synchronizing.
-*/
+*/
-/*!
-\fn void usbMassStorageStarted()
+/*!
+\fn void usbSynchronizationFinished()
-This signal is emitted when EMcMsgUSBMassStorageStart is received from MPXCollectionUtility.
+This signal is emitted when usb in synchronizing state is disconnected.
-*/
+*/
-/*!
-\fn void usbMassStorageEnded()
+/*!
+\fn void libraryRefreshNeeded()
-This signal is emitted when EMcMsgUSBMassStorageEnd is received from MPXCollectionUtility.
+This signal is emitted when usb in MassStorage mode is disconnected.
-*/
-/*!
-\fn void usbMtpStarted()
-This signal is emitted when EMcMsgUSBMtpStart is received from MPXCollectionUtility.
-*/
-/*!
-\fn void usbMtpEnded()
-This signal is emitted when EMcMsgUSBMtpEnd is received from MPXCollectionUtility.
 */
 /*!
 indicates the operation \a success .
 */
 /*!
+\fn void aboutToAddSongs( int count )
+Signal emitted up on a notification from MPX Collection wrapper,
+when play list is prepared and about to be added.
+\a count Indicates number of songs to be added.
+*/
+/*!
+\fn void deleteStarted(TCollectionContext context, int Count)
+This signal is emitted when song delete operation has started.
+\a context The context where delete operation is taking place.
+\a Count Number of items to delete.
+*/
+/*!
 \fn void songsDeleted( bool success )
 This signal is emitted when song delete operation is completed, it
 indicates the operation \a success .
 /*!
 Constructs music player engine.
 */
 MpEngine::MpEngine()
 : mMpxHarvesterWrapper(0),
+mSongScanner(0),
 mMediaKeyHandler(0),
-mUsbOutstandingNote(0),
 mMpxCollectionWrapper(0),
 mMpxPlaybackWrapper(0),
 mMpxDetailsWrapper(0),
 mAudioEffectsWrapper(0),
 mEqualizerWrapper(0),
 mCurrentPresetIndex(KEqualizerPresetNone),
-mMpTranslator(0),
 mUsbBlockingState(USB_NotConnected),
-mPreviousUsbState(USB_NotConnected),
+mPreviousUsbState(USB_NotConnected)
-mProgressDialogHandler(0)
 {
 TX_LOG
 }
 /*!
 Destructs music player engine.
 */
 MpEngine::~MpEngine()
 {
 TX_ENTRY
-delete mMpTranslator;
 delete mMediaKeyHandler;
-delete mUsbOutstandingNote;
 delete mMpxPlaybackWrapper;
 delete mMpxDetailsWrapper;
 delete mMpxHarvesterWrapper;
 delete mMpxCollectionWrapper;
 delete mAudioEffectsWrapper;
 delete mEqualizerWrapper;
-	delete mProgressDialogHandler;
+delete mSongScanner;
 TX_EXIT
 }
 /*!
 Initialize engine
 */
 void MpEngine::initialize( TUid hostUid, EngineMode mode )
 {
 TX_ENTRY
 mHostUid = hostUid;
-//Load musicplayer translator
-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 );
-TX_LOG_ARGS( "Loading translator ok=" << translatorLoaded );
-if ( translatorLoaded ) {
-qApp->installTranslator( mMpTranslator );
-}
 if( mode == StandAlone || mode == Fetch ){
 // Harvesting Wrapper
 mMpxHarvesterWrapper = new MpMpxHarvesterFrameworkWrapper( mHostUid );
 connect( mMpxHarvesterWrapper, SIGNAL( scanStarted() ),
 qRegisterMetaType<MpxDiskEvents>("MpxDiskEvents");
 connect( mMpxHarvesterWrapper, SIGNAL( diskEvent(MpxDiskEvents) ),
 this, SLOT( handleDiskEvent(MpxDiskEvents) ), Qt::QueuedConnection );
 qRegisterMetaType<MpxUsbEvents>("MpxUsbEvents");
 connect( mMpxHarvesterWrapper, SIGNAL( usbEvent(MpxUsbEvents) ),
 this, SLOT( handleUsbEvent(MpxUsbEvents) ), Qt::QueuedConnection );
 mMediaKeyHandler = new MpMediaKeyHandler();
 }
 if ( mode == StandAlone || mode == Fetch || mode == MediaBrowsing) {
 // Collection Wrapper
 mMpxCollectionWrapper = new MpMpxCollectionFrameworkWrapper( mHostUid );
 mMpxCollectionWrapper->setShuffleFeatureEnabled( mode != Fetch );
 connect( mMpxCollectionWrapper, SIGNAL( collectionPlaylistOpened() ),
 this, SIGNAL( collectionPlaylistOpened() ),
 Qt::QueuedConnection );
+connect( mMpxCollectionWrapper, SIGNAL( aboutToAddSongs( int ) ),
+this, SIGNAL( aboutToAddSongs( int ) ) );
 connect( mMpxCollectionWrapper, SIGNAL( playlistSaved( bool ) ),
 this, SIGNAL( playlistSaved( bool ) ),
-Qt::QueuedConnection );
-connect( mMpxCollectionWrapper, SIGNAL( songsDeleted( bool ) ),
-this, SIGNAL( songsDeleted( bool ) ),
 Qt::QueuedConnection );
 connect( mMpxCollectionWrapper, SIGNAL( playlistsRenamed( bool ) ),
 this, SIGNAL( playlistsRenamed( bool ) ),
 Qt::QueuedConnection );
 connect( mMpxCollectionWrapper, SIGNAL( isolatedCollectionOpened( MpMpxCollectionData* ) ),
 this, SIGNAL( isolatedCollectionOpened( MpMpxCollectionData* ) ),
 Qt::QueuedConnection );
 connect( mMpxCollectionWrapper, SIGNAL( containerContentsChanged() ),
 this, SIGNAL( containerContentsChanged() ),
 Qt::QueuedConnection );
-connect( mProgressDialogHandler, SIGNAL( deleteStarted() ),
+connect( mMpxCollectionWrapper, SIGNAL( deleteStarted( TCollectionContext, int ) ),
-this, SLOT( handleDeleteStarted() ),
+this, SLOT( handleDeleteStarted( TCollectionContext, int ) ) );
-Qt::QueuedConnection );
+connect( mMpxCollectionWrapper, SIGNAL( songsDeleted( bool ) ),
-connect( mProgressDialogHandler, SIGNAL( songsDeleted( bool ) ),
+this, SLOT( handleDeleteEnded( bool ) ),
-this, SLOT( handleDeleteEnded( bool ) ),
+Qt::QueuedConnection );
-Qt::QueuedConnection );
+}
-}
 if( mode == StandAlone ){
 // Equalizer wrapper , this needs to be created before playback wrapper.
 mEqualizerWrapper = new MpEqualizerFrameworkWrapper();
 connect( mEqualizerWrapper, SIGNAL( equalizerReady() ),
 this, SLOT( handleEqualizerReady() ), Qt::QueuedConnection );
 if( mode == StandAlone ){
 // AudioEffects wrapper
 mAudioEffectsWrapper = new MpAudioEffectsFrameworkWrapper();
 }
-if (mMpxHarvesterWrapper && mMpxCollectionWrapper){
+TX_EXIT
-mProgressDialogHandler = new MpProgressDialogHandler(mMpxCollectionWrapper, mMpxHarvesterWrapper);
-}
-	TX_EXIT
 }
 /*!
 -------------------------------------------------------------------------------
 Harvesting related
 /*!
 \
 Used to verify if an action can be executed depending on USB blocking state.
 If not, a notification note might be displayed.
 */
-bool MpEngine::verifyUsbBlocking( bool showMessage )
+bool MpEngine::verifyUsbBlocking( bool notify )
 {
 TX_ENTRY
 bool result( false );
 if ( mUsbBlockingState == USB_Connected ) {
 result = true;
-if ( showMessage ) {
+if ( notify ) {
-HbMessageBox *dialog = new HbMessageBox( HbMessageBox::MessageTypeInformation );
+emit unableToCotinueDueUSB();
-dialog->setText( hbTrId( "txt_mus_info_usb_conn_in_progress" ) );
-dialog->setModal( true );
-setOutstandingPopup( dialog );
-mUsbOutstandingNote->show();;
 }
 }
 TX_EXIT
 return result;
 }
 mMpxHarvesterWrapper->checkForSystemEvents();
 TX_EXIT
 }
 /*!
+\
+Returs the current songScanner instance
+*/
+MpSongScanner *MpEngine::songScanner()
+{
+return mSongScanner;
+}
+/*!
 Slot to be called to start Refresh library process.
 If scanning is already ongoing, this request is ignored.
 */
-void MpEngine::refreshLibrary()
+void MpEngine::refreshLibrary( bool automaticRequest )
 {
 TX_ENTRY
 if ( !verifyUsbBlocking( true ) ) {
+if ( !mSongScanner ) {
+mSongScanner = new MpSongScanner( mMpxHarvesterWrapper );
+}
 emit libraryAboutToUpdate();
-mProgressDialogHandler->scan();
+mSongScanner->scan( automaticRequest );
 }
 TX_EXIT
 }
 /*!
 emit libraryUpdated();
 }
 break;
 case DiskInserted:
 if ( mUsbBlockingState == USB_NotConnected ) {
-refreshLibrary();
+refreshLibrary( true );
 }
 else if ( mUsbBlockingState == USB_Connected ) {
 emit libraryUpdated();
 }
 break;
 }
 TX_EXIT
 }
 /*!
-Slot to be called when mUsbOutstandingNote is about to close.
-*/
-void MpEngine::handleOutstandingNoteClosing()
-{
-TX_ENTRY
-mUsbOutstandingNote = 0;
-TX_EXIT
-}
-/*!
 To be called when EMcMsgUSBMassStorageStart event is received.
 */
 void MpEngine::handleUsbMassStorageStartEvent()
 {
 TX_ENTRY
 mMediaKeyHandler->setEnabled(false);
 changeUsbBlockingState( USB_Synchronizing );
 emit usbBlocked(true);
+emit usbSynchronizationStarted();
-launchBlockingNote();
 TX_EXIT
 }
 /*!
 To be called when EMcMsgUSBMassStorageEnd event is received.
 */
 void MpEngine::handleUsbMassStorageEndEvent()
 {
 TX_ENTRY
 mMediaKeyHandler->setEnabled(true);
 changeUsbBlockingState( USB_NotConnected );
 emit usbBlocked(false);
+emit usbSynchronizationFinished();
-HbAction *action;
+emit libraryRefreshNeeded();
-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" ) );
-connect( action, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-promptRefresh->addAction( action );
-action = new HbAction( hbTrId( "txt_common_button_no" ) );
-promptRefresh->addAction( action );
-setOutstandingPopup( promptRefresh );
-mUsbOutstandingNote->show();
 TX_EXIT
 }
 /*!
 To be called when EMcMsgUSBMTPStart event is received.
 emit usbBlocked(true);
 //Cancel any ongoing operation.
 emit libraryAboutToUpdate();
-launchBlockingNote();
+emit usbSynchronizationStarted();
 TX_EXIT
 }
 /*!
 To be called when EMcMsgUSBMTPEnd event is received.
 */
 void MpEngine::handleUsbMtpEndEvent()
 {
 TX_ENTRY
 mMediaKeyHandler->setEnabled(true);
 changeUsbBlockingState( USB_NotConnected );
 emit usbBlocked(false);
-if ( mUsbOutstandingNote ) {
-mUsbOutstandingNote->close();
-}
 if ( mPreviousUsbState == USB_Synchronizing ) {
+emit usbSynchronizationFinished();
 emit libraryUpdated();
 }
 TX_EXIT
 }
 void MpEngine::changeUsbBlockingState( UsbBlockingState state )
 {
 TX_ENTRY
 mPreviousUsbState = mUsbBlockingState;
 mUsbBlockingState = state;
-TX_EXIT
-}
-/*!
-Internal
-Used to launch the usb blocking note
-*/
-void MpEngine::launchBlockingNote()
-{
-TX_ENTRY
-HbProgressDialog *usbBlockingNote = new HbProgressDialog( HbProgressDialog::WaitDialog );
-usbBlockingNote->setModal( true );
-if ( usbBlockingNote->actions().count() ) {
-//Hide cancel action.
-usbBlockingNote->actions().at( 0 )->setVisible( false );
-}
-usbBlockingNote->setDismissPolicy( HbPopup::NoDismiss );
-usbBlockingNote->setText( hbTrId( "txt_mus_info_usb_conn_in_progress" ) );
-setOutstandingPopup( usbBlockingNote );
-mUsbOutstandingNote->show();
-TX_EXIT
-}
-/*!
-\internal
-sets \a popup as the current outstanding popup and cancels any other active popup.
-*/
-void MpEngine::setOutstandingPopup( HbPopup *popup )
-{
-TX_ENTRY
-//Close previous popup (Normally blocking usb note)
-if ( mUsbOutstandingNote ) {
-disconnect( mUsbOutstandingNote, SIGNAL( aboutToClose() ), this, SLOT( handleOutstandingNoteClosing() ) );
-mUsbOutstandingNote->close();
-}
-//Set new outstanding popup
-popup->setAttribute( Qt::WA_DeleteOnClose );
-connect( popup, SIGNAL( aboutToClose() ), this, SLOT( handleOutstandingNoteClosing() ) );
-mUsbOutstandingNote = popup;
 TX_EXIT
 }
 /*!
 -------------------------------------------------------------------------------
 Deletes \a selection from the collection.
 */
 void MpEngine::deleteSongs( QList<int> &selection )
 {
 if ( !verifyUsbBlocking( true ) ) {
-mProgressDialogHandler->deleteSongs( selection );
+mMpxCollectionWrapper->deleteSongs( selection );
 }
 }
 \a originalOrdinal to \a newOrdinal.
 */
 void MpEngine::reorderPlaylist( int playlistId, int songId, int originalOrdinal, int newOrdinal )
 {
 mMpxCollectionWrapper->reorderPlaylist( playlistId, songId, originalOrdinal, newOrdinal );
+}
+/*!
+Slot to be called when song deleting starts.
+*/
+void MpEngine::handleDeleteStarted( TCollectionContext context, int count )
+{
+TX_ENTRY
+mMediaKeyHandler->setEnabled( false );
+emit deleteStarted( context, count );
+TX_EXIT
+}
+/*!
+Slot to be called when song deleting ends.
+*/
+void MpEngine::handleDeleteEnded( bool success )
+{
+TX_ENTRY
+mMediaKeyHandler->setEnabled(true);
+emit songsDeleted( success );
+TX_EXIT
+}
+/*!
+Slot to be called when song deleting ends.
+*/
+void MpEngine::cancelCollectionRequest()
+{
+TX_ENTRY
+mMpxCollectionWrapper->cancelRequest();
+TX_EXIT
 }
 /*!
 Returns pointer to MpPlaybackData, which is the playback data.
 */
 emit equalizerReady();
 TX_EXIT
 }
-/*!
-Slot to be called when song deleting starts.
-*/
-void MpEngine::handleDeleteStarted() {
-TX_ENTRY
-mMediaKeyHandler->setEnabled(false);
-TX_EXIT
-}
-/*!
-Slot to be called when song deleting ends.
-*/
-void MpEngine::handleDeleteEnded() {
-TX_ENTRY
-mMediaKeyHandler->setEnabled(true);
-TX_EXIT
-}

changeset 37	eb79a7c355bf
parent 36	a0afa279b8fe
child 38	b93f525c9244