FCL/sf/app/videoplayer: comparison videocollection/videocollectionwrapper/src/videothumbnaildata

equal deleted inserted replaced

-:8aed59de29f9
+:4eb2df7f7cbe
 *
 * Description:  VideoThumbnailDataPrivate class implementation
 *
 */
-// Version : %version: 20 %
+// Version : %version: 21 %
 // INCLUDE FILES
 #include <qapplication.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 , mTbnReportTimer( 0 )
 , mSignalsConnected( false )
 , mBackgroundFetchingEnabled( true )
 {
 	FUNC_LOG;
-initialize();
+	initialize();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::~VideoThumbnailDataPrivate()
 // -----------------------------------------------------------------------------
 {
 ERROR(-1, "VideoThumbnailDataPrivate::initialize() failed to connect signals.");
 cleanup();
 return -1;
 }
 return 0;
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::cleanup()
 if(model)
 {
 disconnect(model->sourceModel(), SIGNAL(modelReady()), this, SLOT(modelChangedSlot()));
 disconnect(model->sourceModel(), SIGNAL(modelChanged()), this, SLOT(modelChangedSlot()));
 }
-		disconnect(mThumbnailFetcher, SIGNAL(thumbnailReady( QPixmap , void *, int )),
+		disconnect(mThumbnailFetcher, SIGNAL(thumbnailReady(QPixmap , const TMPXItemId &, int )),
-this, SLOT(thumbnailReadySlot( QPixmap , void *, int )));
+this, SLOT(thumbnailReadySlot(QPixmap , const TMPXItemId &, int )));
 disconnect(mThumbnailFetcher, SIGNAL(allThumbnailsFetched()),
 this, SLOT(allThumbnailsFetchedSlot()));
 disconnect(mBgFetchTimer, SIGNAL(timeout()), this, SLOT(doBackgroundFetching()));
 disconnect(mTbnReportTimer, SIGNAL(timeout()), this, SLOT(reportThumbnailsReadySlot()));
 }
 {
 VideoSortFilterProxyModel *model =
 VideoCollectionWrapper::instance().getModel(VideoCollectionCommon::EModelTypeAllVideos);
 if(!model)
 return -1;
-if(!connect(mThumbnailFetcher, SIGNAL(thumbnailReady( QPixmap , void *, int )),
+if(!connect(mThumbnailFetcher, SIGNAL(thumbnailReady( QPixmap , const TMPXItemId &, int )),
-this, SLOT(thumbnailReadySlot( QPixmap , void *, int))) ||
+this, SLOT(thumbnailReadySlot( QPixmap , const TMPXItemId &, int))) ||
 !connect(mThumbnailFetcher, SIGNAL(allThumbnailsFetched()),
 this, SLOT(allThumbnailsFetchedSlot())) ||
 !connect(model->sourceModel(), SIGNAL(modelReady()), this, SLOT(modelChangedSlot())) ||
 !connect(model->sourceModel(), SIGNAL(modelChanged()), this, SLOT(modelChangedSlot())) ||
 !connect(mBgFetchTimer, SIGNAL(timeout()), this, SLOT(doBackgroundFetching())) ||
 startFetchingThumbnail(mCurrentModel->getMediaIdAtIndex(indexes[i]), priority--);
 }
 int started = mThumbnailFetcher->fetchCount() - fetchCountBefore;
-mThumbnailFetcher->continueFetching();
+	// Start the fetches and cancel previous ones.
+mThumbnailFetcher->continueFetching(true);
 return started;
 }
 // -----------------------------------------------------------------------------
 QString fileName = mCurrentModel->getMediaFilePathForId(mediaId);
 // Thumbnail fetcher signals into thumbnailReadySlot when thumbnail ready
 if(fileName.length() > 0)
 {
-// object containing media id to be passed throught
+mThumbnailFetcher->addFetch(fileName, mediaId, priority);
-// thumbnail generation process.
-TMPXItemId *internal = new TMPXItemId(mediaId.iId1, mediaId.iId2);
-mThumbnailFetcher->addFetch(fileName, internal, priority);
 }
 return 0;
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::thumbnailReadySlot()
 // -----------------------------------------------------------------------------
 //
-void VideoThumbnailDataPrivate::thumbnailReadySlot(QPixmap tnData, void *internal, int error)
+void VideoThumbnailDataPrivate::thumbnailReadySlot(QPixmap tnData, const TMPXItemId &mediaId, int error)
 {
-TMPXItemId mediaId(0, 0);
-if(internal)
-{
-mediaId = *(static_cast<TMPXItemId*>(internal));
-delete internal;
-}
-else
-{
-return;
-}
 if(!error && !tnData.isNull())
 {
 mThumbnailData.insert(mediaId, new QIcon(tnData));
 // Gather list of media ids and emit thumbnailReady signals in larger set
 //
 void VideoThumbnailDataPrivate::freeThumbnailData()
 {
 	FUNC_LOG;
 // Stop timers.
-if(mBgFetchTimer)
+	if(mBgFetchTimer)
 {
 mBgFetchTimer->stop();
 }
 if(mTbnReportTimer)
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::startBackgroundFetching(VideoSortFilterProxyModel *model, int fetchIndex)
 {
 	FUNC_LOG;
-if(!mBackgroundFetchingEnabled || !mThumbnailFetcher)
-{
+// If model is null, we continue using the current one. Model and index are kept up to date even
-return;
+	// fetching is not enabled.
-}
-mThumbnailFetcher->cancelFetches();
-// If model is null, we continue using the current one.
 if(model)
 {
 mCurrentModel = model;
 }
 mCurrentFetchIndex = fetchIndex;
 mCurrentBackgroundFetchCount = 0;
+	if(!mBackgroundFetchingEnabled || !mThumbnailFetcher)
+{
+INFO("VideoThumbnailDataPrivate::startBackgroundFetching() fetching is disabled.");
+return;
+}
 doBackgroundFetching();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::continueBackgroundFetch()
 void VideoThumbnailDataPrivate::continueBackgroundFetch()
 {
 	FUNC_LOG;
 if(!mBackgroundFetchingEnabled)
 {
+INFO("VideoThumbnailDataPrivate::continueBackgroundFetch() fetching is disabled.")
 return;
 }
 if(mBgFetchTimer)
 {

changeset 37	4eb2df7f7cbe
parent 36	8aed59de29f9
child 38	ff53afa8ad05