FCL/sf/app/musicplayer: comparison mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp

equal deleted inserted replaced

-:4cc1412daed0
+:560ce2306a17
 mCollectionData = mMpEngine->collectionData();
 qRegisterMetaType<TCollectionContext>("TCollectionContext");
 connect( mCollectionData, SIGNAL( contextChanged( TCollectionContext ) ),
 this, SLOT( setContext( TCollectionContext ) ),
 			 Qt::QueuedConnection );
-mCollectionDataModel = new MpCollectionDataModel( mCollectionData );
+mCollectionDataModel = new MpCollectionDataModel( mCollectionData , mMpEngine->playbackData());
 connect( mCollectionDataModel, SIGNAL( dataReloaded() ),
 this, SLOT( containerDataChanged() ) );
 mDocumentLoader = new MpCollectionDocumentLoader();
 mActivated = false;
 closeActiveDialog( true );
 setNavigationAction( 0 );
-TX_EXIT
-}
-/*!
-Sets the default collection - AllSongs
-*/
-void MpCollectionView::setDefaultView()
-{
-TX_ENTRY
-if ( mCollectionContext != ECollectionContextAllSongs ) {
-// Open 'All Songs' by default
-mMpEngine->openCollection( ECollectionContextAllSongs );
-}
 TX_EXIT
 }
 /*!
 Returns view activation status.
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
 case ECollectionContextArtistAllSongs:
 case ECollectionContextPlaylistSongs:
 doOpen = false;
-songUri = mCollectionData->itemData( index, MpMpxCollectionData::Uri );
+if (!mCollectionData->hasItemProperty(index, MpMpxCollectionData::Corrupted)) {
-emit songSelected( songUri );
+songUri = mCollectionData->itemData( index, MpMpxCollectionData::Uri );
+emit songSelected( songUri );
+}
+else {
+showCorruptedNote();
+}
 break;
 case ECollectionContextArtistAlbumsTBone:
 case ECollectionContextAlbumsTBone:
 doOpen = false;
-songUri = mCollectionData->albumSongData( index, MpMpxCollectionData::Uri );
+if (!mCollectionData->hasAlbumSongProperty(index, MpMpxCollectionData::Corrupted)) {
-emit songSelected( songUri );
+songUri = mCollectionData->albumSongData( index, MpMpxCollectionData::Uri );
+emit songSelected( songUri );
+}
+else {
+showCorruptedNote();
+}
 break;
 default:
 break;
 }
 }
 // Album view going into T-bone. We don't actually open the
 // collection. Just fake an open.
 mCollectionData->setContext( ECollectionContextAlbumsTBone );
 }
 else {
-// Real open. Forward it to the engine.
+switch ( mCollectionContext ) {
-mMpEngine->openCollectionItem( index );
+case ECollectionContextAllSongs:
+case ECollectionContextArtistAllSongs:
+case ECollectionContextPlaylistSongs:
+if (!mCollectionData->hasItemProperty(index, MpMpxCollectionData::Corrupted)) {
+mMpEngine->openCollectionItem( index );
+}
+else {
+showCorruptedNote();
+}
+break;
+case ECollectionContextArtists:
+case ECollectionContextPlaylists:
+mMpEngine->openCollectionItem( index );
+default:
+break;
+}
 }
 }
 TX_EXIT
 }
 play album with \a albumIndex starting with the songs with \a songIndex.
 */
 void MpCollectionView::playAlbumSongs( int albumIndex, int songIndex )
 {
 TX_ENTRY_ARGS( "albumIndex=" << albumIndex << "songIndex=" << songIndex );
-mMpEngine->playAlbumSongs(albumIndex, songIndex);
+if (!mCollectionData->hasAlbumSongProperty(songIndex, MpMpxCollectionData::Corrupted)) {
+mMpEngine->playAlbumSongs(albumIndex, songIndex);
+}
+else {
+showCorruptedNote();
+}
 TX_EXIT
 }
 /*!
 Slot to be called when back/quit softkey is pressed.
 /*!
 Slot to be called when 'Shuffle play all' is clicked by the user from the menu.
 */
 void MpCollectionView::shufflePlayAll()
 {
+TX_ENTRY
 mMpEngine->setShuffle( true );
 MpSettingsManager::setShuffle( true );
 int index = generateShuffleIndex();
 switch ( mCollectionContext ) {
 case ECollectionContextArtistAlbumsTBone:
 break;
 default:
 openIndex( index );
 break;
 }
+TX_EXIT
 }
 /*!
 Slot to be called when 'Add to playlist' is clicked by the user from the menu.
 */
 mActivationWaiting = false;
 activateView();
 }
 else {
 closeActiveDialog();
-//Update cache, even if collection is in background.
+// Update cache, even if collection is in background.
-//Library refreshing could be triggered at any point due USB/MMC events.
+// Library refreshing could be triggered at any point due USB/MMC events.
-mMpEngine->reopenCollection();
+if ( mCollectionContext == ECollectionContextAllSongs ) {
+mMpEngine->reopenCollection();
+}
+		// We force to go to the all songs collection when the refresh is finished.
+else{
+openSongs();
+}
 }
 TX_EXIT
 }
 /*!
 void MpCollectionView::setBannerVisibility( bool visible )
 {
 bool ok = false;
 if ( visible ) {
 mDocumentLoader->load( MUSIC_COLLECTION_DOCML, "showBanner", &ok );
-mNowPlayingBanner->show();
 }
 else {
 mDocumentLoader->load( MUSIC_COLLECTION_DOCML, "hideBanner", &ok );
-mNowPlayingBanner->hide();
 }
 if ( !ok ) {
 TX_LOG_ARGS( "Error: invalid xml file." );
 Q_ASSERT_X( ok, "MpCollectionView::setBannerVisibility", "invalid xml file" );
 }
 }
 /*!
 \internal
-Generates a random index for shuffle all.
+Generates a random index for shuffle all. In case of All Songs, due to incremental open
+delay, the chosen index may not be available yet. In such case, narrow down the upper limit
+and regenerate until a valid index is found.
 */
 int MpCollectionView::generateShuffleIndex()
 {
 int low = 0;
 int high = 0;
+bool tbone;
 switch ( mCollectionContext ) {
 case ECollectionContextArtistAlbumsTBone:
 case ECollectionContextAlbumsTBone:
+tbone = true;
 high = mCollectionData->albumSongsCount();
 break;
 default:
+tbone = false;
 high = mCollectionData->count();
 break;
 }
+bool validIndex = false;
+int index = 0;
+int songId;
 time_t seconds;
-time( &seconds );
+while ( !validIndex ) {
-srand( ( unsigned int ) seconds );
+time( &seconds );
+srand( ( unsigned int ) seconds );
-int index = rand() % ( high - low + 1 ) + low;
+index = rand() % ( high - low + 1 ) + low;
+if ( tbone ) {
+songId = mCollectionData->albumSongId(index);
+}
+else {
+songId = mCollectionData->itemId(index);
+}
+if ( songId != -1 ) {
+// Got a valid index; exit the loop.
+validIndex = true;
+}
+else {
+// Invalid index; re-select an index, but narrow down the
+// upper range to increase the change of hitting a valid index.
+high = index;
+}
+TX_LOG_ARGS( "index=" << index << "valid=" << validIndex );
+}
 return index;
 }
 /*!
 \internal
 {
 mMpPopupHandler->cancelOngoingPopup( onlyContextMenu );
 menu()->close();
 }
+/*!
+\internal
+Shows Corrupted Note in collection view
+*/
+void MpCollectionView::showCorruptedNote()
+{
+TX_ENTRY
+HbMessageBox *messageBox = new HbMessageBox( hbTrId( "txt_mus_info_file_is_corrupt" ), HbMessageBox::MessageTypeInformation );
+messageBox->setAttribute( Qt::WA_DeleteOnClose );
+messageBox->setIcon( HbIcon( QString("qtg_small_fail") ) );
+messageBox->show();
+TX_EXIT
+}

changeset 51	560ce2306a17
parent 43	0f32e550d9d8
child 55	f3930dda3342