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

equal deleted inserted replaced

-:3738fe97f027
+:8aed59de29f9
 *
 * Description:  VideoThumbnailDataPrivate class implementation
 *
 */
+// Version : %version: 20 %
 // INCLUDE FILES
 #include <qapplication.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 #include <mpxmediageneraldefs.h>
 #include <hbicon.h>
 #include <vcxmyvideosdefs.h>
+#include <videocollectioncommon.h>
 #include "videothumbnaildata_p.h"
 #include "videocollectionwrapper.h"
 #include "videosortfilterproxymodel.h"
 #include "videothumbnailfetcher.h"
+#include "videocollectiontrace.h"
 // Maximum thumbnails kept in memory.
 const int THUMBNAIL_CACHE_SIZE = 60;
 // Maximum of thumbnail fetches done at one background fetch round.
 const int THUMBNAIL_BACKGROUND_FETCH_AMOUNT = 20;
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::VideoThumbnailDataPrivate()
 // -----------------------------------------------------------------------------
 //
-VideoThumbnailDataPrivate::VideoThumbnailDataPrivate() :
+VideoThumbnailDataPrivate::VideoThumbnailDataPrivate()
-mThumbnailFetcher(0),
+: mThumbnailFetcher( 0 )
-mCurrentModel(0),
+, mCurrentModel( 0 )
-mCurrentFetchIndex(0),
+, mCurrentFetchIndex( 0 )
-mCurrentBackgroundFetchCount(0),
+, mCurrentBackgroundFetchCount( 0 )
-mBgFetchTimer(0),
+, mBgFetchTimer( 0 )
-mTbnReportTimer(0),
+, mTbnReportTimer( 0 )
-mSignalsConnected(false),
+, mSignalsConnected( false )
-mBackgroundFetchingEnabled(true)
+, mBackgroundFetchingEnabled( true )
 {
+	FUNC_LOG;
 initialize();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::~VideoThumbnailDataPrivate()
 // -----------------------------------------------------------------------------
 //
 VideoThumbnailDataPrivate::~VideoThumbnailDataPrivate()
 {
+	FUNC_LOG;
 cleanup();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::initialize()
 // -----------------------------------------------------------------------------
 //
 int VideoThumbnailDataPrivate::initialize()
 {
+	FUNC_LOG;
 mThumbnailData.setMaxCost(THUMBNAIL_CACHE_SIZE);
 if(!mThumbnailFetcher)
 {
 mThumbnailFetcher = new VideoThumbnailFetcher();
 mTbnReportTimer = new QTimer();
 }
 if(connectSignals() < 0)
 {
+ERROR(-1, "VideoThumbnailDataPrivate::initialize() failed to connect signals.");
 cleanup();
 return -1;
 }
 return 0;
 // VideoThumbnailDataPrivate::cleanup()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::cleanup()
 {
+	FUNC_LOG;
 disconnectSignals();
 delete mThumbnailFetcher;
 mThumbnailFetcher = 0;
 // VideoThumbnailDataPrivate::disconnectSignals()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::disconnectSignals()
 {
+	FUNC_LOG;
 if(mSignalsConnected)
 {
 VideoSortFilterProxyModel *model =
-VideoCollectionWrapper::instance().getModel(VideoCollectionWrapper::EAllVideos);
+VideoCollectionWrapper::instance().getModel(VideoCollectionCommon::EModelTypeAllVideos);
 if(model)
 {
 disconnect(model->sourceModel(), SIGNAL(modelReady()), this, SLOT(modelChangedSlot()));
 disconnect(model->sourceModel(), SIGNAL(modelChanged()), this, SLOT(modelChangedSlot()));
 }
 // VideoThumbnailDataPrivate::connectSignals()
 // -----------------------------------------------------------------------------
 //
 int VideoThumbnailDataPrivate::connectSignals()
 {
+	FUNC_LOG;
 if(!mSignalsConnected)
 {
 VideoSortFilterProxyModel *model =
-VideoCollectionWrapper::instance().getModel(VideoCollectionWrapper::EAllVideos);
+VideoCollectionWrapper::instance().getModel(VideoCollectionCommon::EModelTypeAllVideos);
 if(!model)
 return -1;
 if(!connect(mThumbnailFetcher, SIGNAL(thumbnailReady( QPixmap , void *, int )),
 this, SLOT(thumbnailReadySlot( QPixmap , void *, int))) ||
 !connect(mThumbnailFetcher, SIGNAL(allThumbnailsFetched()),
 // VideoThumbnailDataPrivate::startFetchingThumbnails()
 // -----------------------------------------------------------------------------
 //
 int VideoThumbnailDataPrivate::startFetchingThumbnails(const QList<QModelIndex> &indexes, int priority)
 {
+	FUNC_LOG;
 if(!mCurrentModel || !mThumbnailFetcher)
 {
 return -1;
 }
 if(indexes.count() == 0)
 return 0;
 }
 QString fileName = mCurrentModel->getMediaFilePathForId(mediaId);
-// object containing media id to be passed throught
-// thumbnail generation process.
-TMPXItemId *internal = new TMPXItemId(mediaId.iId1, mediaId.iId2);
 // Thumbnail fetcher signals into thumbnailReadySlot when thumbnail ready
 if(fileName.length() > 0)
 {
+// object containing media id to be passed throught
+// thumbnail generation process.
+TMPXItemId *internal = new TMPXItemId(mediaId.iId1, mediaId.iId2);
 mThumbnailFetcher->addFetch(fileName, internal, priority);
 }
 return 0;
 }
 // VideoThumbnailDataPrivate::doBackgroundFetching()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::doBackgroundFetching()
 {
+	FUNC_LOG;
 if(!mCurrentModel || !mThumbnailFetcher)
 {
 return;
 }
 // VideoThumbnailDataPrivate::getModelIndexes()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::getModelIndexes(QList<QModelIndex> &indexes, int startIndex, int endIndex)
 {
+	FUNC_LOG;
 QModelIndex index;
 for(int i = startIndex; i < endIndex; i++)
 {
 if(i >= 0)
 {
 // VideoThumbnailDataPrivate::reportThumbnailsReadySlot()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::reportThumbnailsReadySlot()
 {
+	FUNC_LOG;
 emit thumbnailsFetched(mReadyThumbnailMediaIds);
 mReadyThumbnailMediaIds.clear();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::allThumbnailsFetchedSlot()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::allThumbnailsFetchedSlot()
 {
+	FUNC_LOG;
 continueBackgroundFetch();
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::modelChangedSlot()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::modelChangedSlot()
 {
+	FUNC_LOG;
 startBackgroundFetching(mCurrentModel, mCurrentFetchIndex);
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::defaultThumbnail()
 // Default thumbnail for user defined album.
 if(mediaId.iId2 == KVcxMvcMediaTypeAlbum)
 {
 if(!mDefaultThumbnails.contains(defaultIdAlbum))
 {
-mDefaultThumbnails[defaultIdAlbum] = HbIcon(":/icons/default_thumbnail_collection.svg");
+mDefaultThumbnails[defaultIdAlbum] = HbIcon("qtg_large_video_collection");
 }
 return &mDefaultThumbnails[defaultIdAlbum].qicon();
 }
 // Thumbnails for default collections.
 default:
 {
 if(!mDefaultThumbnails.contains(defaultIdAlbum))
 {
-mDefaultThumbnails[defaultIdAlbum] = HbIcon(":/icons/default_thumbnail_collection.svg");
+mDefaultThumbnails[defaultIdAlbum] = HbIcon("qtg_large_video_collection");
 }
 return &mDefaultThumbnails[defaultIdAlbum].qicon();
 }
 }
 }
 // VideoThumbnailDataPrivate::removeThumbnail()
 // -----------------------------------------------------------------------------
 //
 bool VideoThumbnailDataPrivate::removeThumbnail(TMPXItemId mediaId)
 {
+	FUNC_LOG;
 return mThumbnailData.remove(mediaId);
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::enableBackgroundFetching()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::enableBackgroundFetching(bool enable)
 {
+	FUNC_LOG;
+INFO_1("VideoThumbnailDataPrivate::enableBackgroundFetching() enable: %d", enable);
 mBackgroundFetchingEnabled = enable;
 startBackgroundFetching(mCurrentModel, 0);
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::enableThumbnailCreation()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::enableThumbnailCreation(bool enable)
 {
+	FUNC_LOG;
+	INFO_1("VideoThumbnailDataPrivate::enableThumbnailCreation() enable: %d", enable);
 if(mThumbnailFetcher)
+{
 mThumbnailFetcher->enableThumbnailCreation(enable);
+}
 }
 // -----------------------------------------------------------------------------
 // VideoThumbnailDataPrivate::freeThumbnailData()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::freeThumbnailData()
 {
+	FUNC_LOG;
 // Stop timers.
 if(mBgFetchTimer)
+{
 mBgFetchTimer->stop();
+}
 if(mTbnReportTimer)
+{
 mTbnReportTimer->stop();
+}
 if(mThumbnailFetcher)
+{
 mThumbnailFetcher->cancelFetches();
+}
 // Clear data.
 mReadyThumbnailMediaIds.clear();
 mThumbnailData.clear();
 mDefaultThumbnails.clear();
 // VideoThumbnailDataPrivate::startBackgroundFetching()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::startBackgroundFetching(VideoSortFilterProxyModel *model, int fetchIndex)
 {
+	FUNC_LOG;
 if(!mBackgroundFetchingEnabled || !mThumbnailFetcher)
+{
 return;
+}
 mThumbnailFetcher->cancelFetches();
 // If model is null, we continue using the current one.
 if(model)
+{
 mCurrentModel = model;
+}
 mCurrentFetchIndex = fetchIndex;
 mCurrentBackgroundFetchCount = 0;
 doBackgroundFetching();
 }
 // VideoThumbnailDataPrivate::continueBackgroundFetch()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::continueBackgroundFetch()
 {
+	FUNC_LOG;
 if(!mBackgroundFetchingEnabled)
+{
 return;
+}
 if(mBgFetchTimer)
 {
 mBgFetchTimer->stop();
 mBgFetchTimer->setSingleShot(true);
 // VideoThumbnailDataPrivate::aboutToQuitSlot()
 // -----------------------------------------------------------------------------
 //
 void VideoThumbnailDataPrivate::aboutToQuitSlot()
 {
+	FUNC_LOG;
 cleanup();
 }
 // End of file

changeset 36	8aed59de29f9
parent 35	3738fe97f027
child 37	4eb2df7f7cbe