FCL/sf/app/videoplayer: comparison videoplayback/videoplaybackview/controlsrc/videoplaybackcontrolscontroller.cpp

equal deleted inserted replaced

-:d2b028fd1f7d
+:4707a0db12f6
 *
 * Description:  Implementation of VideoPlaybackControlsController
 *
 */
-// Version : %version: da1mmcf#51 %
+// Version : %version: da1mmcf#54 %
 // INCLUDE FILES
 #include <coecntrl.h>
 #include <barsread.h>
 #include <f32file.h>
 #include <QTimer>
 #include <thumbnailmanager_qt.h>
-#include <xqserviceutil.h>
 #include <hblabel.h>
 #include <hbvolumesliderpopup.h>
 #include <hbtransparentwindow.h>
 #include <hbiconanimationmanager.h>
 , mThumbnailManager( NULL )
 , mVideoServices( 0 )
 , mViewTransitionIsGoingOn( false )
 , mIsAttachOperation( false )
 , mFileDetailsAdded( false )
+, mShowControlsWhenInHorizontal( false )
 , mThumbNailState( EThumbNailEmpty )
 , mState( EPbStateNotInitialised )
 , mViewMode( EFullScreenView )
+, mShareUi( NULL )
 {
 MPX_ENTER_EXIT(_L("VideoPlaybackControlsController::VideoPlaybackControlsController()"));
 initializeController();
 }
 connect( mView, SIGNAL( tappedOnScreen() ), this, SLOT( handleTappedOnScreen() ) );
 //
 // if videoplayback is in service mode, create a videoservices instance
 //
-if ( XQServiceUtil::isService() && ! mVideoServices )
+if ( isService() && ! mVideoServices )
 {
 //
 // obtain VideoServices instance
 //
 mVideoServices = VideoServices::instance();
 // decrease videoservices instance count
 //
 	mVideoServices->decreaseReferenceCount();
 	mVideoServices = 0;
 }
+if( mShareUi )
+{
+delete mShareUi;
+mShareUi = NULL;
+}
 }
 // -------------------------------------------------------------------------------------------------
 // VideoPlaybackControlsController::addFileDetails()
 // -------------------------------------------------------------------------------------------------
 mFileDetails->mRNFormat = realFormat( mFileDetails->mClipName );
 mControlsConfig->updateControlsWithFileDetails();
-//
+evaluateAndChangeViewMode();
-// for audio-only clips and tv-out, default view is flip view
-//
-if ( ! details->mVideoEnabled )
-{
-changeViewMode( EAudioOnlyView, false );
-}
-if ( details->mTvOutConnected )
-{
-handleEvent( EControlCmdTvOutConnected );
-}
 //
 // Dimmed the volume control if it is video only
 //
 if ( ! mFileDetails->mAudioEnabled )
 }
 case EControlCmdTvOutConnected:
 {
 MPX_DEBUG(_L("    [EControlCmdTvOutConnected]"));
-handleTvOutEvent( true, event );
+mFileDetails->mTvOutConnected = true;
+evaluateAndChangeViewMode();
 break;
 }
 case EControlCmdTvOutDisconnected:
 {
 MPX_DEBUG(_L("    [EControlCmdTvOutDisConnected]"));
-handleTvOutEvent( false, event );
+mFileDetails->mTvOutConnected = false;
+evaluateAndChangeViewMode();
 break;
 }
 case EControlCmdHandleErrors:
 {
 MPX_DEBUG(_L("    [EControlCmdHandleErrors]"));
 mState = newState;
 switch ( newState )
 {
 case EPbStatePlaying:
+{
+if ( mViewMode == EFullScreenView )
+{
+hideAllControls();
+}
+else
+{
+showControls();
+}
+updateState();
+break;
+}
+case EPbStateBuffering:
+{
+if ( mFileDetails->mPlaybackMode != EMPXVideoLocal )
+{
+showControls();
+}
+updateState();
+break;
+}
+case EPbStatePaused:
 case EPbStateInitialising:
-case EPbStateBuffering:
-case EPbStatePaused:
 case EPbStateNotInitialised:
 case EPbStatePluginSeeking:
 {
 //
 //  Show all the controls
 MPX_DEBUG(_L("    EBufferingAnimation add animation definition ok = %d"), ok);
 //
 // Buffering animation icon
 //
+mLoader->load( KPLAYBACKVIEW_DOCML, "BufferingAnimation", &ok );
+MPX_DEBUG(_L("    EBufferingAnimation load BufferingAnimation ok = %d"), ok);
 QGraphicsWidget *widget = mLoader->findWidget( QString( "bufferingIcon" ) );
 HbLabel *bufferingAnim = qobject_cast<HbLabel*>( widget );
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 bufferingAnim,
 properties );
 mControls.append( control );
 break;
 }
 case EStatusPane:
 {
 //
 // Status key (signal + title + back key)
 //
 control = new VideoPlaybackStatusPaneControl( this,
 controlIndex,
 NULL,
 properties );
 mControls.append( control );
 break;
 }
 case EControlBar:
 VideoPlaybackControlBar *controlBar =
 qobject_cast<VideoPlaybackControlBar*>( widget );
 controlBar->initialize();
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 controlBar,
 properties );
 mControls.append( control );
 break;
 }
 case EFileDetailsWidget:
 QGraphicsWidget *widget = mLoader->findWidget( QString( "fileDetailsLayout" ) );
 VideoPlaybackFileDetailsWidget *fileDetails =
 qobject_cast<VideoPlaybackFileDetailsWidget*>( widget );
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 fileDetails,
 properties );
 mControls.append( control );
 break;
 }
 case EIndicatorBitmap:
 {
+bool ok = true;
 QGraphicsWidget *widget = mLoader->findWidget( QString( "bitmapLayout" ) );
+if ( widget == NULL )
+{
+mLoader->load( KPLAYBACKVIEW_DOCML, "IndicatorBitmaps", &ok );
+widget = mLoader->findWidget( QString( "bitmapLayout" ) );
+MPX_DEBUG(_L("    EIndicatorBitmap load IndicatorBitmaps ok = %d"), ok);
+}
+widget = mLoader->findWidget( QString( "bitmapLayout" ) );
 HbWidget *bitmapWidget = qobject_cast<HbWidget*>( widget );
 setDefaultBitmap();
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 bitmapWidget,
 properties );
 mControls.append( control );
 break;
 }
 case ERealLogoBitmap:
 {
+bool ok = false;
+mLoader->load( KPLAYBACKVIEW_DOCML, "RNBitmap", &ok );
+MPX_DEBUG(_L("    ERealLogoBitmap load RNBitmap ok = %d"), ok);
 QGraphicsWidget *widget = mLoader->findWidget( QString( "rnLogoBitmap" ) );
 HbWidget *bitmapWidget = qobject_cast<HbWidget*>( widget );
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 bitmapWidget,
 properties );
 mControls.append( control );
 connect( bitmapWidget, SIGNAL( visibleChanged() ),
 this, SLOT( handleRNLogoVisibleChanged() ) );
 VideoPlaybackDetailsPlaybackWindow *detailsPlaybackWindow =
 qobject_cast<VideoPlaybackDetailsPlaybackWindow*>( widget );
 detailsPlaybackWindow->initialize();
 control = new VideoPlaybackFullScreenControl( this,
 controlIndex,
 detailsPlaybackWindow,
 properties );
 mControls.append( control );
 break;
 }
 }
 {
 MPX_DEBUG(_L("VideoPlaybackControlsController::showControls()"));
 resetDisappearingTimers( ETimerReset );
-if ( ! mViewTransitionIsGoingOn && mOrientation == Qt::Horizontal )
+if ( ! mViewTransitionIsGoingOn )
 {
-for ( int i = 0 ; i < mControls.count() ; i++ )
+if ( mOrientation == Qt::Horizontal )
 {
-mControls[i]->setVisibility( mState );
+for ( int i = 0 ; i < mControls.count() ; i++ )
+{
+mControls[i]->setVisibility( mState );
+}
+}
+else
+{
+mShowControlsWhenInHorizontal = true;
 }
 }
 }
 // -------------------------------------------------------------------------------------------------
 return visible;
 }
 // -------------------------------------------------------------------------------------------------
-//   VideoPlaybackControlsController::handleTvOutEvent
-// -------------------------------------------------------------------------------------------------
-//
-void VideoPlaybackControlsController::handleTvOutEvent(
-bool connected, TVideoPlaybackControlCommandIds event )
-{
-Q_UNUSED( event );
-MPX_DEBUG(_L("VideoPlaybackControlsController::handleTvOutEvent()"));
-mFileDetails->mTvOutConnected = connected;
-setDefaultBitmap();
-if ( mFileDetails->mTvOutConnected )
-{
-generateThumbNail();
-}
-//
-// Change the view.
-// If Tv-out is connected, go to AudioOnlyView.
-// If not, go back to default view.
-//
-TPlaybackViewMode viewMode = EFullScreenView;
-if ( mFileDetails->mTvOutConnected || ! mFileDetails->mVideoEnabled )
-{
-viewMode = EAudioOnlyView;
-}
-changeViewMode( viewMode, false );
-}
-// -------------------------------------------------------------------------------------------------
 //   VideoPlaybackControlsController::changeViewMode
 // -------------------------------------------------------------------------------------------------
 //
-void VideoPlaybackControlsController::changeViewMode(
+void VideoPlaybackControlsController::evaluateAndChangeViewMode(
 TPlaybackViewMode viewMode, bool transitionEffect )
 {
 MPX_DEBUG(_L("VideoPlaybackControlsController::changeViewMode( %d, %d )"),
 viewMode, transitionEffect );
-if ( viewMode != mViewMode )
+switch ( viewMode )
 {
-switch ( viewMode )
+case EFullScreenView:
-{
+case EDetailsView:
-case EFullScreenView:
+{
-case EDetailsView:
+if ( mFileDetails->mVideoEnabled &&
-{
+! mFileDetails->mTvOutConnected )
-if ( mFileDetails->mVideoEnabled && ! mFileDetails->mTvOutConnected )
+{
+if ( viewMode != mViewMode )
 {
 mViewMode = viewMode;
-//
-// Hack to clean up the screen before transition. We may not need it in NGA env
-//
-hideAllControls();
 updateVideoRect( transitionEffect );
 }
 break;
 }
-case EAudioOnlyView:
+//
-{
+// Internal fall-through
-if ( ! mFileDetails->mVideoEnabled || mFileDetails->mTvOutConnected )
+// If it is not possible to change the mode to full screen/details
+// coz of tvout or audio only clip
+// then open audio only view instead
+//
+}
+case EAudioOnlyView:
+{
+//
+// If there is any event changed within audio only view,
+// update bitmap to show current status
+//
+if ( ! mFileDetails->mVideoEnabled || mFileDetails->mTvOutConnected )
+{
+if ( mViewMode == EAudioOnlyView )
 {
-mViewMode = viewMode;
+setDefaultBitmap();
+}
+else
+{
+mViewMode = EAudioOnlyView;
 mControlsConfig->updateControlList( EControlCmdAudionOnlyViewOpened );
+if ( mFileDetails->mTvOutConnected )
+{
+generateThumbNail();
+}
 }
+}
 break;
 }
 default:
 {
 break;
-}
 }
 }
 }
 // -------------------------------------------------------------------------------------------------
 else
 {
 mThumbNailState = EThumbNailNotAvailable;
 }
-setDefaultBitmap();
 disconnect( mThumbnailManager, SIGNAL( thumbnailReady( QPixmap , void * , int , int ) ),
 this, SLOT( handleThumbnailReady( QPixmap , void * , int , int ) ) );
 }
 // -------------------------------------------------------------------------------------------------
 _L("file = %s"), mFileDetails->mClipName.data() );
 //
 // send video to shareUI
 //
-ShareUi dlg;
+if( ! mShareUi )
+{
+mShareUi = new ShareUi();
+}
 QStringList fileList;
 fileList.append( mFileDetails->mClipName );
-dlg.send( fileList, true );
+mShareUi->send( fileList, true );
 }
 // -------------------------------------------------------------------------------------------------
 // VideoPlaybackControlsController::handleRNLogoVisibleChanged()
 // -------------------------------------------------------------------------------------------------
 _L("old orientation %d, new orientation = %d"), mOrientation, orientation );
 Qt::Orientation  oldOrientaiton = mOrientation;
 mOrientation = orientation;
-if ( oldOrientaiton == Qt::Vertical && orientation == Qt::Horizontal )
+if ( oldOrientaiton == Qt::Vertical &&
+orientation == Qt::Horizontal &&
+mShowControlsWhenInHorizontal )
 {
 showControls();
+mShowControlsWhenInHorizontal = false;
 }
 }
 // -------------------------------------------------------------------------------------------------
 // VideoPlaybackControlsController::shouldShowRNLogo()
 MPX_ENTER_EXIT(_L("VideoPlaybackControlsController::shouldShowRNLogo()"));
 bool showRNLogo = false;
 if ( mFileDetails->mRNFormat &&
-!mViewWrapper->IsResumingPlaybackAfterTermination() )
+! mViewWrapper->IsResumingPlaybackAfterTermination() )
 {
 showRNLogo = true;
 }
 return showRNLogo;

changeset 63	4707a0db12f6
parent 58	d2b028fd1f7d
child 66	adb51f74b890