--- a/inc/videoactivitystate.h	Tue Jul 06 14:17:50 2010 +0300
+++ b/inc/videoactivitystate.h	Wed Aug 18 09:50:14 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version:  da1mmcf#3 %
+// Version : %version:  da1mmcf#4 %
 
 #ifndef __VIDEOACTIVITYSTATE_H__
 #define __VIDEOACTIVITYSTATE_H__
@@ -30,6 +30,9 @@
 // last position of the last played media clip (int)
 static const QString KEY_LAST_PLAY_POSITION_ID   = "_VideoActivity_last_play_position_id_";
 
+// TMPXId of the last played media file
+static const QString KEY_LAST_PLAYED_MEDIA_ID   = "_VideoActivity_last_played_media_id_";
+
 // name of the media clip last played (QString)
 static const QString KEY_LAST_PLAYED_CLIP = "_VideoActivity_last_played_clip_";
 

--- a/inc/videoservices.h	Tue Jul 06 14:17:50 2010 +0300
+++ b/inc/videoservices.h	Wed Aug 18 09:50:14 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 5 %
+// Version : %version: 7 %
 
 #ifndef __VIDEOSERVICES_H__
 #define __VIDEOSERVICES_H__
@@ -28,221 +28,218 @@
 class VideoServicePlay;
 class VideoServiceView;
 class VideoServiceBrowse;
-class QVideoPlayerEngine;
+class VideoPlayerEngine;
+class VideoServiceUri;
 
 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;
+    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( VideoPlayerEngine* 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;
+        
+        /**
+         * Returns sort type defined by the service client.
+         * @param None.
+         * @return int.
+         */
+        int sortRole() const;
+    
+        /*
+         * Enum reflecting the services provided 
+         */
+        enum TVideoService
+        {
+            ENoService,
+            EUriFetcher,
+            EPlayback,
+            EView,
+            EUriView,
+            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( VideoPlayerEngine* engine );
+    
+        /**
+         * Destructor.
+         */
+        virtual ~VideoServices();
+    
+        void setEngine( VideoPlayerEngine* engine );
+    
+        /**
+         * Sets the active service
+         *
+         * @param service
+         *
+         */
+        void setCurrentService(VideoServices::TVideoService service);
+    
+        /**
+         * Returns the current engine
+         *
+         * @return engine
+         *
+         */
+        VideoPlayerEngine* engine();
     
-    /**
-     * Returns sort type defined by the service client.
-     * 
-     * @param None.
-     * @return int.
-     */
-    int sortRole() 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;
-
-    /**
-     * Deprecated VideoServiceUriFetch service instance.
-     */
-    VideoServiceUriFetch* mServiceUriFetchDeprecatedNewService;
+        Q_DISABLE_COPY( VideoServices )
+    
+    private:
+    
+        /**
+         * Reference count.
+         */
+        int mReferenceCount;
+    
+        /**
+         * Singleton instance.
+         */
+        static VideoServices* mInstance;
+    
+        /**
+         * VideoServiceUriFetch service instance.
+         */
+        VideoServiceUriFetch* mServiceUriFetch;
+    
+        /**
+         * Deprecated VideoServiceUriFetch service instance.
+         */
+        VideoServiceUriFetch* mServiceUriFetchDeprecatedNewService;
+        
+        /**
+         * Deprecated VideoServiceUriFetch service instance.
+         */
+        VideoServiceUriFetch* mServiceUriFetchDeprecatedOldService;
     
-    /**
-     * Deprecated VideoServiceUriFetch service instance.
-     */
-    VideoServiceUriFetch* mServiceUriFetchDeprecatedOldService;
-
-    /**
-     * VideoServicePlay service instance.
-     */
-    VideoServicePlay* mServicePlay;
-    
-    /**
-     * VideoServicePlay service instance.
-     */
-    VideoServicePlay* mServicePlayDeprecatedNewService;
-    
-    /**
-     * VideoServicePlay service instance.
-     */
-    VideoServicePlay* mServicePlayDeprecatedOldService;    
-    
-    /**
-     * VideoServiceView service instance.
-     */    
-    VideoServiceView* mServiceView; 
-    
-    /**
-     * VideoServiceView service instance.
-     */    
-    VideoServiceView* mServiceViewDeprecatedNewService; 
-    
-    /**
-     * VideoServiceView service instance.
-     */    
-    VideoServiceView* mServiceViewDeprecatedOldService;     
+        /**
+         * VideoServicePlay service instance.
+         */
+        VideoServicePlay* mServicePlay;
+        
+        /**
+         * VideoServicePlay service instance.
+         */
+        VideoServicePlay* mServicePlayDeprecatedNewService;
+        
+        /**
+         * VideoServicePlay service instance.
+         */
+        VideoServicePlay* mServicePlayDeprecatedOldService;    
+        
+        /**
+         * VideoServiceView service instance.
+         */    
+        VideoServiceView* mServiceView; 
+        
+        /**
+         * VideoServiceView service instance.
+         */    
+        VideoServiceView* mServiceViewDeprecatedNewService; 
+        
+        /**
+         * VideoServiceView service instance.
+         */    
+        VideoServiceView* mServiceViewDeprecatedOldService;     
+        
+        /**
+         * VideoServiceBrowse service instance.
+         */
+        VideoServiceBrowse *mServiceBrowse;
     
-    /**
-     * VideoServiceBrowse service instance.
-     */
-    VideoServiceBrowse *mServiceBrowse;
-
-    /**
-     * Deprecated VideoServiceBrowse service instance.
-     */
-    VideoServiceBrowse *mServiceBrowseDeprecatedNewService;
+        /**
+         * Deprecated VideoServiceBrowse service instance.
+         */
+        VideoServiceBrowse *mServiceBrowseDeprecatedNewService;
+        
+        /**
+         * Deprecated VideoServiceBrowse service instance.
+         */
+        VideoServiceBrowse *mServiceBrowseDeprecatedOldService;
+                
+        /**
+         * VideoServiceUri service instance.
+         */
+        VideoServiceUri *mServiceUriView;        
+    
+        /**
+         * Pointer of VideoPlayerEngine.
+         */
+        VideoPlayerEngine* mEngine;
     
-    /**
-     * Deprecated VideoServiceBrowse service instance.
-     */
-    VideoServiceBrowse *mServiceBrowseDeprecatedOldService;
-
-    /**
-     * Pointer of QVideoPlayerEngine.
-     */
-    QVideoPlayerEngine* mEngine;
-
-	/*
-	 * Current service
-	 */
-    VideoServices::TVideoService mCurrentService;
-
-    friend class VideoServiceUriFetch;
-
-    friend class VideoServicePlay;
-	
-	friend class VideoServiceView;
+        /*
+         * Current service
+         */
+        VideoServices::TVideoService mCurrentService;
     
-    friend class VideoServiceBrowse;
-    
-public:
-    
-    /*
-     * indicate fetch service and attach operation has been selected
-     */
-    bool         mFetchSelected;
-    
-    };
+        friend class VideoServiceUriFetch;    
+        friend class VideoServicePlay;        
+        friend class VideoServiceView;        
+        friend class VideoServiceBrowse;        
+	    friend class VideoServiceUri;
+	    
+    public:
+        
+        /*
+         * indicate fetch service and attach operation has been selected
+         */
+        bool mFetchSelected;
+        
+};
 
 #endif //__VIDEOSERVICES_H__