mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-25 02:09:48 +01:00
Code Issues Releases Wiki Activity

* Fix for getting out of sync with locally changed playlists.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2011-09-12 15:17:37 +02:00
parent 0cffdf124a
commit 2bc71743de
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libtomahawk/playlist/playlistmodel.cpp
View File

@ -25,6 +25,7 @@
#include "album.h"
#include "pipeline.h"
#include "source.h"
#include "sourcelist.h"
#include "database/database.h"
#include "database/databasecommand_playbackhistory.h"
#include "dynamic/GeneratorInterface.h"
@ -37,7 +38,6 @@ using namespace Tomahawk;
PlaylistModel::PlaylistModel( QObject* parent )
: TrackModel( parent )
, m_waitForUpdate( false )
, m_isTemporary( false )
{
qDebug() << Q_FUNC_INFO;
@ -331,14 +331,7 @@ PlaylistModel::onDataChanged()
void
PlaylistModel::onRevisionLoaded( Tomahawk::PlaylistRevision revision )
{
qDebug() << Q_FUNC_INFO;
if ( m_waitForUpdate )
{
qDebug() << m_playlist->currentrevision() << revision.revisionguid;
m_waitForUpdate = false;
}
else
if ( m_playlist->author() != SourceList::instance()->getLocal() )
loadPlaylist( m_playlist );
}
@ -425,7 +418,7 @@ PlaylistModel::parsedDroppedTracks( QList< query_ptr > tracks )
if ( m_dropStorage.action & Qt::CopyAction || m_dropStorage.action & Qt::MoveAction )
{
onPlaylistChanged( true );
onPlaylistChanged();
emit trackCountChanged( rowCount( QModelIndex() ) );
}
@ -437,7 +430,7 @@ PlaylistModel::parsedDroppedTracks( QList< query_ptr > tracks )
void
PlaylistModel::onPlaylistChanged( bool waitForUpdate )
PlaylistModel::onPlaylistChanged()
{
qDebug() << Q_FUNC_INFO;
@ -445,13 +438,11 @@ PlaylistModel::onPlaylistChanged( bool waitForUpdate )
return;
QList<plentry_ptr> l = playlistEntries();
foreach( const plentry_ptr& ple, l )
{
qDebug() << "updateinternal:" << ple->query()->toString();
}
m_waitForUpdate = waitForUpdate;
QString newrev = uuid();
if( dynplaylist_ptr dynplaylist = m_playlist.dynamicCast<Tomahawk::DynamicPlaylist>() )
{
@ -463,7 +454,8 @@ PlaylistModel::onPlaylistChanged( bool waitForUpdate )
{
dynplaylist->createNewRevision( newrev, dynplaylist->currentrevision(), dynplaylist->type(), dynplaylist->generator()->controls(), l );
}
} else
}
else
{
m_playlist->createNewRevision( newrev, m_playlist->currentrevision(), l );
}
@ -511,7 +503,7 @@ PlaylistModel::removeIndex( const QModelIndex& index, bool moreToCome )
if ( !moreToCome && !m_playlist.isNull() )
{
onPlaylistChanged( true );
onPlaylistChanged();
}
}

4
src/libtomahawk/playlist/playlistmodel.h
View File

@ -85,7 +85,7 @@ private slots:
void onDataChanged();
void onRevisionLoaded( Tomahawk::PlaylistRevision revision );
void onPlaylistChanged( bool waitForUpdate = true );
void onPlaylistChanged();
void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );
void onTracksInserted( unsigned int row, const QList<Tomahawk::query_ptr>& tracks );
@ -97,7 +97,7 @@ private:
QList<Tomahawk::plentry_ptr> playlistEntries() const;
Tomahawk::playlist_ptr m_playlist;
bool m_waitForUpdate, m_isTemporary;
bool m_isTemporary;
QList< Tomahawk::Query* > m_waitingForResolved;
DropStorageData m_dropStorage;