diff -r 79c49924ae23 -r af3740e3753f mpdata/src/mpplaybackdata.cpp --- a/mpdata/src/mpplaybackdata.cpp Tue Jul 06 14:13:36 2010 +0300 +++ b/mpdata/src/mpplaybackdata.cpp Wed Aug 18 09:46:20 2010 +0300 @@ -81,8 +81,7 @@ mPosition(0), mAlbumId(0), mId(0), - mAlbumArt( "qtg_large_music_album" ), - mDefaultAlbumArt( "qtg_large_music_album" ), + mAlbumArt( "qtg_large_album_art" ), mPlaybackState( NotPlaying ), mRealAudio( false ) { @@ -269,15 +268,15 @@ if ( ok ) { mReqId = mThumbnailManager->getThumbnail( albumArtUri ); if ( mReqId == KUndefined ) { - // Request failed. Set default album art. - mAlbumArt = mDefaultAlbumArt; + // Request failed. clear the icon. + mAlbumArt.clear(); emit albumArtReady(); } } } else { - // No album art uri. Set default album art. - mAlbumArt = mDefaultAlbumArt; + // No album art uri. clear the icon. + mAlbumArt.clear(); emit albumArtReady(); } TX_EXIT @@ -402,7 +401,7 @@ mUri = QString(); mAlbumId = 0; mId = 0; - mAlbumArt = HbIcon(); + mAlbumArt.clear(); mRealAudio = false; emit durationChanged(); @@ -420,35 +419,13 @@ TX_LOG_ARGS( "error = " << error << ", id = " << id ) Q_UNUSED(data); if ( error == 0 && mReqId == id ) { - QIcon qicon; - QPixmap mCompositePixmap; - mReqId = KUndefined; - - mCompositePixmap = QPixmap( 360, 360 ); - mCompositePixmap.fill( Qt::transparent ); - QPainter painter(&mCompositePixmap); - painter.setCompositionMode(QPainter::CompositionMode_Clear); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - painter.fillRect(mCompositePixmap.rect(), Qt::transparent); - painter.drawPixmap(QRect(0, 0,360,360), pixmap); - - if ( !mCompositePixmap.isNull() ) { - qicon = QIcon( mCompositePixmap ); - } - else { - qicon = QIcon( pixmap ); - } - - - mAlbumArt = HbIcon(qicon); - - emit albumArtReady(); + mAlbumArt = HbIcon(QIcon( pixmap )); } else { mReqId = KUndefined; - mAlbumArt = mDefaultAlbumArt; - emit albumArtReady(); + mAlbumArt.clear(); } + emit albumArtReady(); TX_EXIT }