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

Don't fade in to default covers

Browse Source
This commit is contained in:
Leo Franchi
2012-04-05 22:05:42 -04:00
parent caf77a0935
commit 6c48be2563
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,7 @@
using namespace Tomahawk; using namespace Tomahawk;
#define INITIAL_FADEIN 250 #define COVER_FADEIN 1000
#define TRANSITION_LENGTH 1000
PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size ) PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size )
: m_artist( artist ) : m_artist( artist )
@@ -66,27 +65,21 @@ PixmapDelegateFader::init()
m_current = QPixmap( m_size ); m_current = QPixmap( m_size );
m_current.fill( Qt::transparent ); m_current.fill( Qt::transparent );
if ( m_currentReference.isNull() ) m_crossfadeTimeline.setDuration( COVER_FADEIN );
{
// No cover loaded yet, use default
m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::CoverInCase, m_size );
}
m_initialTimeline.setDuration( INITIAL_FADEIN );
m_initialTimeline.setUpdateInterval( 20 );
m_initialTimeline.setFrameRange( 0, 1000 );
m_initialTimeline.setDirection( QTimeLine::Forward );
connect( &m_initialTimeline, SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
connect( &m_initialTimeline, SIGNAL( finished() ), this, SLOT( onAnimationFinished() ) );
m_crossfadeTimeline.setDuration( TRANSITION_LENGTH );
m_crossfadeTimeline.setUpdateInterval( 20 ); m_crossfadeTimeline.setUpdateInterval( 20 );
m_crossfadeTimeline.setFrameRange( 0, 1000 ); m_crossfadeTimeline.setFrameRange( 0, 1000 );
m_crossfadeTimeline.setDirection( QTimeLine::Forward ); m_crossfadeTimeline.setDirection( QTimeLine::Forward );
connect( &m_crossfadeTimeline, SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) ); connect( &m_crossfadeTimeline, SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
connect( &m_crossfadeTimeline, SIGNAL( finished() ), this, SLOT( onAnimationFinished() ) ); connect( &m_crossfadeTimeline, SIGNAL( finished() ), this, SLOT( onAnimationFinished() ) );
m_initialTimeline.start(); if ( m_currentReference.isNull() )
{
// No cover loaded yet, use default and don't fade in
m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::CoverInCase, m_size );
return;
}
m_crossfadeTimeline.start();
} }
@@ -115,7 +108,7 @@ PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
if ( pixmap.isNull() ) if ( pixmap.isNull() )
return; return;
if ( m_crossfadeTimeline.state() == QTimeLine::Running || m_initialTimeline.state() == QTimeLine::Running ) if ( m_crossfadeTimeline.state() == QTimeLine::Running )
{ {
m_pixmapQueue.enqueue( pixmap ); m_pixmapQueue.enqueue( pixmap );
return; return;

2
src/libtomahawk/utils/PixmapDelegateFader.h
View File

@@ -65,7 +65,7 @@ private:
QSize m_size; QSize m_size;
QQueue<QPixmap> m_pixmapQueue; QQueue<QPixmap> m_pixmapQueue;
QTimeLine m_crossfadeTimeline, m_initialTimeline; QTimeLine m_crossfadeTimeline;
QPixmap m_currentReference, m_oldReference, m_current; QPixmap m_currentReference, m_oldReference, m_current;
}; };