From 26be23fdd526fffeb35e026c1d1cfcd2cf0b6da1 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 14 Jan 2011 19:46:55 -0500 Subject: [PATCH] Create dyn playlist with type always --- .../database/databasecommand_createdynamicplaylist.h | 2 +- src/libtomahawk/dynamic/DynamicPlaylist.cpp | 3 ++- src/libtomahawk/dynamic/DynamicPlaylist.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h b/src/libtomahawk/database/databasecommand_createdynamicplaylist.h index e1116e9e7..3a1fa1c23 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h +++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.h @@ -31,7 +31,7 @@ public: qDebug() << "***********" << Q_FUNC_INFO << v; using namespace Tomahawk; - DynamicPlaylist* p = new DynamicPlaylist( source() ); + DynamicPlaylist* p = new DynamicPlaylist( source(), v.toMap().value( "type", QString() ).toString() ); QJson::QObjectHelper::qvariant2qobject( v.toMap(), p ); m_playlist = dynplaylist_ptr( p ); } diff --git a/src/libtomahawk/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/dynamic/DynamicPlaylist.cpp index e0da8d36e..06304ada9 100644 --- a/src/libtomahawk/dynamic/DynamicPlaylist.cpp +++ b/src/libtomahawk/dynamic/DynamicPlaylist.cpp @@ -27,10 +27,11 @@ using namespace Tomahawk; -DynamicPlaylist::DynamicPlaylist(const Tomahawk::source_ptr& author) +DynamicPlaylist::DynamicPlaylist(const Tomahawk::source_ptr& author, const QString& type ) : Playlist(author) { qDebug() << Q_FUNC_INFO << "JSON"; + m_generator = geninterface_ptr( GeneratorFactory::create( type ) ); } diff --git a/src/libtomahawk/dynamic/DynamicPlaylist.h b/src/libtomahawk/dynamic/DynamicPlaylist.h index 8c0674ef3..8474405ef 100644 --- a/src/libtomahawk/dynamic/DynamicPlaylist.h +++ b/src/libtomahawk/dynamic/DynamicPlaylist.h @@ -99,7 +99,7 @@ public: // these need to exist and be public for the json serialization stuff // you SHOULD NOT call them. They are used for an alternate CTOR method from json. // maybe friend QObjectHelper and make them private? - explicit DynamicPlaylist( const source_ptr& author ); + explicit DynamicPlaylist( const source_ptr& author, const QString& type ); void setMode( int mode ); void setType( const QString& type ) { /** TODO */; } void setGenerator( const geninterface_ptr& gen_ptr );