diff -r 0e1e938beb1a -r a9d57bd8d7b7 videoplayback/videoplaybackview/inc/videoplaybackcontrolscontroller.h --- a/videoplayback/videoplaybackview/inc/videoplaybackcontrolscontroller.h Fri Sep 17 08:30:05 2010 +0300 +++ b/videoplayback/videoplaybackview/inc/videoplaybackcontrolscontroller.h Mon Oct 04 00:19:07 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: da1mmcf#25 % +// Version : %version: da1mmcf#28 % @@ -26,6 +26,7 @@ #include #include +#include #include #include "mpxvideo_debug.h" @@ -47,7 +48,7 @@ class VideoPlaybackControlsController; class VideoPlaybackControlConfiguration; class VideoServices; - +class ShareUi; // DATA TYPES @@ -145,7 +146,8 @@ inline TPlaybackViewMode viewMode(); - void changeViewMode( TPlaybackViewMode viewMode, bool transitionEffect = true ); + void evaluateAndChangeViewMode( + TPlaybackViewMode viewMode = EFullScreenView, bool transitionEffect = false ); inline bool isAttachOperation(); @@ -154,6 +156,8 @@ bool isRNLogoBitmapInControlList(); bool shouldShowRNLogo(); + + inline bool isService(); private: /** @@ -241,12 +245,6 @@ */ bool isSoftKeyVisible(); - /** - * Handle tvout connected/disconnected event - */ - void handleTvOutEvent( bool connected, - TVideoPlaybackControlCommandIds event ); - void updateVideoRect( bool transitionEffect = true ); void showVolumeControls(); @@ -284,7 +282,7 @@ CMPXVideoViewWrapper *mViewWrapper; VideoPlaybackViewFileDetails *mFileDetails; - QList mControls; + QList mControls; VideoPlaybackControlPolicy *mControlsPolicy; VideoPlaybackControlConfiguration *mControlsConfig; @@ -301,12 +299,15 @@ bool mViewTransitionIsGoingOn; bool mIsAttachOperation; bool mFileDetailsAdded; + bool mShowControlsWhenInHorizontal; TThumbNailState mThumbNailState; TMPXPlaybackState mState; TPlaybackViewMode mViewMode; Qt::Orientation mOrientation; + + ShareUi *mShareUi; }; // INLINE METHODS @@ -399,6 +400,20 @@ return mFileDetailsAdded; } + +// ------------------------------------------------------------------------------------------------- +// VideoPlaybackControlsController::isService +// ------------------------------------------------------------------------------------------------- +// +inline +bool VideoPlaybackControlsController::isService() +{ + MPX_DEBUG(_L("VideoPlaybackControlsController::isService()")); + + return XQServiceUtil::isService(); +} + + #endif /*MPXVIDEOPLAYBACKCONTROLSCONTROLLER_P_H_*/ // End of File