From 7c6304beea3aae3329e006ee24e343a2ee64cfc9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 16 Aug 2011 01:25:53 +0200 Subject: [PATCH 1/2] * Fixed Javascript resolvers not working / breaking Tomahawk. --- src/resolvers/qtscriptresolver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolvers/qtscriptresolver.cpp b/src/resolvers/qtscriptresolver.cpp index ef89ffe88..ac4a06931 100644 --- a/src/resolvers/qtscriptresolver.cpp +++ b/src/resolvers/qtscriptresolver.cpp @@ -285,9 +285,9 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist ) QVariantMap m = rv.toMap(); Tomahawk::result_ptr rp( new Tomahawk::Result() ); - Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), true ); + Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString() ); rp->setArtist( ap ); - rp->setAlbum( Tomahawk::Album::get( ap, m.value( "album" ).toString(), true ) ); + rp->setAlbum( Tomahawk::Album::get( 0, m.value( "album" ).toString(), ap ) ); rp->setTrack( m.value( "track" ).toString() ); rp->setBitrate( m.value( "bitrate" ).toUInt() ); rp->setUrl( m.value( "url" ).toString() ); From 7b24444010bac60e49be957d62c6d8b5c94f465d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 16 Aug 2011 01:28:39 +0200 Subject: [PATCH 2/2] * Update to version 0.2.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8d94990c..cb4b1e856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" ) SET( TOMAHAWK_VERSION_MAJOR 0 ) SET( TOMAHAWK_VERSION_MINOR 2 ) -SET( TOMAHAWK_VERSION_PATCH 0 ) +SET( TOMAHAWK_VERSION_PATCH 1 ) #SET( TOMAHAWK_VERSION_RC 0 )