--- a/videoplayback/videoplaybackview/controlsrc/videoplaybackcontrolscontroller.cpp Thu Jul 08 13:05:19 2010 +0300
+++ b/videoplayback/videoplaybackview/controlsrc/videoplaybackcontrolscontroller.cpp Fri Jul 23 11:10:06 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: da1mmcf#46 %
+// Version : %version: da1mmcf#48 %
@@ -76,6 +76,7 @@
, mVideoServices( 0 )
, mViewTransitionIsGoingOn( false )
, mIsAttachOperation( false )
+ , mFileDetailsAdded( false )
, mThumbNailState( EThumbNailEmpty )
, mState( EPbStateNotInitialised )
, mViewMode( EFullScreenView )
@@ -292,6 +293,8 @@
{
MPX_ENTER_EXIT(_L("VideoPlaybackControlsController::addFileDetails"));
+ mFileDetailsAdded = true;
+
mFileDetails = details;
mFileDetails->mRNFormat = realFormat( mFileDetails->mClipName );
@@ -727,7 +730,7 @@
case EDetailsView:
{
//
- // ignore the tap for 'Pause' action for non-pausable stream in
+ // ignore the tap for 'Pause' action for non-pausable stream in
// 'Details' view during 'Playing' state
//
if ( mState != EPbStatePlaying || mFileDetails->mPausableStream )
@@ -1410,11 +1413,11 @@
QGraphicsWidget *tvOutBitmap = mLoader->findWidget( "tvOutBitmap" );
HbLabel *tvOutLabel = qobject_cast<HbLabel*>( tvOutBitmap );
- QIcon *qicon = new QIcon( tnData );
+ QIcon qicon( tnData );
- HbIcon *hbIcon = new HbIcon( *qicon );
- hbIcon->setSize( tvOutBitmap->size() );
- tvOutLabel->setIcon( *hbIcon );
+ HbIcon hbIcon( qicon );
+ hbIcon.setSize( tvOutBitmap->size() );
+ tvOutLabel->setIcon( hbIcon );
mThumbNailState = EThumbNailSet;
}
@@ -1460,11 +1463,6 @@
_L("file = %s"), mFileDetails->mClipName.data() );
//
- // pause playback
- //
- handleCommand( EMPXPbvCmdPause );
-
- //
// send video to shareUI
//
ShareUi dlg;
@@ -1573,13 +1571,13 @@
MPX_ENTER_EXIT(_L("VideoPlaybackControlsController::shouldShowRNLogo()"));
bool showRNLogo = false;
-
- if ( mFileDetails->mRNFormat &&
+
+ if ( mFileDetails->mRNFormat &&
!mViewWrapper->IsResumingPlaybackAfterTermination() )
{
showRNLogo = true;
}
-
+
return showRNLogo;
}