mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

Covers aren't showing up now...but at least we're not pegging CPU. Will continue to fix in a bit

Browse Source
This commit is contained in:
Jeff Mitchell
2012-04-08 18:30:29 -04:00
parent 712805f5b0
commit c6b5ea0380
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/utils/PixmapDelegateFader.cpp
View File

@@ -106,8 +106,6 @@ PixmapDelegateFader::init()
m_current = QPixmap( m_size ); m_current = QPixmap( m_size );
m_current.fill( Qt::transparent ); m_current.fill( Qt::transparent );
stlInstance().data()->setUpdateInterval( 20 );
if ( m_currentReference.isNull() ) if ( m_currentReference.isNull() )
{ {
// No cover loaded yet, use default and don't fade in // No cover loaded yet, use default and don't fade in
@@ -135,7 +133,7 @@ PixmapDelegateFader::albumChanged()
if ( m_album.isNull() ) if ( m_album.isNull() )
return; return;
setPixmap( m_album->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_album->cover( m_size ) ) );
} }
void void
@@ -144,7 +142,7 @@ PixmapDelegateFader::artistChanged()
if ( m_artist.isNull() ) if ( m_artist.isNull() )
return; return;
setPixmap( m_artist->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_artist->cover( m_size ) ) );
} }
@@ -154,7 +152,7 @@ PixmapDelegateFader::trackChanged()
if ( m_track.isNull() ) if ( m_track.isNull() )
return; return;
setPixmap( m_track->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_track->cover( m_size ) ) );
} }
@@ -183,6 +181,7 @@ PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
m_oldReference = m_currentReference; m_oldReference = m_currentReference;
m_currentReference = pixmap; m_currentReference = pixmap;
stlInstance().data()->setUpdateInterval( 20 );
m_startFrame = stlInstance().data()->currentFrame(); m_startFrame = stlInstance().data()->currentFrame();
m_connectedToStl = true; m_connectedToStl = true;
m_fadePct = 0; m_fadePct = 0;
@@ -270,13 +269,12 @@ void
PixmapDelegateFader::onAnimationFinished() PixmapDelegateFader::onAnimationFinished()
{ {
m_oldReference = QPixmap(); m_oldReference = QPixmap();
onAnimationStep( INT_MAX );
m_connectedToStl = false; m_connectedToStl = false;
disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) ); disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
if ( !m_pixmapQueue.isEmpty() ) if ( !m_pixmapQueue.isEmpty() )
setPixmap( m_pixmapQueue.dequeue() ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_pixmapQueue.dequeue() ) );
} }

1
src/libtomahawk/widgets/FadingPixmap.cpp
View File

@@ -141,7 +141,6 @@ FadingPixmap::mouseReleaseEvent( QMouseEvent* event )
void void
FadingPixmap::paintEvent( QPaintEvent* event ) FadingPixmap::paintEvent( QPaintEvent* event )
{ {
tDebug() << Q_FUNC_INFO;
Q_UNUSED( event ); Q_UNUSED( event );
QPainter p( this ); QPainter p( this );