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

* Adapted playlist users to use new API.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2013-04-27 01:18:38 +02:00
parent d8c5c74258
commit 4ed267d477
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/ContextMenu.cpp
View File

@ -75,14 +75,17 @@ void
ContextMenu::addToPlaylist( int playlistIdx )
{
Tomahawk::playlist_ptr playlist = m_playlists.at( playlistIdx );
playlist->addEntries( m_queries, playlist->currentrevision() );
playlist->addEntries( m_queries );
}
bool caseInsensitiveLessThan(Tomahawk::playlist_ptr &s1, Tomahawk::playlist_ptr &s2)
bool
caseInsensitiveLessThan( Tomahawk::playlist_ptr &s1, Tomahawk::playlist_ptr &s2 )
{
return s1->title().toLower() < s2->title().toLower();
}
void
ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
{

2
src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
View File

@ -405,7 +405,7 @@ SpotifyPlaylistUpdater::spotifyTracksAdded( const QVariantList& tracks, const QS
qDebug() << Q_FUNC_INFO << "inserting tracks at position:" << pos << "(playlist has current size:" << entries << ")";
m_blockUpdatesForNextRevision = true;
playlist()->insertEntries( queries, pos, playlist()->currentrevision() );
playlist()->insertEntries( queries, pos );
}

2
src/libtomahawk/playlist/dynamic/DynamicModel.cpp
View File

@ -313,7 +313,7 @@ DynamicModel::addToPlaylist( const QList< query_ptr >& entries, bool clearFirst
if ( m_playlist->author()->isLocal() && m_playlist->mode() == Static )
{
m_playlist->addEntries( entries, m_playlist->currentrevision() );
m_playlist->addEntries( entries );
}
else
{

8
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@ -350,24 +350,24 @@ DynamicPlaylist::reportDeleted( const Tomahawk::dynplaylist_ptr& self )
void
DynamicPlaylist::addEntries( const QList< query_ptr >& queries, const QString& oldrev )
DynamicPlaylist::addEntries( const QList< query_ptr >& queries )
{
Q_ASSERT( m_generator->mode() == Static );
QList<plentry_ptr> el = entriesFromQueries( queries );
QString newrev = uuid();
createNewRevision( newrev, oldrev, m_generator->type(), m_generator->controls(), el );
createNewRevision( newrev, m_currentrevision, m_generator->type(), m_generator->controls(), el );
}
void
DynamicPlaylist::addEntry( const Tomahawk::query_ptr& query, const QString& oldrev )
DynamicPlaylist::addEntry( const Tomahawk::query_ptr& query )
{
QList<query_ptr> queries;
queries << query;
addEntries( queries, oldrev );
addEntries( queries );
}

4
src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
View File

@ -101,8 +101,8 @@ public:
// mode of a playlist and want to save it to db/others.
void createNewRevision( const QString& uuid = QString() );
virtual void addEntries( const QList< query_ptr >& queries, const QString& oldrev );
virtual void addEntry( const Tomahawk::query_ptr& query, const QString& oldrev );
virtual void addEntries( const QList< query_ptr >& queries );
virtual void addEntry( const Tomahawk::query_ptr& query );
// <IGNORE hack="true">
// these need to exist and be public for the json serialization stuff

2
src/sourcetree/items/PlaylistItems.cpp
View File

@ -270,7 +270,7 @@ PlaylistItem::parsedDroppedTracks( const QList< query_ptr >& tracks )
{
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Adding" << tracks.count() << "tracks on playlist:" << m_playlist->title() << m_playlist->guid() << m_playlist->currentrevision();
m_playlist->addEntries( tracks, m_playlist->currentrevision() );
m_playlist->addEntries( tracks );
}
else
tDebug() << "ERROR: Could not add" << tracks.count() << "to playlist!";