1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00

Merge branch 'master' into whatshot

Conflicts:
	src/libtomahawk/CMakeLists.txt
This commit is contained in:
Casey Link
2011-08-29 10:43:10 -05:00
86 changed files with 3754 additions and 534 deletions

View File

@@ -170,6 +170,19 @@ ViewManager::createPageForPlaylist( const playlist_ptr& pl )
return view;
}
playlist_ptr
ViewManager::playlistForPage( ViewPage* page ) const
{
playlist_ptr p;
if ( dynamic_cast< PlaylistView* >( page ) && dynamic_cast< PlaylistView* >( page )->playlistModel() &&
!dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist().isNull() )
p = dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist();
else if ( dynamic_cast< DynamicWidget* >( page ) )
p = dynamic_cast< DynamicWidget* >( page )->playlist();
return p;
}
Tomahawk::ViewPage*
ViewManager::show( const Tomahawk::playlist_ptr& playlist )