FCL/sf/app/videoplayer: comparison videocollection/videocollectionwrapper/src/videosortfilterproxymodel.cpp

equal deleted inserted replaced

-:bbb98528c666
+:3738fe97f027
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::VideoSortFilterProxyModel
 // -----------------------------------------------------------------------------
 //
 VideoSortFilterProxyModel::VideoSortFilterProxyModel(int type, QObject *parent) :
 QSortFilterProxyModel(parent),
 mModel(0),
 mCollectionClient(0),
 mType(type),
 mLevel(-1),
 mGenericFilterId(TMPXItemId::InvalidId()),
 mGenericFilterValue(false),
 mIdleSortTimer(0),
 mWantedSortRole(VideoCollectionCommon::KeyDateTime)
 {
 // NOP
 }
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::connectSignals
 // -----------------------------------------------------------------------------
 //
 bool VideoSortFilterProxyModel::connectSignals()
 {
-if(!connect(mModel, SIGNAL(fullVideoDetailsReady(TMPXItemId)),
-this, SIGNAL(fullDetailsReady(TMPXItemId))))
-{
-return false;
-}
 if(!connect(mModel, SIGNAL(modelReady()),
 this, SIGNAL(modelReady())))
 {
 return false;
 }
 if(!connect(mModel, SIGNAL(modelChanged()),
 this, SIGNAL(modelChanged())))
 {
 return false;
 }
-if(!connect(mModel, SIGNAL(albumChanged()),
+if(mType == VideoCollectionWrapper::ECollectionContent)
-this, SLOT(albumChangedSlot())))
+{
-{
+if(!connect(mModel, SIGNAL(albumChanged()),
-return false;
+this, SLOT(albumChangedSlot())))
+{
+return false;
+}
 }
 return true;
 }
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::disconnectSignals
 // -----------------------------------------------------------------------------
 //
 void VideoSortFilterProxyModel::disconnectSignals()
 {
-disconnect(mModel, SIGNAL(fullVideoDetailsReady(TMPXItemId)),
+	disconnect(mModel, SIGNAL(modelReady()), this, SIGNAL(modelReady()));
-this, SIGNAL(fullDetailsReady(TMPXItemId)));
-disconnect(mModel, SIGNAL(modelReady()), this, SIGNAL(modelReady()));
 disconnect(mModel, SIGNAL(modelChanged()), this, SIGNAL(modelChanged()));
-disconnect(mModel, SIGNAL(albumChanged()), this, SLOT(albumChangedSlot()));
+if(mType == VideoCollectionWrapper::ECollectionContent)
+{
+disconnect(mModel, SIGNAL(albumChanged()), this, SLOT(albumChangedSlot()));
+}
 }
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::open
 // -----------------------------------------------------------------------------
 return -1;
 }
 if(mLevel != level)
 {
 mLevel = level;
 invalidateFilter();
 }
 // need to call open every time to make sure all items are
 // inserted to UI ( recent open might have been cancelled)
 return mCollectionClient->startOpenCollection(level);
 if(mModel->removeRows(mappedList))
 {
 // Start fetching thumbnails at start of the model.
 VideoThumbnailData::instance().startBackgroundFetching(0, 0);
 return 0;
 }
 }
 return -1;
 }
 //
 int VideoSortFilterProxyModel::openItem(TMPXItemId mediaId)
 {
 if(mediaId != TMPXItemId::InvalidId() && mCollectionClient)
 {
-mModel->setAlbumInUse(TMPXItemId::InvalidId());
 if(mCollectionClient->openItem(mediaId) == 0)
 {
 if(mediaId.iId2 != KVcxMvcMediaTypeVideo)
 {
 mLevel = VideoCollectionCommon::ELevelAlbum;
 // VideoSortFilterProxyModel::back
 // -----------------------------------------------------------------------------
 //
 int VideoSortFilterProxyModel::back()
 {
 if(mCollectionClient && mCollectionClient->back() == 0)
 {
 if(mLevel == VideoCollectionCommon::ELevelAlbum)
 {
 mLevel = VideoCollectionCommon::ELevelCategory;
 }
 else
 {
 mLevel = VideoCollectionCommon::ELevelVideos;
 }
 return 0;
 }
 return -1;
 }
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::fetchItemDetails
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::filterAcceptsRow
 // -----------------------------------------------------------------------------
 //
-bool VideoSortFilterProxyModel::filterAcceptsRow (int source_row, const QModelIndex &source_parent) const
+bool VideoSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
 Q_UNUSED(source_parent);
 if(!sourceModel())
 return false;
 if(source_row < 0 || source_row >= sourceModel()->rowCount())
 {
 return true;
 }
 }
 else if(mType == VideoCollectionWrapper::ECollections)
 {
 if(mLevel == VideoCollectionCommon::ELevelCategory && id.iId2 != KVcxMvcMediaTypeVideo)
 {
 return true;
 }
 }
 return true;
 }
 }
 else if(mType == VideoCollectionWrapper::EGeneric)
 {
 if(mLevel == VideoCollectionCommon::ELevelVideos && id.iId2 == KVcxMvcMediaTypeVideo)
 {
 //  filter items that belong to that album setted as filter id
 // if there's no filter or setted filter is "all videos", we accept everything
 if(mGenericFilterId == TMPXItemId::InvalidId() ||
 // -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::addItemsInAlbum()
 // -----------------------------------------------------------------------------
 //
-int VideoSortFilterProxyModel::addItemsInAlbum(TMPXItemId albumId,
+int VideoSortFilterProxyModel::addItemsInAlbum(TMPXItemId &albumId,
 const QList<TMPXItemId> &mediaIds)
 {
 int err(-1);
 if (mCollectionClient)
 return err;
 }
 // -----------------------------------------------------------------------------
+// VideoSortFilterProxyModel::removeItemsFromAlbum()
+// -----------------------------------------------------------------------------
+//
+int VideoSortFilterProxyModel::removeItemsFromAlbum(TMPXItemId &albumId,
+const QList<TMPXItemId> &mediaIds)
+{
+int err(-1);
+if (mModel)
+{
+// remove items in album
+err = mModel->removeItemsFromAlbum(albumId, mediaIds);
+if(err > 0)
+{
+// if there really were items to be removed, invalid filter
+invalidateFilter();
+err = 0;
+}
+}
+return err;
+}
+// -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::getOpenItem()
 // -----------------------------------------------------------------------------
 //
 TMPXItemId VideoSortFilterProxyModel::getOpenItem() const
 {
 invalidateFilter();
 }
 }
 // -----------------------------------------------------------------------------
+// VideoSortFilterProxyModel::setAlbumInUse()
+// -----------------------------------------------------------------------------
+//
+void VideoSortFilterProxyModel::setAlbumInUse(TMPXItemId albumId)
+{
+mModel->setAlbumInUse(albumId);
+invalidateFilter();
+}
+// -----------------------------------------------------------------------------
 // VideoSortFilterProxyModel::albumChangedSlot()
 // -----------------------------------------------------------------------------
 //
 void VideoSortFilterProxyModel::albumChangedSlot()
 {

changeset 35	3738fe97f027
parent 34	bbb98528c666
child 36	8aed59de29f9