From 835dd9e4ebab167c7aa278ff05945c1608c044c9 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Wed, 21 Jan 2015 19:24:02 -0800 Subject: [PATCH] Handle JSPF playlists in load/playlist command --- src/libtomahawk/utils/JspfLoader.cpp | 5 ++++- src/libtomahawk/utils/JspfLoader.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/utils/JspfLoader.cpp b/src/libtomahawk/utils/JspfLoader.cpp index 06a514517..f0a7d75b5 100644 --- a/src/libtomahawk/utils/JspfLoader.cpp +++ b/src/libtomahawk/utils/JspfLoader.cpp @@ -216,9 +216,12 @@ JSPFLoader::gotBody() m_creator, false, m_entries ); + emit ok( m_playlist ); + } else { + if ( !m_entries.isEmpty() ) + emit tracks( m_entries ); } - emit ok( m_playlist ); if ( m_autoDelete ) deleteLater(); diff --git a/src/libtomahawk/utils/JspfLoader.h b/src/libtomahawk/utils/JspfLoader.h index 89c04bb0a..5ce976851 100644 --- a/src/libtomahawk/utils/JspfLoader.h +++ b/src/libtomahawk/utils/JspfLoader.h @@ -50,6 +50,7 @@ public: signals: void failed(); void ok( const Tomahawk::playlist_ptr& ); + void tracks( const QList< Tomahawk::query_ptr > tracks ); public slots: void load( const QUrl& url );