diff -r 3738fe97f027 -r 8aed59de29f9 videoplayback/hbvideoplaybackview/tsrc/testprogressbar/stub/inc/mpxvideoplaybackcontrolscontroller.h
--- a/videoplayback/hbvideoplaybackview/tsrc/testprogressbar/stub/inc/mpxvideoplaybackcontrolscontroller.h	Thu Apr 01 23:32:44 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/tsrc/testprogressbar/stub/inc/mpxvideoplaybackcontrolscontroller.h	Fri Apr 16 18:13:14 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 1 %
+// Version : %version: 2 %
 
 
 
@@ -33,17 +33,8 @@
 #include "mpxvideoplaybackviewfiledetails.h"
 
 // FORWARD DECLARATIONS
-class QTimer;
-class QString;
-class HbAction;
-class QActionGroup;
-class QMPXVideoPlaybackControlPolicy;
-class QMPXVideoPlaybackControlsLayout;
 class QMPXVideoPlaybackDocumentLoader;
-class QMPXVideoPlaybackFullScreenControl;
-class QMPXVideoPlaybackNonTouchVolumeBar;
 class QMPXVideoPlaybackControlsController;
-class QMPXVideoPlaybackControlConfiguration;
 
 
 // DATA TYPES
@@ -61,8 +52,6 @@
     EAudioOnlyView
 };
 
-const int KMPXControlsTimeOut = 4000;
-
 
 // CLASS DECLARATION
 
@@ -83,11 +72,10 @@
         virtual ~QMPXVideoPlaybackControlsController();
 
     public:
-
         /**
-        * Handle event from container
+        * Initialize controller
         */
-        void handleEvent( TMPXVideoPlaybackControlCommandIds event, int value = 0 );
+        void initializeController();
 
         /**
         * Command handling function.
@@ -95,16 +83,6 @@
         */
         void handleCommand( TMPXVideoPlaybackViewCommandIds command, int value = 0 );
 
-        /*
-        * Return ETrue if TV-out cable gets connected
-        */
-        inline bool isTvOutConnected();
-
-        /*
-         * Return ETrue if TV-out cable is connected and content can be played
-         */
-        inline bool isTvOutPlaybackAllowed();
-
         /**
         * Reset or cancel timers for the controls
         */
@@ -120,168 +98,18 @@
         */
         inline QMPXVideoPlaybackViewFileDetails* fileDetails();
 
-        //
-        //  Add the file details to the controls controller when available
-        //
-        void addFileDetails( QMPXVideoPlaybackViewFileDetails* details );
-
         QMPXVideoPlaybackDocumentLoader* layoutLoader();
 
-        inline bool isFlipView();
-
-        void updateVideoRectDone();
-        
-        void changeViewMode( TPlaybackViewMode viewMode, bool transitionEffect = true );
-        
         TPlaybackViewMode viewMode();
 
     public:
-        /**
-        * Initialize controller
-        */
-        void initializeController();
-
-        /**
-        * Create controls
-        */
-        void createControls();
-
-        /**
-        * Update controls
-        */
-        void handleStateChange( TMPXPlaybackState newState );
-
-        /**
-        * Update Control's visibility
-        */
-        void updateControlsVisibility();
-
-        /**
-        * Toggle visibility
-        */
-        void toggleVisibility();
-
-        /**
-        * Create/delete controls based on updated control list
-        */
-        void controlsListUpdated();
-
-        /**
-        * Show Controls and reset the timers
-        */
-        void showControls();
-
-        /**
-        * Return ETrue if any control is visible
-        */
-        bool isVisible();
-
-        /**
-        * Append a control based on control index
-        */
-        void appendControl( TMPXVideoPlaybackControls controlIndex );
-
-        /**
-        * Set changed volume
-        */
-        void volumeChanged( int volume );
-
-        /**
-        * Set changed duration
-        */
-        void durationChanged( int duration);
-
-        /**
-        * Set changed position
-        */
-        void positionChanged( int position );
-
-        /**
-        * Set changed position
-        */
-        void aspectRatioChanged( int aspectRatio );
-
-        /*
-         *  Sets the download size on the progress bar
-         */
-        void setDownloadSize( int size );
-
-        /*
-         *  Updates the download ratio on the progress bar
-         */
-        void updateDownloadPosition( int newSize );
-
-        /**
-        * Set changed state on button bar
-        */
-        void updateStateOnButtonBar();
-
-        /**
-        * Check whether this clip is real format or not
-        */
-        bool realFormat( QString filename );
-
-        /**
-        * Check whether this clip is real format or not for streaming/live streaming
-        */
-        bool realFormatForStreaming( const TDesC& des );
-
-        /**
-        * Check whether this clip is real format or not for local/progressive donwload
-        */
-        bool realFormatForLocal();
-        
-        /**
-        * Handle errors
-        */
-        void handleErrors(); 
-        
-        /**
-		* Return ETrue if control is visible
-		*/
-		bool isSoftKeyVisible( int value );
-
-        /**
-        * Handle tvout connected/disconnected event
-        */
-    void handleTvOutEvent( bool connected, 
-		                        TMPXVideoPlaybackControlCommandIds event,
-		                        int value );
-
-		HbAction* createAction( QActionGroup *actionsGroup,
-		                        int index,
-		                        const char *slot,
-		                        const QString& toolTip );
-
-		void updateVideoRect(  bool transitionEffect = true ); 
-
-		void showVolumeControls();
-
-    private slots:
-        void hideAllControls();
-        void skipToNextVideoItem();
-        void skipToPreviousVideoItem();
-        void handleTappedOnScreen();
-
-    public:
         QMPXVideoPlaybackViewFileDetails          *mFileDetails;
-
-        QList<QMPXVideoPlaybackFullScreenControl*> mControls;
-
-        QMPXVideoPlaybackControlPolicy            *mControlsPolicy;
-        QMPXVideoPlaybackControlConfiguration     *mControlsConfig;
-
-        QTimer                                    *mControlsTimer;
-
         QMPXVideoPlaybackDocumentLoader           *mLoader;
-        QMPXVideoPlaybackNonTouchVolumeBar        *mVolumeControl;
-
-        bool                                       mFlipViewOpened;
-        bool                                       mViewTransitionIsGoingOn;
         TMPXPlaybackState                          mState;
         TPlaybackViewMode                          mViewMode;
         TMPXTimerAction                            mTimerAction;
-        
+        TMPXVideoPlaybackViewCommandIds            mCommand;
+        int                                        mValue;
 };
 
 // INLINE METHODS
@@ -305,45 +133,6 @@
     return mFileDetails;
 }
 
-// -------------------------------------------------------------------------------------------------
-//   QMPXVideoPlaybackControlsController::isTvOutConnected
-// -------------------------------------------------------------------------------------------------
-//
-inline
-bool QMPXVideoPlaybackControlsController::isTvOutConnected()
-{
-    MPX_DEBUG(_L("QMPXVideoPlaybackControlsController::isTvOutConnected(%d)"),
-            mFileDetails->mTvOutConnected);
-
-    return mFileDetails->mTvOutConnected;
-}
-
-// -------------------------------------------------------------------------------------------------
-//   QMPXVideoPlaybackControlsController::isTvOutPlaybackAllowed
-// -------------------------------------------------------------------------------------------------
-//
-inline
-bool QMPXVideoPlaybackControlsController::isTvOutPlaybackAllowed()
-{
-    bool playable = ( ! mFileDetails->mTvOutConnected || mFileDetails->mTvOutPlayAllowed );
-
-    MPX_DEBUG(_L("QMPXVideoPlaybackControlsController::isTvOutPlaybackAllowed() [%d]"),
-            playable);
-
-    return playable;
-}
-
-// -------------------------------------------------------------------------------------------------
-//   QMPXVideoPlaybackControlsController::isFlipView
-// -------------------------------------------------------------------------------------------------
-//
-inline
-bool QMPXVideoPlaybackControlsController::isFlipView()
-{
-    return mFlipViewOpened;
-}
-
-
 #endif /*MPXVIDEOPLAYBACKCONTROLSCONTROLLER_P_H_*/
 
 // End of File