--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/videoplayerappexport.h	Mon May 03 12:32:50 2010 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   DLL export macro for videoplayer app.
+* 
+*/
+
+#ifndef _VIDEOPLAYERAPPEXPORT_H
+#define _VIDEOPLAYERAPPEXPORT_H
+
+// System includes
+#include <qglobal.h>
+
+#ifdef BUILD_VIDEOPLAYERAPP_DLL
+    #define VIDEOPLAYERAPP_DLL_EXPORT Q_DECL_EXPORT
+#else
+    #define VIDEOPLAYERAPP_DLL_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // _VIDEOPLAYERAPPEXPORT_H
+
+// End of file.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/videoservices.h	Mon May 03 12:32:50 2010 +0300
@@ -0,0 +1,190 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   VideoServices class definition
+*
+*/
+
+#ifndef __VIDEOSERVICES_H__
+#define __VIDEOSERVICES_H__
+
+#include <QStringList>
+#include "videoplayerappexport.h"
+
+//FORWARD CLASS DECLARATION
+class VideoServiceUriFetch;
+class VideoServicePlay;
+class VideoServiceView;
+class VideoServiceBrowse;
+class QVideoPlayerEngine;
+
+class VIDEOPLAYERAPP_DLL_EXPORT VideoServices : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    /**
+     * Returns singleton instance for this class.
+     *
+     * WARNING! Not safe to call this from destructor of another function scope static object!
+     *
+     * @return The singleton instance.
+     */
+    static VideoServices *instance(QVideoPlayerEngine* engine = 0);
+
+    /**
+     * Decreases the reference count, when count reaches zero cleanup is done.
+     *
+     */
+    void decreaseReferenceCount();
+
+    /**
+     * Returns the context title set by service requestee
+     *
+     * @return QString the title
+     *
+     */
+    QString contextTitle() const;
+
+	/*
+	 * Enum reflecting the services provided 
+	 */
+    enum TVideoService
+    {
+        ENoService,
+        EUriFetcher,
+        EPlayback,
+		EView,
+        EBrowse
+    };
+
+    /**
+     * Returns service active status
+     *
+     * @return bool true if active, false if not active
+     *
+     */
+    VideoServices::TVideoService currentService();
+
+    /**
+     * Returns browsing category.
+     * 
+     * @return see vcxmyvideosdef.h for default categories.
+     */
+    int getBrowseCategory() const;
+
+public slots:
+    void itemSelected(const QString& item);
+    void browsingEnded();
+
+signals:
+	/*
+	 * Emitted when service user has set the title
+	 */    
+	void titleReady(const QString& title);
+
+	/*
+	 * Emitted to acticate requested plugin
+	 */
+	void activated(int command);
+
+private:
+
+    /**
+     * Constructor
+     */
+    VideoServices();
+
+    /**
+     * Constructor
+     */
+    VideoServices(QVideoPlayerEngine* engine);
+
+    /**
+     * Destructor.
+     */
+    virtual ~VideoServices();
+
+    void setEngine(QVideoPlayerEngine* engine);
+
+    /**
+     * Sets the active service
+     *
+     * @param service
+     *
+     */
+    void setCurrentService(VideoServices::TVideoService service);
+
+    /**
+     * Returns the current engine
+     *
+     * @return engine
+     *
+     */
+    QVideoPlayerEngine* engine();
+
+    Q_DISABLE_COPY(VideoServices)
+
+private:
+
+    /**
+     * Reference count.
+     */
+    int mReferenceCount;
+
+    /**
+     * Singleton instance.
+     */
+    static VideoServices* mInstance;
+
+    /**
+     * VideoServiceUriFetch service instance.
+     */
+    VideoServiceUriFetch* mServiceUriFetch;
+
+    /**
+     * VideoServicePlay service instance.
+     */
+    VideoServicePlay* mServicePlay;
+    
+    /**
+     * VideoServiceView service instance.
+     */    
+    VideoServiceView* mServiceView; 
+    
+    /**
+     * VideoServiceBrowse service instance.
+     */
+    VideoServiceBrowse *mServiceBrowse;
+
+    /**
+     * Pointer of QVideoPlayerEngine.
+     */
+    QVideoPlayerEngine* mEngine;
+
+	/*
+	 * Current service
+	 */
+    VideoServices::TVideoService mCurrentService;
+
+    friend class VideoServiceUriFetch;
+
+    friend class VideoServicePlay;
+	
+	friend class VideoServiceView;
+    
+    friend class VideoServiceBrowse;
+    };
+
+#endif //__VIDEOSERVICES_H__

--- a/layers.sysdef.xml	Fri Apr 16 14:59:52 2010 +0300
+++ b/layers.sysdef.xml	Mon May 03 12:32:50 2010 +0300
@@ -19,6 +19,7 @@
             <unit unitID="vado.testhintwidget" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testhintwidget" proFile="testhintwidget.pro" name="unittest.testhintwidget"/>
             <unit unitID="vado.testlistview" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testlistview" proFile="testlistview.pro" name="unittest.testlistview"/>
             <unit unitID="vado.testlistwidget" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testlistwidget" proFile="testlistwidget.pro" name="unittest.testlistwidget"/>
+            <unit unitID="vado.testvideocollectionuiloader" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testvideocollectionuiloader" proFile="testvideocollectionuiloader.pro" name="unittest.testvideocollectionuiloader"/>
             <unit unitID="vado.testvideocollectionviewutils" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testvideocollectionviewutils" proFile="testvideocollectionviewutils.pro" name="unittest.testvideocollectionviewutils"/>
             <unit unitID="vado.testvideolistselectiondialog" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionview/tsrc/testvideolistselectiondialog" proFile="testvideolistselectiondialog.pro" name="unittest.testvideolistselectiondialog"/>
             <unit unitID="vado.testvideocollectionclient" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" proFile="testvideocollectionclient.pro" name="unittest.testvideocollectionclient"/>
@@ -31,6 +32,7 @@
             <unit unitID="vado.testvideosortfilterproxymodel" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" proFile="testvideosortfilterproxymodel.pro" name="unittest.testvideosortfilterproxymodel"/>
             <unit unitID="vado.testvideothumbnaildata" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" proFile="testvideothumbnaildata.pro" name="unittest.testvideothumbnaildata"/>
             <unit unitID="vado.testvideothumbnaildata_p" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" proFile="testvideothumbnaildata_p.pro" name="unittest.testvideothumbnaildata_p"/>
+            <unit unitID="vado.testvideothumbnailfetcher" mrp="" bldFile="&layer_real_source_path;/videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" proFile="testvideothumbnailfetcher.pro" name="unittest.testvideothumbnailfetcher"/>
         </module>
     </layer>
     

--- a/mediasettings/mediasettingsengine/group/bld.inf	Fri Apr 16 14:59:52 2010 +0300
+++ b/mediasettings/mediasettingsengine/group/bld.inf	Mon May 03 12:32:50 2010 +0300
@@ -16,7 +16,7 @@
 
 
 
-// Version : %version: 6 %
+// Version : %version: 7 %
 
 #include <platform_paths.hrh>
 
@@ -28,7 +28,7 @@
 //  Export the loc, stub sis iby files for S60 5.0
 //
 ../rom/mpsettropmodel.iby      	CORE_APP_LAYER_IBY_EXPORT_PATH(mpsettropmodel.iby)
-../rom/mpsettropmodelrsc.iby    LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(mpsettropmodelrsc.iby)
+../rom/mpsettropmodelrsc.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(mpsettropmodelrsc.iby)
 
 PRJ_MMPFILES
 ../group/MPSettROPModel.mmp

--- a/videocollection/bwins/videocollectionwrapperu.def	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/bwins/videocollectionwrapperu.def	Mon May 03 12:32:50 2010 +0300
@@ -3,32 +3,32 @@
 	?sendAsyncStatus@VideoCollectionWrapper@@QAEXHAAVQVariant@@@Z @ 2 NONAME ; void VideoCollectionWrapper::sendAsyncStatus(int, class QVariant &)
 	??1VideoSortFilterProxyModel@@UAE@XZ @ 3 NONAME ; VideoSortFilterProxyModel::~VideoSortFilterProxyModel(void)
 	?removeThumbnail@VideoThumbnailData@@QAE_NVTMPXItemId@@@Z @ 4 NONAME ; bool VideoThumbnailData::removeThumbnail(class TMPXItemId)
-	?deleteItems@VideoSortFilterProxyModel@@QAEHABV?$QList@VQModelIndex@@@@@Z @ 5 NONAME ; int VideoSortFilterProxyModel::deleteItems(class QList<class QModelIndex> const &)
-	?trUtf8@VideoThumbnailData@@SA?AVQString@@PBD0@Z @ 6 NONAME ; class QString VideoThumbnailData::trUtf8(char const *, char const *)
-	?removeItemsFromAlbum@VideoSortFilterProxyModel@@QAEHAAVTMPXItemId@@ABV?$QList@VTMPXItemId@@@@@Z @ 7 NONAME ; int VideoSortFilterProxyModel::removeItemsFromAlbum(class TMPXItemId &, class QList<class TMPXItemId> const &)
-	?instance@VideoCollectionWrapper@@SAAAV1@XZ @ 8 NONAME ; class VideoCollectionWrapper & VideoCollectionWrapper::instance(void)
-	?back@VideoSortFilterProxyModel@@QAEHXZ @ 9 NONAME ; int VideoSortFilterProxyModel::back(void)
-	?modelReady@VideoSortFilterProxyModel@@IAEXXZ @ 10 NONAME ; void VideoSortFilterProxyModel::modelReady(void)
-	?albumChangedSlot@VideoSortFilterProxyModel@@AAEXXZ @ 11 NONAME ; void VideoSortFilterProxyModel::albumChangedSlot(void)
-	?qt_metacall@VideoThumbnailData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 12 NONAME ; int VideoThumbnailData::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1VideoThumbnailData@@EAE@XZ @ 13 NONAME ; VideoThumbnailData::~VideoThumbnailData(void)
-	??_EVideoThumbnailData@@UAE@I@Z @ 14 NONAME ; VideoThumbnailData::~VideoThumbnailData(unsigned int)
-	?getMediaFilePathForId@VideoSortFilterProxyModel@@QAE?AVQString@@VTMPXItemId@@@Z @ 15 NONAME ; class QString VideoSortFilterProxyModel::getMediaFilePathForId(class TMPXItemId)
-	?setAlbumInUse@VideoSortFilterProxyModel@@QAEXVTMPXItemId@@@Z @ 16 NONAME ; void VideoSortFilterProxyModel::setAlbumInUse(class TMPXItemId)
-	?qt_metacast@VideoCollectionWrapper@@UAEPAXPBD@Z @ 17 NONAME ; void * VideoCollectionWrapper::qt_metacast(char const *)
-	?addItemsInAlbum@VideoSortFilterProxyModel@@QAEHAAVTMPXItemId@@ABV?$QList@VTMPXItemId@@@@@Z @ 18 NONAME ; int VideoSortFilterProxyModel::addItemsInAlbum(class TMPXItemId &, class QList<class TMPXItemId> const &)
-	?tr@VideoSortFilterProxyModel@@SA?AVQString@@PBD0H@Z @ 19 NONAME ; class QString VideoSortFilterProxyModel::tr(char const *, char const *, int)
-	?removeAlbums@VideoSortFilterProxyModel@@QAEHABV?$QList@VQModelIndex@@@@@Z @ 20 NONAME ; int VideoSortFilterProxyModel::removeAlbums(class QList<class QModelIndex> const &)
-	?instance@VideoThumbnailData@@SAAAV1@XZ @ 21 NONAME ; class VideoThumbnailData & VideoThumbnailData::instance(void)
-	?fetchItemDetails@VideoSortFilterProxyModel@@QAEHABVQModelIndex@@@Z @ 22 NONAME ; int VideoSortFilterProxyModel::fetchItemDetails(class QModelIndex const &)
-	??0VideoCollectionWrapper@@AAE@XZ @ 23 NONAME ; VideoCollectionWrapper::VideoCollectionWrapper(void)
-	?metaObject@VideoSortFilterProxyModel@@UBEPBUQMetaObject@@XZ @ 24 NONAME ; struct QMetaObject const * VideoSortFilterProxyModel::metaObject(void) const
-	?metaObject@VideoCollectionWrapper@@UBEPBUQMetaObject@@XZ @ 25 NONAME ; struct QMetaObject const * VideoCollectionWrapper::metaObject(void) const
-	?open@VideoSortFilterProxyModel@@QAEHH@Z @ 26 NONAME ; int VideoSortFilterProxyModel::open(int)
-	?lessThan@VideoSortFilterProxyModel@@MBE_NABVQModelIndex@@0@Z @ 27 NONAME ; bool VideoSortFilterProxyModel::lessThan(class QModelIndex const &, class QModelIndex const &) const
-	?getStaticMetaObject@VideoCollectionWrapper@@SAABUQMetaObject@@XZ @ 28 NONAME ; struct QMetaObject const & VideoCollectionWrapper::getStaticMetaObject(void)
-	?indexOfId@VideoSortFilterProxyModel@@QAE?AVQModelIndex@@VTMPXItemId@@@Z @ 29 NONAME ; class QModelIndex VideoSortFilterProxyModel::indexOfId(class TMPXItemId)
-	??0VideoSortFilterProxyModel@@QAE@HPAVQObject@@@Z @ 30 NONAME ; VideoSortFilterProxyModel::VideoSortFilterProxyModel(int, class QObject *)
+	?open@VideoSortFilterProxyModel@@QAEHW4TCollectionLevels@VideoCollectionCommon@@@Z @ 5 NONAME ; int VideoSortFilterProxyModel::open(enum VideoCollectionCommon::TCollectionLevels)
+	?deleteItems@VideoSortFilterProxyModel@@QAEHABV?$QList@VQModelIndex@@@@@Z @ 6 NONAME ; int VideoSortFilterProxyModel::deleteItems(class QList<class QModelIndex> const &)
+	?trUtf8@VideoThumbnailData@@SA?AVQString@@PBD0@Z @ 7 NONAME ; class QString VideoThumbnailData::trUtf8(char const *, char const *)
+	?removeItemsFromAlbum@VideoSortFilterProxyModel@@QAEHAAVTMPXItemId@@ABV?$QList@VTMPXItemId@@@@@Z @ 8 NONAME ; int VideoSortFilterProxyModel::removeItemsFromAlbum(class TMPXItemId &, class QList<class TMPXItemId> const &)
+	?instance@VideoCollectionWrapper@@SAAAV1@XZ @ 9 NONAME ; class VideoCollectionWrapper & VideoCollectionWrapper::instance(void)
+	?back@VideoSortFilterProxyModel@@QAEHXZ @ 10 NONAME ; int VideoSortFilterProxyModel::back(void)
+	?modelReady@VideoSortFilterProxyModel@@IAEXXZ @ 11 NONAME ; void VideoSortFilterProxyModel::modelReady(void)
+	?albumChangedSlot@VideoSortFilterProxyModel@@AAEXXZ @ 12 NONAME ; void VideoSortFilterProxyModel::albumChangedSlot(void)
+	?qt_metacall@VideoThumbnailData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13 NONAME ; int VideoThumbnailData::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1VideoThumbnailData@@EAE@XZ @ 14 NONAME ; VideoThumbnailData::~VideoThumbnailData(void)
+	??_EVideoThumbnailData@@UAE@I@Z @ 15 NONAME ; VideoThumbnailData::~VideoThumbnailData(unsigned int)
+	?getMediaFilePathForId@VideoSortFilterProxyModel@@QAE?AVQString@@VTMPXItemId@@@Z @ 16 NONAME ; class QString VideoSortFilterProxyModel::getMediaFilePathForId(class TMPXItemId)
+	?setAlbumInUse@VideoSortFilterProxyModel@@QAEXVTMPXItemId@@@Z @ 17 NONAME ; void VideoSortFilterProxyModel::setAlbumInUse(class TMPXItemId)
+	?qt_metacast@VideoCollectionWrapper@@UAEPAXPBD@Z @ 18 NONAME ; void * VideoCollectionWrapper::qt_metacast(char const *)
+	?addItemsInAlbum@VideoSortFilterProxyModel@@QAEHAAVTMPXItemId@@ABV?$QList@VTMPXItemId@@@@@Z @ 19 NONAME ; int VideoSortFilterProxyModel::addItemsInAlbum(class TMPXItemId &, class QList<class TMPXItemId> const &)
+	?tr@VideoSortFilterProxyModel@@SA?AVQString@@PBD0H@Z @ 20 NONAME ; class QString VideoSortFilterProxyModel::tr(char const *, char const *, int)
+	?removeAlbums@VideoSortFilterProxyModel@@QAEHABV?$QList@VQModelIndex@@@@@Z @ 21 NONAME ; int VideoSortFilterProxyModel::removeAlbums(class QList<class QModelIndex> const &)
+	?instance@VideoThumbnailData@@SAAAV1@XZ @ 22 NONAME ; class VideoThumbnailData & VideoThumbnailData::instance(void)
+	?getType@VideoSortFilterProxyModel@@QAE?AW4TModelType@VideoCollectionCommon@@XZ @ 23 NONAME ; enum VideoCollectionCommon::TModelType VideoSortFilterProxyModel::getType(void)
+	?fetchItemDetails@VideoSortFilterProxyModel@@QAEHABVQModelIndex@@@Z @ 24 NONAME ; int VideoSortFilterProxyModel::fetchItemDetails(class QModelIndex const &)
+	??0VideoCollectionWrapper@@AAE@XZ @ 25 NONAME ; VideoCollectionWrapper::VideoCollectionWrapper(void)
+	?metaObject@VideoSortFilterProxyModel@@UBEPBUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const * VideoSortFilterProxyModel::metaObject(void) const
+	?metaObject@VideoCollectionWrapper@@UBEPBUQMetaObject@@XZ @ 27 NONAME ; struct QMetaObject const * VideoCollectionWrapper::metaObject(void) const
+	?lessThan@VideoSortFilterProxyModel@@MBE_NABVQModelIndex@@0@Z @ 28 NONAME ; bool VideoSortFilterProxyModel::lessThan(class QModelIndex const &, class QModelIndex const &) const
+	?getStaticMetaObject@VideoCollectionWrapper@@SAABUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const & VideoCollectionWrapper::getStaticMetaObject(void)
+	?indexOfId@VideoSortFilterProxyModel@@QAE?AVQModelIndex@@VTMPXItemId@@@Z @ 30 NONAME ; class QModelIndex VideoSortFilterProxyModel::indexOfId(class TMPXItemId)
 	?getStaticMetaObject@VideoSortFilterProxyModel@@SAABUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const & VideoSortFilterProxyModel::getStaticMetaObject(void)
 	?trUtf8@VideoSortFilterProxyModel@@SA?AVQString@@PBD0@Z @ 32 NONAME ; class QString VideoSortFilterProxyModel::trUtf8(char const *, char const *)
 	?doSorting@VideoSortFilterProxyModel@@QAEXHW4SortOrder@Qt@@_N@Z @ 33 NONAME ; void VideoSortFilterProxyModel::doSorting(int, enum Qt::SortOrder, bool)
@@ -42,37 +42,40 @@
 	?trUtf8@VideoThumbnailData@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString VideoThumbnailData::trUtf8(char const *, char const *, int)
 	?enableBackgroundFetching@VideoThumbnailData@@QAEX_N@Z @ 42 NONAME ; void VideoThumbnailData::enableBackgroundFetching(bool)
 	?getMediaIdAtIndex@VideoSortFilterProxyModel@@QBE?AVTMPXItemId@@ABVQModelIndex@@@Z @ 43 NONAME ; class TMPXItemId VideoSortFilterProxyModel::getMediaIdAtIndex(class QModelIndex const &) const
-	?connectSignals@VideoSortFilterProxyModel@@AAE_NXZ @ 44 NONAME ; bool VideoSortFilterProxyModel::connectSignals(void)
-	?tr@VideoCollectionWrapper@@SA?AVQString@@PBD0H@Z @ 45 NONAME ; class QString VideoCollectionWrapper::tr(char const *, char const *, int)
-	?staticMetaObject@VideoSortFilterProxyModel@@2UQMetaObject@@B @ 46 NONAME ; struct QMetaObject const VideoSortFilterProxyModel::staticMetaObject
-	?tr@VideoSortFilterProxyModel@@SA?AVQString@@PBD0@Z @ 47 NONAME ; class QString VideoSortFilterProxyModel::tr(char const *, char const *)
-	?asyncStatus@VideoCollectionWrapper@@IAEXHAAVQVariant@@@Z @ 48 NONAME ; void VideoCollectionWrapper::asyncStatus(int, class QVariant &)
-	?initialize@VideoSortFilterProxyModel@@QAEHPAVVideoListDataModel@@@Z @ 49 NONAME ; int VideoSortFilterProxyModel::initialize(class VideoListDataModel *)
-	?modelChanged@VideoSortFilterProxyModel@@IAEXXZ @ 50 NONAME ; void VideoSortFilterProxyModel::modelChanged(void)
-	?thumbnailsFetched@VideoThumbnailData@@IAEXV?$QList@VTMPXItemId@@@@@Z @ 51 NONAME ; void VideoThumbnailData::thumbnailsFetched(class QList<class TMPXItemId>)
-	?trUtf8@VideoCollectionWrapper@@SA?AVQString@@PBD0@Z @ 52 NONAME ; class QString VideoCollectionWrapper::trUtf8(char const *, char const *)
-	?processSorting@VideoSortFilterProxyModel@@AAEXXZ @ 53 NONAME ; void VideoSortFilterProxyModel::processSorting(void)
-	?getSorting@VideoSortFilterProxyModel@@QAEXAAHAAW4SortOrder@Qt@@@Z @ 54 NONAME ; void VideoSortFilterProxyModel::getSorting(int &, enum Qt::SortOrder &)
-	?filterAcceptsRow@VideoSortFilterProxyModel@@MBE_NHABVQModelIndex@@@Z @ 55 NONAME ; bool VideoSortFilterProxyModel::filterAcceptsRow(int, class QModelIndex const &) const
-	?metaObject@VideoThumbnailData@@UBEPBUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const * VideoThumbnailData::metaObject(void) const
-	?tr@VideoThumbnailData@@SA?AVQString@@PBD0H@Z @ 57 NONAME ; class QString VideoThumbnailData::tr(char const *, char const *, int)
-	?disconnectSignals@VideoSortFilterProxyModel@@AAEXXZ @ 58 NONAME ; void VideoSortFilterProxyModel::disconnectSignals(void)
-	?getModel@VideoCollectionWrapper@@QAEPAVVideoSortFilterProxyModel@@H@Z @ 59 NONAME ; class VideoSortFilterProxyModel * VideoCollectionWrapper::getModel(int)
-	?trUtf8@VideoSortFilterProxyModel@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString VideoSortFilterProxyModel::trUtf8(char const *, char const *, int)
-	?openItem@VideoSortFilterProxyModel@@QAEHVTMPXItemId@@@Z @ 61 NONAME ; int VideoSortFilterProxyModel::openItem(class TMPXItemId)
-	?qt_metacast@VideoThumbnailData@@UAEPAXPBD@Z @ 62 NONAME ; void * VideoThumbnailData::qt_metacast(char const *)
-	?tr@VideoCollectionWrapper@@SA?AVQString@@PBD0@Z @ 63 NONAME ; class QString VideoCollectionWrapper::tr(char const *, char const *)
-	??_EVideoSortFilterProxyModel@@UAE@I@Z @ 64 NONAME ; VideoSortFilterProxyModel::~VideoSortFilterProxyModel(unsigned int)
-	?addNewAlbum@VideoSortFilterProxyModel@@QAE?AVTMPXItemId@@ABVQString@@@Z @ 65 NONAME ; class TMPXItemId VideoSortFilterProxyModel::addNewAlbum(class QString const &)
-	?enableThumbnailCreation@VideoThumbnailData@@QAEX_N@Z @ 66 NONAME ; void VideoThumbnailData::enableThumbnailCreation(bool)
-	?qt_metacall@VideoSortFilterProxyModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 67 NONAME ; int VideoSortFilterProxyModel::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?freeThumbnailData@VideoThumbnailData@@QAEXXZ @ 68 NONAME ; void VideoThumbnailData::freeThumbnailData(void)
-	?shortDetailsReady@VideoSortFilterProxyModel@@IAEXVTMPXItemId@@@Z @ 69 NONAME ; void VideoSortFilterProxyModel::shortDetailsReady(class TMPXItemId)
-	?qt_metacast@VideoSortFilterProxyModel@@UAEPAXPBD@Z @ 70 NONAME ; void * VideoSortFilterProxyModel::qt_metacast(char const *)
-	?staticMetaObject@VideoCollectionWrapper@@2UQMetaObject@@B @ 71 NONAME ; struct QMetaObject const VideoCollectionWrapper::staticMetaObject
-	?tr@VideoThumbnailData@@SA?AVQString@@PBD0@Z @ 72 NONAME ; class QString VideoThumbnailData::tr(char const *, char const *)
-	??1VideoCollectionWrapper@@EAE@XZ @ 73 NONAME ; VideoCollectionWrapper::~VideoCollectionWrapper(void)
-	?trUtf8@VideoCollectionWrapper@@SA?AVQString@@PBD0H@Z @ 74 NONAME ; class QString VideoCollectionWrapper::trUtf8(char const *, char const *, int)
-	??0VideoThumbnailData@@AAE@XZ @ 75 NONAME ; VideoThumbnailData::VideoThumbnailData(void)
-	?staticMetaObject@VideoThumbnailData@@2UQMetaObject@@B @ 76 NONAME ; struct QMetaObject const VideoThumbnailData::staticMetaObject
+	?renameAlbum@VideoSortFilterProxyModel@@QAEHABVTMPXItemId@@ABVQString@@@Z @ 44 NONAME ; int VideoSortFilterProxyModel::renameAlbum(class TMPXItemId const &, class QString const &)
+	?connectSignals@VideoSortFilterProxyModel@@AAE_NXZ @ 45 NONAME ; bool VideoSortFilterProxyModel::connectSignals(void)
+	?getModel@VideoCollectionWrapper@@QAEPAVVideoSortFilterProxyModel@@W4TModelType@VideoCollectionCommon@@@Z @ 46 NONAME ; class VideoSortFilterProxyModel * VideoCollectionWrapper::getModel(enum VideoCollectionCommon::TModelType)
+	?tr@VideoCollectionWrapper@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString VideoCollectionWrapper::tr(char const *, char const *, int)
+	?staticMetaObject@VideoSortFilterProxyModel@@2UQMetaObject@@B @ 48 NONAME ; struct QMetaObject const VideoSortFilterProxyModel::staticMetaObject
+	?tr@VideoSortFilterProxyModel@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString VideoSortFilterProxyModel::tr(char const *, char const *)
+	?asyncStatus@VideoCollectionWrapper@@IAEXHAAVQVariant@@@Z @ 50 NONAME ; void VideoCollectionWrapper::asyncStatus(int, class QVariant &)
+	?initialize@VideoSortFilterProxyModel@@QAEHPAVVideoListDataModel@@@Z @ 51 NONAME ; int VideoSortFilterProxyModel::initialize(class VideoListDataModel *)
+	?modelChanged@VideoSortFilterProxyModel@@IAEXXZ @ 52 NONAME ; void VideoSortFilterProxyModel::modelChanged(void)
+	?itemModifiedSlot@VideoSortFilterProxyModel@@AAEXABVTMPXItemId@@@Z @ 53 NONAME ; void VideoSortFilterProxyModel::itemModifiedSlot(class TMPXItemId const &)
+	?thumbnailsFetched@VideoThumbnailData@@IAEXV?$QList@VTMPXItemId@@@@@Z @ 54 NONAME ; void VideoThumbnailData::thumbnailsFetched(class QList<class TMPXItemId>)
+	?trUtf8@VideoCollectionWrapper@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString VideoCollectionWrapper::trUtf8(char const *, char const *)
+	?processSorting@VideoSortFilterProxyModel@@AAEXXZ @ 56 NONAME ; void VideoSortFilterProxyModel::processSorting(void)
+	?getSorting@VideoSortFilterProxyModel@@QAEXAAHAAW4SortOrder@Qt@@@Z @ 57 NONAME ; void VideoSortFilterProxyModel::getSorting(int &, enum Qt::SortOrder &)
+	?filterAcceptsRow@VideoSortFilterProxyModel@@MBE_NHABVQModelIndex@@@Z @ 58 NONAME ; bool VideoSortFilterProxyModel::filterAcceptsRow(int, class QModelIndex const &) const
+	?metaObject@VideoThumbnailData@@UBEPBUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const * VideoThumbnailData::metaObject(void) const
+	?tr@VideoThumbnailData@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString VideoThumbnailData::tr(char const *, char const *, int)
+	?disconnectSignals@VideoSortFilterProxyModel@@AAEXXZ @ 61 NONAME ; void VideoSortFilterProxyModel::disconnectSignals(void)
+	?trUtf8@VideoSortFilterProxyModel@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString VideoSortFilterProxyModel::trUtf8(char const *, char const *, int)
+	?openItem@VideoSortFilterProxyModel@@QAEHVTMPXItemId@@@Z @ 63 NONAME ; int VideoSortFilterProxyModel::openItem(class TMPXItemId)
+	?qt_metacast@VideoThumbnailData@@UAEPAXPBD@Z @ 64 NONAME ; void * VideoThumbnailData::qt_metacast(char const *)
+	?tr@VideoCollectionWrapper@@SA?AVQString@@PBD0@Z @ 65 NONAME ; class QString VideoCollectionWrapper::tr(char const *, char const *)
+	??_EVideoSortFilterProxyModel@@UAE@I@Z @ 66 NONAME ; VideoSortFilterProxyModel::~VideoSortFilterProxyModel(unsigned int)
+	??0VideoSortFilterProxyModel@@QAE@W4TModelType@VideoCollectionCommon@@PAVQObject@@@Z @ 67 NONAME ; VideoSortFilterProxyModel::VideoSortFilterProxyModel(enum VideoCollectionCommon::TModelType, class QObject *)
+	?addNewAlbum@VideoSortFilterProxyModel@@QAE?AVTMPXItemId@@ABVQString@@@Z @ 68 NONAME ; class TMPXItemId VideoSortFilterProxyModel::addNewAlbum(class QString const &)
+	?enableThumbnailCreation@VideoThumbnailData@@QAEX_N@Z @ 69 NONAME ; void VideoThumbnailData::enableThumbnailCreation(bool)
+	?qt_metacall@VideoSortFilterProxyModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 70 NONAME ; int VideoSortFilterProxyModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?freeThumbnailData@VideoThumbnailData@@QAEXXZ @ 71 NONAME ; void VideoThumbnailData::freeThumbnailData(void)
+	?shortDetailsReady@VideoSortFilterProxyModel@@IAEXVTMPXItemId@@@Z @ 72 NONAME ; void VideoSortFilterProxyModel::shortDetailsReady(class TMPXItemId)
+	?qt_metacast@VideoSortFilterProxyModel@@UAEPAXPBD@Z @ 73 NONAME ; void * VideoSortFilterProxyModel::qt_metacast(char const *)
+	?staticMetaObject@VideoCollectionWrapper@@2UQMetaObject@@B @ 74 NONAME ; struct QMetaObject const VideoCollectionWrapper::staticMetaObject
+	?tr@VideoThumbnailData@@SA?AVQString@@PBD0@Z @ 75 NONAME ; class QString VideoThumbnailData::tr(char const *, char const *)
+	??1VideoCollectionWrapper@@EAE@XZ @ 76 NONAME ; VideoCollectionWrapper::~VideoCollectionWrapper(void)
+	?trUtf8@VideoCollectionWrapper@@SA?AVQString@@PBD0H@Z @ 77 NONAME ; class QString VideoCollectionWrapper::trUtf8(char const *, char const *, int)
+	??0VideoThumbnailData@@AAE@XZ @ 78 NONAME ; VideoThumbnailData::VideoThumbnailData(void)
+	?staticMetaObject@VideoThumbnailData@@2UQMetaObject@@B @ 79 NONAME ; struct QMetaObject const VideoThumbnailData::staticMetaObject
 

--- a/videocollection/eabi/videocollectionwrapperu.def	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/eabi/videocollectionwrapperu.def	Mon May 03 12:32:50 2010 +0300
@@ -22,7 +22,7 @@
 	_ZN22VideoCollectionWrapper15sendAsyncStatusEiR8QVariant @ 21 NONAME
 	_ZN22VideoCollectionWrapper16staticMetaObjectE @ 22 NONAME DATA 16
 	_ZN22VideoCollectionWrapper19getStaticMetaObjectEv @ 23 NONAME
-	_ZN22VideoCollectionWrapper8getModelEi @ 24 NONAME
+	_ZN22VideoCollectionWrapper8getModelEN21VideoCollectionCommon10TModelTypeE @ 24 NONAME
 	_ZN22VideoCollectionWrapper8instanceEv @ 25 NONAME
 	_ZN22VideoCollectionWrapperC1Ev @ 26 NONAME
 	_ZN22VideoCollectionWrapperC2Ev @ 27 NONAME
@@ -36,43 +36,46 @@
 	_ZN25VideoSortFilterProxyModel11deleteItemsERK5QListI11QModelIndexE @ 35 NONAME
 	_ZN25VideoSortFilterProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 36 NONAME
 	_ZN25VideoSortFilterProxyModel11qt_metacastEPKc @ 37 NONAME
-	_ZN25VideoSortFilterProxyModel12modelChangedEv @ 38 NONAME
-	_ZN25VideoSortFilterProxyModel12removeAlbumsERK5QListI11QModelIndexE @ 39 NONAME
-	_ZN25VideoSortFilterProxyModel13setAlbumInUseE10TMPXItemId @ 40 NONAME
-	_ZN25VideoSortFilterProxyModel14connectSignalsEv @ 41 NONAME
-	_ZN25VideoSortFilterProxyModel14processSortingEv @ 42 NONAME
-	_ZN25VideoSortFilterProxyModel15addItemsInAlbumER10TMPXItemIdRK5QListIS0_E @ 43 NONAME
-	_ZN25VideoSortFilterProxyModel16albumChangedSlotEv @ 44 NONAME
-	_ZN25VideoSortFilterProxyModel16fetchItemDetailsERK11QModelIndex @ 45 NONAME
-	_ZN25VideoSortFilterProxyModel16staticMetaObjectE @ 46 NONAME DATA 16
-	_ZN25VideoSortFilterProxyModel17disconnectSignalsEv @ 47 NONAME
-	_ZN25VideoSortFilterProxyModel17shortDetailsReadyE10TMPXItemId @ 48 NONAME
-	_ZN25VideoSortFilterProxyModel18setGenericIdFilterE10TMPXItemIdb @ 49 NONAME
-	_ZN25VideoSortFilterProxyModel19getStaticMetaObjectEv @ 50 NONAME
-	_ZN25VideoSortFilterProxyModel20removeItemsFromAlbumER10TMPXItemIdRK5QListIS0_E @ 51 NONAME
-	_ZN25VideoSortFilterProxyModel21getMediaFilePathForIdE10TMPXItemId @ 52 NONAME
-	_ZN25VideoSortFilterProxyModel4backEv @ 53 NONAME
-	_ZN25VideoSortFilterProxyModel4openEi @ 54 NONAME
-	_ZN25VideoSortFilterProxyModel8openItemE10TMPXItemId @ 55 NONAME
-	_ZN25VideoSortFilterProxyModel9doSortingEiN2Qt9SortOrderEb @ 56 NONAME
-	_ZN25VideoSortFilterProxyModel9indexOfIdE10TMPXItemId @ 57 NONAME
-	_ZN25VideoSortFilterProxyModelC1EiP7QObject @ 58 NONAME
-	_ZN25VideoSortFilterProxyModelC2EiP7QObject @ 59 NONAME
-	_ZN25VideoSortFilterProxyModelD0Ev @ 60 NONAME
-	_ZN25VideoSortFilterProxyModelD1Ev @ 61 NONAME
-	_ZN25VideoSortFilterProxyModelD2Ev @ 62 NONAME
-	_ZNK18VideoThumbnailData10metaObjectEv @ 63 NONAME
-	_ZNK22VideoCollectionWrapper10metaObjectEv @ 64 NONAME
-	_ZNK25VideoSortFilterProxyModel10metaObjectEv @ 65 NONAME
-	_ZNK25VideoSortFilterProxyModel11getOpenItemEv @ 66 NONAME
-	_ZNK25VideoSortFilterProxyModel16filterAcceptsRowEiRK11QModelIndex @ 67 NONAME
-	_ZNK25VideoSortFilterProxyModel16resolveAlbumNameERK7QString @ 68 NONAME
-	_ZNK25VideoSortFilterProxyModel17getMediaIdAtIndexERK11QModelIndex @ 69 NONAME
-	_ZNK25VideoSortFilterProxyModel8lessThanERK11QModelIndexS2_ @ 70 NONAME
-	_ZTI18VideoThumbnailData @ 71 NONAME
-	_ZTI22VideoCollectionWrapper @ 72 NONAME
-	_ZTI25VideoSortFilterProxyModel @ 73 NONAME
-	_ZTV18VideoThumbnailData @ 74 NONAME
-	_ZTV22VideoCollectionWrapper @ 75 NONAME
-	_ZTV25VideoSortFilterProxyModel @ 76 NONAME
+	_ZN25VideoSortFilterProxyModel11renameAlbumERK10TMPXItemIdRK7QString @ 38 NONAME
+	_ZN25VideoSortFilterProxyModel12modelChangedEv @ 39 NONAME
+	_ZN25VideoSortFilterProxyModel12removeAlbumsERK5QListI11QModelIndexE @ 40 NONAME
+	_ZN25VideoSortFilterProxyModel13setAlbumInUseE10TMPXItemId @ 41 NONAME
+	_ZN25VideoSortFilterProxyModel14connectSignalsEv @ 42 NONAME
+	_ZN25VideoSortFilterProxyModel14processSortingEv @ 43 NONAME
+	_ZN25VideoSortFilterProxyModel15addItemsInAlbumER10TMPXItemIdRK5QListIS0_E @ 44 NONAME
+	_ZN25VideoSortFilterProxyModel16albumChangedSlotEv @ 45 NONAME
+	_ZN25VideoSortFilterProxyModel16fetchItemDetailsERK11QModelIndex @ 46 NONAME
+	_ZN25VideoSortFilterProxyModel16itemModifiedSlotERK10TMPXItemId @ 47 NONAME
+	_ZN25VideoSortFilterProxyModel16staticMetaObjectE @ 48 NONAME DATA 16
+	_ZN25VideoSortFilterProxyModel17disconnectSignalsEv @ 49 NONAME
+	_ZN25VideoSortFilterProxyModel17shortDetailsReadyE10TMPXItemId @ 50 NONAME
+	_ZN25VideoSortFilterProxyModel18setGenericIdFilterE10TMPXItemIdb @ 51 NONAME
+	_ZN25VideoSortFilterProxyModel19getStaticMetaObjectEv @ 52 NONAME
+	_ZN25VideoSortFilterProxyModel20removeItemsFromAlbumER10TMPXItemIdRK5QListIS0_E @ 53 NONAME
+	_ZN25VideoSortFilterProxyModel21getMediaFilePathForIdE10TMPXItemId @ 54 NONAME
+	_ZN25VideoSortFilterProxyModel4backEv @ 55 NONAME
+	_ZN25VideoSortFilterProxyModel4openEN21VideoCollectionCommon17TCollectionLevelsE @ 56 NONAME
+	_ZN25VideoSortFilterProxyModel7getTypeEv @ 57 NONAME
+	_ZN25VideoSortFilterProxyModel8openItemE10TMPXItemId @ 58 NONAME
+	_ZN25VideoSortFilterProxyModel9doSortingEiN2Qt9SortOrderEb @ 59 NONAME
+	_ZN25VideoSortFilterProxyModel9indexOfIdE10TMPXItemId @ 60 NONAME
+	_ZN25VideoSortFilterProxyModelC1EN21VideoCollectionCommon10TModelTypeEP7QObject @ 61 NONAME
+	_ZN25VideoSortFilterProxyModelC2EN21VideoCollectionCommon10TModelTypeEP7QObject @ 62 NONAME
+	_ZN25VideoSortFilterProxyModelD0Ev @ 63 NONAME
+	_ZN25VideoSortFilterProxyModelD1Ev @ 64 NONAME
+	_ZN25VideoSortFilterProxyModelD2Ev @ 65 NONAME
+	_ZNK18VideoThumbnailData10metaObjectEv @ 66 NONAME
+	_ZNK22VideoCollectionWrapper10metaObjectEv @ 67 NONAME
+	_ZNK25VideoSortFilterProxyModel10metaObjectEv @ 68 NONAME
+	_ZNK25VideoSortFilterProxyModel11getOpenItemEv @ 69 NONAME
+	_ZNK25VideoSortFilterProxyModel16filterAcceptsRowEiRK11QModelIndex @ 70 NONAME
+	_ZNK25VideoSortFilterProxyModel16resolveAlbumNameERK7QString @ 71 NONAME
+	_ZNK25VideoSortFilterProxyModel17getMediaIdAtIndexERK11QModelIndex @ 72 NONAME
+	_ZNK25VideoSortFilterProxyModel8lessThanERK11QModelIndexS2_ @ 73 NONAME
+	_ZTI18VideoThumbnailData @ 74 NONAME
+	_ZTI22VideoCollectionWrapper @ 75 NONAME
+	_ZTI25VideoSortFilterProxyModel @ 76 NONAME
+	_ZTV18VideoThumbnailData @ 77 NONAME
+	_ZTV22VideoCollectionWrapper @ 78 NONAME
+	_ZTV25VideoSortFilterProxyModel @ 79 NONAME
 

--- a/videocollection/inc/videocollectioncommon.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/inc/videocollectioncommon.h	Mon May 03 12:32:50 2010 +0300
@@ -35,9 +35,10 @@
         KeyDateTime,
 		KeySizeValue,
 		KeyStatus,
-		KeyMetaData,
 		KeyFilePath,
-        KeyLast
+        KeyLast,
+        KeyNumberOfItems,
+        KeyTitle
     };
     
     /**
@@ -74,7 +75,7 @@
      */
     const char * const VideoDetailLabels[] = {
     		QT_TR_NOOP("txt_videos_list_drm"),
-            QT_TR_NOOP("Service:"), //TODO: localisation
+            QT_TR_NOOP("txt_videos_list_service"),
             QT_TR_NOOP("txt_videos_list_description"),
             QT_TR_NOOP("txt_videos_list_duration"),
             QT_TR_NOOP("txt_videos_list_date"),
@@ -82,7 +83,7 @@
             QT_TR_NOOP("txt_videos_list_location"),
             QT_TR_NOOP("txt_videos_list_author"),
             QT_TR_NOOP("txt_videos_list_copyright"),
-            QT_TR_NOOP("Audio Type:"), //TODO: localisation
+            QT_TR_NOOP("txt_videos_list_audio_type"),
             QT_TR_NOOP("txt_videos_list_language"),
             QT_TR_NOOP("txt_videos_list_keywords"),
             QT_TR_NOOP("txt_videos_list_file_size"),
@@ -151,7 +152,16 @@
         statusAllVideosAlreadyInCollection,
         statusVideosRemovedFromCollection
     };
-    
+
+    enum TModelType
+    {
+    	EModelTypeInvalid,
+    	EModelTypeAllVideos,
+    	EModelTypeCollections,
+    	EModelTypeCollectionContent,
+    	EModelTypeGeneric
+    };
+
     /**
      * Utility macro to trace heap consumption.
      */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videocollection/inc/videocollectiontrace.h	Mon May 03 12:32:50 2010 +0300
@@ -0,0 +1,933 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  tracing functionality for video collection 
+*
+*/
+
+#ifndef VIDEOCOLLETIONTRACE_H
+#define VIDEOCOLLETIONTRACE_H
+
+/**
+ * Set 1 to enable tracing in urel builds. Default is 0.
+ */
+#define UREL_TRACE 0
+
+/**
+ * Set to 1 to disable tracing. Default is 0.
+ */
+#define DISABLE_TRACE 0
+
+/**
+ * 0 = Tracing into RDebug in all builds.
+ * 1 = Tracing into RDebug in winscw, file in ARM. (Default)
+ * 2 = Tracing into file in all builds. 
+ */
+#define TRACE_OUTPUT 1
+
+//-----------------------------------------------------------------------------
+// Trace configuration
+//-----------------------------------------------------------------------------
+//
+#if ( (defined(_DEBUG) || UREL_TRACE == 1) && DISABLE_TRACE == 0 )
+
+    // Error trace
+    #define ERROR_TRACE
+    
+    // Function trace
+    #define FUNC_TRACE
+
+    // Info trace
+    #define INFO_TRACE
+    
+    // Timestamp trace
+    #define TIMESTAMP_TRACE
+    
+    // Tracing current client process and thread
+    #define CLIENT_TRACE
+
+    // Enable tracing into file.
+    #if ((TRACE_OUTPUT == 1 && !defined(__WINSCW__)) || TRACE_OUTPUT == 2)
+        #define TRACE_INTO_FILE
+    #endif
+
+#else // TRACING DISABLED
+
+    #undef ERROR_TRACE
+    #undef INFO_TRACE
+    #undef TIMESTAMP_TRACE
+    #undef FUNC_TRACE
+    #undef CLIENT_TRACE
+    #undef TRACE_INTO_FILE
+
+#endif // TRACING ENABLED
+
+//-----------------------------------------------------------------------------
+// INCLUDES
+//-----------------------------------------------------------------------------
+//
+#include <qstring.h>
+#include <e32debug.h> // RDebug
+
+#if defined TRACE_INTO_FILE
+    #include <flogger.h> // RFileLogger
+#endif
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+//
+/**
+* Trace prefixes for macros with component name.
+*/
+#define _PREFIX_TRACE( a ) TPtrC( (const TText*) L"#FuC# " L##a )
+#define _PREFIX_TRACE_2( a, b ) TPtrC( (const TText*) L"#FuC# " L##a L##b )
+#define _PREFIX_TRACE8( a ) (const char*)( "#FuC# " ##a )
+
+/**
+* Prefix error trace
+*/
+#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
+
+/**
+* Define needed if TRACE_INTO_FILE macro in use
+*/
+#ifdef TRACE_INTO_FILE
+    _LIT( KTracePath, "Fusion" );
+    _LIT( KTraceFile, "videos.log" );
+#endif
+
+//-----------------------------------------------------------------------------
+// Error trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef ERROR_TRACE
+
+    /**
+    * Error trace definitions.
+    */
+    #ifdef TRACE_INTO_FILE
+
+        #define ERROR( aErr, aMsg )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                    EFileLoggingModeAppend,\
+                    _PREFIX_ERROR( aMsg ), aErr );\
+                }\
+            }
+        #define ERROR_1( aErr, aMsg, aP1 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                    EFileLoggingModeAppend,\
+                    _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+                }\
+            }
+        #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                    EFileLoggingModeAppend,\
+                    _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+                }\
+            }
+        #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                    EFileLoggingModeAppend,\
+                    _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+                }\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define ERROR( aErr, aMsg )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
+                }\
+            }
+        #define ERROR_1( aErr, aMsg, aP1 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+                }\
+            }
+        #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+                }\
+            }
+        #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+            {\
+            if( aErr < KErrNone )\
+                {\
+                RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+                }\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+    #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
+    #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
+    #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
+    #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
+
+    #define ERROR_PARAM(_p) _p
+
+    #define TRAPD_ERR( aErr, aStmt ) TRAPD( aErr, aStmt )
+    #define TRAP_ERR( aErr, aStmt ) TRAP( aErr, aStmt )
+
+    #define TRAP_AND_LEAVE(_s,_t) \
+        { TRAPD(_e,_s); ERROR(_e,_t); User::LeaveIfError(_e); }
+
+#else//ERROR_TRACE not defined
+
+    #define ERROR( aErr, aMsg )
+    #define ERROR_1( aErr, aMsg, aP1 )
+    #define ERROR_2( aErr, aMsg, aP1, aP2 )
+    #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
+    #define ERROR_GEN( aMsg )
+    #define ERROR_GEN_1( aMsg, aP1 )
+    #define ERROR_GEN_2( aMsg, aP1, aP2 )
+    #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
+
+    #define ERROR_PARAM(_p)
+
+    #define TRAPD_ERR( aErr, aStmt ) TRAP_IGNORE( aStmt )
+    #define TRAP_ERR( aErr, aStmt )  TRAP_IGNORE( aStmt )
+
+    #define TRAP_AND_LEAVE(_s,_t) { _s; }
+
+#endif//ERROR_TRACE
+
+//-----------------------------------------------------------------------------
+// Info trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef INFO_TRACE
+
+    /**
+    * Info log message definitions.
+    */
+    #ifdef TRACE_INTO_FILE
+
+        #define INFO( aMsg )\
+            {\
+            RFileLogger::Write( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ) );\
+            }
+        #define INFO_1( aMsg, aP1 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), aP1 );\
+            }
+        #define INFO_2( aMsg, aP1, aP2 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), aP1, aP2 );\
+            }
+        #define INFO_3( aMsg, aP1, aP2, aP3 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), aP1, aP2, aP3 );\
+            }
+        #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), aP1, aP2, aP3, aP4 );\
+            }
+        #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+            }
+        #define INFOQSTR_1( aMsg, aQStr )\
+            {\
+            TPtrC _qstringptrc(aQStr.utf16()); \
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), &_qstringptrc );\
+            }
+        #define INFOQSTR_2( aMsg, aQStr1, aQStr2 )\
+            {\
+            TPtrC _qstringptrc1(aQStr1.utf16()); \
+            TPtrC _qstringptrc2(aQStr2.utf16()); \
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                _PREFIX_TRACE( aMsg ), &_qstringptrc1, &_qstringptrc2 );\
+            }            
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define INFO( aMsg )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ) );\
+            }
+        #define INFO_1( aMsg, aP1 )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ), aP1 );\
+            }
+        #define INFO_2( aMsg, aP1, aP2 )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ), aP1, aP2 );\
+            }
+        #define INFO_3( aMsg, aP1, aP2, aP3 )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ), aP1, aP2, aP3 );\
+            }
+        #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ), aP1, aP2, aP3, aP4 );\
+            }
+        #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+            {\
+            RDebug::Print( _PREFIX_TRACE( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+            }
+
+        #define INFOQSTR_1( aMsg, aQStr )\
+            {\
+            TPtrC _qstringptrc(aQStr.utf16()); \
+            RDebug::Print( _PREFIX_TRACE( aMsg ), &_qstringptrc );\
+            }
+
+        #define INFOQSTR_2( aMsg, aQStr1, aQStr2 )\
+            {\
+            TPtrC _qstringptrc1(aQStr1.utf16()); \
+            TPtrC _qstringptrc2(aQStr2.utf16()); \
+            RDebug::Print( _PREFIX_TRACE( aMsg ), &_qstringptrc1, &_qstringptrc2 );\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+    #define INFO_PARAM( aParam ) aParam
+
+#else//INFO_TRACE not defined
+
+    #define INFO( aMsg )
+    #define INFO_1( aMsg, aP1 )
+    #define INFO_2( aMsg, aP1, aP2 )
+    #define INFO_3( aMsg, aP1, aP2, aP3 )
+    #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )
+    #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+    #define INFO_PARAM( aParam )
+    #define INFOQSTR_1( aMsg, aP1 );
+    #define INFOQSTR_2( aMsg, aP1, aP2 );
+
+#endif//INFO_TRACE
+
+//-----------------------------------------------------------------------------
+// Trace current client thread name and process id
+//-----------------------------------------------------------------------------
+//
+#ifdef CLIENT_TRACE
+
+    #define _PREFIX_CLIENT( aMsg ) _PREFIX_TRACE( "[CLIENT: sid [0x%x] thread [%S]] " L##aMsg )
+
+    #ifdef TRACE_INTO_FILE
+
+        #define CLIENT_TRACE_2( aMsg, aP1, aP2 )\
+            {\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_CLIENT(aMsg), aP1, aP2 );\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define CLIENT_TRACE_2( aMsg, aP1, aP2 )\
+            {\
+            RDebug::Print( _PREFIX_CLIENT(aMsg), aP1, aP2 );\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+    /**
+    * Traces current secure id and thread
+    */
+    #define CURRENT_CLIENT( aMsg )\
+        {\
+        TName name( RThread().Name() );\
+        TSecureId sid( RThread().SecureId() );\
+        CLIENT_TRACE_2( aMsg, sid.iId, &name );\
+        }
+
+    /**
+    * Traces secure id and thread from RMessage2
+    */
+    #define CLIENT( aRMessage2 )\
+        {\
+        RThread thread;\
+        TInt err = aRMessage2.Client( thread );\
+        if( err == KErrNone )\
+            {\
+            TName name( thread.Name() );\
+            TSecureId sid( thread.SecureId() );\
+            CLIENT_TRACE_2( "", sid.iId, &name );\
+            }\
+        thread.Close();\
+        }
+
+    /**
+    * Traces secure id and thread from RMessage2
+    */
+    #define CLIENT_1( aRMessage2, aMsg )\
+        {\
+        RThread thread;\
+        TInt err = aRMessage2.Client( thread );\
+        if( err == KErrNone )\
+            {\
+            TName name( thread.Name() );\
+            TSecureId sid( thread.SecureId() );\
+            CLIENT_TRACE_2( aMsg, sid.iId, &name );\
+            }\
+        thread.Close();\
+        }
+
+#else
+
+    #define CURRENT_CLIENT( aMsg )
+    #define CLIENT( aRMessage2 )
+    #define CLIENT_1( aRMessage2, aMsg )
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Trace current heap usage
+//-----------------------------------------------------------------------------
+//
+#ifdef HEAP_TRACE
+
+    #define _PREFIX_HEAP( aMsg ) _PREFIX_TRACE( "[HEAP: %d bytes] " L##aMsg )
+
+    #ifdef TRACE_INTO_FILE
+
+        #define HEAP( aMsg )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+            }
+        #define HEAP_1( aMsg, aP1 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+            }
+        #define HEAP_2( aMsg, aP1, aP2 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+            }
+        #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+            }
+        #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define HEAP( aMsg )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+            }
+        #define HEAP_1( aMsg, aP1 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+            }
+        #define HEAP_2( aMsg, aP1, aP2 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+            }
+        #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+            }
+        #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+            {\
+            TInt totalAllocSpace = 0;\
+            User::AllocSize( totalAllocSpace );\
+            RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+#else//HEAP_TRACE not defined
+
+    #define HEAP( aMsg )
+    #define HEAP_1( aMsg, aP1 )
+    #define HEAP_2( aMsg, aP1, aP2 )
+    #define HEAP_3( aMsg, aP1, aP2, aP3 )
+    #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )
+
+#endif//HEAP_TRACE
+
+
+//-----------------------------------------------------------------------------
+// Function trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef FUNC_TRACE
+
+    #include <e32base.h> // TCleanupItem
+
+    /**
+    * Function logging definitions.
+    */
+    #ifdef TRACE_INTO_FILE
+
+        #define FUNC( aMsg, aP1 )\
+            {\
+            TPtrC8 trace( _S8( aMsg ) );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, trace, aP1 );\
+            }
+
+        #define FUNC2( aMsg, aP1, aP2 )\
+            {\
+            TPtrC8 trace( _S8( aMsg ) );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, trace, aP1, aP2 );\
+            }
+
+        #define FUNC_2( aMsg, aP1, aP2, aP3 )\
+            {\
+            TPtrC8 trace( _S8( aMsg ) );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, trace, aP1, aP2, aP3 );\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define FUNC( aMsg, aP1 )\
+            {\
+            RDebug::Printf( aMsg, aP1 );\
+            }
+
+        #define FUNC2( aMsg, aP1, aP2 )\
+            {\
+            RDebug::Printf( aMsg, aP1, aP2 );\
+            }
+        
+        #define FUNC_2( aMsg, aP1, aP2, aP3 )\
+            {\
+            RDebug::Printf( aMsg, aP1, aP2, aP3 );\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+    /**
+    * Function trace helper class.
+    */
+    const TText KFuncNameTerminator = '(';
+    const TText KFuncLeaveIndicator = 'L';
+    const TInt KFuncCanLeave = 0x1;
+    const TInt KFuncLeft = 0x2;
+    const TInt KFuncLogClient = 0x4;
+    
+    class TFuncLog
+        {
+    public:
+        static void Cleanup( TAny* aPtr )
+            {
+            TFuncLog* self = static_cast< TFuncLog* >( aPtr );
+            self->iFlags |= KFuncLeft;
+            self->LogLeave();
+            }
+    
+        inline void LogStart()
+            {
+            if ( iFlags & KFuncLogClient )
+                {
+                TBuf8<KMaxName> name8;
+                name8.Copy( RThread().Name() );
+                TSecureId sid( RThread().SecureId() );
+                FUNC_2( _PREFIX_TRACE8("%S() -> ENTER(sid [0x%x] thread [%S])"),
+                    &iFunc, sid.iId, &name8 );
+                }
+            else
+                {
+                if(!iAddr) 
+                    {
+                    FUNC( _PREFIX_TRACE8("%S() -> ENTER"), &iFunc );
+                    }
+                else
+                    {
+                    FUNC2( _PREFIX_TRACE8("%S() [0x%x] -> ENTER"), &iFunc, iAddr );
+                    }
+                }
+            }
+
+        inline void LogLeave()
+            {
+            if ( iFlags & KFuncLogClient )
+                {
+                TBuf8<KMaxName> name8;
+                name8.Copy( RThread().Name() );
+                TSecureId sid( RThread().SecureId() );
+                FUNC_2( _PREFIX_TRACE8("%S() - LEAVE(sid [0x%x] thread [%S])"),
+                    &iFunc, sid.iId, &name8 );
+                }
+            else
+                {
+                if(!iAddr)
+                    {
+                    FUNC( _PREFIX_TRACE8("%S() - LEAVE"), &iFunc );
+                    }
+                else
+                    {
+                    FUNC2( _PREFIX_TRACE8("%S() [0x%x] - LEAVE"), &iFunc, iAddr );
+                    }
+                }
+            }
+    
+        inline void LogEnd()
+            {
+            if ( iFlags & KFuncLogClient )
+                {
+                TBuf8<KMaxName> name8;
+                name8.Copy( RThread().Name() );
+                TSecureId sid( RThread().SecureId() );
+                FUNC_2( _PREFIX_TRACE8("%S() <- OUT(sid [0x%x] thread [%S])"),
+                    &iFunc, sid.iId, &name8 );
+                }
+            else
+                {
+                if(!iAddr)
+                    {
+                    FUNC( _PREFIX_TRACE8("%S() <- OUT"), &iFunc );
+                    }
+                else
+                    {
+                    FUNC2( _PREFIX_TRACE8("%S() [0x%x] <- OUT"), &iFunc, iAddr );
+                    }
+                }
+            }
+    
+        // For non leaving and L methods
+        inline TFuncLog( const char* aFunc, TUint aFlags ) :
+                iAddr(0), iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+                iFlags( aFlags ),
+                iCleanupItem( Cleanup, this ),
+                iLCPtr( NULL )
+            {
+            TInt pos( iFunc.Locate( KFuncNameTerminator ) );
+            if( pos >= 0 && pos < iFunc.Length() )
+                {
+                iFunc.Set( iFunc.Left( pos ) );
+                TInt len( iFunc.Length() );
+                if( len > 0 && iFunc[ len - 1 ] == KFuncLeaveIndicator )
+                    {
+                    iFlags |= KFuncCanLeave;
+                    CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+                    }
+                }
+            LogStart();
+            }
+
+        // For non leaving and L methods
+        inline TFuncLog( TUint aAddr, const char* aFunc, TUint aFlags ) :
+                iAddr(aAddr), iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+                iFlags( aFlags ),
+                iCleanupItem( Cleanup, this ),
+                iLCPtr( NULL )
+            {
+            TInt pos( iFunc.Locate( KFuncNameTerminator ) );
+            if( pos >= 0 && pos < iFunc.Length() )
+                {
+                iFunc.Set( iFunc.Left( pos ) );
+                TInt len( iFunc.Length() );
+                if( len > 0 && iFunc[ len - 1 ] == KFuncLeaveIndicator )
+                    {
+                    iFlags |= KFuncCanLeave;
+                    CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+                    }
+                }
+            LogStart();
+            }
+    
+        // For LC methods only
+        inline TFuncLog( const char* aFunc, TUint aFlags, TAny** aLCPtr ) :
+                iAddr(0), iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+                iFlags( aFlags ),
+                iCleanupItem( Cleanup, this ),
+                iLCPtr( NULL )
+            {
+            TInt pos( iFunc.Locate( KFuncNameTerminator ) );
+            if( pos >= 0 && pos < iFunc.Length() )
+                {
+                iFunc.Set( iFunc.Left( pos ) );
+                iFlags |= KFuncCanLeave;
+                iLCPtr = aLCPtr;
+                CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+                }
+            LogStart();
+            }
+    
+        inline ~TFuncLog()
+            {
+            if ( !( iFlags & KFuncLeft ) )
+                {
+                if ( iFlags & KFuncCanLeave )
+                    {
+                    if ( iLCPtr && *iLCPtr)
+                        {
+                        CleanupStack::Pop(); // Pop LC ptr first
+                        CleanupStack::Pop( this ); // Pop the cleanup item
+                        CleanupStack::PushL( *iLCPtr ); // Push LC ptr back
+                        }
+                    else
+                        {
+                        CleanupStack::Pop( this ); // Pop the cleanup item
+                        }
+                    }
+                LogEnd(); // Normally finished
+                }
+            }
+    
+    private: // Data
+        TPtrC8 iFunc;
+        TUint iFlags;
+        TCleanupItem iCleanupItem;
+        TAny** iLCPtr;
+        TUint iAddr;
+        };
+
+    /*
+    * Use with non leaving and L methods
+    *
+    * CMyClass* CMyClass::DoL()
+    *   {
+    *   FUNC_LOG;
+    *   CMyClass* ret = new (ELeave) CMyClass();
+    *   ...
+    *   return ret;
+    *   }
+    *
+    * CMyClass* CMyClass::Do()
+    *   {
+    *   FUNC_LOG;
+    *   return iMyClass;
+    *   }
+    *
+    */
+    #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__, 0 );
+    
+    /**
+     * Use this to log memory address. 
+     */
+    #define FUNC_LOG_ADDR(P1) TFuncLog _fl2( (int)P1, __PRETTY_FUNCTION__, 0 );
+
+    /*
+    * Use with LC methods
+    *
+    * CMyClass* CMyClass::DoLC()
+    *   {
+    *   CMyClass* ret = NULL;
+    *   FUNC_LOG_LC( ret );
+    *   ...
+    *   return ret;
+    *   }
+    */
+    #define FUNC_LOG_LC( aPtr ) TFuncLog _fl( __PRETTY_FUNCTION__, 0, (TAny**)&aPtr );
+
+#ifdef CLIENT_TRACE
+
+    /*
+    * Used like FUNC_LOG. Prints client info useful for client side executed API methods.
+    */
+    #define FUNC_LOG_WITH_CLIENT TFuncLog _fl( __PRETTY_FUNCTION__, KFuncLogClient );
+
+    /*
+    * Used like FUNC_LOG_LC. Prints client info useful for client side executed API methods.
+    */ 
+    #define FUNC_LOG_WITH_CLIENT_LC( aPtr )\
+        TFuncLog _fl( __PRETTY_FUNCTION__, KFuncLogClient, (TAny**)&aPtr );
+
+#else //CLIENT_TRACE not defined
+
+    #define FUNC_LOG_WITH_CLIENT FUNC_LOG
+    #define FUNC_LOG_WITH_CLIENT_LC( aPtr ) FUNC_LOG_LC( aPtr )
+
+#endif //CLIENT_TRACE
+
+#else//FUNC_TRACE not defined
+
+    #define FUNC_LOG
+    #define FUNC_LOG_ADDR(P1)
+    #define FUNC_LOG_LC( ptr )
+    #define FUNC_LOG_WITH_CLIENT
+    #define FUNC_LOG_WITH_CLIENT_LC( ptr )
+
+#endif//FUNC_TRACE
+
+//-----------------------------------------------------------------------------
+// Timestamp trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef TIMESTAMP_TRACE
+
+    #define PREFIX_TIMESTAMP( aCaption )\
+        _PREFIX_TRACE_2("[TIMESTAMP] (%d:%02d:%02d.%06d us) ",aCaption)
+    #define CURRENT_TIME( aDt ) TDateTime aDt; { TTime t; t.HomeTime(); aDt = t.DateTime(); }
+    #define EXTRACT_TIME( aDt ) aDt.Hour(), aDt.Minute(), aDt.Second(), aDt.MicroSecond()
+
+    #ifdef TRACE_INTO_FILE
+
+        #define TIMESTAMP( aCaption )\
+            {\
+            CURRENT_TIME( dt );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\
+            }
+
+        #define TIMESTAMP_1( aCaption, aP1 )\
+            {\
+            CURRENT_TIME( dt );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\
+            }
+
+        #define TIMESTAMP_2( aCaption, aP1, aP2 )\
+            {\
+            CURRENT_TIME( dt );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                 EFileLoggingModeAppend,\
+                PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\
+            }
+
+        #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\
+            {\
+            CURRENT_TIME( dt );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend,\
+                PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define TIMESTAMP( aCaption )\
+            {\
+            CURRENT_TIME( dt );\
+            RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\
+            }
+
+        #define TIMESTAMP_1( aCaption, aP1 )\
+            {\
+            CURRENT_TIME( dt );\
+            RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\
+            }
+
+        #define TIMESTAMP_2( aCaption, aP1, aP2 )\
+            {\
+            CURRENT_TIME( dt );\
+            RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\
+            }
+
+        #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\
+            {\
+            CURRENT_TIME( dt );\
+            RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\
+            }
+
+    #endif//TRACE_INTO_FILE
+
+#else//TIMESTAMP_TRACE not defined
+
+    #define TIMESTAMP( aCaption )
+    #define TIMESTAMP_1( aCaption, aP1 )
+    #define TIMESTAMP_2( aCaption, aP1, aP2 )
+    #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )
+
+#endif//TIMESTAMP_TRACE
+
+//-----------------------------------------------------------------------------
+// Trace assert macros
+//-----------------------------------------------------------------------------
+//
+#if ( (defined(_DEBUG) || UREL_TRACE == 1) && DISABLE_TRACE == 0 )
+
+    #ifdef TRACE_INTO_FILE
+
+        #define PANIC_TRACE_2( aMsg, aP1, aP2 )\
+            {\
+            TPtrC8 trace( _S8( aMsg ) );\
+            RFileLogger::WriteFormat( KTracePath, KTraceFile,\
+                EFileLoggingModeAppend, trace, aP1, aP2 );\
+            }
+
+    #else//TRACE_INTO_FILE not defined
+
+        #define PANIC_TRACE_2( aMsg, aP1, aP2 )\
+            {\
+            RDebug::Printf( aMsg, aP1, aP2 );\
+            }
+
+    #endif //TRACE_INTO_FILE not define
+
+    static void Panic( const TDesC8& aFileName, const TInt aLineNum )
+        {
+        PANIC_TRACE_2( "Assertion failed in file=%S, line=%d", &aFileName, aLineNum );
+        User::Invariant();
+        }
+
+    #define ASSERT_ALWAYS_TRACE Panic( _L8(__FILE__), __LINE__ );
+    #define ASSERT_TRACE( _s ) if ( !( _s ) ) { ASSERT_ALWAYS_TRACE; }
+
+#else // TRACING DISABLED
+
+    #define ASSERT_ALWAYS_TRACE
+    #define ASSERT_TRACE( _s )
+
+#endif // TRACING ENABLED
+
+
+#endif // VIDEOCOLLETIONTRACE_H

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosactivetask.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosactivetask.h	Mon May 03 12:32:50 2010 +0300
@@ -114,14 +114,19 @@
      * Can be used to run async operations.
      */
     void ContinueStepping();
-    
+
+    /**
+     * Add some functionality to CActive::Cancel
+     */
+    void Cancel();
+
 protected: // From base class
 
     /**
     * From CActive
     */
     void RunL();
-
+    
     /**
     * From CActive
     */
@@ -144,6 +149,13 @@
     */
     void ConstructL();
 
+public:
+    /**
+     * Set to ETrue when stepping is stopped.
+     * Cancel or Done has to be called.
+     */
+    TBool iStopped;
+
 private: // data
 
     CMPXCommand*  iCurCommand;  // Current Command

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosalbum.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosalbum.h	Mon May 03 12:32:50 2010 +0300
@@ -38,9 +38,9 @@
 
         /**
          * Constructor.
-         */        
-        TVcxMyVideosAlbumVideo::TVcxMyVideosAlbumVideo();
-        
+         */
+        TVcxMyVideosAlbumVideo();
+
         /**
         * = operator.
         */        
@@ -141,11 +141,6 @@
      *                  ETrue as default.
      */
     void Remove( TUint32 aMdsId, TBool aCompress = ETrue );
-
-    /**
-     * Updates album attributes from scratch.
-     */
-    void UpdateAttributesL();
     
     /**
      * Used for keeping RArray<TVcxMyVideosAlbumVideo> in integer order by
@@ -178,6 +173,16 @@
     void AppendToVideoListL( CMPXMedia& aFromVideoList,
             CMPXMedia& aToVideoList, TInt aNewItemStartIndex );
 
+    /**
+     * Calculates KVcxMediaMyVideosCategoryItemCount, KVcxMediaMyVideosCategoryNewItemCount,
+     * KVcxMediaMyVideosCategoryNewItemName and KMPXMediaGeneralDate attributes to iMedia.
+     * 
+     * @param aStartIndex  Start position of the calculations in iVideoList.
+     *                     Can be used to update values when items are appended
+     *                     to old list, without calculating everything from scratch.
+     */
+    void CalculateAttributesL( TInt aStartIndex = 0 );
+    
 private:
 
     /**

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosalbums.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosalbums.h	Mon May 03 12:32:50 2010 +0300
@@ -158,6 +158,29 @@
          */
         TBool UpdateAlbumL( const CMPXMedia& aAlbum );
 
+        /**
+         * Calculates and updates album media attributes.
+         */
+        void CalculateAttributesL();
+        
+        /**
+         * Called when video's New Video flag changes. Calculates
+         * album attributes for the affected albums. Adds events
+         * to iCollection.iMessageList but does not send them.
+         * 
+         * @param aMdsId  MDS ID of the changed video.
+         */
+        void NewVideoFlagChangedL( TUint32 aMdsId );
+
+        /**
+         * Called when video's title changes. Calculates
+         * album attributes for the affected albums. Adds events
+         * to iCollection.iMessageList but does not send them.
+         * 
+         * @param aMdsId  MDS ID of the changed video.
+         */
+        void VideoTitleChangedL( TUint32 aMdsId );
+
 protected:
         
         /**

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideoscollectionplugin.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideoscollectionplugin.h	Mon May 03 12:32:50 2010 +0300
@@ -387,15 +387,6 @@
         */
         TBool iOrphanDownloadsCleared;
 
-                        
-#ifdef _DEBUG
-        /**
-        * Used for debugging that client receives all events.
-        */
-        TInt iTotalMessagesSent;
-        TInt iMessagesInArraySent;
-#endif
-
     };
 
 #endif   // VCXMYVIDEOSCOLLECTIONPLUGIN_H

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideoscollectionutil.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideoscollectionutil.h	Mon May 03 12:32:50 2010 +0300
@@ -127,6 +127,14 @@
         static TUint32 FlagsL( CMPXMedia& aVideo );
 
         /**
+         * Gets KMPXMediaGeneralDate (creation date) of aVideo.
+         * 
+         * @param aVideo  Media object to fetch parameter from.
+         * @return        Creation date, works with TTime.
+         */
+        static TInt64 CreationDateL( CMPXMedia& aVideo );
+
+        /**
         * Gets KVcxMediaMyVideosDownloadId attribute of aVideo.
         *
         * @param aVideo  Media object to fetch parameter from.
@@ -223,7 +231,7 @@
          * @param aMedia  Media where from the attribute is fetched.
          * @return        Pointer to media array.
          */
-        static CMPXMediaArray* MediaArrayL( CMPXMedia& aMedia );
+        static CMPXMediaArray* MediaArrayL( const CMPXMedia& aMedia );
         
         /**
          * Gets KVcxMediaMyVideosInt32Value attribute from aMedia. Leaves

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosmdsalbums.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosmdsalbums.h	Mon May 03 12:32:50 2010 +0300
@@ -41,7 +41,7 @@
         public CActive,
         public MMdEQueryObserver,
         public MMdERelationItemObserver
-#if 0 // not used
+#if 0
         ,
         public MMdERelationObserver
 #endif
@@ -77,13 +77,21 @@
     public: // new methods
 
         /**
+         * From CActive.
          * Cancels possible ongoing asynchronous request.
          * 
          * @param aType Defines what kind of request is cancelled.
          */
-        void Cancel( CVcxMyVideosMdsDb::TRequestType aType = CVcxMyVideosMdsDb::EAll );
+        void DoCancel( CVcxMyVideosMdsDb::TRequestType aType = CVcxMyVideosMdsDb::EAll );
 
         /**
+         * Cancels queries.
+         *
+         * @param aType Defines what kind of request is cancelled.
+         */
+        void CancelQueries( CVcxMyVideosMdsDb::TRequestType aType = CVcxMyVideosMdsDb::EAll );
+        
+        /**
         * Gets My Videos albums from MDS asynchronously.
         * HandleGetAlbumsResp() callback function is called when ready.
         * Utilizes CVcxMyVideosMdsCmdQueue.
@@ -300,7 +308,7 @@
          * @param aMpxCmd  Media containing command parameters: array with albums IDs.
          * @param aClient  Response call is done to this object.
          */
-        void CVcxMyVideosMdsAlbums::DoRemoveAlbumsL( CMPXMedia* aMpxCmd,
+        void DoRemoveAlbumsL( CMPXMedia* aMpxCmd,
                 MVcxMyVideosMdsAlbumsObserver& aClient );
 
         /**

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosmdsdb.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosmdsdb.h	Mon May 03 12:32:50 2010 +0300
@@ -157,6 +157,17 @@
         virtual void HandleRelationEvent( TObserverNotificationType aType,
                 const RArray<TMdERelation>& aRelationArray ) = 0;
 
+#if 0
+        /**
+         * Event handler function for relation add events.
+         * 
+         * @param aType           Event type
+         * @param aRelationArray  Array containing relations.
+         */
+        virtual void HandleRelationIdEvent( TObserverNotificationType aType,
+                const RArray<TUint32>& aRelationIdArray ) = 0;
+#endif
+        
     };
 
 /**
@@ -443,6 +454,12 @@
      * @param aObject Creation date is written here.
      */
     void SetCreationDateToObjectL( const CMPXMedia& aVideo, CMdEObject& aObject );
+
+    /**
+     * Opens MDS session.
+     */
+    void OpenMdsSessionL();
+    
 public:
 
     /**

--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosvideocache.h	Fri Apr 16 14:59:52 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosvideocache.h	Mon May 03 12:32:50 2010 +0300
@@ -31,6 +31,140 @@
 // CLASS DECLARATION
 
 /**
+ * Contains information about video.
+ * These are stored to CVcxMyVideosVideoListIndex::iVideoArray.
+ */
+NONSHARABLE_CLASS(TVcxMyVideosVideo)
+    {
+    public:
+
+        /**
+         * Constructor.
+         */        
+        TVcxMyVideosVideo();
+        
+        /**
+        * = operator.
+        */        
+        TVcxMyVideosVideo& operator=( const TVcxMyVideosVideo& aVideo );
+    public:
+        
+        /**
+        * Set values.
+        * 
+        * @param aMdsId  MDS ID
+        * @param aPos    Position in CVcxMyVideosVideoCache::iVideoList
+        * @param aVideo  Pointer to CVcxMyVideosVideoCache::iVideoList item,
+        *                ownership does not move.
+        */
+        void Set( TUint32 aMdsId, TInt aPos, CMPXMedia* aVideo );
+
+    public:
+        TUint32    iMdsId; // Video object ID in MDS.
+        CMPXMedia* iVideo; // Pointer to CVcxMyVideosVideoCache::iVideoList item
+        TInt       iPos;   // Items position in CVcxMyVideosVideoCache::iVideoList
+    };
+
+/**
+* Used for keeping videos in MDS ID order for fast access.
+* (Indexes CVcxMyVideosVideoCache::iVideoList).
+*
+* @lib mpxmyvideoscollectionplugin.lib
+*/
+NONSHARABLE_CLASS(CVcxMyVideosVideoListIndex) : public CBase
+    {    
+public: // Constructors and destructor
+
+    /**
+    * Two-phased constructor
+    * @return Object constructed
+    */
+    static CVcxMyVideosVideoListIndex* NewL();
+    
+    /**
+    * Destructor
+    */
+    virtual ~CVcxMyVideosVideoListIndex();
+
+public:
+    
+    /**
+     * Sets up iVideoArray from aVideoList. Sorting is also done.
+     * 
+     * @param aVideoList  Video list to use for constructing iVideoArray. 
+     */
+    void SetL( const CMPXMedia& aVideoList );
+    
+    /**
+     * Finds video by MDS ID from the index. Uses bisection method.
+     * 
+     * @param aVideo  The found video data is written here.
+     * @return        KErrNotFound if not found, index of the item in iVideoArray
+     *                otherwise.
+     */
+    TInt Find( TUint32 aMdsId, TVcxMyVideosVideo& aVideo );
+    
+    /**
+     * Removes video from index.
+     * 
+     * @param aMdsId     ID if the item to be removed.
+     * @param aCompress  If ETrue, compresses the video array.
+     * @return           KErrNotFound if not found, index of the removed item otherwise.
+     */
+    TInt Remove( TUint32 aMdsId, TBool aCompress = ETrue );
+    
+    /**
+     * Adds video to index. Keeps sorting order.
+     * 
+     * @param aVideo  Video to be added, ownership does not move.
+     * @param aPos    aVideo's position in CVcxMyVideosVideoCache::iVideoList.
+     */
+    void AddL( CMPXMedia* aVideo, TInt aPos );
+
+#ifdef _DEBUG
+    /**
+     * Returns reference to video array.
+     */
+    const RArray<TVcxMyVideosVideo>& VideoArray();
+#endif
+    
+private:
+    /**
+    * Constructor
+    */
+    CVcxMyVideosVideoListIndex();
+    
+    /**
+    * Symbian 2nd phase constructor.
+    */
+    void ConstructL ();
+
+    /**
+     * Sorts iVideoArray by MDS ID.
+     */
+    void Sort();
+    
+    /**
+     * Used for keeping RArray<TVcxMyVideosVideo> in integer order by
+     * TVcxMyVideosVideo::iMdsId.
+     * 
+     * @param aVideo1 Video to compare
+     * @param aVideo2 Video to compare
+     * @return -1 if aVideo1 is smaller than aVideo2, 1 if aVideo1 is larger than
+     *         aVideo2.
+     */
+    static TInt CompareVideosByMdsId( const TVcxMyVideosVideo& aVideo1,
+            const TVcxMyVideosVideo& aVideo2 );
+
+private:
+    
+    /**
+     * Video array which is kept in order by MDS ID.
+     */
+    RArray<TVcxMyVideosVideo> iVideoArray;
+    };
+
+/**
 * Used for storing MDS items to RAM for fast access.
 *
 * @lib mpxmyvideoscollectionplugin.lib
@@ -52,6 +186,19 @@
         */
         virtual ~CVcxMyVideosVideoCache();
  
+    public:
+        
+        /**
+         * @return  ETrue if iVideoList is complete. (All items have
+         *          been fetched from MDS.)
+         */
+        TBool IsComplete();
+        
+        /**
+         * Set to ETrue when all items have been fetched from MDS.
+         */
+        void SetComplete( TBool aComplete );
+
     private:
         /**
         * Constructor
@@ -176,7 +323,14 @@
         * @return        Position, KErrNotFound if item is not in iVideoList.
         */
         TInt PosOnVideoListL( CMPXMedia& aVideo );
-                 
+
+#ifdef _DEBUG
+        /**
+         * Checks that iVideoListIndex is correctly formed.
+         */
+        void CheckVideoListIndexL();
+#endif
+        
     public:            
         /**
         * Creates filtered video list from iVideoList. This is used for
@@ -327,11 +481,6 @@
         * is removed.
         */
         RArray<CMPXMedia*> iPartialVideoList;
-
-        /**
-        * If ETrue then iVideoList does not contain all items from MDS.
-        */
-        TBool iVideoListIsPartial;
                                 
         /**
         * Sorting order which was used last time when list was queryed from MDS.
@@ -343,11 +492,22 @@
          */
         TBool IsFetchingVideoList;
     private:
+
+        /**
+        * If ETrue then iVideoList contains all items from MDS.
+        */
+        TBool iVideoListIsComplete;
         
         /**
         * My Videos collection plugin, owner of this object.
         */
-        CVcxMyVideosCollectionPlugin& iCollection;        
+        CVcxMyVideosCollectionPlugin& iCollection;
+        
+        /**
+         * Index which keeps TVcxMyVidesVideo items indexed in MDS ID
+         * order for fast access.
+         */
+        CVcxMyVideosVideoListIndex* iVideoListIndex;
     };
 
 #endif   // VCXMYVIDEOSVIDEOCACHE_H