diff -r 2d690156cf8f -r 315810614048 videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp --- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp Thu Jul 15 18:41:27 2010 +0300 +++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp Thu Aug 19 09:57:17 2010 +0300 @@ -16,7 +16,7 @@ */ -// Version : %version: e003sa33#17 % +// Version : %version: 18 % // INCLUDE FILES @@ -65,6 +65,7 @@ CMPXVideoPlaybackMediaDetailsViewer::CMPXVideoPlaybackMediaDetailsViewer( CMPXVideoPlaybackControlsController* aController ) : iController( aController ) + , iDrmDetailsLaunched( EFalse ) { } @@ -238,7 +239,12 @@ // void CMPXVideoPlaybackMediaDetailsViewer::LaunchDRMDetailsL() { - iController->iContainer->HandleCommandL(EMPXPbvLaunchDRMDetails); + if ( ! iDrmDetailsLaunched ) + { + iDrmDetailsLaunched = ETrue; + iController->iContainer->HandleCommandL( EMPXPbvLaunchDRMDetails ); + iDrmDetailsLaunched = EFalse; + } } // ------------------------------------------------------------------------------------------------- @@ -307,10 +313,10 @@ CleanupStack::PopAndDestroy( heading ); } - + // Title HBufC* fileTitle = iController->FileDetails()->GenerateFileTitleL(); - + if ( fileTitle && fileTitle->Length() ) { // Title gets populated by UpdateTitle method @@ -322,7 +328,7 @@ iTitleLabel->MakeVisible( ETrue ); rowsAdded++; } - + delete fileTitle; // Filename @@ -339,9 +345,9 @@ iClipnameLabel->MakeVisible( ETrue ); rowsAdded++; } - + delete fileName; - + // Mime Type (Format) if ( iController->FileDetails()->iMimeType && iController->FileDetails()->iMimeType->Length() ) { @@ -697,7 +703,7 @@ { UpdateFilenameL(); } - + if ( iTitleScroller.IsUpdateNeeded() ) { UpdateTitleL(); @@ -755,8 +761,8 @@ } HBufC* title = NULL; - TRAP_IGNORE ( title = iController->FileDetails()->GenerateFileTitleL() ); - + TRAP_IGNORE ( title = iController->FileDetails()->GenerateFileTitleL() ); + if ( title ) { numOfItems++; @@ -843,10 +849,10 @@ void CMPXVideoPlaybackMediaDetailsViewer::UpdateFilenameL() { MPX_ENTER_EXIT( _L( "CMPXVideoPlaybackMediaDetailsViewer::UpdateFilenameL" ) ); - - HBufC* fileName = iController->FileDetails()->GenerateFileNameL(); + + HBufC* fileName = iController->FileDetails()->GenerateFileNameL(); CleanupStack::PushL( fileName ); - + if ( fileName && fileName->Length() ) { HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_FILENAME_HEADING ); @@ -865,7 +871,7 @@ CleanupStack::PopAndDestroy( heading ); } - + CleanupStack::PopAndDestroy( fileName ); } @@ -876,11 +882,11 @@ void CMPXVideoPlaybackMediaDetailsViewer::UpdateTitleL() { MPX_ENTER_EXIT( _L( "CMPXVideoPlaybackMediaDetailsViewer::UpdateTitleL" ) ); - - HBufC* fileTitle = iController->FileDetails()->GenerateFileTitleL(); + + HBufC* fileTitle = iController->FileDetails()->GenerateFileTitleL(); CleanupStack::PushL( fileTitle ); - - if ( fileTitle && fileTitle->Length() ) + + if ( fileTitle && fileTitle->Length() ) { HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_TITLE_HEADING ); CleanupStack::PushL( heading ); @@ -898,8 +904,8 @@ CleanupStack::PopAndDestroy( heading ); } - - CleanupStack::PopAndDestroy( fileTitle ); + + CleanupStack::PopAndDestroy( fileTitle ); } // ------------------------------------------------------------------------------------------------- @@ -940,8 +946,8 @@ TBool CMPXVideoPlaybackMediaDetailsViewer::TTextScroller::IsUpdateNeeded() { MPX_ENTER_EXIT( _L( "CMPXVideoPlaybackMediaDetailsViewer::TTextScroller::IsUpdateNeeded" ) ); - - // skip the scrolling operation if the loop for delay is going on + + // skip the scrolling operation if the loop for delay is going on TBool skipForTimerDelay = EFalse; // add a delay after each complete scrolling @@ -977,12 +983,12 @@ TDes& aDesText ) { MPX_ENTER_EXIT( _L( "CMPXVideoPlaybackMediaDetailsViewer::TTextScroller::ScrollText" ) ); - - if ( 0 == iSrcTextLen ) + + if ( 0 == iSrcTextLen ) { iSrcTextLen = aSrcText.Length(); } - + ASSERT( aSrcText.Length() == iSrcTextLen ); if ( aSrcText.Length() >= KMediaDetailsViewerVisibleCharacters ) { @@ -999,7 +1005,7 @@ iTextScrollPos++; } iScroll = ETrue; - + } else {