MCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewcontainer.cpp

equal deleted inserted replaced

-:ff3acec5bc43
+:8118492f1bdf
 CreateWindowL();
 TAknWindowLineLayout screenLayout =
 AknLayout::screen();
 TRect screenRect = screenLayout.Rect();
-iBackground = CAknsBasicBackgroundControlContext::NewL(
+	iBackground = CAknsBasicBackgroundControlContext::NewL(
-KAknsIIDQsnBgAreaMainMp, screenRect, EFalse );
+			KAknsIIDQsnBgAreaMain, screenRect, EFalse );
 	iSeekTimer = CPeriodic::NewL( EPriorityLow );
 TInt flags( 0 );
 CRepository* repository = CRepository::NewL( KCRUidMPXMPFeatures );
 iEnableMarquee = static_cast<TBool>( flags & KMPXMarqueeArtistName );
 iEnableButtons = static_cast<TBool>( flags & KMPXRockerMappingSupport );
-CreateBackgroundImagesL();
 // Create labels
 CreateLabelsL();
 iLabels[ETextPlaylistCount]->MakeVisible( ETrue );
 iLabels.ResetAndDestroy();
 delete iMinSecFormatString;
 delete iShortFormatString;
 delete iCommonUiHelper;
-delete iOffScreenBitmap;
-delete iOSBitmapContext;
-delete iOSBitmapDevice;
 delete iButtonManager;
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if (feedback)
 {
 CCoeControl::HandleResourceChange( aType );
 if ( aType == KAknsMessageSkinChange )
 {
-		iRefreshBackBuffer = ETrue;
 // Reload icons
 TRAP_IGNORE(
 {
 CreateIconsL();
 } );
 else if ( aType == KEikDynamicLayoutVariantSwitch )
 {
 iLayoutObserver->HandleLayoutChange();
 UpdateBackgroundSkinControlContext( Rect() );
-// recreate background image
-TRAP_IGNORE( CreateBackgroundImagesL() );
 }
 else
 {
 // pass
 }
 {
 label->StartMarquee();
 label->DrawDeferred();
 }
 }
-}
-// ---------------------------------------------------------------------------
-// Creates background images
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMPXCommonPlaybackViewContainer::CreateBackgroundImagesL()
-{
-CWindowGc& gc( SystemGc() );
-CGraphicsDevice* device( gc.Device() );
-TSize size( device->SizeInPixels() );
-TDisplayMode mode( device->DisplayMode() );
-if( iOffScreenBitmap &&
-		size == iOffScreenBitmap->SizeInPixels() &&
-		mode == iOffScreenBitmap->DisplayMode() )
-	{
-		// No need to update backbuffer
-	return;
-	}
-delete iOffScreenBitmap;
-iOffScreenBitmap = NULL;
-delete iOSBitmapContext;
-iOSBitmapContext = NULL;
-delete iOSBitmapDevice;
-iOSBitmapDevice = NULL;
-iOffScreenBitmap = new (ELeave) CFbsBitmap();
-TInt err( iOffScreenBitmap->Create( size, mode ));
-if ( KErrNone != err )
-{
-delete iOffScreenBitmap;
-iOffScreenBitmap = NULL;
-User::Leave( err );
-}
-iOSBitmapDevice = CFbsBitmapDevice::NewL( iOffScreenBitmap );
-err = iOSBitmapDevice->CreateContext( iOSBitmapContext );
-if ( KErrNone != err )
-{
-delete iOSBitmapDevice;
-iOSBitmapDevice = NULL;
-User::Leave( err );
-}
-iRefreshBackBuffer = ETrue;
 }
 // ---------------------------------------------------------------------------
 // Creates labels.
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Draw an icon
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CMPXCommonPlaybackViewContainer::DrawIndicator(
-CBitmapContext& aGc,
+CWindowGc& aGc ,
 const TRect& aDirtyRect,
 const TRect& aIndicatorRect,
 const CGulIcon* aIcon,
 TBool aInvertMask ) const
 {
 // ---------------------------------------------------------------------------
 // Redraw part of the screen.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CMPXCommonPlaybackViewContainer::RedrawRect(
-const TRect& aRect,
+const TRect& aRect) const
-CBitmapContext& aGc) const
+{
-{
+	CWindowGc& gc = SystemGc();
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-AknsDrawUtils::DrawBackground(
-skin,
+	AknsDrawUtils::Background( skin, iBackground,
-iBackground,
+			this, gc, aRect );
-this,
-aGc,
-aRect.iTl,
-aRect,
-KAknsDrawParamDefault );
 TBool embedded = iEikonEnv->StartedAsServerApp();
 if ( iPrerollCompleted )
 {
 if ( iRepeatAllMode && !embedded )
 {
-DrawIndicator( aGc, aRect, iRepeatIconRect, iRepeatAllIcon );
+DrawIndicator( gc, aRect, iRepeatIconRect, iRepeatAllIcon );
 }
 if ( iRepeatOneMode && !embedded )
 {
-DrawIndicator(aGc, aRect, iRepeatIconRect, iRepeatOneIcon);
+DrawIndicator(gc, aRect, iRepeatIconRect, iRepeatOneIcon);
 }
 if ( iRandomMode && !embedded )
 {
-DrawIndicator(aGc, aRect, iRandomIconRect, iRandomIcon);
+DrawIndicator(gc, aRect, iRandomIconRect, iRandomIcon);
 }
 #ifdef RD_RA_SUPPORT_FOR_MUSIC_PLAYER
 if ( iRealAudioMode )
 {
-DrawIndicator( aGc, aRect, iRealIconRect, iRealIcon );
+DrawIndicator( gc, aRect, iRealIconRect, iRealIcon );
 }
 #endif
-DrawIndicator( aGc, aRect, iSliderBackgroundRect, iSliderBackground );
+DrawIndicator( gc, aRect, iSliderBackgroundRect, iSliderBackground );
 if ( iMode == EPlayMode || iMode == EPauseMode )
 {
-DrawIndicator( aGc, aRect, TRect(iDownloadSliderRect.iTl,
+DrawIndicator( gc, aRect, TRect(iDownloadSliderRect.iTl,
 iDownloadSlider->Bitmap()->SizeInPixels()),
 iDownloadSlider );
-DrawIndicator(aGc, aRect, TRect(iPlaybackSliderRect.iTl,
+DrawIndicator(gc, aRect, TRect(iPlaybackSliderRect.iTl,
 iPlaybackSlider->Bitmap()->SizeInPixels() ),
 iPlaybackSlider );
 }
 if ( iDisplayAlbumArt && aRect.Intersects( iAlbumArtRect ) )
 TPoint Centerpos = TPoint(xPos, yPos );
 // bitmap top left corner position
 Centerpos += iAlbumArtRect.iTl;
 // Draw album art and frame
-aGc.BitBlt( Centerpos, iTrackAlbumArt);
+gc.BitBlt( Centerpos, iTrackAlbumArt);
 TRgb color = KRgbBlack;
 AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
 EAknsCIQsnTextColorsCG50 );
 TRect imageRect( Centerpos, iTrackAlbumArt->SizeInPixels() );
-aGc.SetPenStyle( CGraphicsContext::ESolidPen );
+gc.SetPenStyle( CGraphicsContext::ESolidPen );
-aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
+gc.SetBrushStyle( CGraphicsContext::ENullBrush );
-aGc.SetPenColor( color );
+gc.SetPenColor( color );
-aGc.DrawRect( imageRect );
+gc.DrawRect( imageRect );
 }
 else
 {
-DrawIndicator( aGc, aRect, iAlbumArtRect, iDefaultAlbumArt );
+DrawIndicator( gc, aRect, iAlbumArtRect, iDefaultAlbumArt );
 }
 }
 }
 }
 EXPORT_C void CMPXCommonPlaybackViewContainer::UpdateBackgroundSkinControlContext(
 const TRect& aRect )
 {
 CAknsBasicBackgroundControlContext* background =
 static_cast<CAknsBasicBackgroundControlContext*>( iBackground );
 if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 TAknWindowLineLayout screenLayout =
 AknLayout::screen();
 TRect screenRect = screenLayout.Rect();
-background->SetBitmap( KAknsIIDQsnBgAreaMainMp );
+background->SetBitmap( KAknsIIDQsnBgAreaMain );
 background->SetRect( screenRect );
 }
 else
 {
-background->SetBitmap( KAknsIIDQsnBgAreaMainMp );
+background->SetBitmap( KAknsIIDQsnBgAreaMain );
 background->SetRect( aRect );
 }
-iRefreshBackBuffer = ETrue;
 }
 // ---------------------------------------------------------------------------
 // Set FMTX mode.
 // FMTX label shouldn't appear in some playback views
 // Draws the control.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CMPXCommonPlaybackViewContainer::Draw( const TRect& aRect ) const
 {
-if( iActiveView || iRefreshBackBuffer )
+RedrawRect(aRect);
-{
-if ( iOSBitmapContext )
-{
-RedrawRect( aRect, *iOSBitmapContext );
-iRefreshBackBuffer = EFalse;
-}
-}
-// Draw off-screen bitmap to display
-if ( iOffScreenBitmap )
-{
-CWindowGc& gc = SystemGc();
-		gc.BitBlt( TPoint(),iOffScreenBitmap );
-}
 }
 // -----------------------------------------------------------------------------
 // CMPXCommonPlaybackViewContainer::HandleButtonCommandL
 // -----------------------------------------------------------------------------
 {
 // Layout has not changed, do nothing
 return;
 }
-CreateBackgroundImagesL();
 MPX_DEBUG5( "CMPXCommonPlaybackViewContainer::DoUpdateLayoutL() -- new layout: top-left (%d, %d) size (%d, %d)",
 myRect.iTl.iX, myRect.iTl.iY, myRect.Size().iWidth, myRect.Size().iHeight );
 // Get layout data

changeset 1	8118492f1bdf
parent 0	ff3acec5bc43
child 11	943ff5625028