mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 23:26:40 +02:00
Code Issues Releases Wiki Activity

Select the just-created xspf as soon as it is imported

Browse Source
This commit is contained in:
Leo Franchi
2011-10-13 22:39:25 -04:00
parent ac7aadf615
commit 0ba9a9e076
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/utils/xspfloader.cpp
View File

@@ -34,7 +34,7 @@ XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject *parent )
: QObject( parent ) : QObject( parent )
, m_autoCreate( autoCreate ) , m_autoCreate( autoCreate )
, m_autoUpdate( autoUpdate ) , m_autoUpdate( autoUpdate )
, m_autoResolve( false ) , m_autoResolve( true )
, m_NS("http://xspf.org/ns/0/") , m_NS("http://xspf.org/ns/0/")
{ {
qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode"); qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode");

7
src/tomahawkwindow.cpp
View File

@@ -504,6 +504,7 @@ TomahawkWindow::loadSpiff()
XSPFLoader* loader = new XSPFLoader( true, autoUpdate ); XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) ); connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
loader->load( url ); loader->load( url );
} }
#endif #endif
@@ -521,11 +522,17 @@ TomahawkWindow::loadXspfFinished( int ret )
XSPFLoader* loader = new XSPFLoader( true, autoUpdate ); XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) ); connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
loader->load( url ); loader->load( url );
} }
d->deleteLater(); d->deleteLater();
} }
void
TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
{
ViewManager::instance()->show( pl );
}
void void

1
src/tomahawkwindow.h
View File

@@ -85,6 +85,7 @@ private slots:
void onSipError(); void onSipError();
void onXSPFError( XSPFLoader::XSPFErrorCode error ); void onXSPFError( XSPFLoader::XSPFErrorCode error );
void onXSPFOk( const Tomahawk::playlist_ptr& );
void addPeerManually(); void addPeerManually();