mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Use new Playlist::get().

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-26 14:00:05 +02:00
parent f4a3db0c37
commit 31f95e24cf
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libtomahawk/widgets/RecentPlaylistsModel.cpp
View File

@@ -95,22 +95,23 @@ RecentPlaylistsModel::playlistsLoaded( const QList<DatabaseCommand_LoadAllSorted
DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair plPair;
foreach ( plPair, playlistGuids )
{
source_ptr s = SourceList::instance()->get( plPair.first );
if ( s.isNull() )
source_ptr source = SourceList::instance()->get( plPair.first );
if ( !source )
continue;
playlist_ptr pl = s->dbCollection()->playlist( plPair.second );
if ( pl.isNull() )
pl = s->dbCollection()->autoPlaylist( plPair.second );
if ( pl.isNull() )
pl = s->dbCollection()->station( plPair.second );
playlist_ptr pl = source->dbCollection()->playlist( plPair.second );
if ( !pl )
pl = source->dbCollection()->autoPlaylist( plPair.second );
if ( !pl )
pl = source->dbCollection()->station( plPair.second );
if ( pl.isNull() )
if ( !pl )
{
qDebug() << "Found a playlist that is NOT LOADED FOR ANY SOURCE:" << plPair.first << plPair.second;
tDebug() << "ERROR: Found a playlist that is not associated with any source:" << plPair.first << plPair.second;
continue;
}
connect( pl.data(), SIGNAL( changed() ), this, SLOT( updatePlaylist() ) );
connect( pl.data(), SIGNAL( changed() ), SLOT( updatePlaylist() ) );
m_playlists << pl;
if ( !pl->loaded() )

22
src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
View File

@@ -63,12 +63,12 @@ RecentlyPlayedPlaylistsModel::loadFromSettings()
// qDebug() << "loading playlist" << playlist_guids[i];
playlist_ptr pl = m_cached.value( playlist_guids[i], Tomahawk::playlist_ptr() );
if ( pl.isNull() )
pl = Tomahawk::Playlist::load( playlist_guids[i] );
if ( pl.isNull() )
pl = Tomahawk::DynamicPlaylist::load( playlist_guids[i] );
if ( !pl )
pl = Tomahawk::Playlist::get( playlist_guids[i] );
if ( !pl )
pl = Tomahawk::DynamicPlaylist::get( playlist_guids[i] );
if ( !pl.isNull() )
if ( pl )
{
m_recplaylists << pl;
@@ -230,16 +230,16 @@ void
RecentlyPlayedPlaylistsModel::plAdded( const QString& plguid, int sId )
{
source_ptr source = SourceList::instance()->get( sId );
if ( source.isNull() )
if ( !source )
return;
playlist_ptr pl = source->dbCollection()->playlist( plguid );
if ( pl.isNull() )
if ( !pl )
pl = source->dbCollection()->autoPlaylist( plguid );
if ( pl.isNull() )
if ( !pl )
pl = source->dbCollection()->station( plguid );
if ( pl.isNull() )
if ( !pl )
return;
onPlaylistsRemoved( QList< playlist_ptr >() << pl );
@@ -256,7 +256,7 @@ void
RecentlyPlayedPlaylistsModel::playlistChanged( Tomahawk::playlistinterface_ptr pli )
{
// ARG
if ( pli.isNull() )
if ( !pli )
return;
if ( Playlist *pl = dynamic_cast< Playlist* >( pli.data() ) )
@@ -269,7 +269,7 @@ RecentlyPlayedPlaylistsModel::playlistChanged( Tomahawk::playlistinterface_ptr p
ptr = test;
}
if ( !ptr.isNull() && m_artists.contains( ptr ) )
if ( ptr && m_artists.contains( ptr ) )
{
m_artists[ ptr ] = QString();
}