Try out some fading for album covers

src/libtomahawk/CMakeLists.txt

@@ -120,6 +120,7 @@ set( libGuiSources
     utils/proxystyle.cpp
     utils/tomahawkutilsgui.cpp
     utils/closure.cpp
+    utils/PixmapDelegateFader.cpp
 
     widgets/animatedcounterlabel.cpp
     widgets/checkdirtree.cpp

src/libtomahawk/album.cpp

@@ -111,7 +111,7 @@ Album::cover( const QSize& size, bool forceLoad ) const
     {
         if ( !forceLoad )
             return QPixmap();
-        
+
         m_uuid = uuid();
 
         Tomahawk::InfoSystem::InfoStringHash trackInfo;
@@ -127,7 +127,7 @@ Album::cover( const QSize& size, bool forceLoad ) const
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                 SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                 SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-        
+
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                 SIGNAL( finished( QString ) ),
                 SLOT( infoSystemFinished( QString ) ) );
@@ -178,6 +178,8 @@ Album::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVaria
         if ( ba.length() )
         {
             m_coverBuffer = ba;
+
+            emit coverChanged();
         }
     }
 }
@@ -193,7 +195,7 @@ Album::infoSystemFinished( QString target )
 
     disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                 this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-        
+
     disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
                 this, SLOT( infoSystemFinished( QString ) ) );
 

src/libtomahawk/album.h

@@ -60,6 +60,7 @@ public:
 signals:
     void tracksAdded( const QList<Tomahawk::query_ptr>& tracks );
     void updated();
+    void coverChanged();
 
 private slots:
     void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );

src/libtomahawk/artist.cpp

@@ -117,7 +117,7 @@ Artist::cover( const QSize& size, bool forceLoad ) const
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                 SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                 SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-        
+
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                 SIGNAL( finished( QString ) ),
                 SLOT( infoSystemFinished( QString ) ) );
@@ -168,6 +168,7 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari
         if ( ba.length() )
         {
             m_coverBuffer = ba;
+            emit coverChanged();
         }
     }
 }
@@ -177,13 +178,13 @@ void
 Artist::infoSystemFinished( QString target )
 {
     Q_UNUSED( target );
-    
+
     if ( target != m_uuid )
         return;
 
     disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                 this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-        
+
     disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
                 this, SLOT( infoSystemFinished( QString ) ) );
 

src/libtomahawk/artist.h

@@ -59,6 +59,7 @@ public:
 signals:
     void tracksAdded( const QList<Tomahawk::query_ptr>& tracks );
     void updated();
+    void coverChanged();
 
 private slots:
     void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );

src/libtomahawk/playlist/albumitemdelegate.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, Leo Franchi            <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -28,9 +29,12 @@
 
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
+#include "utils/PixmapDelegateFader.h"
+#include <utils/closure.h>
 
 #include "playlist/albumitem.h"
 #include "playlist/albumproxymodel.h"
+#include "albumview.h"
 #include <QMouseEvent>
 #include <viewmanager.h>
 
@@ -40,6 +44,8 @@ AlbumItemDelegate::AlbumItemDelegate( QAbstractItemView* parent, AlbumProxyModel
     , m_view( parent )
     , m_model( proxy )
 {
+    if ( m_view && m_view->metaObject()->indexOfSignal( "modelChanged()" ) > -1 )
+        connect( m_view, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) );
 }
 
 
@@ -89,18 +95,16 @@ AlbumItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     }
 
     QRect r = option.rect.adjusted( 6, 5, -6, -41 );
-    QPixmap cover;
-    if ( !item->album().isNull() )
+
+    if ( !m_covers.contains( index ) )
     {
-        cover = item->album()->cover( r.size() );
-        if ( cover.isNull() )
-            cover = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::CoverInCase, r.size() );
-    }
-    else if ( !item->artist().isNull() )
-    {
-        cover = item->artist()->cover( r.size() );
+        m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size() ) ) );
+        _detail::Closure* closure = NewClosure( m_covers[ index ], SIGNAL( repaintRequest() ), const_cast<AlbumItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
+        closure->setAutoDelete( false );
     }
 
+    const QPixmap cover = m_covers[ index ]->currentPixmap();
+
     if ( option.state & QStyle::State_Selected )
     {
 #if defined(Q_WS_MAC) || defined(Q_WS_WIN)
@@ -258,3 +262,22 @@ AlbumItemDelegate::whitespaceMouseEvent()
         emit updateIndex( old );
     }
 }
+
+
+void
+AlbumItemDelegate::modelChanged()
+{
+    m_artistNameRects.clear();
+    m_hoveringOver = QPersistentModelIndex();
+
+    if ( AlbumView* view = qobject_cast< AlbumView* >( m_view ) )
+        m_model = view->proxyModel();
+}
+
+
+void
+AlbumItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
+{
+    emit updateIndex( idx );
+}
+

src/libtomahawk/playlist/albumitemdelegate.h

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, Leo Franchi            <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,6 +24,10 @@
 
 #include "dllmacro.h"
 
+namespace Tomahawk {
+    class PixmapDelegateFader;
+}
+
 class QEvent;
 class AlbumProxyModel;
 
@@ -40,16 +45,21 @@ protected:
     QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
 
     bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-//    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
 
 signals:
     void updateIndex( const QModelIndex& idx );
 
+private slots:
+    void modelChanged();
+    void doUpdateIndex( const QPersistentModelIndex& idx );
+
 private:
     QAbstractItemView* m_view;
     AlbumProxyModel* m_model;
 
     mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects;
+    mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_covers;
+
     QPersistentModelIndex m_hoveringOver;
 
     QPixmap m_shadowPixmap;

src/libtomahawk/playlist/albumview.cpp

@@ -112,6 +112,8 @@ AlbumView::setAlbumModel( AlbumModel* model )
     connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onItemCountChanged( unsigned int ) ) );
     connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
     connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
+
+    emit modelChanged();
 }
 
 

src/libtomahawk/playlist/albumview.h

@@ -66,6 +66,9 @@ public:
 public slots:
     void onItemActivated( const QModelIndex& index );
 
+signals:
+    void modelChanged();
+
 protected:
     virtual void startDrag( Qt::DropActions supportedActions );
 

src/libtomahawk/utils/PixmapDelegateFader.cpp

@@ -0,0 +1,221 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "PixmapDelegateFader.h"
+#include "tomahawkutilsgui.h"
+
+#include <QPainter>
+#include <QPaintEngine>
+
+using namespace Tomahawk;
+
+#define INITIAL_FADEIN 250
+#define TRANSITION_LENGTH 1000
+
+PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size )
+    : m_artist( artist )
+    , m_size( size )
+{
+    if ( !m_artist.isNull() )
+    {
+        connect( m_artist.data(), SIGNAL( coverChanged() ), this, SLOT( artistChanged() ) );
+        m_currentReference = m_artist->cover( size );
+    }
+
+    init();
+}
+
+PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& size )
+    : m_album( album )
+    , m_size( size )
+{
+    if ( !m_album.isNull() )
+    {
+        connect( m_album.data(), SIGNAL( coverChanged() ), this, SLOT( albumChanged() ) );
+        m_currentReference = m_album->cover( size );
+    }
+
+    init();
+}
+
+
+PixmapDelegateFader::~PixmapDelegateFader()
+{
+
+}
+
+
+void
+PixmapDelegateFader::init()
+{
+    m_current = QPixmap( m_size );
+    m_current.fill( Qt::transparent );
+
+    if ( m_currentReference.isNull() )
+    {
+        // 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.setFrameRange( 0, 1000 );
+    m_crossfadeTimeline.setDirection( QTimeLine::Forward );
+    connect( &m_crossfadeTimeline, SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
+    connect( &m_crossfadeTimeline, SIGNAL( finished() ), this, SLOT( onAnimationFinished() ) );
+
+    m_initialTimeline.start();
+}
+
+
+void
+PixmapDelegateFader::albumChanged()
+{
+    if ( m_album.isNull() || m_album->cover( m_size ).isNull() )
+        return;
+
+    setPixmap( m_album->cover( m_size ) );
+}
+
+void
+PixmapDelegateFader::artistChanged()
+{
+    if ( m_artist.isNull() || m_artist->cover( m_size ).isNull() )
+        return;
+
+    setPixmap( m_artist->cover( m_size ) );
+}
+
+
+void
+PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
+{
+    if ( pixmap.isNull() )
+        return;
+
+    if ( m_crossfadeTimeline.state() == QTimeLine::Running || m_initialTimeline.state() == QTimeLine::Running )
+    {
+        m_pixmapQueue.enqueue( pixmap );
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << "Setting album or artist pixmap to fade into";
+    m_oldReference = m_currentReference;
+    m_currentReference = pixmap;
+
+    m_crossfadeTimeline.start();
+}
+
+
+void
+PixmapDelegateFader::onAnimationStep( int step )
+{
+    const qreal opacity = ((qreal)step / 1000.);
+    const qreal oldOpacity =  ( 1000. - step ) / 1000. ;
+    m_current.fill( Qt::transparent );
+
+    // Update our pixmap with the new opacity
+    QPainter p( &m_current );
+
+    if ( !m_oldReference.isNull() )
+    {
+        qDebug() << Q_FUNC_INFO << "Drawing old pixmap w/ opacity;" << oldOpacity;
+        p.setOpacity( oldOpacity );
+        p.drawPixmap( 0, 0, m_oldReference );
+    }
+
+    Q_ASSERT( !m_currentReference.isNull() );
+    if ( !m_currentReference.isNull() ) // Should never be null..
+    {
+        qDebug() << Q_FUNC_INFO << "Drawing NEW pixmap w/ opacity;" << opacity;
+        p.setOpacity( opacity );
+        p.drawPixmap( 0, 0, m_currentReference );
+    }
+
+    p.end();
+
+    emit repaintRequest();
+    /**
+     * Avoids using setOpacity that is slow on X11 (turns off graphics-backed painting, forces fallback to
+     * software rasterizer.
+     *
+     * but a bit buggy.
+     */
+    /*
+     const int opacity = ((float)step* / 1000.) * 255;
+     const int oldOpacity = 255 - opacity;
+    if ( !m_oldReference.isNull() )
+    {
+        p.setCompositionMode( QPainter::CompositionMode_Source );
+        p.drawPixmap( 0, 0, m_oldReference );
+
+        // Reduce the source opacity by the value of the alpha channel
+        p.setCompositionMode( QPainter::CompositionMode_DestinationIn );
+        qDebug() << Q_FUNC_INFO << "Drawing old pixmap w/ opacity;" << oldOpacity;
+        p.fillRect( m_current.rect(), QColor( 0, 0, 0, oldOpacity ) );
+    }
+
+    Q_ASSERT( !m_currentReference.isNull() );
+    if ( !m_currentReference.isNull() ) // Should never be null..
+    {
+        QPixmap temp( m_size );
+        temp.fill( Qt::transparent );
+
+        QPainter p2( &temp );
+        p2.drawPixmap( 0, 0, m_currentReference );
+
+        p2.setCompositionMode( QPainter::CompositionMode_DestinationIn );
+        qDebug() << Q_FUNC_INFO << "Drawing NEW pixmap w/ opacity;" << opacity;
+
+        p2.fillRect( temp.rect(), QColor( 0, 0, 0, opacity ) );
+        p2.end();
+
+        p.setCompositionMode( QPainter::CompositionMode_Source );
+        p.drawPixmap( 0, 0, temp );
+    }
+    */
+
+}
+
+
+void
+PixmapDelegateFader::onAnimationFinished()
+{
+    m_oldReference = QPixmap();
+    onAnimationStep( 1000 );
+
+    if ( !m_pixmapQueue.isEmpty() )
+    {
+        setPixmap( m_pixmapQueue.dequeue() );
+    }
+}
+
+
+
+QPixmap
+PixmapDelegateFader::currentPixmap() const
+{
+    return m_current;
+}

src/libtomahawk/utils/PixmapDelegateFader.h

@@ -0,0 +1,74 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011-2012, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PIXMAPDELEGATEFADER_H
+#define PIXMAPDELEGATEFADER_H
+
+#include "artist.h"
+#include "album.h"
+
+#include <QObject>
+#include <QTimeLine>
+#include <QQueue>
+
+namespace Tomahawk
+{
+
+/**
+ * No parent, manage it yourself!
+ *
+ * TODO: Handle changing sizes
+ */
+
+class PixmapDelegateFader : public QObject
+{
+    Q_OBJECT
+public:
+    PixmapDelegateFader( const artist_ptr& artist, const QSize& size );
+    PixmapDelegateFader( const album_ptr& album, const QSize& size );
+
+    virtual ~PixmapDelegateFader();
+
+    void setPixmap( const QPixmap& pixmap );
+
+    QPixmap currentPixmap() const;
+
+signals:
+    void repaintRequest();
+
+private slots:
+    void artistChanged();
+    void albumChanged();
+
+    void onAnimationStep( int );
+    void onAnimationFinished();
+private:
+    void init();
+
+    artist_ptr m_artist;
+    album_ptr m_album;
+    QSize m_size;
+
+    QQueue<QPixmap> m_pixmapQueue;
+    QTimeLine m_crossfadeTimeline, m_initialTimeline;
+    QPixmap m_currentReference, m_oldReference, m_current;
+};
+
+}
+
+#endif // PIXMAPDELEGATEFADER_H

src/libtomahawk/utils/closure.cpp

@@ -29,6 +29,7 @@ Closure::Closure(QObject* sender,
                  const ClosureArgumentWrapper* val3)
     : QObject(receiver),
       callback_(NULL),
+      autoDelete_( true ),
       val0_(val0),
       val1_(val1),
       val2_(val2),
@@ -72,7 +73,9 @@ void Closure::Invoked() {
         val2_ ? val2_->arg() : QGenericArgument(),
         val3_ ? val3_->arg() : QGenericArgument());
   }
-  deleteLater();
+
+  if ( autoDelete_ )
+    deleteLater();
 }
 
 void Closure::Cleanup() {

src/libtomahawk/utils/closure.h

@@ -63,6 +63,8 @@ class Closure : public QObject, boost::noncopyable {
   Closure(QObject* sender, const char* signal,
           std::tr1::function<void()> callback);
 
+  void setAutoDelete( bool autoDelete ) { autoDelete_ = autoDelete; }
+
   virtual ~Closure();
 
  private slots:
@@ -74,6 +76,7 @@ class Closure : public QObject, boost::noncopyable {
 
   QMetaMethod slot_;
   std::tr1::function<void()> callback_;
+  bool autoDelete_;
 
   boost::scoped_ptr<const ClosureArgumentWrapper> val0_;
   boost::scoped_ptr<const ClosureArgumentWrapper> val1_;