FCL/sf/app/videoplayer: comparison videoplayback/hbvideoplaybackview/viewsrc/mpxvideoviewwrapper.cpp

equal deleted inserted replaced

-:c48470be1ba7
+:adbe7d5ba2f5
 *
 * Description:   Implementation of Video base playback view
 *
 */
-// Version : %version: da1mmcf#32 %
+// Version : %version: da1mmcf#33 %
 //  Include Files
 //
 void CMPXVideoViewWrapper::ConstructL()
 {
 MPX_ENTER_EXIT(_L("CMPXVideoViewWrapper::ConstructL()"));
 iPlaybackUtility =
 MMPXPlaybackUtility::UtilityL( EMPXCategoryVideo, KPbModeDefault );
 iPlaybackUtility->AddObserverL( *this );
 iPlaybackUtility->SetPrimaryClientL();
 //
 //  Create Active Object for closing player
 //
 iCloseAO = CIdle::NewL( CActive::EPriorityStandard );
 //
 //  Create Video Playback Display Handler
 //
 iDisplayHandler = CMPXVideoPlaybackDisplayHandler::NewL( iPlaybackUtility, this );
 // -------------------------------------------------------------------------------------------------
 //
 void CMPXVideoViewWrapper::CreateGeneralPlaybackCommandL( TMPXPlaybackCommand aCmd, TBool aDoSync )
 {
 MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::CreateGeneralPlaybackCommandL()"),
 _L("aCmd = %d, aDoSync, = %d"), aCmd, aDoSync );
 CMPXCommand* cmd = CMPXCommand::NewL();
 CleanupStack::PushL( cmd );
 cmd->SetTObjectValueL<TBool>( KMPXCommandGeneralDoSync, aDoSync );
 cmd->SetTObjectValueL<TBool>( KMPXCommandPlaybackGeneralNoBuffer, ETrue );
 break;
 }
 case EMPXPbvCmdClose:
 {
 MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdClose"));
 //
 // closing playback view occurs:
 //     - synchronously (mSyncClose=true) for PDL case (when PDL is supported)
 //     - asynchronously (mSyncClose=false) for all other cases
 //
 break;
 }
 case EMPXPbvCmdPlayPause:
 {
 MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdPause"));
-iPlaybackUtility->CommandL( EPbCmdPlayPause );
+if ( iPlaybackState == EPbStatePlaying )
+{
+CreateGeneralPlaybackCommandL( EPbCmdPause );
+}
+else if ( iPlaybackState == EPbStatePaused )
+{
+CreateGeneralPlaybackCommandL( EPbCmdPlay );
+}
 break;
 }
 case EMPXPbvCmdStop:
 {
 MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdStop"));
 HandleShortPressBackwardL();
 break;
 }
 case EMPXPbvCmdResetControls:
 {
+MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdResetControls"));
 CreateControlsL();
 iView->retrievePdlInformation();
 break;
 }
 case EMPXPbvCmdNextListItem:
 {
+MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdNextListItem"));
 if ( iPlaylistView && iFileDetails->mMultiItemPlaylist )
 {
 iPlaybackUtility->CommandL( EPbCmdNext );
 }
-break;
+else
-}
+{
-case EMPXPbvCmdPreviousListItem:
+MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() ignore EMPXPbvCmdNextListItem"));
-{
+}
+break;
+}
+case EMPXPbvCmdPreviousListItem:
+{
+MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdPreviousListItem"));
 if ( iPlaylistView && iFileDetails->mMultiItemPlaylist )
 {
 			    //
 			    // the command is being sent twice on purpose
 // one EMPXPbvCmdPreviousListItem command only sets the position to 0
 // the second cmd actually goes to the previous item in the list
 				//
 iPlaybackUtility->CommandL( EPbCmdPrevious );
 iPlaybackUtility->CommandL( EPbCmdPrevious );
 }
+else
+{
+MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() ignore EMPXPbvCmdNextListItem"));
+}
 break;
 }
 case EMPXPbvCmdEndOfClip:
 {
 CreateVideoSpecificCmdL( EPbCmdEndofClipReached );
 CreateVideoSpecificCmdL( EPbCmdCustomPlay );
 break;
 }
 case EMPXPbvCmdRealOneBitmapTimeout:
 {
 IssuePlayCommandL();
 break;
 }
 }
 }
 // -------------------------------------------------------------------------------------------------
 // From MMPXPlaybackObserver
 cmdId = EMPXControlCmdTvOutConnected;
 }
 if ( iUserInputHandler )
 {
 TRAP_IGNORE(iUserInputHandler->HandleTVOutEventL( tvOutConnected ));
 }
 if ( iControlsController )
 {
 iControlsController->handleEvent( cmdId );
 {
 iMediaRequestStatus = MediaNotRequested;
 HandleCommandL( EMPXPbvCmdResetControls );
 if ( iFileDetails )
 {
 iFileDetails->clearFileDetails();
 }
 }
 }
 break;
 {
 iView->handleStoppedState();
 }
 else
 {
 iView->closePlaybackView();
 }
 break;
 }
 case EPbStateInitialised:
 //
 if ( aMedia.IsSupported( KMPXMediaVideoDrmProtected ) )
 {
 iFileDetails->mDrmProtected = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoDrmProtected );
 }
 //
 //  Description
 //
 if ( aMedia.IsSupported( KMPXMediaVideoDescription ) )
 {
 TPtrC description( aMedia.ValueText( KMPXMediaVideoDescription ) );
 const QString qDescription( (QChar*)description.Ptr(), description.Length() );
 iFileDetails->mDescription = qDescription;
 }
 //
 //  Location
 //
 if ( aMedia.IsSupported( KMPXMediaVideoLocation ) )
 {
 TPtrC location( aMedia.ValueText( KMPXMediaVideoLocation ) );
 const QString qLocation( (QChar*)location.Ptr(), location.Length() );
 iFileDetails->mLocation = qLocation;
 }
 //
 //  Copyright
 //
 if ( aMedia.IsSupported( KMPXMediaVideoCopyright ) )
 {
 TPtrC copyright( aMedia.ValueText( KMPXMediaVideoCopyright ) );
 const QString qCopyright( (QChar*)copyright.Ptr(), copyright.Length() );
 iFileDetails->mCopyright = qCopyright;
 }
 //
 //  Language
 //
 if ( aMedia.IsSupported( KMPXMediaVideoLanguage ) )
 {
 TPtrC language( aMedia.ValueText( KMPXMediaVideoLanguage ) );
 const QString qLanguage( (QChar*)language.Ptr(), language.Length() );
 iFileDetails->mLanguage = qLanguage;
 }
 //
 //  Keywords
 //
 if ( aMedia.IsSupported( KMPXMediaVideoKeywords ) )
 {
 TPtrC keywords( aMedia.ValueText( KMPXMediaVideoKeywords ) );
 const QString qKeywords( (QChar*)keywords.Ptr(), keywords.Length() );
 iFileDetails->mKeywords = qKeywords;
 }
 //
 //  Creation date/time
 //
 if ( aMedia.IsSupported( KMPXMediaVideoCreated ) )
 {
 iFileDetails->mCreationTime = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoCreated );
 }
 //
 //  Last Modified date/time
 //
 if ( aMedia.IsSupported( KMPXMediaVideoLastModified ) )
 {
 iFileDetails->mModificationTime = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoLastModified );
 }
 }
 // -------------------------------------------------------------------------------------------------
 // Handle media properties.
 // Notes: The client is responsible for delete the object of aProperties.
 iMediaRequestStatus = MediaDelivered;
 if ( ! iFileDetails )
 {
 iFileDetails = new QMPXVideoPlaybackViewFileDetails();
 }
 //
 //  Read in the media data
 //
 ParseMetaDataL( aMedia );
 // -------------------------------------------------------------------------------------------------
 //   CMPXVideoViewWrapper::HandlePropertyL()
 // -------------------------------------------------------------------------------------------------
 //
 void
 CMPXVideoViewWrapper::HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError )
 {
 MPX_DEBUG(_L("CMPXVideoViewWrapper::HandlePropertyL - Error(%d)"), aError );
 if ( aError == KErrNone )
 new (ELeave) CArrayFixFlat<TInt>( wsSession.NumWindowGroups() );
 // check if our window is front or not
 if ( wsSession.WindowGroupList( 0, wgList ) == KErrNone )
 {
 ret = ( CEikonEnv::Static()->RootWin().Identifier() == wgList->At(0) );
 }
 else
 {
 ret = EFalse;
 }
 // -------------------------------------------------------------------------------------------------
 //
 void CMPXVideoViewWrapper::ClosePlaybackViewL()
 {
 MPX_ENTER_EXIT(_L("CMPXVideoViewWrapper::closePlaybackView()"));
 iView->closePlaybackView();
 }
 // -------------------------------------------------------------------------------------------------
 //   CMPXVideoViewWrapper::HandleVolumeCmdL()
 iFileDetails = NULL;
 }
 iFileDetails = new QMPXVideoPlaybackViewFileDetails();
 TPtrC fileName( cmd->ValueText( KMPXMediaVideoPlaybackFileName ) );
 const QString qFilename( (QChar*)fileName.Ptr(), fileName.Length() );
 iFileDetails->mClipName = qFilename;
 iFileDetails->mPlaybackMode = (TMPXVideoMode) cmd->ValueTObjectL<TInt>( KMPXMediaVideoMode );
 iFileDetails->mTvOutConnected   = cmd->ValueTObjectL<TInt>( KMPXMediaVideoTvOutConnected );
 TPtrC mimeType( cmd->ValueText( KMPXMediaVideoRecognizedMimeType ) );
 const QString qMimeType( (QChar*)mimeType.Ptr(), mimeType.Length() );
 iFileDetails->mMimeType = qMimeType;
 //
 // get playlist information and set mMultiItemPlaylist flag
 //
 TInt numItems = 1;
 MMPXSource* s = iPlaybackUtility->Source();
 if ( s )
 {
 CMPXCollectionPlaylist* playlist = NULL;
 MPX_TRAPD( err, playlist = s->PlaylistL() );
 if ( err == KErrNone && playlist )
 {
 iPlaylistView = ETrue;
 numItems = playlist->Count();
 delete playlist;
 }
 }
 iFileDetails->mMultiItemPlaylist = ( numItems > 1 );
 CleanupStack::PopAndDestroy( cmd );
 if ( iControlsController )
 {
 delete iControlsController;
 //   CMPXVideoViewWrapper::IsMultiItemPlaylist()
 // -------------------------------------------------------------------------------------------------
 //
 TBool CMPXVideoViewWrapper::IsMultiItemPlaylist()
 {
 bool multiLinks( false );
 if ( iFileDetails )
 {
 multiLinks = iFileDetails->mMultiItemPlaylist;
 }
 MPX_DEBUG(_L("CMPXVideoViewWrapper::IsMultiItemPlaylist() ret %d"), multiLinks );
 return multiLinks;
 }
 // -------------------------------------------------------------------------------------------------
 //   CMPXVideoViewWrapper::UpdateVideoRect()
 // -------------------------------------------------------------------------------------------------
 //
 void CMPXVideoViewWrapper::UpdateVideoRect(
 TInt aX, TInt aY, TInt aWidth, TInt aHeight, TBool transitionEffect )
 {
 MPX_DEBUG(_L("CMPXVideoViewWrapper::UpdateVideoRect()"));
 TRect rect( TPoint( aX, aY ), TSize( aWidth, aHeight ) );
 //
 //  Create controls since file details are available
 //
 if ( iControlsController )
 {
 iControlsController->addFileDetails( iFileDetails );
 }
 if ( iFileDetails->mVideoEnabled )
 {
 //
 // get window size
 //
 RWindow *window = iView->getWindow();
 TRect displayRect = TRect( TPoint( window->Position() ), TSize( window->Size() ) );
 //
 // get window aspect ratio
 //   if device is in landscape mode, width > height
 //   if device is in portrait mode, width < height
 //
 TReal32 width = (TReal32) displayRect.Width();
 TReal32 height = (TReal32) displayRect.Height();
 TReal32 displayAspectRatio = (width > height)? (width / height) : (height / width);
 //
 // get new aspect ratio
 TInt newAspectRatio =
 iDisplayHandler->SetDefaultAspectRatioL( iFileDetails, displayAspectRatio );
 //
 //  Setup the display window and issue play command
 //

changeset 46	adbe7d5ba2f5
parent 28	c48470be1ba7
child 47	45e72b57a2fd