Precache next track to play when reaching end of current song

Allow to specify weight for collection (matters only as last resort for sorting results)

CMakeLists.txt

@@ -179,7 +179,7 @@ if( NOT BUILD_WITH_QT4 )
             set(HAVE_X11 FALSE)
         endif()
 
-        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
+        message(STATUS "Found Qt5!")
 
         if( UNIX AND NOT APPLE )
             # We need this to find the paths to qdbusxml2cpp and co
@@ -228,6 +228,10 @@ endif()
 if( NOT Qt5Core_DIR )
     message(STATUS "Could not find Qt5, searching for Qt4 instead...")
 
+    if(NOT FORCE_QT4)
+        message(FATAL_ERROR "Qt4 support is broken, if you plan to fix it, add -DFORCE_QT4=ON to your cmake arguments otherwise you should compile Tomahawk with Qt5")
+    endif()
+
     set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
     if( BUILD_GUI )
         list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
@@ -307,14 +311,10 @@ else()
     message(STATUS "${CMAKE_CXX_COMPILER} does not support C++11, please use a
     different compiler")
 endif()
-if(LIBCPP_FOUND AND APPLE)
+if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR APPLE) AND LIBCPP_FOUND)
     tomahawk_add_cxx_flags( "-stdlib=libc++" )
 endif()
 
-
-macro_optional_find_package(Echonest 2.3.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.3.0 is needed for dynamic playlists and the infosystem")
-
 find_package(Boost REQUIRED COMPONENTS filesystem system)
 macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
 
@@ -404,7 +404,7 @@ if( WIN32 )
 endif( WIN32 )
 
 if( WIN32 OR APPLE )
-    macro_optional_find_package(LibsnoreQt5 0.5.70 QUIET)
+    macro_optional_find_package(LibsnoreQt5 0.6.0 QUIET)
     macro_log_feature(LibsnoreQt5_FOUND "Libsnore" "Library for notifications" "https://projects.kde.org/projects/playground/libs/snorenotify" FALSE "" "")
 endif()
 

CMakeModules/FindEchonest.cmake

@@ -1,42 +0,0 @@
-# - Find libechonest
-# Find the libechonest includes and the libechonest libraries
-# This module defines
-# ECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h
-# ECHONEST_LIBRARIES, the path to libechonest
-# ECHONEST_FOUND, whether libechonest was found
-
-FIND_PACKAGE(PkgConfig QUIET)
-
-if( TOMAHAWK_QT5 )
-    set(LIBECHONEST_SUFFIX "5")
-endif()
-
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
-
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
-    HINTS
-        ${PC_ECHONEST_INCLUDEDIR}
-        ${PC_ECHONEST_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest${LIBECHONEST_SUFFIX}
-    HINTS
-        ${PC_ECHONEST_LIBDIR}
-        ${PC_ECHONEST_LIBRARY_DIRS}
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
-)
-
-IF(ECHONEST_LIBRARIES AND ECHONEST_INCLUDE_DIR AND NOT PC_ECHONEST_VERSION)
-    MESSAGE(WARNING "You don't have pkg-config and so the libechonest version check does not work!")
-    set(PC_ECHONEST_VERSION "999.9.9")
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Echonest
-                                  REQUIRED_VARS ECHONEST_LIBRARIES ECHONEST_INCLUDE_DIR
-                                  VERSION_VAR PC_ECHONEST_VERSION)
-
-MARK_AS_ADVANCED(ECHONEST_INCLUDE_DIR ECHONEST_LIBRARIES)

CMakeModules/FindLIBVLC.cmake

@@ -6,19 +6,16 @@ find_path(LIBVLC_INCLUDE_DIR vlc/vlc.h
     HINTS
         ${PC_LIBVLC_INCLUDEDIR}
         ${PC_LIBVLC_INCLUDE_DIRS}
+        /usr/local/opt/vlc/include
 )
 
 find_library(LIBVLC_LIBRARY NAMES vlc libvlc
     HINTS
         ${PC_LIBVLC_LIBDIR}
         ${PC_LIBVLC_LIBRARY_DIRS}
+        /usr/local/opt/vlc/lib
 )
 
-find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
-    HINTS
-        ${PC_LIBVLC_LIBDIR}
-        ${PC_LIBVLC_LIBRARY_DIRS}
-)
 
 set(LIBVLC_VERSION ${PC_LIBVLC_VERSION})
 
@@ -32,8 +29,6 @@ int main(int argc, char *argv[]) {
 HAVE_VLC_ALBUMARTIST)
 
 find_package_handle_standard_args(LibVLC
-    REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR
+    REQUIRED_VARS LIBVLC_LIBRARY LIBVLC_INCLUDE_DIR
     VERSION_VAR LIBVLC_VERSION
 )
-
- 

CMakeModules/NSIS.template.in

@@ -18,11 +18,10 @@
 !ifndef MINGW_ROOT
     !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw"
 !endif
-
-!define APPLICATION_NAME "Tomahawk"
-!define TARGET_NAME "tomahawk"
+!define APPLICATION_NAME "@CPACK_PACKAGE_NAME@"
+!define TARGET_NAME "@CPACK_PACKAGE_TARGET_NAME@"
 ;define app id needed for Windows 8 notifications
-!define AppUserModelId @TOMAHAWK_APPLICATION_PACKAGE_NAME@
+!define AppUserModelId "@TOMAHAWK_APPLICATION_PACKAGE_NAME@"
 
 !define MINGW_BIN "${MINGW_ROOT}/bin"
 !define MINGW_LIB "${MINGW_ROOT}/lib"
@@ -347,101 +346,108 @@ Section "${APPLICATION_NAME}" SEC_TOMAHAWK_PLAYER
     File "${QT_DLL_PATH}\icudata56.dll"
     File "${QT_DLL_PATH}\icui18n56.dll"
 
-   ;SQLite driver
-   SetOutPath "$INSTDIR\sqldrivers"
-   File "${SQLITE_DLL_PATH}\qsqlite.dll"
-   SetOutPath "$INSTDIR"
-   File "${MINGW_BIN}\libsqlite3-0.dll"
+    ;SQLite driver
+    SetOutPath "$INSTDIR\sqldrivers"
+    File "${SQLITE_DLL_PATH}\qsqlite.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libsqlite3-0.dll"
 
-   ;Qt platform plugins
-   SetOutPath "$INSTDIR\platforms"
-    File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
-   SetOutPath "$INSTDIR"
+    ;Qt platform plugins
+    SetOutPath "$INSTDIR\platforms"
+     File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
+    SetOutPath "$INSTDIR"
 
-   ;Image plugins
-   SetOutPath "$INSTDIR\imageformats"
-   File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
-   SetOutPath "$INSTDIR"
+    ;Image plugins
+    SetOutPath "$INSTDIR\imageformats"
+    File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
+    SetOutPath "$INSTDIR"
 
-   ;Qt qml plugins
-   SetOutPath "$INSTDIR\QtQuick.2"
-   File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
-   SetOutPath "$INSTDIR\QtQuick\Window.2"
-   File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
-   SetOutPath "$INSTDIR"
+    ;Qt qml plugins
+    SetOutPath "$INSTDIR\QtQuick.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
+    SetOutPath "$INSTDIR\QtQuick\Window.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
+    SetOutPath "$INSTDIR"
 
-   ;Cygwin/c++ stuff
-   File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
-   File "${MINGW_BIN}\libstdc++-6.dll"
+    ;Cygwin/c++ stuff
+    File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
+    File "${MINGW_BIN}\libstdc++-6.dll"
 
-   ;VLC
-   File "${VLC_BIN}\libvlc.dll"
-   File "${VLC_BIN}\libvlccore.dll"
-   SetOutPath "$INSTDIR\plugins"
-   File /r "${VLC_PLUGIN_PATH}\*.dll"
-   SetOutPath "$INSTDIR"
+    ;VLC
+    File "${VLC_BIN}\libvlc.dll"
+    File "${VLC_BIN}\libvlccore.dll"
+    SetOutPath "$INSTDIR\plugins"
+    File /r "${VLC_PLUGIN_PATH}\*.dll"
+    SetOutPath "$INSTDIR"
 
-   ; Other
-   File "${MINGW_BIN}\libtag.dll"
-   File "${MINGW_BIN}\libpng16-16.dll"
-   File "${MINGW_BIN}\libjpeg-8.dll"
-   File "${MINGW_BIN}\zlib1.dll"
-   File "${MINGW_BIN}\libfreetype-6.dll"
-   File "${MINGW_BIN}\libglib-2.0-0.dll"
-   File "${MINGW_BIN}\libharfbuzz-0.dll"
+    ; Other
+    File "${MINGW_BIN}\libtag.dll"
+    File "${MINGW_BIN}\libpng16-16.dll"
+    File "${MINGW_BIN}\libjpeg-8.dll"
+    File "${MINGW_BIN}\zlib1.dll"
+    File "${MINGW_BIN}\libfreetype-6.dll"
+    File "${MINGW_BIN}\libglib-2.0-0.dll"
+    File "${MINGW_BIN}\libharfbuzz-0.dll"
 
-   File "${MINGW_BIN}\libechonest5.dll"
-   File "${MINGW_BIN}\liblastfm5.dll"
-   File "${MINGW_BIN}\libquazip5.dll"
-   File "${MINGW_BIN}\libqt5keychain.dll"
+    ; ANGLE
+    File "${MINGW_BIN}\D3DCompiler_43.dll"
 
-   ; GnuTLS
-   File "${MINGW_BIN}\libgnutls-28.dll"
-   File "${MINGW_BIN}\libtasn1-6.dll"
-   File "${MINGW_BIN}\libgmp-10.dll"
-   File "${MINGW_BIN}\libhogweed-2-4.dll"
-   File "${MINGW_BIN}\libintl-8.dll"
-   File "${MINGW_BIN}\libnettle-4-6.dll"
-   File "${MINGW_BIN}\libp11-kit-0.dll"
-   File "${MINGW_BIN}\libffi-6.dll"
+    File "${MINGW_BIN}\libechonest5.dll"
+    File "${MINGW_BIN}\liblastfm5.dll"
+    File "${MINGW_BIN}\libquazip5.dll"
+    File "${MINGW_BIN}\libqt5keychain.dll"
 
-   ; Snorenotify
-   File "${MINGW_BIN}\SnoreToast.exe"
-   File "${MINGW_BIN}\libsnore-qt5.dll"
-   File "${MINGW_BIN}\snoresettings.exe"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snoretoast.dll"
+    ; GnuTLS
+    File "${MINGW_BIN}\libgnutls-28.dll"
+    File "${MINGW_BIN}\libtasn1-6.dll"
+    File "${MINGW_BIN}\libgmp-10.dll"
+    File "${MINGW_BIN}\libhogweed-4-1.dll"
+    File "${MINGW_BIN}\libintl-8.dll"
+    File "${MINGW_BIN}\libnettle-6-1.dll"
+    File "${MINGW_BIN}\libp11-kit-0.dll"
+    File "${MINGW_BIN}\libffi-6.dll"
 
-   ; Snoregrowl
-   File "${MINGW_BIN}\libsnoregrowl++.dll"
-   File "${MINGW_BIN}\libsnoregrowl.dll"
+    ; Snorenotify
+    File "${MINGW_BIN}\SnoreToast.exe"
+    File "${MINGW_BIN}\libsnore-qt5.dll"
+    File "${MINGW_BIN}\libsnoresettings-qt5.dll"
+    File "${MINGW_BIN}\snoresettings.exe"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_windowstoast.dll"
+
+    ; Snoregrowl
+    File "${MINGW_BIN}\libsnoregrowl++.dll"
+    File "${MINGW_BIN}\libsnoregrowl.dll"
 
    ; Jabber
-   File "${MINGW_BIN}\libjreen-qt5.dll"
-   File "${MINGW_BIN}\libidn-11.dll"
-   File "${MINGW_BIN}\libgsasl-7.dll"
-   File "${MINGW_BIN}\libqca-qt5.dll"
-   SetOutPath "$INSTDIR\crypto"
-   File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
-   SetOutPath "$INSTDIR"
-   File "${MINGW_BIN}\libssl-10.dll"
-   File "${MINGW_BIN}\libcrypto-10.dll"
+    File "${MINGW_BIN}\libjreen-qt5.dll"
+    File "${MINGW_BIN}\libidn-11.dll"
+    File "${MINGW_BIN}\libgsasl-7.dll"
+    File "${MINGW_BIN}\libqca-qt5.dll"
+    SetOutPath "$INSTDIR\crypto"
+    File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libssl-10.dll"
+    File "${MINGW_BIN}\libcrypto-10.dll"
 
-   ; LucenePlusPlus
-   File "${MINGW_BIN}\liblucene++.dll"
-   File "${MINGW_BIN}\libboost_system-mt.dll"
-   File "${MINGW_BIN}\libboost_filesystem-mt.dll"
-   File "${MINGW_BIN}\libboost_iostreams-mt.dll"
-   File "${MINGW_BIN}\libboost_regex-mt.dll"
-   File "${MINGW_BIN}\libboost_thread-mt.dll"
-   File "${MINGW_BIN}\libbz2-1.dll"
+    ; LucenePlusPlus
+    File "${MINGW_BIN}\liblucene++.dll"
+    File "${MINGW_BIN}\libboost_system-mt.dll"
+    File "${MINGW_BIN}\libboost_filesystem-mt.dll"
+    File "${MINGW_BIN}\libboost_iostreams-mt.dll"
+    File "${MINGW_BIN}\libboost_regex-mt.dll"
+    File "${MINGW_BIN}\libboost_thread-mt.dll"
+    File "${MINGW_BIN}\libbz2-1.dll"
 
-   File "${MINGW_BIN}\libqtsparkle-qt5.dll"
-   File "${MINGW_BIN}\libKF5Attica.dll"
+    File "${MINGW_BIN}\libqtsparkle-qt5.dll"
+    File "${MINGW_BIN}\libKF5Attica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"

ChangeLog

@@ -1,6 +1,7 @@
 Version 0.9.0:
     * Resolved various playback issues by switching to a new audio engine.
     * Fixed collection sorting.
+    * Fixed volume/mute state not being reset correctly on startup.
 
 Version 0.8.4:
     * Fixed drag & drop issues on sidebar.

README.md

@@ -79,7 +79,6 @@ Required dependencies:
 * [TagLib 1.8](https://taglib.github.io/)
 * [Boost 1.3](http://www.boost.org/)
 * [Lucene++ 3.0.6](https://github.com/luceneplusplus/LucenePlusPlus/)
-* [libechonest 2.3.1](http://projects.kde.org/projects/playground/libs/libechonest/)
 * [Attica 5.6.0](http://ftp.kde.org/stable/attica/)
 * [QuaZip 0.4.3](http://quazip.sourceforge.net/)
 * [liblastfm 1.0.9](https://github.com/lastfm/liblastfm/)

TomahawkCPack.cmake

@@ -2,7 +2,7 @@ INCLUDE( InstallRequiredSystemLibraries )
 
 SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_APPLICATION_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
+SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_TARGET_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
 
 # CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
 # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
@@ -13,7 +13,9 @@ SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${TOMAHAWK_DESCRIPTION_SUMMARY} ) #  Des
 SET( CPACK_PACKAGE_INSTALL_DIRECTORY  ${TOMAHAWK_APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
 SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
 SET( CPACK_PACKAGE_NAME  ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name
+SET( CPACK_PACKAGE_TARGET_NAME  ${TOMAHAWK_TARGET_NAME} ) # Used to build library and executable names
 SET( CPACK_PACKAGE_VENDOR  ${TOMAHAWK_ORGANIZATION_NAME} )   # Package vendor name
+SET( TOMAHAWK_APPLICATION_PACKAGE_NAME ${TOMAHAWK_APPLICATION_PACKAGE_NAME} )
 SET( CPACK_PACKAGE_VERSION_MAJOR  ${TOMAHAWK_VERSION_MAJOR} )
 SET( CPACK_PACKAGE_VERSION_MINOR  ${TOMAHAWK_VERSION_MINOR} )
 SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )

TomahawkUse.cmake.in

@@ -3,8 +3,6 @@
 set( TOMAHAWK_QT5 @TOMAHAWK_QT5@ )
 
 if(TOMAHAWK_QT5)
-    message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
-
     # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
     find_package(Qt5Core REQUIRED)
     find_package(Qt5Concurrent REQUIRED)

admin/mac/Info.plist

@@ -5,23 +5,23 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.tomahawk-player.Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_PACKAGE_NAME@</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleVersion</key>
-	<string>TOMAHAWK_VERSION</string>
+	<string>@TOMAHAWK_VERSION@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>TOMAHAWK_VERSION</string>
+	<string>@TOMAHAWK_VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>tomahawk</string>
+	<string>@TOMAHAWK_BASE_TARGET_NAME@</string>
 	<key>CFBundleIconFile</key>
-	<string>Tomahawk.icns</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@.icns</string>
 	<key>CFBundleName</key>
-	<string>Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.7.0</string>
 	<key>NSPrincipalClass</key>
@@ -29,7 +29,7 @@
 	<key>NSHighResolutionCapable</key>
 	<true />
 	<key>SUFeedURL</key>
-	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
+	<string>@TOMAHAWK_SPARKLE_UPDATE_URL@</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>sparkle_pub.pem</string>
 	<key>SUEnableSystemProfiling</key>

admin/mac/build-release-osx.sh

@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-set -e
+TARGET_NAME="Tomahawk"
 
+set -e
 
 function header {
     echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -31,30 +32,28 @@ CERT_SIGNER=$2
 ################################################################################
 
     header "Fixing and copying libraries"
-    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
+    $ROOT/../admin/mac/macdeploy.py "${TARGET_NAME}.app" quiet
 
-    cd Tomahawk.app
+    cd "${TARGET_NAME}.app"
 
     cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
-#    header "Copying Sparkle framework"
-#    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-
-    header "Creating DMG"
-    cd ..
+    header "Fixing fonts"
+    mkdir "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
+    cp -R $ROOT/../data/fonts/*.ttf "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
 
     header "Signing bundle"
-#    codesign -s "Developer ID Application: $CERT_SIGNER" -f -v ./Tomahawk.app
-
+    cd ..
     if [ -f ~/sign_step.sh ];
     then
-        ~/sign_step.sh "$CERT_SIGNER" "Tomahawk.app" || true
+        ~/sign_step.sh "$CERT_SIGNER" "${TARGET_NAME}.app"
     fi
 
-    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
-    mv Tomahawk.dmg Tomahawk-$VERSION.dmg
+    header "Creating DMG"
+    $ROOT/../admin/mac/create-dmg.sh "${TARGET_NAME}.app"
+    mv "${TARGET_NAME}.dmg" "${TARGET_NAME}-$VERSION.dmg"
 
     header "Creating signed Sparkle update"
-    $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
+#     $ROOT/../admin/mac/sign_bundle.rb "${TARGET_NAME}" $VERSION ~/tomahawk_sparkle_privkey.pem
 
     header "Done!"

admin/mac/create-dmg.sh

@@ -43,7 +43,7 @@ ln -s /Applications "$TMP/Applications"
 cp -R "$IN" "$TMP"
 
 # create
-hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
+hdiutil makehybrid -hfs -hfs-volume-name "$NAME" -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
 hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$OUT"
 
 # cleanup

admin/mac/macdeploy.py

@@ -22,171 +22,170 @@ import commands
 import sys
 import glob
 
+TARGET_NAME="tomahawk"
+
 FRAMEWORK_SEARCH_PATH=[
     '/Library/Frameworks',
     os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]
 
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/opt/vlc/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
 
 VLC_PLUGINS=[
-  'access/libattachment_plugin.dylib',
-  #'access/libaccess_avio_plugin.dylib',
-  #'access/libaccess_fake_plugin.dylib',
-  'access/libftp_plugin.dylib',
-  'access/libhttp_plugin.dylib',
-  'access/libimem_plugin.dylib',
-  #'access/libaccess_mmap_plugin.dylib',
-  'access/libaccess_mms_plugin.dylib',
-  'access/libaccess_realrtsp_plugin.dylib',
-  'access/libtcp_plugin.dylib',
-  'access/libudp_plugin.dylib',
-  'access/libcdda_plugin.dylib',
-  'access/libfilesystem_plugin.dylib',
-  'access/libqtcapture_plugin.dylib',
-  'access/librtp_plugin.dylib',
-  'access/libzip_plugin.dylib',
-  'access_output/libaccess_output_dummy_plugin.dylib',
-  'access_output/libaccess_output_file_plugin.dylib',
-  'access_output/libaccess_output_http_plugin.dylib',
-  'access_output/libaccess_output_shout_plugin.dylib',
-  'access_output/libaccess_output_udp_plugin.dylib',
-  'audio_filter/liba52tofloat32_plugin.dylib',
-  'audio_filter/liba52tospdif_plugin.dylib',
-  'audio_filter/libaudio_format_plugin.dylib',
-  'audio_filter/libaudiobargraph_a_plugin.dylib',
-  'audio_filter/libchorus_flanger_plugin.dylib',
+  'libattachment_plugin.dylib',
+  #'libaccess_avio_plugin.dylib',
+  #'libaccess_fake_plugin.dylib',
+  'libftp_plugin.dylib',
+  'libhttp_plugin.dylib',
+  'libhttplive_plugin.dylib',
+  'libimem_plugin.dylib',
+  #'libaccess_mmap_plugin.dylib',
+  'libaccess_mms_plugin.dylib',
+  'libaccess_realrtsp_plugin.dylib',
+  'libtcp_plugin.dylib',
+  'libudp_plugin.dylib',
+  'libcdda_plugin.dylib',
+  'libfilesystem_plugin.dylib',
+  'libqtcapture_plugin.dylib',
+  'librtp_plugin.dylib',
+  'libzip_plugin.dylib',
+  'liba52tofloat32_plugin.dylib',
+  'liba52tospdif_plugin.dylib',
+  'libaudio_format_plugin.dylib',
+  'libaudiobargraph_a_plugin.dylib',
+  'libchorus_flanger_plugin.dylib',
   #'libconverter_fixed_plugin.dylib',
-  'audio_filter/libdolby_surround_decoder_plugin.dylib',
-  'audio_filter/libdtstofloat32_plugin.dylib',
-  'audio_filter/libdtstospdif_plugin.dylib',
-  'audio_filter/libequalizer_plugin.dylib',
-  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
-  'audio_filter/libmono_plugin.dylib',
-  'audio_filter/libmpgatofixed32_plugin.dylib',
-  'audio_filter/libnormvol_plugin.dylib',
-  'audio_filter/libparam_eq_plugin.dylib',
-  'audio_filter/libscaletempo_plugin.dylib',
-  'audio_filter/libsimple_channel_mixer_plugin.dylib',
-  'audio_filter/libspatializer_plugin.dylib',
-  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
-  'audio_filter/libugly_resampler_plugin.dylib',
-  'audio_mixer/libfloat_mixer_plugin.dylib',
+  'libdolby_surround_decoder_plugin.dylib',
+  'libdtstofloat32_plugin.dylib',
+  'libdtstospdif_plugin.dylib',
+  'libequalizer_plugin.dylib',
+  'libheadphone_channel_mixer_plugin.dylib',
+  'libmono_plugin.dylib',
+  'libmpgatofixed32_plugin.dylib',
+  'libnormvol_plugin.dylib',
+  'libparam_eq_plugin.dylib',
+  'libscaletempo_plugin.dylib',
+  'libsimple_channel_mixer_plugin.dylib',
+  'libspatializer_plugin.dylib',
+  'libtrivial_channel_mixer_plugin.dylib',
+  'libugly_resampler_plugin.dylib',
+  'libfloat_mixer_plugin.dylib',
   #'libspdif_mixer_plugin.dylib',
   #'libtrivial_mixer_plugin.dylib',
   #'libaout_file_plugin.dylib',
-  'audio_output/libauhal_plugin.dylib',
-  'codec/liba52_plugin.dylib',
-  'codec/libadpcm_plugin.dylib',
-  'codec/libaes3_plugin.dylib',
-  'codec/libaraw_plugin.dylib',
-  'codec/libavcodec_plugin.dylib',
-  'codec/libcc_plugin.dylib',
-  'codec/libcdg_plugin.dylib',
-  'codec/libdts_plugin.dylib',
-  'codec/libfaad_plugin.dylib',
+  'libauhal_plugin.dylib',
+  'liba52_plugin.dylib',
+  'libadpcm_plugin.dylib',
+  'libaes3_plugin.dylib',
+  'libaraw_plugin.dylib',
+  'libavcodec_plugin.dylib',
+  'libcc_plugin.dylib',
+  'libcdg_plugin.dylib',
+  'libdts_plugin.dylib',
+  'libfaad_plugin.dylib',
   #'libfake_plugin.dylib',
-  'codec/libflac_plugin.dylib',
+  'libflac_plugin.dylib',
   #'libfluidsynth_plugin.dylib',
   #'libinvmem_plugin.dylib',
-  'codec/liblpcm_plugin.dylib',
-  'codec/libmpeg_audio_plugin.dylib',
-  'codec/libpng_plugin.dylib',
-  'codec/librawvideo_plugin.dylib',
-  'codec/libspeex_plugin.dylib',
-  'codec/libspudec_plugin.dylib',
-  'codec/libtheora_plugin.dylib',
-  'codec/libtwolame_plugin.dylib',
-  'codec/libvorbis_plugin.dylib',
-  #'control/libgestures_plugin.dylib',
+  'liblpcm_plugin.dylib',
+  'libmpeg_audio_plugin.dylib',
+  'libpng_plugin.dylib',
+  'librawvideo_plugin.dylib',
+  'libspeex_plugin.dylib',
+  'libspudec_plugin.dylib',
+  'libtheora_plugin.dylib',
+  'libtwolame_plugin.dylib',
+  'libvorbis_plugin.dylib',
+  #'libgestures_plugin.dylib',
   #'libhotkeys_plugin.dylib',
   #'libmotion_plugin.dylib',
   #'libnetsync_plugin.dylib',
   #'libsignals_plugin.dylib',
-  'demux/libaiff_plugin.dylib',
-  'demux/libasf_plugin.dylib',
-  'demux/libau_plugin.dylib',
+  'libaiff_plugin.dylib',
+  'libasf_plugin.dylib',
+  'libau_plugin.dylib',
   #'libavformat_plugin.dylib',
-  'demux/libavi_plugin.dylib',
-  'demux/libdemux_cdg_plugin.dylib',
-  'demux/libdemuxdump_plugin.dylib',
-  'demux/libdiracsys_plugin.dylib',
-  'demux/libes_plugin.dylib',
-  'demux/libflacsys_plugin.dylib',
-  'access/liblive555_plugin.dylib',
-  'demux/libmkv_plugin.dylib',
-  'demux/libmod_plugin.dylib',
-  'demux/libmp4_plugin.dylib',
-  'demux/libmpc_plugin.dylib',
-  'demux/libmpgv_plugin.dylib',
-  'demux/libnsc_plugin.dylib',
-  'demux/libnsv_plugin.dylib',
-  'demux/libnuv_plugin.dylib',
-  'demux/libogg_plugin.dylib',
-  'demux/libplaylist_plugin.dylib',
-  'demux/libps_plugin.dylib',
-  'demux/libpva_plugin.dylib',
-  'demux/librawaud_plugin.dylib',
-  'demux/librawdv_plugin.dylib',
-  'demux/librawvid_plugin.dylib',
-  'demux/libreal_plugin.dylib',
-  'demux/libsmf_plugin.dylib',
-  'demux/libts_plugin.dylib',
-  'demux/libtta_plugin.dylib',
-  'demux/libty_plugin.dylib',
-  'demux/libvc1_plugin.dylib',
-  'demux/libvoc_plugin.dylib',
-  'demux/libwav_plugin.dylib',
-  'demux/libxa_plugin.dylib',
-  'meta_engine/libfolder_plugin.dylib',
-  'meta_engine/libtaglib_plugin.dylib',
+  'libavi_plugin.dylib',
+  'libdemux_cdg_plugin.dylib',
+  'libdemuxdump_plugin.dylib',
+  'libdiracsys_plugin.dylib',
+  'libes_plugin.dylib',
+  'libflacsys_plugin.dylib',
+  'liblive555_plugin.dylib',
+  'libmkv_plugin.dylib',
+  'libmod_plugin.dylib',
+  'libmp4_plugin.dylib',
+  'libmpc_plugin.dylib',
+  'libmpgv_plugin.dylib',
+  'libnsc_plugin.dylib',
+  'libnsv_plugin.dylib',
+  'libnuv_plugin.dylib',
+  'libogg_plugin.dylib',
+  'libplaylist_plugin.dylib',
+  'libps_plugin.dylib',
+  'libpva_plugin.dylib',
+  'librawaud_plugin.dylib',
+  'librawdv_plugin.dylib',
+  'librawvid_plugin.dylib',
+  'libreal_plugin.dylib',
+  'libsmf_plugin.dylib',
+  'libts_plugin.dylib',
+  'libtta_plugin.dylib',
+  'libty_plugin.dylib',
+  'libvc1_plugin.dylib',
+  'libvoc_plugin.dylib',
+  'libwav_plugin.dylib',
+  'libxa_plugin.dylib',
+  'libfolder_plugin.dylib',
+  'libtaglib_plugin.dylib',
   #'libaudioscrobbler_plugin.dylib',
-  'control/libdummy_plugin.dylib',
-  'misc/libexport_plugin.dylib',
+  'libdummy_plugin.dylib',
+  'libexport_plugin.dylib',
   #'libfreetype_plugin.dylib',
   #'libgnutls_plugin.dylib',
-  'misc/liblogger_plugin.dylib',
-  'lua/liblua_plugin.dylib',
+  'liblogger_plugin.dylib',
+  'liblua_plugin.dylib',
   #'libosd_parser_plugin.dylib',
   #'libquartztext_plugin.dylib',
   #'libstats_plugin.dylib',
-  'misc/libvod_rtsp_plugin.dylib',
-  'misc/libxml_plugin.dylib',
+  'libvod_rtsp_plugin.dylib',
+  'libxml_plugin.dylib',
   #'libxtag_plugin.dylib',
-  'video_chroma/libi420_rgb_mmx_plugin.dylib',
-  'video_chroma/libi420_yuy2_mmx_plugin.dylib',
-  'video_chroma/libi422_yuy2_mmx_plugin.dylib',
+  'libi420_rgb_mmx_plugin.dylib',
+  'libi420_yuy2_mmx_plugin.dylib',
+  'libi422_yuy2_mmx_plugin.dylib',
   #'libmemcpymmx_plugin.dylib',
   #'libmemcpymmxext_plugin.dylib',
-  'mux/libmux_asf_plugin.dylib',
-  'mux/libmux_avi_plugin.dylib',
-  'mux/libmux_dummy_plugin.dylib',
-  'mux/libmux_mp4_plugin.dylib',
-  'mux/libmux_mpjpeg_plugin.dylib',
-  'mux/libmux_ogg_plugin.dylib',
-  'mux/libmux_ps_plugin.dylib',
-  'mux/libmux_ts_plugin.dylib',
-  'mux/libmux_wav_plugin.dylib',
-  'packetizer/libpacketizer_copy_plugin.dylib',
-  'packetizer/libpacketizer_dirac_plugin.dylib',
-  'packetizer/libpacketizer_flac_plugin.dylib',
-  'packetizer/libpacketizer_h264_plugin.dylib',
-  'packetizer/libpacketizer_mlp_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
-  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
-  'packetizer/libpacketizer_vc1_plugin.dylib',
-  'video_chroma/libi420_rgb_sse2_plugin.dylib',
-  'video_chroma/libi420_yuy2_sse2_plugin.dylib',
-  'video_chroma/libi422_yuy2_sse2_plugin.dylib',
-  'stream_filter/libdecomp_plugin.dylib',
-  #'access/libstream_filter_rar_plugin.dylib',
-  'stream_filter/librecord_plugin.dylib',
+  'libmux_asf_plugin.dylib',
+  'libmux_avi_plugin.dylib',
+  'libmux_dummy_plugin.dylib',
+  'libmux_mp4_plugin.dylib',
+  'libmux_mpjpeg_plugin.dylib',
+  'libmux_ogg_plugin.dylib',
+  'libmux_ps_plugin.dylib',
+  'libmux_ts_plugin.dylib',
+  'libmux_wav_plugin.dylib',
+  'libpacketizer_copy_plugin.dylib',
+  'libpacketizer_dirac_plugin.dylib',
+  'libpacketizer_flac_plugin.dylib',
+  'libpacketizer_h264_plugin.dylib',
+  'libpacketizer_mlp_plugin.dylib',
+  'libpacketizer_mpeg4audio_plugin.dylib',
+  'libpacketizer_mpeg4video_plugin.dylib',
+  'libpacketizer_mpegvideo_plugin.dylib',
+  'libpacketizer_vc1_plugin.dylib',
+  'libi420_rgb_sse2_plugin.dylib',
+  'libi420_yuy2_sse2_plugin.dylib',
+  'libi422_yuy2_sse2_plugin.dylib',
+  'libdecomp_plugin.dylib',
+  #'libstream_filter_rar_plugin.dylib',
+  'librecord_plugin.dylib',
   #'libvisual_plugin.dylib',
+  'libsecuretransport_plugin.dylib'
 ]
 
 VLC_SEARCH_PATH=[
-    '/usr/local/lib/vlc/plugins/',
+    '/usr/local/opt/vlc/lib/vlc/plugins/',
 ]
 
 QT_PLUGINS = [
@@ -201,39 +200,39 @@ QT_PLUGINS = [
 ]
 
 SNORE_PLUGINS = [
-#    'libsnore_backend_growl.so',
-#    'libsnore_backend_osxnotificationcenter.so',
+    'libsnore_backend_growl.so',
+    'libsnore_backend_osxnotificationcenter.so',
 ]
 
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.dylib',
-  'libtomahawk_account_google.so',
-  'libtomahawk_account_zeroconf.so',
-#  'libtomahawk_account_hatchet.so',
-  'libtomahawk_infoplugin_adium.so',
-  'libtomahawk_infoplugin_charts.so',
-  'libtomahawk_infoplugin_discogs.so',
-  'libtomahawk_infoplugin_echonest.so',
-  'libtomahawk_infoplugin_hypem.so',
-  'libtomahawk_infoplugin_musicbrainz.so',
-  'libtomahawk_infoplugin_musixmatch.so',
-  'libtomahawk_infoplugin_newreleases.so',
-  'libtomahawk_infoplugin_rovi.so',
-#  'libtomahawk_infoplugin_snorenotify.so',
-  'libtomahawk_infoplugin_spotify.so',
-  'libtomahawk_viewpage_dashboard.so',
-#  'libtomahawk_viewpage_networkactivity.so',
-  'libtomahawk_viewpage_charts.so',
-  'libtomahawk_viewpage_newreleases.so',
-  'libtomahawk_viewpage_whatsnew_0_8.so',
+  'lib%s_account_xmpp.dylib' % TARGET_NAME,
+  'lib%s_account_google.so' % TARGET_NAME,
+  'lib%s_account_zeroconf.so' % TARGET_NAME,
+  'lib%s_account_hatchet.so' % TARGET_NAME,
+  'lib%s_infoplugin_adium.so' % TARGET_NAME,
+  'lib%s_infoplugin_charts.so' % TARGET_NAME,
+#  'lib%s_infoplugin_discogs.so' % TARGET_NAME,
+  'lib%s_infoplugin_echonest.so' % TARGET_NAME,
+  'lib%s_infoplugin_hypem.so' % TARGET_NAME,
+#  'lib%s_infoplugin_musicbrainz.so' % TARGET_NAME,
+  'lib%s_infoplugin_musixmatch.so' % TARGET_NAME,
+  'lib%s_infoplugin_newreleases.so' % TARGET_NAME,
+#  'lib%s_infoplugin_rovi.so' % TARGET_NAME,
+  'lib%s_infoplugin_snorenotify.so' % TARGET_NAME,
+  'lib%s_infoplugin_spotify.so' % TARGET_NAME,
+  'lib%s_viewpage_dashboard.so' % TARGET_NAME,
+#  'lib%s_viewpage_networkactivity.so' % TARGET_NAME,
+  'lib%s_viewpage_charts.so' % TARGET_NAME,
+  'lib%s_viewpage_newreleases.so' % TARGET_NAME,
+  'lib%s_viewpage_whatsnew_0_8.so' % TARGET_NAME,
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt5/5.4.0/plugins',
+    '/usr/local/opt/qt5/plugins',
 ]
 
 SNORE_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/snorenotify/HEAD/lib/libsnore',
+    '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5',
 ]
 
 class Error(Exception):
@@ -247,6 +246,8 @@ class CouldNotFindQtPluginErrorFindFrameworkError(Error):
 class InstallNameToolError(Error):
   pass
 
+class CouldNotFindFrameworkError(Error):
+  pass
 
 class CouldNotFindQtPluginError(Error):
   pass
@@ -308,7 +309,7 @@ def GetBrokenLibraries(binary):
       continue  # unix style system library
     elif re.match(r'Breakpad', line):
       continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line) and not re.match(r'^\s*@loader_path/../lib', line):
       # Potentially already fixed library
       if '.framework' in line:
         relative_path = os.path.join(*line.split('/')[3:])
@@ -332,6 +333,11 @@ def FindFramework(path):
     if os.path.exists(abs_path):
       return abs_path
 
+  # replace rpath with /Library/Frameworks for Sparkle
+  abs_path = path.replace("@rpath/", "/Library/Frameworks/")
+  if os.path.exists(abs_path):
+    return abs_path
+
   raise CouldNotFindFrameworkError(path)
 
 def FindLibrary(path):
@@ -576,12 +582,12 @@ for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
 for plugin in SNORE_PLUGINS:
-  FixPlugin(FindSnorePlugin(plugin), '../MacOS/libsnore')
+  FixPlugin(FindSnorePlugin(plugin), '../lib/plugins/libsnore-qt5')
 
 try:
-  FixPlugin('tomahawk_crash_reporter', '../MacOS')
+  FixPlugin('%s_crash_reporter' % TARGET_NAME, '../MacOS')
 except:
-  print 'Failed to find tomahawk_crash_reporter'
+  print 'Failed to find %s_crash_reporter' % TARGET_NAME
 
 for plugin in QT_PLUGINS:
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

admin/mac/sign_bundle.rb

@@ -6,9 +6,9 @@ if ARGV.length < 2
   exit
 end
 
-tarball = "tomahawk-#{ARGV[0]}.tar.bz2"
+tarball = "#{ARGV[0].downcase}-#{ARGV[1]}.tar.bz2"
 puts "Zipping: #{tarball}..."
-`tar jcvf "#{tarball}" Tomahawk.app`
+`tar jcvf "#{tarball}" #{ARGV[0]}.app`
 
 puts "Signing..."
-puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64`
+puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[2]}" | openssl enc -base64`

admin/win/update-vlc.sh

@@ -9,19 +9,20 @@ fi
 
 rm -rvf vlc/
 
+VLC_TARBALL="vlc.tar.bz2"
 
 echo "Download phonon archive..."
 # wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
 # wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
 # wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
 # wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
-wget -c http://download.tomahawk-player.org/test/vlc.tar.bz2
+wget -c "http://download.tomahawk-player.org/test/$VLC_TARBALL"
 
 echo "Extract binary..."
 # 7z x phonon*.7z
 # mv -v vlc-*/ vlc/
 # unzip tomahawk-vlc-0.1.zip
-tar xvjf vlc.tar.bz2
+tar xvjf "$VLC_TARBALL"
 
 # echo "Download phonon_vlc_no_video.dll..."
 # wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
@@ -72,7 +73,9 @@ rm -rvf \
     **/libi420* \
     **/libi422* \
     mux/ \
-    stream_filter/ \
+    stream_filter/*dash* \
+    stream_filter/*smooth* \
+    stream_filter/*record* \
     **/libtheora_plugin* \
     **/liblibbluray_plugin* \
     **/libdtv_plugin* \

data/images/folder.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="86px" height="86px" viewBox="0 0 86 86" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>folder</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="folder" sketch:type="MSLayerGroup" transform="translate(0.000000, 13.000000)" fill="#000000">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <path d="M84.1450038,10.4833376 C82.8248024,9.1092149 80.9427764,8.3195294 78.9789985,8.3195294 L72.233622,8.3195294 L34.4730823,8.3195294 L34.4730823,7.0184614 C34.4730823,3.1483061 31.3247762,0 27.4563602,0 L10.1441555,0 C6.27226058,0 3.12569415,3.1500456 3.12569415,7.0184614 L3.12569415,9.4918821 C1.2088801,10.761641 0,12.9237099 0,15.3362515 L0,54.4987445 C0,54.5057021 0,54.5178779 0.0017394,54.5265748 L0,54.5439688 C0,58.3897726 3.14656684,61.5154666 7.0184614,61.5154666 L72.2336242,61.5154666 C72.4736608,61.5154666 72.7102186,61.5050302 72.9432977,61.4789393 C72.9850432,61.4771999 73.028528,61.4650241 73.0702735,61.4615453 C73.2616071,61.4389332 73.4529406,61.4145816 73.6390559,61.3745755 C73.6686257,61.3693573 73.6947166,61.3606604 73.7242863,61.3519634 C73.9225774,61.3119573 74.1208685,61.2597754 74.3139414,61.200636 C74.3243778,61.1954178 74.3348142,61.191939 74.3452506,61.1884602 C76.756053,60.4300837 78.5998126,58.4123847 79.1059765,55.9198305 C79.1077159,55.912873 79.1077159,55.9024366 79.1077159,55.895479 C79.1512008,55.6937091 79.18251,55.4919392 79.2051221,55.2797329 C79.2103403,55.2240723 79.2155585,55.1684116 79.2190373,55.1092721 C79.2277343,55.0136054 79.2433888,54.9266356 79.2451282,54.8309688 L85.9539776,15.7937099 L85.9939837,15.4127822 C86.0705187,13.5587047 85.4147685,11.8086925 84.1450038,10.4833376 C84.1450038,10.4833376 85.4147685,11.8086925 84.1450038,10.4833376 L84.1450038,10.4833376" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>

data/images/nav-back.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>nav-back</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="nav-back" sketch:type="MSLayerGroup" transform="translate(4.000000, 6.000000)">
+            <g id="Layer_2"></g>
+            <g id="Layer_3"></g>
+            <g id="Layer_4"></g>
+            <g id="Layer_5"></g>
+            <g id="Layer_6"></g>
+            <g id="Layer_8"></g>
+            <g id="Layer_9"></g>
+            <g id="Layer_10"></g>
+            <g id="Layer_11"></g>
+            <g id="Layer_12"></g>
+            <g id="Layer_13"></g>
+            <g id="Layer_14"></g>
+            <g id="Layer_15"></g>
+            <g id="Layer_16"></g>
+            <g id="Layer_17"></g>
+            <g id="Layer_18"></g>
+            <g id="Layer_19"></g>
+            <g id="Layer_20"></g>
+            <g id="Layer_21"></g>
+            <g id="Layer_24"></g>
+            <g id="Layer_25"></g>
+            <g id="Layer_26"></g>
+            <g id="Layer_27"></g>
+            <g id="Layer_28"></g>
+            <g id="Layer_29"></g>
+            <g id="Layer_47"></g>
+            <g id="Layer_30"></g>
+            <g id="Layer_31"></g>
+            <g id="Layer_32"></g>
+            <g id="Layer_33"></g>
+            <g id="Layer_34"></g>
+            <g id="Layer_35"></g>
+            <g id="Layer_36"></g>
+            <g id="Layer_37"></g>
+            <g id="Layer_38" transform="translate(2.000000, 0.000000)" fill="#000000" sketch:type="MSShapeGroup">
+                <path d="M9.7,13.9 L-0.3,7 L9.7,0.1 L10.3,0.9 L1.5,7 L10.3,13.1 L9.7,13.9 Z" id="Shape"></path>
+            </g>
+            <g id="Layer_39"></g>
+            <g id="Layer_40"></g>
+            <g id="Layer_41"></g>
+            <g id="Layer_42"></g>
+            <g id="Layer_43"></g>
+            <g id="Layer_44"></g>
+            <g id="Layer_45"></g>
+            <g id="Layer_46"></g>
+        </g>
+    </g>
+</svg>

data/images/nav-forward.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>nav-forward</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="nav-forward" sketch:type="MSLayerGroup" transform="translate(6.000000, 6.000000)">
+            <g id="Layer_2"></g>
+            <g id="Layer_3"></g>
+            <g id="Layer_4"></g>
+            <g id="Layer_5"></g>
+            <g id="Layer_6"></g>
+            <g id="Layer_8"></g>
+            <g id="Layer_9"></g>
+            <g id="Layer_10"></g>
+            <g id="Layer_11"></g>
+            <g id="Layer_12"></g>
+            <g id="Layer_13"></g>
+            <g id="Layer_14"></g>
+            <g id="Layer_15"></g>
+            <g id="Layer_16"></g>
+            <g id="Layer_17"></g>
+            <g id="Layer_18"></g>
+            <g id="Layer_19"></g>
+            <g id="Layer_20"></g>
+            <g id="Layer_21"></g>
+            <g id="Layer_24"></g>
+            <g id="Layer_25"></g>
+            <g id="Layer_26"></g>
+            <g id="Layer_27"></g>
+            <g id="Layer_28"></g>
+            <g id="Layer_29"></g>
+            <g id="Layer_47"></g>
+            <g id="Layer_30"></g>
+            <g id="Layer_31"></g>
+            <g id="Layer_32"></g>
+            <g id="Layer_33"></g>
+            <g id="Layer_34"></g>
+            <g id="Layer_35"></g>
+            <g id="Layer_36"></g>
+            <g id="Layer_37"></g>
+            <g id="Layer_38"></g>
+            <g id="Layer_39"></g>
+            <g id="Layer_40"></g>
+            <g id="Layer_41" transform="translate(2.000000, 0.000000)" fill="#000000" sketch:type="MSShapeGroup">
+                <path d="M0.5,13.7 L-0.1,12.9 L8.3,7 L-0.1,1.1 L0.5,0.3 L10.1,7 L0.5,13.7 Z" id="Shape"></path>
+            </g>
+            <g id="Layer_42"></g>
+            <g id="Layer_43"></g>
+            <g id="Layer_44"></g>
+            <g id="Layer_45"></g>
+            <g id="Layer_46"></g>
+        </g>
+    </g>
+</svg>

data/js/tomahawk.js

@@ -42,6 +42,8 @@ Tomahawk.apiVersion = "0.2.2";
 //Statuses considered a success for HTTP request
 var httpSuccessStatuses = [200, 201];
 
+Tomahawk.error = console.error;
+
 // install RSVP error handler for uncaught(!) errors
 RSVP.on('error', function (reason) {
     var resolverName = "";
@@ -49,9 +51,9 @@ RSVP.on('error', function (reason) {
         resolverName = Tomahawk.resolver.instance.settings.name + " - ";
     }
     if (reason) {
-        console.error(resolverName + 'Uncaught error:', reason);
+        Tomahawk.error(resolverName + 'Uncaught error:', reason);
     } else {
-        console.error(resolverName + 'Uncaught error: error thrown from RSVP but it was empty');
+        Tomahawk.error(resolverName + 'Uncaught error: error thrown from RSVP but it was empty');
     }
 });
 
@@ -273,30 +275,45 @@ Tomahawk.Resolver = {
     getStreamUrl: function (params) {
         return params;
     },
+    getDownloadUrl: function (params) {
+        return params;
+    },
+    resolve: function() {
+    },
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },
 
     _adapter_search: function (params) {
         return RSVP.Promise.resolve(this.search(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },
 
     _adapter_testConfig: function (config) {
-        return RSVP.Promise.resolve(this.testConfig(config)).then(function () {
-            return {result: Tomahawk.ConfigTestResultType.Success};
+        return RSVP.Promise.resolve(this.testConfig(config)).then(function (results) {
+            results = results || Tomahawk.ConfigTestResultType.Success;
+            return results;
+        }, function (error) {
+            return error;
         });
     }
 };
 
-
 // help functions
 
 Tomahawk.valueForSubNode = function (node, tag) {
@@ -367,48 +384,6 @@ Tomahawk.retrievedMetadata = function (metadataId, metadata, error) {
     delete Tomahawk.retrieveMetadataCallbacks[metadataId];
 };
 
-/**
- * Internal counter used to identify asyncRequest callback from native code.
- */
-Tomahawk.asyncRequestIdCounter = 0;
-/**
- * Internal map used to map asyncRequestIds to the respective javascript
- * callback functions.
- */
-Tomahawk.asyncRequestCallbacks = {};
-
-/**
- * Pass the natively retrieved reply back to the javascript callback
- * and augment the fake XMLHttpRequest object.
- *
- * Internal use only!
- */
-Tomahawk.nativeAsyncRequestDone = function (reqId, xhr) {
-    // Check that we have a matching callback stored.
-    if (!Tomahawk.asyncRequestCallbacks.hasOwnProperty(reqId)) {
-        return;
-    }
-
-    // Call the real callback
-    if (xhr.readyState == 4 && httpSuccessStatuses.indexOf(xhr.status) != -1) {
-        // Call the real callback
-        if (Tomahawk.asyncRequestCallbacks[reqId].callback) {
-            Tomahawk.asyncRequestCallbacks[reqId].callback(xhr);
-        }
-    } else if (xhr.readyState === 4) {
-        Tomahawk.log("Failed to do nativeAsyncRequest");
-        Tomahawk.log("Status Code was: " + xhr.status);
-        if (Tomahawk.asyncRequestCallbacks[reqId].errorHandler) {
-            Tomahawk.asyncRequestCallbacks[reqId].errorHandler(xhr);
-        }
-    }
-
-    // Callbacks are only used once.
-    delete Tomahawk.asyncRequestCallbacks[reqId];
-};
-
-
-
 /**
  * This method is externalized from Tomahawk.asyncRequest, so that other clients
  * (like tomahawk-android) can inject their own logic that determines whether or not to do a request
@@ -423,9 +398,9 @@ var shouldDoNativeRequest = function (options) {
         || extraHeaders.hasOwnProperty("User-Agent")));
 };
 
-
 /**
  * Possible options:
+ *  - url: The URL to call
  *  - method: The HTTP request method (default: GET)
  *  - username: The username for HTTP Basic Auth
  *  - password: The password for HTTP Basic Auth
@@ -443,7 +418,12 @@ var doRequest = function(options) {
                 return this.responseHeaders;
             };
             xhr.getResponseHeader = function (header) {
-                return this.responseHeaders[header];
+                for(key in xhr.responseHeaders) {
+                    if(key.toLowerCase() === header.toLowerCase()) {
+                        return xhr.responseHeaders[key];
+                    }
+                }
+                return null;
             };
 
             return xhr;
@@ -735,7 +715,6 @@ Tomahawk.base64Encode = function (b) {
     return window.btoa(b);
 };
 
-
 Tomahawk.PluginManager = {
     wrapperPrefix: '_adapter_',
     objects: {},
@@ -766,8 +745,6 @@ Tomahawk.PluginManager = {
             methodName = this.wrapperPrefix + methodName;
         }
 
-
-        var pluginManager = this;
         if (!this.objects[objectId]) {
             Tomahawk.log("Object not found! objectId: " + objectId + " methodName: " + methodName);
         } else {
@@ -788,20 +765,21 @@ Tomahawk.PluginManager = {
     invoke: function (requestId, objectId, methodName, params) {
         RSVP.Promise.resolve(this.invokeSync(requestId, objectId, methodName, params))
             .then(function (result) {
-                Tomahawk.reportScriptJobResults({
+                var params = {
                     requestId: requestId,
                     data: result
-                });
+                };
+                Tomahawk.reportScriptJobResults(encodeParamsToNativeFunctions(params));
             }, function (error) {
-                Tomahawk.reportScriptJobResults({
+                var params = {
                     requestId: requestId,
                     error: error
-                });
+                };
+                Tomahawk.reportScriptJobResults(encodeParamsToNativeFunctions(params));
             });
     }
 };
 
-
 var encodeParamsToNativeFunctions = function(param) {
   return param;
 };
@@ -815,7 +793,7 @@ Tomahawk.NativeScriptJobManager = {
         var requestId = this.idCounter++;
         var deferred = RSVP.defer();
         this.deferreds[requestId] = deferred;
-        Tomahawk.invokeNativeScriptJob(requestId, methodName, encodeParamsToNativeFunctions(params));;
+        Tomahawk.invokeNativeScriptJob(requestId, methodName, encodeParamsToNativeFunctions(params));
         return deferred.promise;
     },
     reportNativeScriptJobResult: function(requestId, result) {
@@ -1484,9 +1462,7 @@ Tomahawk.Collection = {
             return new RSVP.Promise(function (resolve, reject) {
                 that.cachedDbs[id].changeVersion(that.cachedDbs[id].version, "", null,
                     function (err) {
-                        if (console.error) {
-                            console.error("Error!: %o", err);
-                        }
+                        Tomahawk.error("Error trying to change db version!", err);
                         reject();
                     }, function () {
                         delete that.cachedDbs[id];
@@ -1790,6 +1766,9 @@ Tomahawk.Collection = {
         this.settings.capabilities = [Tomahawk.Collection.BrowseCapability.Artists,
             Tomahawk.Collection.BrowseCapability.Albums,
             Tomahawk.Collection.BrowseCapability.Tracks];
+        if (!this.settings.weight && this.resolver && this.resolver.settings.weight) {
+            this.settings.weight = this.resolver.settings.weight;
+        }
         return this.settings;
     },
 
@@ -1798,6 +1777,14 @@ Tomahawk.Collection = {
           return this.resolver.getStreamUrl(params);
         }
 
+        return params;
+    },
+
+    getDownloadUrl: function(params) {
+        if(this.resolver) {
+          return this.resolver.getDownloadUrl(params);
+        }
+
         return params;
     }
 };

resources.qrc

@@ -3,6 +3,7 @@
         <file>data/images/collection_background.png</file>
         <file>data/images/playlist_background.png</file>
         <file>data/images/filter.svg</file>
+        <file>data/images/folder.svg</file>
         <file>data/images/loved.svg</file>
         <file>data/images/love.svg</file>
         <file>data/images/not-loved.svg</file>
@@ -167,5 +168,8 @@
         <file>data/images/repeat-one.svg</file>
         <file>data/images/downloads.svg</file>
         <file>data/images/downloadbutton.svg</file>
+        <file>data/images/nav-back.svg</file>
+        <file>data/images/nav-forward.svg</file>
+        <file>data/sounds/silence.ogg</file>
     </qresource>
 </RCC>

src/accounts/hatchet/CMakeLists.txt

@@ -24,13 +24,6 @@ include_directories(
 
 add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
 
-if(APPLE)
-    # http://stackoverflow.com/questions/7226753/osx-lion-xcode-4-1-how-do-i-setup-a-c0x-project/7236451#7236451
-    add_definitions(-std=c++11 -stdlib=libc++ -U__STRICT_ANSI__)
-    set(PLATFORM_SPECIFIC_LINK_LIBRARIES "/usr/lib/libc++.dylib")
-else()
-    add_definitions(-std=c++0x)
-endif()
 
 tomahawk_add_plugin(hatchet
     TYPE account

src/accounts/xmpp/XmppInfoPlugin.cpp

@@ -69,6 +69,13 @@ Tomahawk::InfoSystem::XmppInfoPlugin::init()
 }
 
 
+const QString
+Tomahawk::InfoSystem::XmppInfoPlugin::friendlyName() const
+{
+    return "xmpp";
+}
+
+
 void
 Tomahawk::InfoSystem::XmppInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
 {

src/accounts/xmpp/XmppInfoPlugin.h

@@ -38,16 +38,18 @@ namespace Tomahawk {
             XmppInfoPlugin(XmppSipPlugin* parent);
             virtual ~XmppInfoPlugin();
 
+            const QString friendlyName() const override;
+
         signals:
             void publishTune( QUrl url, Tomahawk::InfoSystem::InfoStringHash trackInfo );
 
         public slots:
-            void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+            void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ) override;
 
         protected slots:
-            void init();
-            void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
-            void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+            void init() override;
+            void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ) override;
+            void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) override;
 
         private slots:
             void audioStarted( const Tomahawk::InfoSystem::PushInfoPair& pushInfoPair );

src/accounts/xmpp/sip/XmppSip.cpp

@@ -194,9 +194,9 @@ InfoSystem::InfoPluginPtr
 XmppSipPlugin::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-        m_infoPlugin = QPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
+        m_infoPlugin = QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
 
-    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 
@@ -285,7 +285,7 @@ XmppSipPlugin::onConnect()
     // load XmppInfoPlugin
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 
@@ -359,7 +359,6 @@ XmppSipPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
     if ( !m_infoPlugin.isNull() )
     {
         Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
-        delete m_infoPlugin;
     }
 }
 

src/accounts/xmpp/sip/XmppSip.h

@@ -128,7 +128,7 @@ private:
     int m_currentPort;
     QString m_currentResource;
 
-    QPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
+    QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
     Tomahawk::Accounts::Account::ConnectionState m_state;
 
     // sort out

src/accounts/zeroconf/Zeroconf.h

@@ -54,14 +54,14 @@ public:
     Account::ConnectionState connectionState() const;
 
 public slots:
-    void connectPlugin();
-    void disconnectPlugin();
+    void connectPlugin() override;
+    void disconnectPlugin() override;
 
     void advertise();
 
-    virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& /* receiver */, const QList<SipInfo>& /* info */ ) {}
+    virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& /* receiver */, const QList<SipInfo>& /* info */ ) override {}
     void broadcastMsg( const QString& ) {}
-    bool addContact( const QString&, AddContactOptions, const QString& ) { return false; }
+    bool addContact( const QString&, AddContactOptions, const QString& ) override { return false; }
 
 private slots:
     void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid );

src/crashreporter/main.cpp

@@ -174,7 +174,7 @@ int main( int argc, char* argv[] )
     reporter.setLogo( QPixmap( CRASHREPORTER_ICON ) );
     #endif
     reporter.setWindowTitle( CRASHREPORTER_PRODUCT_NAME );
-    reporter.setText("<html><head/><body><p><span style=\" font-weight:600;\">Sorry!</span> " CRASHREPORTER_PRODUCT_NAME " crashed. Please tell us about it! " CRASHREPORTER_PRODUCT_NAME " has created an error report for you that can help improve the stability in the future. You can now send this report directly to the " CRASHREPORTER_PRODUCT_NAME " developers.</p></body></html>");
+    reporter.setText("<html><head/><body><p><span style=\"font-weight:600;\">Sorry!</span> " CRASHREPORTER_PRODUCT_NAME " crashed. Please tell us about it! " CRASHREPORTER_PRODUCT_NAME " has created an error report for you that can help improve the stability in the future. You can now send this report directly to the " CRASHREPORTER_PRODUCT_NAME " developers.</p><p>Can you tell us what you were doing when this happened?</p></body></html>");
 
     reporter.setReportData( "BuildID", CRASHREPORTER_BUILD_ID );
     reporter.setReportData( "ProductName",  CRASHREPORTER_PRODUCT_NAME );

src/infoplugins/generic/CMakeLists.txt

@@ -1,5 +1,4 @@
 include_directories(
-    ${ECHONEST_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
 )
 if(WIN32 OR APPLE)
@@ -15,14 +14,13 @@ endif()
 endif(WIN32 OR APPLE)
 
 list(APPEND simple_plugins
-    Echonest
     Charts
     NewReleases
-    Spotify
+    #Spotify
     Hypem
     MusixMatch
     MusicBrainz
-    Rovi
+    #Rovi
     Discogs
 )
 

src/infoplugins/generic/snorenotify/SnoreNotifyPlugin.cpp

@@ -36,19 +36,6 @@
 #include <QPixmap>
 
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-namespace Qt
-{
-inline QString escape( const QString &x )
-{
-    return x.toHtmlEscaped();
- }
- }
-#else
-// QTextDocument provides Qt::escape()
-#include <QTextDocument>
-#endif
-
 namespace Tomahawk
 {
 
@@ -63,8 +50,8 @@ SnoreNotifyPlugin::SnoreNotifyPlugin()
     m_supportedPushTypes << InfoNotifyUser << InfoNowPlaying << InfoTrackUnresolved << InfoNowStopped << InfoInboxReceived;
 
     Snore::SnoreCore &snore = Snore::SnoreCore::instance();
-    snore.loadPlugins( Snore::SnorePlugin::BACKEND | Snore::SnorePlugin::SECONDARY_BACKEND );
-    snore.setDefaultSettingsValue("Silent", true, Snore::LOCAL_SETTING);
+    snore.loadPlugins( Snore::SnorePlugin::Backend | Snore::SnorePlugin::SecondaryBackend );
+    snore.setDefaultSettingsValue("Silent", true, Snore::LocalSetting );
 
     m_application = Snore::Application( qApp->applicationName(), m_defaultIcon );
     m_application.hints().setValue( "use-markup", true );
@@ -174,11 +161,11 @@ SnoreNotifyPlugin::nowPlaying( const QVariant& input )
     // Remark: If using xml-based markup in notifications, the supplied strings need to be escaped.
     QString album;
     if ( !hash[ "album" ].isEmpty() )
-        album = QString( "<br><i>%1</i> %2" ).arg( tr( "on", "'on' is followed by an album name" ) ).arg( Qt::escape( hash[ "album" ] ) );
+        album = QString( "<br><i>%1</i> %2" ).arg( tr( "on", "'on' is followed by an album name" ) ).arg( hash[ "album" ].toHtmlEscaped() );
 
     messageText = tr( "%1%4 %2%3.", "%1 is a title, %2 is an artist and %3 is replaced by either the previous message or nothing, %4 is the preposition used to link track and artist ('by' in english)" )
-            .arg( Qt::escape( hash[ "title" ] ) )
-            .arg( Qt::escape( hash[ "artist" ] ) )
+            .arg( hash[ "title" ].toHtmlEscaped() )
+            .arg( hash[ "artist" ].toHtmlEscaped() )
             .arg( album )
             .arg( QString( "<br><i>%1</i>" ).arg( tr( "by", "preposition to link track and artist" ) ) );
 
@@ -224,9 +211,9 @@ SnoreNotifyPlugin::inboxReceived( const QVariant& input )
     QString messageText;
     // Remark: If using xml-based markup in notifications, the supplied strings need to be escaped.
     messageText = tr( "%1 sent you\n%2%4 %3.", "%1 is a nickname, %2 is a title, %3 is an artist, %4 is the preposition used to link track and artist ('by' in english)" )
-            .arg( Qt::escape( src["friendlyname"] ) )
-            .arg( Qt::escape( hash[ "title" ] ) )
-            .arg( Qt::escape( hash[ "artist" ] ) )
+            .arg( src["friendlyname"].toHtmlEscaped() )
+            .arg( hash[ "title" ].toHtmlEscaped() )
+            .arg( hash[ "artist" ].toHtmlEscaped() )
             .arg( QString( "\n<i>%1</i>" ).arg( tr( "by", "preposition to link track and artist" ) ) );
 
     // Dirty hack(TM) so that KNotify/QLabel recognizes the message as Rich Text

src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp

@@ -80,7 +80,7 @@ FdoNotifyPlugin::FdoNotifyPlugin()
     , m_wmSupportsBodyMarkup( false )
 {
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-    m_supportedPushTypes << InfoNotifyUser << InfoNowPlaying << InfoTrackUnresolved << InfoNowStopped << InfoInboxReceived;
+    m_supportedPushTypes << InfoNotifyUser << InfoNowPlaying << InfoNowResumed << InfoTrackUnresolved << InfoNowStopped << InfoInboxReceived;
 
     // Query the window manager for its capabilties in styling notifications.
     notifications_interface = new org::freedesktop::Notifications( "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
@@ -139,6 +139,7 @@ FdoNotifyPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
             return;
 
         case Tomahawk::InfoSystem::InfoNowPlaying:
+        case Tomahawk::InfoSystem::InfoNowResumed:
             nowPlaying( pushData.infoPair.second );
             return;
 

src/libtomahawk-playdarapi/CMakeLists.txt

@@ -24,6 +24,7 @@ tomahawk_add_library(${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}
         qtcertificateaddon
         ${GNUTLS_LIBRARIES}
     EXPORT TomahawkLibraryDepends
+    EXPORT_MACRO TOMAHAWK_WIDGETS_EXPORT_PRO
     VERSION ${TOMAHAWK_VERSION_SHORT}
     )
 

src/libtomahawk-playdarapi/PlaydarAPIDllMacro.h

@@ -23,7 +23,7 @@
 #include <QtCore/qglobal.h>
 
 #ifndef TOMAHAWK_PLAYDARAPI_EXPORT
-# if defined (tomahawk_playdarapi_EXPORTS)
+# if defined (TOMAHAWK_WIDGETS_EXPORT_PRO)
 #  define TOMAHAWK_PLAYDARAPI_EXPORT Q_DECL_EXPORT
 # else
 #  define TOMAHAWK_PLAYDARAPI_EXPORT Q_DECL_IMPORT

src/libtomahawk-playdarapi/PlaydarApi.h

@@ -34,7 +34,7 @@ public:
      * Creates a Playdar HTTP interface
      * @param ha Address to listen on
      * @param port Port to listen on with HTTP
-     * @param sport Pot to listen on with HTTPS
+     * @param sport Port to listen on with HTTPS
      * @param parent
      */
     explicit PlaydarApi( QHostAddress ha, qint16 port, qint16 sport, QObject *parent = 0 );

src/libtomahawk-widgets/CMakeLists.txt

@@ -13,5 +13,6 @@ tomahawk_add_library(${TOMAHAWK_WIDGETS_LIBRARY_TARGET}
     SOURCES ${${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_SOURCES}
     UI ${${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_UI}
     EXPORT TomahawkLibraryDepends
+    EXPORT_MACRO TOMAHAWK_WIDGETS_EXPORT_PRO
     VERSION ${TOMAHAWK_VERSION_SHORT}
 )

src/libtomahawk-widgets/WidgetsDllMacro.h

@@ -23,7 +23,7 @@
 #include <QtCore/qglobal.h>
 
 #ifndef TOMAHAWK_WIDGETS_EXPORT
-# if defined (tomahawk_widgets_EXPORTS)
+# if defined (TOMAHAWK_WIDGETS_EXPORT_PRO)
 #  define TOMAHAWK_WIDGETS_EXPORT Q_DECL_EXPORT
 # else
 #  define TOMAHAWK_WIDGETS_EXPORT Q_DECL_IMPORT

src/libtomahawk/ActionCollection.cpp

@@ -62,6 +62,8 @@ ActionCollection::~ActionCollection()
 void
 ActionCollection::initActions()
 {
+    // ATTENTION: Don't set ApplicationSpecificRole for submenu actions: they won't show up on OS X (Qt 5.5)
+
     QAction *latchOn = new QAction( tr( "&Listen Along" ), this );
     latchOn->setIcon( ImageRegistry::instance()->icon( RESPATH "images/headphones.svg" ) );
     m_actionCollection[ "latchOn" ] = latchOn;
@@ -118,9 +120,12 @@ ActionCollection::initActions()
     m_actionCollection[ "createPlaylist" ] = new QAction( tr( "Create Playlist" ), this );
     m_actionCollection[ "createPlaylist" ]->setShortcut( QKeySequence( "Ctrl+N" ) );
     m_actionCollection[ "createPlaylist" ]->setShortcutContext( Qt::ApplicationShortcut );
+    // echonest is dead, disable stations
+    /*
     m_actionCollection[ "createStation" ] = new QAction( tr( "Create Station" ), this );
     m_actionCollection[ "createStation" ]->setShortcut( QKeySequence( "Ctrl+S" ) );
     m_actionCollection[ "createStation" ]->setShortcutContext( Qt::ApplicationShortcut );
+    */
 #ifdef Q_OS_MAC
     m_actionCollection[ "minimize" ] = new QAction( tr( "Minimize" ), this );
     m_actionCollection[ "minimize" ]->setShortcut( QKeySequence( "Ctrl+M" ) );
@@ -147,7 +152,6 @@ ActionCollection::initActions()
 #endif
     m_actionCollection[ "crashNow" ] = new QAction( "Crash now...", this );
     m_actionCollection[ "whatsnew_0_8" ] = new QAction( tr( "%applicationName 0.8" ) , this );
-    m_actionCollection[ "whatsnew_0_8" ]->setMenuRole( QAction::ApplicationSpecificRole );
     m_actionCollection[ "reportBug" ] = new QAction( tr( "Report a Bug" ) , this );
     m_actionCollection[ "getSupport" ] = new QAction( tr( "Get Support" ) , this );
     m_actionCollection[ "helpTranslate" ] = new QAction( tr( "Help Us Translate" ) , this );
@@ -170,7 +174,8 @@ ActionCollection::createMenuBar( QWidget *parent )
     controlsMenu->addAction( m_actionCollection[ "showOfflineSources" ] );
     controlsMenu->addSeparator();
     controlsMenu->addAction( m_actionCollection[ "createPlaylist" ] );
-    controlsMenu->addAction( m_actionCollection[ "createStation" ] );
+    // echonest is dead, disable stations
+    // controlsMenu->addAction( m_actionCollection[ "createStation" ] );
     controlsMenu->addAction( m_actionCollection[ "importPlaylist" ] );
     controlsMenu->addAction( m_actionCollection[ "updateCollection" ] );
     controlsMenu->addAction( m_actionCollection[ "rescanCollection" ] );

src/libtomahawk/Album.cpp

@@ -33,6 +33,7 @@
 
 #include <QReadWriteLock>
 #include <QPixmapCache>
+#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -75,6 +76,7 @@ Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCr
     }
 
     album_ptr album = album_ptr( new Album( name, artist ), &Album::deleteLater );
+    album->moveToThread( QCoreApplication::instance()->thread() );
     album->setWeakRef( album.toWeakRef() );
     album->loadId( autoCreate );
     s_albumsByName.insert( key, album );

src/libtomahawk/Artist.cpp

@@ -36,6 +36,7 @@
 
 #include <QReadWriteLock>
 #include <QPixmapCache>
+#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -109,6 +110,7 @@ Artist::get( unsigned int id, const QString& name )
     }
 
     artist_ptr a = artist_ptr( new Artist( id, name ), &Artist::deleteLater );
+    a->moveToThread( QCoreApplication::instance()->thread() );
     a->setWeakRef( a.toWeakRef() );
     s_artistsByName.insert( key, a );
 

src/libtomahawk/AtticaManager.cpp

@@ -67,7 +67,7 @@ AtticaManager::AtticaManager( QObject* parent )
     connect( &m_manager, SIGNAL( providerAdded( Attica::Provider ) ), this, SLOT( providerAdded( Attica::Provider ) ) );
 
     // resolvers
-//    m_manager.addProviderFile( QUrl( "http://bakery.tomahawk-player.org/resolvers/providers.xml" ) );
+//    m_manager.addProviderFile( QUrl( "http://v09.bakery.tomahawk-player.org/resolvers/providers.xml" ) );
 
     const QString url = QString( "%1/resolvers/providers.xml?version=%2" ).arg( hostname() ).arg( TomahawkUtils::appFriendlyVersion() );
     QNetworkReply* reply = Tomahawk::Utils::nam()->get( QNetworkRequest( QUrl( url ) ) );
@@ -116,7 +116,7 @@ AtticaManager::fetchMissingIcons()
 QString
 AtticaManager::hostname() const
 {
-    return "http://bakery.tomahawk-player.org";
+    return "http://v09.bakery.tomahawk-player.org";
 }
 
 

src/libtomahawk/CMakeLists.txt

@@ -37,6 +37,7 @@ set( libGuiSources
     jobview/ErrorStatusMessage.cpp
     jobview/IndexingJobItem.cpp
     jobview/InboxJobItem.cpp
+    jobview/ScriptErrorStatusMessage.cpp
 
     playlist/InboxModel.cpp
     playlist/InboxView.cpp
@@ -73,9 +74,6 @@ set( libGuiSources
     playlist/dynamic/DynamicPlaylist.cpp
     playlist/dynamic/DynamicView.cpp
     playlist/dynamic/DynamicModel.cpp
-    playlist/dynamic/echonest/EchonestGenerator.cpp
-    playlist/dynamic/echonest/EchonestControl.cpp
-    playlist/dynamic/echonest/EchonestSteerer.cpp
     playlist/dynamic/widgets/DynamicWidget.cpp
     playlist/dynamic/widgets/DynamicControlWrapper.cpp
     playlist/dynamic/widgets/DynamicControlList.cpp
@@ -145,6 +143,7 @@ set( libGuiSources
     widgets/ClickableLabel.cpp
     widgets/ComboBox.cpp
     widgets/DropDownButton.cpp
+    widgets/DownloadButton.cpp
     widgets/ElidedLabel.cpp
     widgets/FilterHeader.cpp
     widgets/CaptionLabel.cpp
@@ -206,7 +205,6 @@ list(APPEND libSources
     PlaylistInterface.cpp
     UrlHandler.cpp
 
-    EchonestCatalogSynchronizer.cpp
 
     accounts/AccountManager.cpp
     accounts/Account.cpp
@@ -411,13 +409,12 @@ include_directories(
 
     ${QT_INCLUDE_DIR}
     ${QJSON_INCLUDE_DIR}
-    ${ECHONEST_INCLUDE_DIR}
     ${LUCENEPP_INCLUDE_DIRS}
     ${LIBVLC_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
 
     ${LIBPORTFWD_INCLUDE_DIR}
-    ${QUAZIP_INCLUDE_DIR}
+    ${QUAZIP_INCLUDE_DIRS}
     ${QTKEYCHAIN_INCLUDE_DIRS}
 )
 
@@ -500,7 +497,7 @@ set_target_properties(
             AUTOMOC TRUE
             VERSION ${TOMAHAWK_VERSION_SHORT}
             SOVERSION ${TOMAHAWK_VERSION_SHORT}
-            OUTPUT_NAME ${TOMAHAWK_TARGET_NAME}
+            OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME}
 )
 
 
@@ -523,7 +520,6 @@ ENDIF( UNIX AND NOT APPLE )
 TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}
     LINK_PRIVATE
     ${LIBVLC_LIBRARY}
-    ${LIBVLCCORE_LIBRARY}
 
     # Thirdparty shipped with tomahawk
     ${LIBPORTFWD_LIBRARIES}
@@ -534,7 +530,6 @@ TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}
     # External deps
     ${QJSON_LIBRARIES}
     ${LUCENEPP_LIBRARIES}
-    ${ECHONEST_LIBRARIES}
     ${QT_QTSQL_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
@@ -578,7 +573,7 @@ file( GLOB networkHeaders "network/*.h" )
 file( GLOB playlistHeaders "playlist/*.h" )
 file( GLOB playlistDynamicHeaders "playlist/dynamic/*.h" )
 file( GLOB playlistDynamicDatabaseHeaders "playlist/dynamic/database/*.h" )
-file( GLOB playlistDynamicEchonestHeaders "playlist/dynamic/echonest/*.h" )
+# file( GLOB playlistDynamicEchonestHeaders "playlist/dynamic/echonest/*.h" )
 file( GLOB playlistDynamicWidgetsHeaders "playlist/dynamic/widgets/*.h" )
 file( GLOB resolversHeaders "resolvers/*.h" )
 file( GLOB sipHeaders "sip/*.h" )
@@ -607,7 +602,7 @@ install( FILES ${networkHeaders} DESTINATION include/libtomahawk/network )
 install( FILES ${playlistHeaders} DESTINATION include/libtomahawk/playlist )
 install( FILES ${playlistDynamicHeaders} DESTINATION include/libtomahawk/playlist/dynamic )
 install( FILES ${playlistDynamicDatabaseHeaders} DESTINATION include/libtomahawk/playlist/dynamic/database )
-install( FILES ${playlistDynamicEchonestHeaders} DESTINATION include/libtomahawk/playlist/dynamic/echonest )
+# install( FILES ${playlistDynamicEchonestHeaders} DESTINATION include/libtomahawk/playlist/dynamic/echonest )
 install( FILES ${playlistDynamicWidgetsHeaders} DESTINATION include/libtomahawk/playlist/dynamic/widgets )
 install( FILES ${resolversHeaders} DESTINATION include/libtomahawk/resolvers )
 install( FILES ${sipHeaders} DESTINATION include/libtomahawk/sip )

src/libtomahawk/ContextMenu.cpp

@@ -37,6 +37,9 @@
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 
+#include <QDesktopServices>
+#include <QFileInfo>
+
 using namespace Tomahawk;
 
 
@@ -51,7 +54,7 @@ ContextMenu::ContextMenu( QWidget* parent )
     m_sigmap = new QSignalMapper( this );
     connect( m_sigmap, SIGNAL( mapped( int ) ), SLOT( onTriggered( int ) ) );
 
-    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend;
+    clear();
 }
 
 
@@ -69,7 +72,7 @@ ContextMenu::clear()
     m_albums.clear();
     m_artists.clear();
 
-    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend;
+    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend | ActionOpenFileManager;
 }
 
 
@@ -216,10 +219,23 @@ ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
     addSeparator();
 
     if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+    {
         m_sigmap->setMapping( addAction( tr( "&Copy Track Link" ) ), ActionCopyLink );
+    }
+
+    if ( m_supportedActions & ActionOpenFileManager &&
+         queries.length() == 1 &&
+         queries.first()->numResults() &&
+         queries.first()->results().first()->isLocal() )
+    {
+        m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/folder.svg" ),
+                                         tr( "Open Folder in File Manager..." ) ), ActionOpenFileManager );
+    }
 
     if ( m_supportedActions & ActionEditMetadata && itemCount() == 1 )
+    {
         m_sigmap->setMapping( addAction( tr( "Properties..." ) ), ActionEditMetadata );
+    }
 
     addSeparator();
 
@@ -239,6 +255,8 @@ ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
             m_sigmap->setMapping( addAction( tr( "Mark as &Listened" ) ), ActionMarkListened );
     }
 
+    addSeparator();
+
     if ( m_supportedActions & ActionDelete )
         m_sigmap->setMapping( addAction( queries.count() > 1 ? tr( "&Remove Items" ) : tr( "&Remove Item" ) ), ActionDelete );
 
@@ -394,6 +412,15 @@ ContextMenu::onTriggered( int action )
             }
             break;
 
+        case ActionOpenFileManager:
+            {
+                result_ptr result = m_queries.first()->results().first();
+                QString path = QFileInfo( result->url() ).path();
+                tLog() << Q_FUNC_INFO << "open directory" << path;
+                QDesktopServices::openUrl( path );
+            }
+            break;
+
         default:
             emit triggered( action );
     }

src/libtomahawk/ContextMenu.h

@@ -37,21 +37,22 @@ Q_OBJECT
 public:
     enum MenuActions
     {
-        ActionPlay =         1,
-        ActionQueue =        2,
-        ActionDelete =       4,
-        ActionCopyLink =     8,
-        ActionLove =         16,
-        ActionStopAfter =    32,
-        ActionPage =         64,
-        ActionTrackPage =    128,
-        ActionArtistPage =   256,
-        ActionAlbumPage =    512,
-        ActionEditMetadata = 1024,
-        ActionPlaylist =     2048,
-        ActionSend =         4096,
-        ActionMarkListened = 8192,
-        ActionDownload =     16384
+        ActionPlay =            1,
+        ActionQueue =           2,
+        ActionDelete =          4,
+        ActionCopyLink =        8,
+        ActionLove =            16,
+        ActionStopAfter =       32,
+        ActionPage =            64,
+        ActionTrackPage =       128,
+        ActionArtistPage =      256,
+        ActionAlbumPage =       512,
+        ActionEditMetadata =    1024,
+        ActionPlaylist =        2048,
+        ActionSend =            4096,
+        ActionMarkListened =    8192,
+        ActionDownload =        16384,
+        ActionOpenFileManager = 32768
     };
 
     explicit ContextMenu( QWidget* parent = 0 );

src/libtomahawk/DownloadJob.cpp

@@ -118,7 +118,7 @@ DownloadJob::localFile() const
 
 
 QString
-DownloadJob::localPath() const
+DownloadJob::localPath( const Tomahawk::album_ptr& album )
 {
     QDir dir = TomahawkSettings::instance()->downloadsPath();
 
@@ -127,7 +127,7 @@ DownloadJob::localPath() const
         dir.mkpath( "." );
     }
 
-    QString path = QString( "%1/%2" ).arg( safeEncode( m_track->artist(), true ) ).arg( safeEncode( m_track->album(), true ) );
+    QString path = QString( "%1/%2" ).arg( safeEncode( album->artist()->name(), true ) ).arg( safeEncode( album->name(), true ) );
     dir.mkpath( path );
 
     return QString( dir.path() + "/" + path ).replace( "//", "/" );
@@ -138,7 +138,7 @@ QUrl
 DownloadJob::prepareFilename()
 {
     QString filename = QString( "%1. %2.%3" ).arg( m_track->albumpos() ).arg( safeEncode( m_track->track() ) ).arg( m_format.extension );
-    QString path = localPath();
+    QString path = localPath( m_track->albumPtr() );
     QString localFile = QString( path + "/" + filename );
 
     if ( !m_tryResuming )
@@ -206,22 +206,17 @@ DownloadJob::download()
 {
     if ( m_state == Running )
         return true;
+
     setState( Running );
 
-    if ( m_result->resolvedByCollection() )
-    {
-        Tomahawk::ScriptCollection* collection = qobject_cast<Tomahawk::ScriptCollection*>( m_result->resolvedByCollection().data() );
-        if ( collection )
-        {
-            QVariantMap arguments;
-            arguments[ "url" ] = m_format.url;
-
-            // HACK: *shrug* WIP.
-            Tomahawk::ScriptJob* job = collection->scriptObject()->invoke( "getStreamUrl", arguments );
-            connect( job, SIGNAL( done(QVariantMap) ), SLOT( onUrlRetrieved(QVariantMap) ) );
-            job->start();
-        }
+    if (m_result->resolvedBy() != nullptr) {
+        Tomahawk::ScriptJob *job = m_result->resolvedBy()->getDownloadUrl( m_result, m_format );
+        connect( job, SIGNAL( done(QVariantMap) ), SLOT( onUrlRetrieved(QVariantMap) ) );
+        job->start();
+    } else {
+        onUrlRetrieved({{"url", m_format.url}});
     }
+
     return true;
 }
 
@@ -444,7 +439,7 @@ DownloadJob::checkForResumedFile()
 
 
 QString
-DownloadJob::safeEncode( const QString& filename, bool removeTrailingDots ) const
+DownloadJob::safeEncode( const QString& filename, bool removeTrailingDots )
 {
     //FIXME: make it a regexp
     QString res = QString( filename ).toLatin1().replace( "/", "_" ).replace( "\\", "_" )

src/libtomahawk/DownloadJob.h

@@ -58,7 +58,7 @@ public:
     long receivedSize() const { return m_rcvdSize; }
     long fileSize() const { return m_fileSize; }
 
-    QString localPath() const;
+    static QString localPath( const Tomahawk::album_ptr& album );
     QString localFile() const;
     DownloadFormat format() const;
 
@@ -90,7 +90,7 @@ private slots:
 
 private:
     void storeState();
-    QString safeEncode( const QString& filename, bool removeTrailingDots = false ) const;
+    static QString safeEncode( const QString& filename, bool removeTrailingDots = false );
     bool checkForResumedFile();
     QUrl prepareFilename();
 

src/libtomahawk/DownloadManager.cpp

@@ -24,6 +24,8 @@
 #include "TomahawkSettings.h"
 #include "infosystem/InfoSystem.h"
 #include "utils/Logger.h"
+#include "Result.h"
+#include "Query.h"
 
 DownloadManager* DownloadManager::s_instance = 0;
 
@@ -85,6 +87,36 @@ DownloadManager::localFileForDownload( const QString& url ) const
 }
 
 
+QUrl
+DownloadManager::localUrlForDownload( const Tomahawk::query_ptr& query ) const
+{
+    Tomahawk::result_ptr result = query->numResults( true ) ? query->results().first() : Tomahawk::result_ptr();
+    if ( result )
+    {
+        return localUrlForDownload( result );
+    }
+
+    return QUrl();
+}
+
+
+QUrl
+DownloadManager::localUrlForDownload( const Tomahawk::result_ptr& result ) const
+{
+    if ( result && !result->downloadFormats().isEmpty() &&
+        !localFileForDownload( result->downloadFormats().first().url.toString() ).isEmpty() )
+    {
+        return QUrl::fromLocalFile( QFileInfo( DownloadManager::instance()->localFileForDownload( result->downloadFormats().first().url.toString() ) ).absolutePath() );
+    }
+    else if ( result && result->downloadJob() && result->downloadJob()->state() == DownloadJob::Finished )
+    {
+        return QUrl::fromLocalFile( QFileInfo( result->downloadJob()->localFile() ).absolutePath() );
+    }
+
+    return QUrl();
+}
+
+
 void
 DownloadManager::storeJobs( const QList<downloadjob_ptr>& jobs )
 {

src/libtomahawk/DownloadManager.h

@@ -45,6 +45,8 @@ public:
 
     void storeJobs( const QList<downloadjob_ptr>& jobs );
     QString localFileForDownload( const QString& url ) const;
+    QUrl localUrlForDownload( const Tomahawk::result_ptr& result ) const;
+    QUrl localUrlForDownload( const Tomahawk::query_ptr& query ) const;
 
 public slots:
     bool addJob( const downloadjob_ptr& job );

src/libtomahawk/DropJob.cpp

@@ -263,9 +263,14 @@ bool
 DropJob::validateLocalFiles(const QString &paths, const QString &suffix)
 {
     QStringList filePaths = paths.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    for ( QStringList::iterator it = filePaths.begin(); it != filePaths.end(); ++it )
+    QStringList::iterator it = filePaths.begin();
+    while ( it != filePaths.end() )
+    {
         if ( !validateLocalFile( *it, suffix ) )
-            filePaths.erase( it );
+            it = filePaths.erase( it );
+        else
+            ++it;
+    }
     return !filePaths.isEmpty();
 }
 
@@ -975,7 +980,7 @@ DropJob::removeRemoteSources()
 
         foreach ( const Tomahawk::result_ptr& result, item->results() )
         {
-            if ( !result->resolvedByCollection().isNull() && !result->resolvedByCollection()->isLocal() )
+            if ( !result->isLocal() )
             {
                 list.append( item );
                 break;

src/libtomahawk/GlobalActionManager.cpp

@@ -1,14 +1,14 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
- *   Copyright (C) 2011, Jeff Mitchell <jeff@tomahawk-player.org>
- *   Copyright (C) 2011-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright (C) 2013, Uwe L. Korn <uwelk@xhochy.com>
- *   Copyright (C) 2013, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2011,      Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011-2016, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011,      Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2013,      Uwe L. Korn <uwelk@xhochy.com>
+ *   Copyright 2013,      Teo Mrnjavac <teo@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
+ *   the Free Software Foundation, either version 3 of the License, or
  *   (at your option) any later version.
  *
  *   Tomahawk is distributed in the hope that it will be useful,
@@ -20,7 +20,6 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "GlobalActionManager.h"
 
 #include "accounts/AccountManager.h"
@@ -47,12 +46,6 @@
 #include "TomahawkSettings.h"
 #include "ViewManager.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-#include <echonest5/Playlist.h>
-#else
-#include <echonest/Playlist.h>
-#endif
-
 #include <QMessageBox>
 #include <QFileInfo>
 
@@ -913,144 +906,144 @@ GlobalActionManager::loadDynamicPlaylist( const QUrl& url, bool station )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistRadioType ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistRadioType ) );
+                // controls << c;
             }
             else if ( param.first == "artist_limitto" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistType ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistType ) );
+                // controls << c;
             }
             else if ( param.first == "description" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Artist Description" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistDescriptionType ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistDescriptionType ) );
+                // controls << c;
             }
             else if ( param.first == "variety" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Variety" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Variety ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Variety ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "tempo" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Tempo" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinTempo + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinTempo + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "duration" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Duration" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDuration + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDuration + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "loudness" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Loudness" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinLoudness + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinLoudness + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "danceability" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Danceability" );
                 int extra = param.first.endsWith( "_max" ) ? 1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDanceability + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDanceability + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "energy" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Energy" );
                 int extra = param.first.endsWith( "_max" ) ? 1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinEnergy + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinEnergy + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "artist_familiarity" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Artist Familiarity" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinFamiliarity + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinFamiliarity + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "artist_hotttnesss" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Artist Hotttnesss" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinHotttnesss + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinHotttnesss + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "song_hotttnesss" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Song Hotttnesss" );
                 int extra = param.first.endsWith( "_max" ) ? -1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongMinHotttnesss + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongMinHotttnesss + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "longitude" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Longitude" );
                 int extra = param.first.endsWith( "_max" ) ? 1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLongitude + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLongitude + extra ) );
+                // controls << c;
             }
             else if ( param.first.startsWith( "latitude" ) )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Latitude" );
                 int extra = param.first.endsWith( "_max" ) ? 1 : 0;
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLatitude + extra ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLatitude + extra ) );
+                // controls << c;
             }
             else if ( param.first == "key" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Key" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Key ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Key ) );
+                // controls << c;
             }
             else if ( param.first == "mode" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Mode" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mode ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mode ) );
+                // controls << c;
             }
             else if ( param.first == "mood" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Mood" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mood ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mood ) );
+                // controls << c;
             }
             else if ( param.first == "style" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Style" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Style ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Style ) );
+                // controls << c;
             }
             else if ( param.first == "song" )
             {
                 dyncontrol_ptr c = pl->generator()->createControl( "Song" );
                 c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongRadioType ) );
-                controls << c;
+                // c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongRadioType ) );
+                // controls << c;
             }
         }
 

src/libtomahawk/GlobalActionManager.h

@@ -1,21 +1,21 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011,      Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011-2016, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef GLOBALACTIONMANAGER_H
 #define GLOBALACTIONMANAGER_H

src/libtomahawk/Pipeline.cpp

@@ -36,7 +36,7 @@
 #define MAX_CONCURRENT_QUERIES 16
 #define CLEANUP_TIMEOUT 5 * 60 * 1000
 #define MINSCORE 0.5
-#define DEFAULT_RESOLVER_TIMEOUT 5000 //5 seconds
+#define DEFAULT_RESOLVER_TIMEOUT 5000 // 5 seconds
 
 using namespace Tomahawk;
 
@@ -149,6 +149,15 @@ Pipeline::removeResolver( Resolver* r )
 }
 
 
+QList< Tomahawk::Resolver* >
+Pipeline::resolvers() const
+{
+    Q_D( const Pipeline );
+
+    return d->resolvers;
+}
+
+
 void
 Pipeline::addResolver( Resolver* r )
 {
@@ -533,12 +542,12 @@ Pipeline::shuntNext()
         q->setCurrentResolver( 0 );
     }
 
-    //Zero-patient, a stub so that query is not resolved until we go through
-    //all resolvers
-    //As query considered as 'finished trying to resolve' when there are no
-    //more qid entries in qidsState we'll put one as sort of 'keep this until
-    //we kick off all our resolvers' entry
-    //once we kick off all resolvers we'll remove this entry
+    // Zero-patient, a stub so that query is not resolved until we go through
+    // all resolvers
+    // As query considered as 'finished trying to resolve' when there are no
+    // more qid entries in qidsState we'll put one as sort of 'keep this until
+    // we kick off all our resolvers' entry
+    // once we kick off all resolvers we'll remove this entry
     incQIDState( q, nullptr );
     checkQIDState( q );
 }
@@ -586,8 +595,8 @@ Pipeline::shunt( const query_ptr& q )
         // we get here if we disable a resolver while a query is resolving
         // OR we are just out of resolvers while query is still resolving
 
-        //since we seem to at least tried to kick off all of the resolvers,
-        //remove the '.keep' entry
+        // since we seem to at least tried to kick off all of the resolvers,
+        // remove the '.keep' entry
         decQIDState( q, nullptr );
         return;
     }
@@ -627,7 +636,7 @@ Pipeline::checkQIDState( const Tomahawk::query_ptr& query )
     Q_D( Pipeline );
     QMutexLocker lock( &d->mut );
 
-    tDebug() << Q_FUNC_INFO << " " << query->id() << " " << d->qidsState.count( query->id() );
+    tDebug() << Q_FUNC_INFO << query->id() << d->qidsState.count( query->id() );
 
     if ( d->qidsState.contains( query->id() ) )
     {
@@ -664,7 +673,7 @@ Pipeline::decQIDState( const Tomahawk::query_ptr& query, Tomahawk::Resolver* r )
     {
         {
             QMutexLocker lock( &d->mut );
-            d->qidsState.remove( query->id(), r );//Removes all matching pairs
+            d->qidsState.remove( query->id(), r ); // Removes all matching pairs
         }
 
         checkQIDState( query );

src/libtomahawk/Pipeline.h

@@ -66,6 +66,7 @@ public:
     QList< QPointer< ExternalResolver > > scriptResolvers() const;
     Tomahawk::ExternalResolver* resolverForPath( const QString& scriptPath );
 
+    QList< Resolver* > resolvers() const;
     void addResolver( Resolver* r );
     void removeResolver( Resolver* r );
 

src/libtomahawk/Query.cpp

@@ -33,6 +33,7 @@
 
 #include <QtAlgorithms>
 #include <QDebug>
+#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -47,6 +48,7 @@ Query::get( const QString& artist, const QString& track, const QString& album, c
         autoResolve = false;
 
     query_ptr q = query_ptr( new Query( Track::get( artist, track, album ), qid, autoResolve ), &QObject::deleteLater );
+    q->moveToThread( QCoreApplication::instance()->thread() );
     q->setWeakRef( q.toWeakRef() );
 
     if ( autoResolve )
@@ -192,7 +194,7 @@ Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
         }*/
 
         d->results << newresults;
-        qStableSort( d->results.begin(), d->results.end(), std::bind( &Query::resultSorter, this, std::placeholders::_1, std::placeholders::_2 ) );
+        sortResults();
 
         // hook up signals, and check solved status
         foreach( const result_ptr& rp, newresults )
@@ -256,7 +258,7 @@ Query::onResultStatusChanged()
         Q_D( Query );
         QMutexLocker lock( &d->mutex );
         if ( !d->results.isEmpty() )
-            qStableSort( d->results.begin(), d->results.end(), std::bind( &Query::resultSorter, this, std::placeholders::_1, std::placeholders::_2 ) );
+            sortResults();
     }
 
     checkResults();
@@ -271,6 +273,11 @@ Query::removeResult( const Tomahawk::result_ptr& result )
         Q_D( Query );
         QMutexLocker lock( &d->mutex );
         d->results.removeAll( result );
+        if ( d->preferredResult == result )
+        {
+            d->preferredResult.clear();
+        }
+        sortResults();
     }
 
     emit resultsRemoved( result );
@@ -394,21 +401,35 @@ Query::id() const
 bool
 Query::resultSorter( const result_ptr& left, const result_ptr& right )
 {
+    Q_D( Query );
+    if ( !d->preferredResult.isNull() )
+    {
+        if ( d->preferredResult == left )
+            return true;
+        if ( d->preferredResult == right )
+            return false;
+    }
+
     const float ls = left->isOnline() ? howSimilar( left ) : 0.0;
     const float rs = right->isOnline() ? howSimilar( right ) : 0.0;
 
     if ( ls == rs )
     {
-        if ( right->resolvedByCollection() && right->resolvedByCollection()->isLocal() )
+        if ( right->isLocal() )
         {
             return false;
         }
-        if ( !right->isPreview() )
+        if ( left->isPreview() != right->isPreview() )
         {
-            return false;
+            return !left->isPreview();
         }
 
-        return true;
+        if ( left->resolvedBy() != nullptr && right->resolvedBy() != nullptr )
+        {
+            return left->resolvedBy()->weight() > right->resolvedBy()->weight();
+        }
+
+        return left->id() > right->id();
     }
 
     if ( left->isPreview() != right->isPreview() )
@@ -420,6 +441,30 @@ Query::resultSorter( const result_ptr& left, const result_ptr& right )
 }
 
 
+result_ptr
+Query::preferredResult() const
+{
+    Q_D( const Query );
+    return d->preferredResult;
+}
+
+
+void
+Query::setPreferredResult( const result_ptr& result )
+{
+    {
+        Q_D( Query );
+        QMutexLocker lock( &d->mutex );
+
+        Q_ASSERT( d->results.contains( result ) );
+        d->preferredResult = result;
+        sortResults();
+    }
+
+    emit resultsChanged();
+}
+
+
 void
 Query::setCurrentResolver( Tomahawk::Resolver* resolver )
 {
@@ -615,6 +660,10 @@ float
 Query::howSimilar( const Tomahawk::result_ptr& r )
 {
     Q_D( Query );
+    if (d->howSimilarCache.find(r->id()) != d->howSimilarCache.end())
+    {
+        return d->howSimilarCache[r->id()];
+    }
     // result values
     const QString& rArtistname = r->track()->artistSortname();
     const QString& rAlbumname  = r->track()->albumSortname();
@@ -636,6 +685,13 @@ Query::howSimilar( const Tomahawk::result_ptr& r )
         qTrackname  = queryTrack()->trackSortname();
     }
 
+    static const QRegExp filterOutChars = QRegExp(QString::fromUtf8("[-`´~!@#$%^&*\\(\\)_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]"));
+
+    //Cleanup symbols for minor naming differences
+    qArtistname.remove(filterOutChars);
+    qTrackname.remove(filterOutChars);
+    qAlbumname.remove(filterOutChars);
+
     // normal edit distance
     const int artdist = TomahawkUtils::levenshtein( qArtistname, rArtistname );
     const int trkdist = TomahawkUtils::levenshtein( qTrackname, rTrackname );
@@ -666,12 +722,16 @@ Query::howSimilar( const Tomahawk::result_ptr& r )
         const int mlatr = qMax( artistTrackname.length(), rArtistTrackname.length() );
         const float dcatr = (float)( mlatr - atrdist ) / mlatr;
 
-        return qMax( dctrk, qMax( dcatr, qMax( dcart, dcalb ) ) );
+        float resultScore = qMax( dctrk, qMax( dcatr, qMax( dcart, dcalb ) ) );
+        d->howSimilarCache[r->id()] =  resultScore;
+        return resultScore;
     }
     else
     {
         // weighted, so album match is worth less than track title
-        return ( dcart * 4 + dcalb + dctrk * 5 ) / 10;
+        float resultScore = ( dcart * 4 + dcalb + dctrk * 5 ) / 10;
+        d->howSimilarCache[r->id()] =  resultScore;
+        return resultScore;
     }
 }
 
@@ -722,3 +782,11 @@ Query::setWeakRef( QWeakPointer<Query> weakRef )
     Q_D( Query );
     d->ownRef = weakRef;
 }
+
+
+void
+Query::sortResults()
+{
+    Q_D( Query );
+    qStableSort( d->results.begin(), d->results.end(), std::bind( &Query::resultSorter, this, std::placeholders::_1, std::placeholders::_2 ) );
+}

src/libtomahawk/Query.h

@@ -112,6 +112,8 @@ public:
 
     /// sorter for list of results
     bool resultSorter( const result_ptr& left, const result_ptr& right );
+    result_ptr preferredResult() const;
+    void setPreferredResult( const result_ptr& result );
 
 signals:
     void resultsAdded( const QList<Tomahawk::result_ptr>& );
@@ -158,6 +160,7 @@ private:
     void setCurrentResolver( Tomahawk::Resolver* resolver );
     void clearResults();
     void checkResults();
+    void sortResults();
 };
 
 } //ns

src/libtomahawk/Query_p.h

@@ -4,6 +4,7 @@
 #include "Query.h"
 
 #include <QMutex>
+#include <map>
 
 namespace Tomahawk
 {
@@ -39,6 +40,7 @@ private:
     QList< Tomahawk::artist_ptr > artists;
     QList< Tomahawk::album_ptr > albums;
     QList< Tomahawk::result_ptr > results;
+    Tomahawk::result_ptr preferredResult;
 
     float score;
     bool solved;
@@ -58,6 +60,8 @@ private:
 
     mutable QMutex mutex;
     QWeakPointer< Tomahawk::Query > ownRef;
+
+    std::map<QString, float> howSimilarCache;
 };
 
 } // Tomahawk

src/libtomahawk/Result.cpp

@@ -35,6 +35,8 @@
 #include "Track.h"
 #include "Typedefs.h"
 
+#include <QCoreApplication>
+
 using namespace Tomahawk;
 
 static QHash< QString, result_wptr > s_results;
@@ -69,6 +71,7 @@ Result::get( const QString& url, const track_ptr& track )
     }
 
     result_ptr r = result_ptr( new Result( url, track ), &Result::deleteLater );
+    r->moveToThread( QCoreApplication::instance()->thread() );
     r->setWeakRef( r.toWeakRef() );
     s_results.insert( url, r );
 
@@ -132,11 +135,19 @@ Result::deleteLater()
 void
 Result::onResolverRemoved( Tomahawk::Resolver* resolver )
 {
+    m_mutex.lock();
+
     if ( m_resolver.data() == resolver )
     {
         m_resolver = 0;
+        m_mutex.unlock();
+
         emit statusChanged();
     }
+    else
+    {
+        m_mutex.unlock();
+    }
 }
 
 
@@ -150,6 +161,8 @@ Result::resolvedByCollection() const
 QString
 Result::url() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_url;
 }
 
@@ -157,6 +170,8 @@ Result::url() const
 bool
 Result::checked() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_checked;
 }
 
@@ -164,6 +179,8 @@ Result::checked() const
 bool
 Result::isPreview() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_isPreview;
 }
 
@@ -171,6 +188,8 @@ Result::isPreview() const
 QString
 Result::mimetype() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_mimetype;
 }
 
@@ -178,6 +197,8 @@ Result::mimetype() const
 RID
 Result::id() const
 {
+    QMutexLocker lock( &m_mutex );
+
     if ( m_rid.isEmpty() )
         m_rid = uuid();
 
@@ -194,6 +215,8 @@ Result::isOnline() const
     }
     else
     {
+        QMutexLocker lock( &m_mutex );
+
         return !m_resolver.isNull();
     }
 }
@@ -211,27 +234,36 @@ Result::playable() const
 }
 
 
+bool
+Result::isLocal() const
+{
+    return resolvedByCollection().isNull() ? false : resolvedByCollection()->isLocal();
+}
+
+
 QVariant
 Result::toVariant() const
 {
+    track_ptr t = track();
+
     QVariantMap m;
-    m.insert( "artist", m_track->artist() );
-    m.insert( "album", m_track->album() );
-    m.insert( "track", m_track->track() );
+    m.insert( "artist", t->artist() );
+    m.insert( "album", t->album() );
+    m.insert( "track", t->track() );
     m.insert( "source", friendlySource() );
     m.insert( "mimetype", mimetype() );
     m.insert( "size", size() );
     m.insert( "bitrate", bitrate() );
-    m.insert( "duration", m_track->duration() );
+    m.insert( "duration", t->duration() );
 //    m.insert( "score", score() );
     m.insert( "sid", id() );
-    m.insert( "discnumber", m_track->discnumber() );
-    m.insert( "albumpos", m_track->albumpos() );
+    m.insert( "discnumber", t->discnumber() );
+    m.insert( "albumpos", t->albumpos() );
     m.insert( "preview", isPreview() );
     m.insert( "purchaseUrl", purchaseUrl() );
 
-    if ( !m_track->composer().isEmpty() )
-        m.insert( "composer", m_track->composer() );
+    if ( !t->composer().isEmpty() )
+        m.insert( "composer", t->composer() );
 
     return m;
 }
@@ -240,20 +272,25 @@ Result::toVariant() const
 QString
 Result::toString() const
 {
-    if ( m_track )
+    m_mutex.lock();
+    track_ptr track = m_track;
+    QString url = m_url;
+    m_mutex.unlock();
+
+    if ( track )
     {
         return QString( "Result(%1) %2 - %3%4 (%5)" )
                   .arg( id() )
-                  .arg( m_track->artist() )
-                  .arg( m_track->track() )
-                  .arg( m_track->album().isEmpty() ? QString() : QString( " on %1" ).arg( m_track->album() ) )
-                  .arg( m_url );
+                  .arg( track->artist() )
+                  .arg( track->track() )
+                  .arg( track->album().isEmpty() ? QString() : QString( " on %1" ).arg( track->album() ) )
+                  .arg( url );
     }
     else
     {
         return QString( "Result(%1) (%2)" )
                   .arg( id() )
-                  .arg( m_url );
+                  .arg( url );
     }
 }
 
@@ -261,6 +298,8 @@ Result::toString() const
 Tomahawk::query_ptr
 Result::toQuery()
 {
+    QMutexLocker l( &m_mutex );
+
     if ( m_query.isNull() )
     {
         query_ptr query = Tomahawk::Query::get( m_track );
@@ -270,12 +309,15 @@ Result::toQuery()
         m_query = query->weakRef();
 
         QList<Tomahawk::result_ptr> rl;
-        rl << weakRef().toStrongRef();
+        rl << m_ownRef.toStrongRef();
+        m_mutex.unlock();
         query->addResults( rl );
+        m_mutex.lock();
         query->setResolveFinished( true );
         return query;
     }
 
+
     return m_query.toStrongRef();
 }
 
@@ -295,9 +337,10 @@ Result::onOffline()
 
 
 void
-Result::setResolvedByCollection( const Tomahawk::collection_ptr& collection , bool emitOnlineEvents )
+Result::setResolvedByCollection( const Tomahawk::collection_ptr& collection, bool emitOnlineEvents )
 {
     m_collection = collection;
+
     if ( emitOnlineEvents )
     {
         Q_ASSERT( !collection.isNull() );
@@ -311,6 +354,8 @@ Result::setResolvedByCollection( const Tomahawk::collection_ptr& collection , bo
 void
 Result::setFriendlySource( const QString& s )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_friendlySource = s;
 }
 
@@ -318,6 +363,8 @@ Result::setFriendlySource( const QString& s )
 void
 Result::setPreview( bool isPreview )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_isPreview = isPreview;
 }
 
@@ -325,6 +372,8 @@ Result::setPreview( bool isPreview )
 void
 Result::setPurchaseUrl( const QString& u )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_purchaseUrl = u;
 }
 
@@ -332,6 +381,8 @@ Result::setPurchaseUrl( const QString& u )
 void
 Result::setLinkUrl( const QString& u )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_linkUrl = u;
 }
 
@@ -339,6 +390,8 @@ Result::setLinkUrl( const QString& u )
 void
 Result::setChecked( bool checked )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_checked = checked;
 }
 
@@ -346,6 +399,8 @@ Result::setChecked( bool checked )
 void
 Result::setMimetype( const QString& mimetype )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_mimetype = mimetype;
 }
 
@@ -353,6 +408,8 @@ Result::setMimetype( const QString& mimetype )
 void
 Result::setBitrate( unsigned int bitrate )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_bitrate = bitrate;
 }
 
@@ -360,6 +417,8 @@ Result::setBitrate( unsigned int bitrate )
 void
 Result::setSize( unsigned int size )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_size = size;
 }
 
@@ -367,6 +426,8 @@ Result::setSize( unsigned int size )
 void
 Result::setModificationTime( unsigned int modtime )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_modtime = modtime;
 }
 
@@ -374,6 +435,8 @@ Result::setModificationTime( unsigned int modtime )
 void
 Result::setTrack( const track_ptr& track )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_track = track;
 }
 
@@ -381,6 +444,8 @@ Result::setTrack( const track_ptr& track )
 unsigned int
 Result::fileId() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_fileId;
 }
 
@@ -390,6 +455,8 @@ Result::friendlySource() const
 {
     if ( resolvedByCollection().isNull() )
     {
+        QMutexLocker lock( &m_mutex );
+
         return m_friendlySource;
     }
     else
@@ -400,6 +467,8 @@ Result::friendlySource() const
 QString
 Result::purchaseUrl() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_purchaseUrl;
 }
 
@@ -407,6 +476,8 @@ Result::purchaseUrl() const
 QString
 Result::linkUrl() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_linkUrl;
 }
 
@@ -416,6 +487,8 @@ Result::sourceIcon( TomahawkUtils::ImageMode style, const QSize& desiredSize ) c
 {
     if ( resolvedByCollection().isNull() )
     {
+        //QMutexLocker lock( &m_mutex );
+
         const ExternalResolver* resolver = qobject_cast< ExternalResolver* >( m_resolver.data() );
         if ( !resolver )
         {
@@ -466,6 +539,8 @@ Result::sourceIcon( TomahawkUtils::ImageMode style, const QSize& desiredSize ) c
 unsigned int
 Result::bitrate() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_bitrate;
 }
 
@@ -473,6 +548,8 @@ Result::bitrate() const
 unsigned int
 Result::size() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_size;
 }
 
@@ -480,6 +557,8 @@ Result::size() const
 unsigned int
 Result::modificationTime() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_modtime;
 }
 
@@ -487,6 +566,8 @@ Result::modificationTime() const
 void
 Result::setFileId( unsigned int id )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_fileId = id;
 }
 
@@ -494,6 +575,8 @@ Result::setFileId( unsigned int id )
 Tomahawk::Resolver*
 Result::resolvedBy() const
 {
+    QMutexLocker lock( &m_mutex );
+
     if ( !m_collection.isNull() )
         return m_collection.data();
 
@@ -504,12 +587,16 @@ Result::resolvedBy() const
 void
 Result::setResolvedByResolver( Tomahawk::Resolver* resolver )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_resolver = QPointer< Tomahawk::Resolver >( resolver );
 }
 
 
 QPointer< Resolver > Result::resolvedByResolver() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_resolver;
 }
 
@@ -525,16 +612,29 @@ Result::doneEditing()
 track_ptr
 Result::track() const
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_track;
 }
 
 
+QList< DownloadFormat >
+Result::downloadFormats() const
+{
+    QMutexLocker lock( &m_mutex );
+
+    return m_formats;
+}
+
+
 void
 Result::setDownloadFormats( const QList<DownloadFormat>& formats )
 {
     if ( formats.isEmpty() )
         return;
 
+    QMutexLocker lock( &m_mutex );
+
     m_formats.clear();
     foreach ( const DownloadFormat& format, formats )
     {
@@ -562,7 +662,7 @@ Result::setDownloadFormats( const QList<DownloadFormat>& formats )
 void
 Result::onSettingsChanged()
 {
-    if ( TomahawkSettings::instance()->downloadsPreferredFormat().toLower() != m_formats.first().extension.toLower() )
+    if ( TomahawkSettings::instance()->downloadsPreferredFormat().toLower() != downloadFormats().first().extension.toLower() )
     {
         setDownloadFormats( downloadFormats() );
         emit updated();
@@ -599,6 +699,8 @@ Result::onDownloadJobStateChanged( DownloadJob::TrackState newState, DownloadJob
 QWeakPointer<Result>
 Result::weakRef()
 {
+    QMutexLocker lock( &m_mutex );
+
     return m_ownRef;
 }
 
@@ -606,5 +708,7 @@ Result::weakRef()
 void
 Result::setWeakRef( QWeakPointer<Result> weakRef )
 {
+    QMutexLocker lock( &m_mutex );
+
     m_ownRef = weakRef;
 }

src/libtomahawk/Result.h

@@ -31,6 +31,7 @@
 #include <QPixmap>
 #include <QPointer>
 #include <QVariant>
+#include <QMutex>
 
 class MetadataEditor;
 
@@ -93,6 +94,12 @@ public:
     bool isOnline() const;
     bool playable() const;
 
+    /**
+     * @brief whether this result isLocal, i.e. resolved by a local collection
+     * @return isLocal
+     */
+    bool isLocal() const;
+
     QString url() const;
     /**
      * Has the given url been checked that it is accessible/valid.
@@ -131,7 +138,7 @@ public:
 
     track_ptr track() const;
 
-    QList<DownloadFormat> downloadFormats() const { return m_formats; }
+    QList< DownloadFormat > downloadFormats() const;
     void setDownloadFormats( const QList<DownloadFormat>& formats );
 
     downloadjob_ptr downloadJob() const { return m_downloadJob; }
@@ -161,6 +168,8 @@ private:
     explicit Result( const QString& url, const Tomahawk::track_ptr& track );
     explicit Result();
 
+    mutable QMutex m_mutex;
+
     mutable RID m_rid;
     collection_wptr m_collection;
     QPointer< Tomahawk::Resolver > m_resolver;

src/libtomahawk/TomahawkSettings.cpp

@@ -929,6 +929,20 @@ TomahawkSettings::setVolume( unsigned int volume )
 }
 
 
+bool
+TomahawkSettings::muted() const
+{
+    return value( "audio/muted" ).toBool();
+}
+
+
+void
+TomahawkSettings::setMuted( bool muted )
+{
+    setValue( "audio/muted", muted );
+}
+
+
 QString
 TomahawkSettings::proxyHost() const
 {
@@ -1750,3 +1764,15 @@ TomahawkSettings::setPlaydarKey( const QByteArray& key )
     setValue( "playdar/key", key );
 }
 
+QString
+TomahawkSettings::vlcArguments() const
+{
+    return value( "vlc/cmdline_args" ).value< QString >();
+}
+
+void
+TomahawkSettings::setVlcArguments( const QString& args )
+{
+    setValue( "vlc/cmdline_args", args);
+}
+

src/libtomahawk/TomahawkSettings.h

@@ -107,6 +107,9 @@ public:
     unsigned int volume() const;
     void setVolume( unsigned int volume );
 
+    bool muted() const;
+    void setMuted( bool muted );
+
     /// Playlist stuff
     QByteArray playlistColumnSizes( const QString& playlistid ) const;
     void setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state );
@@ -250,6 +253,10 @@ public:
     QByteArray playdarKey() const;
     void setPlaydarKey( const QByteArray& key );
 
+    // VLC Settings
+    QString vlcArguments() const;
+    void setVlcArguments( const QString& arguments );
+
 signals:
     void changed();
     void recentlyPlayedPlaylistAdded( const QString& playlistId, int sourceId );

src/libtomahawk/Track.cpp

@@ -37,6 +37,7 @@
 #include <QtAlgorithms>
 #include <QDateTime>
 #include <QReadWriteLock>
+#include <QCoreApplication>
 
 
 using namespace Tomahawk;
@@ -92,6 +93,7 @@ Track::get( const QString& artist, const QString& track, const QString& album, c
     }
 
     track_ptr t = track_ptr( new Track( artist, track, album, albumArtist, duration, composer, albumpos, discnumber ), &Track::deleteLater );
+    t->moveToThread( QCoreApplication::instance()->thread() );
     t->setWeakRef( t.toWeakRef() );
     s_tracksByName.insert( key, t );
 

src/libtomahawk/TrackData.cpp

@@ -19,8 +19,7 @@
 
 #include "TrackData.h"
 
-#include <QtAlgorithms>
-#include <QReadWriteLock>
+
 
 #include "audio/AudioEngine.h"
 #include "collection/Collection.h"
@@ -41,6 +40,10 @@
 #include "PlaylistEntry.h"
 #include "SourceList.h"
 
+#include <QtAlgorithms>
+#include <QReadWriteLock>
+#include <QCoreApplication>
+
 using namespace Tomahawk;
 
 QHash< QString, trackdata_wptr > TrackData::s_trackDatasByName = QHash< QString, trackdata_wptr >();
@@ -84,6 +87,7 @@ TrackData::get( unsigned int id, const QString& artist, const QString& track )
     }
 
     trackdata_ptr t = trackdata_ptr( new TrackData( id, artist, track ), &TrackData::deleteLater );
+    t->moveToThread( QCoreApplication::instance()->thread() );
     t->setWeakRef( t.toWeakRef() );
     s_trackDatasByName.insert( key, t );
 

src/libtomahawk/Typedefs.h

@@ -253,7 +253,7 @@ namespace Tomahawk
         typedef QHash< QString, QString > InfoStringHash;
         typedef QPair< QVariantMap, QVariant > PushInfoPair;
 
-        typedef QPointer< InfoPlugin > InfoPluginPtr;
+        typedef QSharedPointer< InfoPlugin > InfoPluginPtr;
     }
 
     namespace Network

src/libtomahawk/ViewPage.h

@@ -76,6 +76,8 @@ public:
      */
     virtual bool addPageItem() const;
 
+    virtual bool isRemovable() const { return false; }
+
     /**
      * This page is actually a constant page that will be shown on every
      * restart of Tomahawk until the user selects it to be removed.

src/libtomahawk/accounts/Account.h

@@ -167,7 +167,7 @@ signals:
     void connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState state );
 
     void configurationChanged();
-    void configTestResult( Tomahawk::Accounts::ConfigTestResultType );
+    void configTestResult( int, const QString& = QString() );
 
 protected:
     virtual void loadFromConfig( const QString &accountId );

src/libtomahawk/accounts/DelegateConfigWrapper.cpp

@@ -68,6 +68,7 @@ DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* accou
         h->setContentsMargins( m_widget->contentsMargins() );
 
     m_errorLabel->setAlignment( Qt::AlignCenter );
+    m_errorLabel->setWordWrap( true );
     v->addWidget( m_errorLabel );
 
     v->addLayout( h );
@@ -81,7 +82,7 @@ DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* accou
     if ( m_widget->metaObject()->indexOfSignal( "sizeHintChanged()" ) > -1 )
         connect( m_widget, SIGNAL( sizeHintChanged() ), this, SLOT( updateSizeHint() ) );
 
-    connect( m_account, SIGNAL( configTestResult( Tomahawk::Accounts::ConfigTestResultType ) ), SLOT( onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType ) ) );
+    connect( m_account, SIGNAL( configTestResult( int, const QString& ) ), SLOT( onConfigTestResult( int, const QString& ) ) );
 }
 
 
@@ -192,11 +193,11 @@ DelegateConfigWrapper::aboutClicked( bool )
 
 
 void
-DelegateConfigWrapper::onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType result )
+DelegateConfigWrapper::onConfigTestResult( int code, const QString& message )
 {
-    tLog() << Q_FUNC_INFO << result;
+    tLog() << Q_FUNC_INFO << code << ": " << message;
 
-    if( result == Tomahawk::Accounts::ConfigTestResultSuccess )
+    if( code == Tomahawk::Accounts::ConfigTestResultSuccess )
     {
         m_invalidData = QVariantMap();
         closeDialog( QDialog::Accepted );
@@ -226,8 +227,25 @@ DelegateConfigWrapper::onConfigTestResult( Tomahawk::Accounts::ConfigTestResultT
 
         m_invalidData = m_widget->readData();
 
-        // TODO: generate message based on status code
-        m_errorLabel->setText( QString( "<font color='red'>%1</font>" ).arg( tr( "Your config is invalid." ) ) );
+	QString msg = !message.isEmpty() ? message : getTestConfigMessage( code );
+        m_errorLabel->setText( QString( "<font color='red'>%1</font>" ).arg( msg ) );
+    }
+}
+
+QString
+DelegateConfigWrapper::getTestConfigMessage( int code )
+{
+    switch(code) {
+	case Tomahawk::Accounts::ConfigTestResultCommunicationError:
+	    return tr( "Unable to authenticate. Please check your connection." );
+	case Tomahawk::Accounts::ConfigTestResultInvalidCredentials:
+	    return tr( "Username or password incorrect." );
+	case Tomahawk::Accounts::ConfigTestResultInvalidAccount:
+	    return tr( "Account rejected by server." );
+	case Tomahawk::Accounts::ConfigTestResultPlayingElsewhere:
+	    return tr( "Action not allowed, account is in use elsewhere." );
+	case Tomahawk::Accounts::ConfigTestResultAccountExpired:
+	    return tr( "Your account has expired." );
     }
 }
 

src/libtomahawk/accounts/DelegateConfigWrapper.h

@@ -60,10 +60,11 @@ protected:
 
 private slots:
     void aboutClicked( bool );
-    void onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType );
+    void onConfigTestResult( int, const QString& );
 
 private:
     void closeDialog( QDialog::DialogCode code );
+    QString getTestConfigMessage( int code );
 
     Tomahawk::Accounts::Account* m_account;
     AccountConfigWidget* m_widget;

src/libtomahawk/accounts/ResolverAccount.cpp

@@ -79,7 +79,7 @@ ResolverAccountFactory::createFromPath( const QString& path )
 }
 
 
-Account*
+ResolverAccount*
 ResolverAccountFactory::createFromPath( const QString& path, const QString& factory,  bool isAttica )
 {
     qDebug() << "Creating ResolverAccount from path:" << path << "is attica" << isAttica;
@@ -110,57 +110,8 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
 
         if ( pathInfo.suffix() == "axe" )
         {
-            QString uniqueName = uuid();
-            QDir dir( TomahawkUtils::extractScriptPayload( pathInfo.filePath(),
-                                                           uniqueName,
-                                                           MANUALRESOLVERS_DIR ) );
-            if ( !( dir.exists() && dir.isReadable() ) ) //decompression fubar
+            if ( !installAxe( realPath, configuration ) )
             {
-                displayError( tr( "Resolver installation error: cannot open bundle." ) );
-                return 0;
-            }
-
-            if ( !dir.cd( "content" ) ) //more fubar
-            {
-                displayError( tr( "Resolver installation error: incomplete bundle." ) );
-                return 0;
-            }
-
-            QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
-            configuration = metadataFromJsonFile( metadataFilePath );
-
-            configuration[ "bundleDir" ] = uniqueName;
-
-            if ( !configuration[ "pluginName" ].isNull() && !configuration[ "pluginName" ].toString().isEmpty() )
-            {
-                dir.cdUp();
-                if ( !dir.cdUp() ) //we're in MANUALRESOLVERS_DIR
-                    return 0;
-
-                QString name = configuration[ "pluginName" ].toString();
-
-                QString namePath = dir.absoluteFilePath( name );
-                QFileInfo npI( namePath );
-
-                if ( npI.exists() && npI.isDir() )
-                {
-                    TomahawkUtils::removeDirectory( namePath );
-                }
-
-                dir.rename( uniqueName, name );
-
-                configuration[ "bundleDir" ] = name;
-
-                if ( !dir.cd( QString( "%1/content" ).arg( name ) ) ) //should work if it worked once
-                    return 0;
-            }
-
-            expandPaths( dir, configuration );
-
-            realPath = configuration[ "path" ].toString();
-            if ( realPath.isEmpty() )
-            {
-                displayError( tr( "Resolver installation error: bad metadata in bundle." ) );
                 return 0;
             }
         }
@@ -221,6 +172,71 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
 }
 
 
+bool
+ResolverAccountFactory::installAxe( QString& realPath, QVariantHash& configuration )
+{
+    const QFileInfo pathInfo( realPath );
+    QString uniqueName = uuid();
+    QDir dir( TomahawkUtils::extractScriptPayload( pathInfo.filePath(),
+                                                    uniqueName,
+                                                    MANUALRESOLVERS_DIR ) );
+    if ( !( dir.exists() && dir.isReadable() ) ) //decompression fubar
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage(
+                                tr( "Resolver installation error: cannot open bundle." ) ) );
+        return 0;
+    }
+
+    if ( !dir.cd( "content" ) ) //more fubar
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage(
+                                tr( "Resolver installation error: incomplete bundle." ) ) );
+        return 0;
+    }
+
+    QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
+    configuration = metadataFromJsonFile( metadataFilePath );
+
+    configuration[ "bundleDir" ] = uniqueName;
+
+    if ( !configuration[ "pluginName" ].isNull() && !configuration[ "pluginName" ].toString().isEmpty() )
+    {
+        dir.cdUp();
+        if ( !dir.cdUp() ) //we're in MANUALRESOLVERS_DIR
+            return 0;
+
+        QString name = configuration[ "pluginName" ].toString();
+
+        QString namePath = dir.absoluteFilePath( name );
+        QFileInfo npI( namePath );
+
+        if ( npI.exists() && npI.isDir() )
+        {
+            TomahawkUtils::removeDirectory( namePath );
+        }
+
+        dir.rename( uniqueName, name );
+
+        configuration[ "bundleDir" ] = name;
+
+        if ( !dir.cd( QString( "%1/content" ).arg( name ) ) ) //should work if it worked once
+            return 0;
+    }
+
+    expandPaths( dir, configuration );
+
+    realPath = configuration[ "path" ].toString();
+    if ( realPath.isEmpty() )
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage(
+                                tr( "Resolver installation error: bad metadata in bundle." ) ) );
+        return 0;
+    }
+
+    return true;
+}
+
+
 QVariantHash
 ResolverAccountFactory::metadataFromJsonFile( const QString& path )
 {
@@ -517,7 +533,8 @@ ResolverAccount::removeBundle()
 }
 
 
-void ResolverAccount::testConfig()
+void
+ResolverAccount::testConfig()
 {
     // HACK: move to JSAccount once we have that properly
     JSResolver* resolver = qobject_cast< Tomahawk::JSResolver* >( m_resolver );
@@ -525,7 +542,7 @@ void ResolverAccount::testConfig()
     {
         QVariantMap data = resolver->loadDataFromWidgets();
         ScriptJob* job = resolver->scriptObject()->invoke( "testConfig", data );
-        connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onTestConfig( QVariantMap ) ) );
+        connect( job, SIGNAL( done( QVariant ) ), SLOT( onTestConfig( QVariant ) ) );
         job->start();
     }
     else
@@ -535,19 +552,25 @@ void ResolverAccount::testConfig()
 }
 
 
+ExternalResolverGui*
+ResolverAccount::resolver() const
+{
+    return m_resolver;
+}
+
+
 void
-ResolverAccount::onTestConfig( const QVariantMap& result )
+ResolverAccount::onTestConfig( const QVariant& result )
 {
     tLog() << Q_FUNC_INFO << result;
 
-    int resultCode = result[ "result" ].toInt();
-    if ( resultCode == 1 )
+    if ( result.type() == QVariant::String )
     {
-        emit configTestResult( Accounts::ConfigTestResultSuccess );
+        emit configTestResult( Accounts::ConfigTestResultOther, result.toString() ); 
     }
     else
     {
-        emit configTestResult( Accounts::ConfigTestResultOther );
+        emit configTestResult( result.toInt() );       
     }
 
     sender()->deleteLater();
@@ -566,6 +589,7 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId )
 
 }
 
+
 AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId, const QVariantHash& initialConfiguration )
     : ResolverAccount( accountId, path, initialConfiguration )
     , m_atticaId( atticaId )
@@ -595,8 +619,6 @@ AtticaResolverAccount::init()
         loadIcon();
     else
         connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) );
-
-
 }
 
 

src/libtomahawk/accounts/ResolverAccount.h

@@ -33,6 +33,8 @@ class ExternalResolverGui;
 
 namespace Accounts {
 
+class ResolverAccount;
+
 class DLLEXPORT ResolverAccountFactory : public AccountFactory
 {
     Q_OBJECT
@@ -53,7 +55,10 @@ public:
     Account* createFromPath( const QString& path ) override;
 
     // Internal use
-    static Account* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
+    static ResolverAccount* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
+    // YES, non const parameters!
+    static bool installAxe( QString& realPath, QVariantHash& configuration );
+
 
 private:
     static void displayError( const QString& error );
@@ -101,9 +106,11 @@ public:
 
     void testConfig() override;
 
+    ExternalResolverGui* resolver() const;
+
 private slots:
     void resolverChanged();
-    void onTestConfig( const QVariantMap& result );
+    void onTestConfig( const QVariant& result );
 
 protected:
     // Created by factory, when user installs a new resolver

src/libtomahawk/accounts/lastfm/LastFmAccount.cpp

@@ -71,7 +71,7 @@ LastFmAccount::LastFmAccount( const QString& accountId )
 
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 }
@@ -82,7 +82,6 @@ LastFmAccount::~LastFmAccount()
     if ( m_infoPlugin )
     {
         Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
-        delete m_infoPlugin;
     }
 
     delete m_resolver.data();
@@ -168,9 +167,11 @@ InfoPluginPtr
 LastFmAccount::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-        m_infoPlugin = QPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) );
+    {
+        m_infoPlugin = QSharedPointer< LastFmInfoPlugin>( new LastFmInfoPlugin( this ) );
+    }
 
-    return InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 bool

src/libtomahawk/accounts/lastfm/LastFmAccount.h

@@ -105,7 +105,7 @@ private:
     void hookupResolver();
 
     QPointer<Tomahawk::ExternalResolverGui> m_resolver;
-    QPointer<Tomahawk::InfoSystem::LastFmInfoPlugin> m_infoPlugin;
+    QSharedPointer<Tomahawk::InfoSystem::LastFmInfoPlugin> m_infoPlugin;
     QPointer<LastFmConfig> m_configWidget;
 };
 

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp

@@ -65,13 +65,6 @@ LastFmInfoPlugin::init()
         return;
     }
 
-    lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
-    lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
-    lastfm::ws::Username = m_account.data()->username();
-    lastfm::setNetworkAccessManager( Tomahawk::Utils::nam() );
-
-    m_pw = m_account.data()->password();
-
     //HACK work around a bug in liblastfm---it doesn't create its config dir, so when it
     // tries to write the track cache, it fails silently. until we have a fixed version, do this
     // code taken from Amarok (src/services/lastfm/ScrobblerAdapter.cpp)
@@ -86,6 +79,17 @@ LastFmInfoPlugin::init()
 
     m_badUrls << QUrl( "http://cdn.last.fm/flatness/catalogue/noimage" );
 
+
+    lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
+    lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
+    lastfm::setNetworkAccessManager( Tomahawk::Utils::nam() );
+
+    if ( !m_account.isNull() )
+    {
+        lastfm::ws::Username = m_account->username();
+        m_pw = m_account->password();
+    }
+
     QTimer::singleShot( 0, this, SLOT( settingsChanged() ) );
 }
 

src/libtomahawk/accounts/spotify/SpotifyAccount.cpp

@@ -116,6 +116,12 @@ SpotifyAccount::~SpotifyAccount()
 {
     clearUser();
 
+    if ( m_infoPlugin )
+    {
+        Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
+    }
+
+
     if ( m_spotifyResolver.isNull() )
         return;
 
@@ -135,7 +141,7 @@ SpotifyAccount::init()
 
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 
@@ -366,10 +372,10 @@ SpotifyAccount::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
     {
-        m_infoPlugin = QPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) );
+        m_infoPlugin = QSharedPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) );
     }
 
-    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 

src/libtomahawk/accounts/spotify/SpotifyAccount.h

@@ -170,7 +170,7 @@ private:
     QPointer<SpotifyAccountConfig> m_configWidget;
     QPointer<QWidget> m_aboutWidget;
     QPointer<ScriptResolver> m_spotifyResolver;
-    QPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
+    QSharedPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
 
     QMap<QString, QPair<QObject*, QString> > m_qidToSlotMap;
     QMap<QString, QVariant > m_qidToExtraData;

src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp

@@ -277,7 +277,7 @@ SpotifyAccountConfig::showLoggedIn()
         m_ui->verticalLayout->insertWidget( 1, m_loggedInUser, 0, Qt::AlignCenter );
     }
 
-    qDebug() << "Showing logged in withuserame:" << m_verifiedUsername;
+    qDebug() << "Showing logged in with username:" << m_verifiedUsername;
     m_loggedInUser->show();
     m_loggedInUser->setText( tr( "Logged in as %1" ).arg( m_verifiedUsername ) );
 

src/libtomahawk/audio/AudioEngine.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2016, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *   Copyright 2013,      Teo Mrnjavac <teo@kde.org>
  *
@@ -165,12 +165,19 @@ AudioEngine::AudioEngine()
     d->s_instance = this;
     tDebug() << "Init AudioEngine";
 
-    d->audioOutput = new AudioOutput(this);
+    d->audioOutput = new AudioOutput( this );
 
+    connect( d->audioOutput, SIGNAL( initialized() ), this, SIGNAL( initialized() ) );
     connect( d->audioOutput, SIGNAL( stateChanged( AudioOutput::AudioState, AudioOutput::AudioState ) ), d_func(), SLOT( onStateChanged( AudioOutput::AudioState, AudioOutput::AudioState ) ) );
     connect( d->audioOutput, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) );
     connect( d->audioOutput, SIGNAL( positionChanged( float ) ), SLOT( onPositionChanged( float ) ) );
+    connect( d->audioOutput, SIGNAL( volumeChanged( qreal ) ), SLOT( onVolumeChanged( qreal ) ) );
+    connect( d->audioOutput, SIGNAL( mutedChanged( bool ) ), SIGNAL( mutedChanged( bool ) ) );
 
+    if ( TomahawkSettings::instance()->muted() )
+    {
+        mute();
+    }
     setVolume( TomahawkSettings::instance()->volume() );
 
     qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
@@ -183,6 +190,7 @@ AudioEngine::~AudioEngine()
     tDebug() << Q_FUNC_INFO;
 
     TomahawkSettings::instance()->setVolume( volume() );
+    TomahawkSettings::instance()->setMuted( isMuted() );
 
     delete d_ptr;
 }
@@ -289,8 +297,11 @@ AudioEngine::stop( AudioErrorCode errorCode )
     if ( d->waitingOnNewTrack )
         sendWaitingNotification();
 
-    Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag );
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+    if ( d->audioOutput->isInitialized() )
+    {
+        Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag );
+        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+    }
 }
 
 
@@ -455,6 +466,8 @@ AudioEngine::mute()
 {
     Q_D( AudioEngine );
     d->audioOutput->setMuted( true );
+
+    emit volumeChanged( volume() );
 }
 
 
@@ -463,6 +476,8 @@ AudioEngine::toggleMute()
 {
     Q_D( AudioEngine );
     d->audioOutput->setMuted( !d->audioOutput->isMuted() );
+
+    emit volumeChanged( volume() );
 }
 
 
@@ -557,10 +572,16 @@ AudioEngine::onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type )
 
 
 void
-AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
+AudioEngine::loadTrack( const Tomahawk::result_ptr& result, bool preload )
 {
     Q_D( AudioEngine );
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() ) << " preload:" << preload;
+
+
+    if ( !d->audioOutput->isInitialized() )
+    {
+        return;
+    }
 
     if ( !result )
     {
@@ -568,36 +589,82 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
         return;
     }
 
-    // We do this to stop the audio as soon as a user activated another track
-    // If we don't block the audioOutput signals, the state change will trigger
-    // loading yet another track
-    d->audioOutput->blockSignals( true );
-    d->audioOutput->stop();
-    d->audioOutput->blockSignals( false );
+    if (preload && d->preloadedTrack == result)
+        return;
 
-    setCurrentTrack( result );
+    if (preload) 
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << "not preloaded yet, preloading";
+
+    if (preload) 
+    {
+        setPreloadTrack( result );
+    }
+    else
+    {
+        // We do this to stop the audio as soon as a user activated another track
+        // If we don't block the audioOutput signals, the state change will trigger
+        // loading yet another track
+        d->audioOutput->blockSignals( true );
+        d->audioOutput->stop();
+        d->audioOutput->blockSignals( false );
+
+        setCurrentTrack( result );
+        if ( result == d->preloadedTrack ) 
+        {
+            setPreloadTrack( Tomahawk::result_ptr(nullptr) );
+            d->state = Loading;
+            emit loading( d->currentTrack );
+            d->audioOutput->switchToPreloadedMedia();
+            if ( !d->input.isNull() )
+            {
+                d->input->close();
+                d->input.clear();
+            }
+            d->input = d->inputPreloaded;
+
+            d->audioOutput->play();
+
+            if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
+            {
+                d->currentTrack->track()->startPlaying();
+            }
+
+            sendNowPlayingNotification( Tomahawk::InfoSystem::InfoNowPlaying );
+            return;
+        }
+        setPreloadTrack( Tomahawk::result_ptr(nullptr) );
+    }
 
     ScriptJob* job = result->resolvedBy()->getStreamUrl( result );
     connect( job, SIGNAL( done( QVariantMap ) ), SLOT( gotStreamUrl( QVariantMap ) ) );
     job->setProperty( "result", QVariant::fromValue( result ) );
+    job->setProperty( "isPreload", QVariant::fromValue(preload) );
+    tDebug() << "preload:" << preload << ", for result:" << result;
     job->start();
 }
 
+
 void
 AudioEngine::gotStreamUrl( const QVariantMap& data )
 {
     QString streamUrl = data[ "url" ].toString();
     QVariantMap headers = data[ "headers" ].toMap();
     Tomahawk::result_ptr result = sender()->property( "result" ).value<result_ptr>();
+    bool isPreload = sender()->property( "isPreload" ).value<bool>();
 
-    if ( streamUrl.isEmpty() || !( TomahawkUtils::isHttpResult( streamUrl ) || TomahawkUtils::isHttpsResult( streamUrl ) || TomahawkUtils::isRtmpResult( streamUrl ) ) )
+    tDebug() << Q_FUNC_INFO << " is preload:" << isPreload << ", for result:" << result;
+
+    if ( streamUrl.isEmpty() || headers.isEmpty() ||
+         !( TomahawkUtils::isHttpResult( streamUrl ) || TomahawkUtils::isHttpsResult( streamUrl ) ) )
     {
-        // Not an http(s) or RTMP URL, get IO device
+        // We can't supply custom headers to VLC - but prefer using its HTTP streaming due to improved seeking ability
+        // Not an RTMP or HTTP-with-headers URL, get IO device
         QSharedPointer< QIODevice > sp;
-        performLoadIODevice( result, streamUrl );
+        performLoadIODevice( result, streamUrl, isPreload );
     }
     else
     {
+        // We need our own QIODevice for streaming
         // TODO: just make this part of the http(s) IoDeviceFactory (?)
         QUrl url = QUrl::fromEncoded( streamUrl.toUtf8() );
         QNetworkRequest req( url );
@@ -619,35 +686,42 @@ AudioEngine::gotStreamUrl( const QVariantMap& data )
 
         tDebug() << "Creating a QNetworkReply with url:" << req.url().toString();
         NetworkReply* reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) );
-        NewClosure( reply, SIGNAL( finalUrlReached() ), this, SLOT( gotRedirectedStreamUrl( Tomahawk::result_ptr, NetworkReply* )), result, reply );
+        NewClosure( reply, SIGNAL( finalUrlReached() ), this, SLOT( gotRedirectedStreamUrl( Tomahawk::result_ptr, NetworkReply* ) ), result, reply );
     }
 
     sender()->deleteLater();
 }
 
+
 void
 AudioEngine::gotRedirectedStreamUrl( const Tomahawk::result_ptr& result, NetworkReply* reply )
 {
+    Q_D( AudioEngine );
     // std::functions cannot accept temporaries as parameters
     QSharedPointer< QIODevice > sp ( reply->reply(), &QObject::deleteLater );
     QString url = reply->reply()->url().toString();
     reply->disconnectFromReply();
     reply->deleteLater();
 
-    performLoadTrack( result, url, sp );
+    bool isPreload = result == d->preloadedTrack;
+    tDebug() << Q_FUNC_INFO << " is preload:" << isPreload;
+
+    performLoadTrack( result, url, sp, isPreload );
 }
 
 
 void
 AudioEngine::onPositionChanged( float new_position )
 {
+    if ( new_position >= 0.90 )
+        loadNextTrack(true);
 //    tDebug() << Q_FUNC_INFO << new_position << state();
     emit trackPosition( new_position );
 }
 
 
 void
-AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url )
+AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url, bool preload )
 {
     tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : url );
 
@@ -657,37 +731,39 @@ AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url )
         std::function< void ( const QString, QSharedPointer< QIODevice > ) > callback =
                 std::bind( &AudioEngine::performLoadTrack, this, result,
                            std::placeholders::_1,
-                           std::placeholders::_2 );
+                           std::placeholders::_2,
+                           preload );
         Tomahawk::UrlHandler::getIODeviceForUrl( result, url, callback );
     }
     else
     {
         QSharedPointer< QIODevice > io;
-        performLoadTrack( result, url, io );
+        performLoadTrack( result, url, io, preload );
     }
 }
 
 
 void
-AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io )
+AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io, bool preload )
 {
     if ( QThread::currentThread() != thread() )
     {
         QMetaObject::invokeMethod( this, "performLoadTrack", Qt::QueuedConnection,
                                    Q_ARG( const Tomahawk::result_ptr, result ),
                                    Q_ARG( const QString, url ),
-                                   Q_ARG( QSharedPointer< QIODevice >, io )
+                                   Q_ARG( QSharedPointer< QIODevice >, io ),
+                                   Q_ARG( bool, preload )
                                    );
         return;
     }
 
     Q_D( AudioEngine );
-    if ( currentTrack() != result )
+    if ( !preload && currentTrack() != result )
     {
         tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Track loaded too late, skip.";
         return;
     }
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() ) << preload;
     QSharedPointer< QIODevice > ioToKeep = io;
 
     bool err = false;
@@ -701,9 +777,16 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
 
         if ( !err )
         {
-            tLog() << Q_FUNC_INFO << "Starting new song:" << url;
-            d->state = Loading;
-            emit loading( d->currentTrack );
+            if (preload)
+            {
+                tLog() << Q_FUNC_INFO << "Preloading new song:" << url;
+            }
+            else
+            {
+                tLog() << Q_FUNC_INFO << "Starting new song:" << url;
+                d->state = Loading;
+                emit loading( d->currentTrack );
+            }
 
             if ( !TomahawkUtils::isLocalResult( url )
                  && !( TomahawkUtils::isHttpResult( url ) && io.isNull() )
@@ -712,18 +795,18 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
                 QSharedPointer<QNetworkReply> qnr = io.objectCast<QNetworkReply>();
                 if ( !qnr.isNull() )
                 {
-                    d->audioOutput->setCurrentSource( new QNR_IODeviceStream( qnr, this ) );
+                    d->audioOutput->setCurrentSource( new QNR_IODeviceStream( qnr, this ), preload );
                     // We keep track of the QNetworkReply in QNR_IODeviceStream
                     // and AudioOutput handles the deletion of the
                     // QNR_IODeviceStream object
                     ioToKeep.clear();
-                    d->audioOutput->setAutoDelete( true );
+                    d->audioOutput->setAutoDelete( true, preload );
                 }
                 else
                 {
-                    d->audioOutput->setCurrentSource( io.data() );
+                    d->audioOutput->setCurrentSource( io.data(), preload);
                     // We handle the deletion via tracking in d->input
-                    d->audioOutput->setAutoDelete( false );
+                    d->audioOutput->setAutoDelete( false, preload);
                 }
             }
             else
@@ -742,7 +825,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
                     }
 
                     tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Passing to VLC:" << furl;
-                    d->audioOutput->setCurrentSource( furl );
+                    d->audioOutput->setCurrentSource( furl, preload );
                 }
                 else
                 {
@@ -751,26 +834,37 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
                         furl = furl.right( furl.length() - 7 );
 
                     tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Passing to VLC:" << QUrl::fromLocalFile( furl );
-                    d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ) );
+                    d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ), preload );
                 }
 
-                d->audioOutput->setAutoDelete( true );
+                d->audioOutput->setAutoDelete( true, preload );
             }
 
-            if ( !d->input.isNull() )
+            if ( preload ) {
+                if ( !d->inputPreloaded.isNull() )
+                {
+                    d->inputPreloaded->close();
+                    d->inputPreloaded.clear();
+                }
+                d->inputPreloaded = ioToKeep;
+            }
+            else
             {
-                d->input->close();
-                d->input.clear();
-            }
-            d->input = ioToKeep;
-            d->audioOutput->play();
+                if ( !d->input.isNull() )
+                {
+                    d->input->close();
+                    d->input.clear();
+                }
+                d->input = ioToKeep;
+                d->audioOutput->play();
 
-            if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
-            {
-                d->currentTrack->track()->startPlaying();
-            }
+                if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
+                {
+                    d->currentTrack->track()->startPlaying();
+                }
 
-            sendNowPlayingNotification( Tomahawk::InfoSystem::InfoNowPlaying );
+                sendNowPlayingNotification( Tomahawk::InfoSystem::InfoNowPlaying );
+            }
         }
     }
 
@@ -780,7 +874,10 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
         return;
     }
 
-    d->waitingOnNewTrack = false;
+    if ( !preload )
+    {
+        d->waitingOnNewTrack = false;
+    }
     return;
 }
 
@@ -812,18 +909,19 @@ AudioEngine::loadPreviousTrack()
     }
 
     if ( result )
-        loadTrack( result );
+        loadTrack( result, false );
     else
         stop();
 }
 
 
 void
-AudioEngine::loadNextTrack()
+AudioEngine::loadNextTrack( bool preload )
 {
     if ( QThread::currentThread() != thread() )
     {
-        QMetaObject::invokeMethod( this, "loadNextTrack", Qt::QueuedConnection );
+        QMetaObject::invokeMethod( this, "loadNextTrack", Qt::QueuedConnection,
+                Q_ARG( bool, preload ));
         return;
     }
 
@@ -837,8 +935,11 @@ AudioEngine::loadNextTrack()
     {
         if ( d->stopAfterTrack->track()->equals( d->currentTrack->track() ) )
         {
-            d->stopAfterTrack.clear();
-            stop();
+            if ( !preload )
+            {
+                d->stopAfterTrack.clear();
+                stop();
+            }
             return;
         }
     }
@@ -856,17 +957,24 @@ AudioEngine::loadNextTrack()
 
         if ( d->playlist.data()->nextResult() )
         {
-            result = d->playlist.data()->setSiblingResult( 1 );
-            setCurrentTrackPlaylist( d->playlist );
+            if ( preload )
+            {
+                result = d->playlist.data()->nextResult();
+            }
+            else
+            {
+                result = d->playlist.data()->setSiblingResult( 1 );
+                setCurrentTrackPlaylist( d->playlist );
+            }
         }
     }
 
     if ( result )
     {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got next item, loading track";
-        loadTrack( result );
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got next item, loading track, preload:" << preload;
+        loadTrack( result, preload );
     }
-    else
+    else if ( !preload )
     {
         if ( !d->playlist.isNull() && d->playlist.data()->retryMode() == Tomahawk::PlaylistModes::Retry )
             d->waitingOnNewTrack = true;
@@ -935,7 +1043,7 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
 
     if ( result )
     {
-        loadTrack( result );
+        loadTrack( result, false );
     }
     else if ( !d->playlist.isNull() && d->playlist.data()->retryMode() == PlaylistModes::Retry )
     {
@@ -951,9 +1059,9 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
 void
 AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query )
 {
-    if ( query->resolvingFinished() )
+    if ( query->resolvingFinished() || query->numResults( true ) )
     {
-        if ( query->numResults() && query->results().first()->isOnline() )
+        if ( query->numResults( true ) )
         {
             playItem( playlist, query->results().first(), query );
             return;
@@ -969,7 +1077,7 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
     {
         Pipeline::instance()->resolve( query );
 
-        NewClosure( query.data(), SIGNAL( resolvingFinished( bool ) ),
+        NewClosure( query.data(), SIGNAL( resultsChanged() ),
                     const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::playlistinterface_ptr, Tomahawk::query_ptr ) ), playlist, query );
     }
 }
@@ -1210,6 +1318,14 @@ AudioEngine::setStopAfterTrack( const query_ptr& query )
 }
 
 
+void
+AudioEngine::setPreloadTrack( const Tomahawk::result_ptr& result )
+{
+    Q_D( AudioEngine );
+
+    d->preloadedTrack = result;
+}
+
 void
 AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
 {
@@ -1236,7 +1352,6 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
     }
 }
 
-
 void
 AudioEngine::setState( AudioState state )
 {

src/libtomahawk/audio/AudioEngine.h

@@ -135,10 +135,10 @@ public slots:
     void toggleMute();
 
     void play( const QUrl& url );
-    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery = Tomahawk::query_ptr() );
-    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query );
-    void playItem( const Tomahawk::artist_ptr& artist );
-    void playItem( const Tomahawk::album_ptr& album );
+    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery = Tomahawk::query_ptr());
+    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query);
+    void playItem( const Tomahawk::artist_ptr& artist);
+    void playItem( const Tomahawk::album_ptr& album);
     void playPlaylistInterface( const Tomahawk::playlistinterface_ptr& playlist );
     void setPlaylist( Tomahawk::playlistinterface_ptr playlist );
     void setQueue( const Tomahawk::playlistinterface_ptr& queue );
@@ -149,6 +149,8 @@ public slots:
     void setShuffled( bool enabled );
 
 signals:
+    void initialized();
+
     void loading( const Tomahawk::result_ptr track );
     void started( const Tomahawk::result_ptr track );
     void finished( const Tomahawk::result_ptr track );
@@ -180,21 +182,22 @@ signals:
     void error( AudioEngine::AudioErrorCode errorCode );
 
 private slots:
-    void loadTrack( const Tomahawk::result_ptr& result ); //async!
+    void loadTrack( const Tomahawk::result_ptr& result, bool preload ); //async!
     void gotStreamUrl( const QVariantMap& data );
     void gotRedirectedStreamUrl( const Tomahawk::result_ptr& result, NetworkReply* reply );
 
 
-    void performLoadIODevice( const Tomahawk::result_ptr& result, const QString& url ); //only call from loadTrack kthxbi
-    void performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi
+    void performLoadIODevice( const Tomahawk::result_ptr& result, const QString& url, bool preload ); //only call from loadTrack kthxbi
+    void performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io, bool preload ); //only call from loadTrack or performLoadIODevice kthxbi
     void loadPreviousTrack();
-    void loadNextTrack();
+    void loadNextTrack(bool preload = false);
 
     void onVolumeChanged( qreal volume );
     void timerTriggered( qint64 time );
     void onPositionChanged( float new_position );
 
     void setCurrentTrack( const Tomahawk::result_ptr& result );
+    void setPreloadTrack( const Tomahawk::result_ptr& result );
     void onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type );
     void onPlaylistNextTrackAvailable();
 

src/libtomahawk/audio/AudioEngine_p.h

@@ -28,9 +28,11 @@ public slots:
 
 private:
     QSharedPointer<QIODevice> input;
+    QSharedPointer<QIODevice> inputPreloaded;
 
     Tomahawk::query_ptr stopAfterTrack;
     Tomahawk::result_ptr currentTrack;
+    Tomahawk::result_ptr preloadedTrack;
     Tomahawk::playlistinterface_ptr playlist;
     Tomahawk::playlistinterface_ptr currentTrackPlaylist;
     Tomahawk::playlistinterface_ptr queue;

src/libtomahawk/audio/AudioOutput.cpp

@@ -22,21 +22,26 @@
 #include "AudioEngine.h"
 #include "AudioOutput.h"
 #include "TomahawkVersion.h"
+#include "TomahawkSettings.h"
 
 #include "audio/MediaStream.h"
 #include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QApplication>
 #include <QVarLengthArray>
 #include <QFile>
 #include <QDir>
+#include <QTimer>
 
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_media.h>
-#include <vlc/libvlc_media_player.h>
 #include <vlc/libvlc_events.h>
+#include <vlc/libvlc_media_player.h>
 #include <vlc/libvlc_version.h>
 
+#include <algorithm>
+
 AudioOutput* AudioOutput::s_instance = 0;
 
 
@@ -51,17 +56,22 @@ AudioOutput::AudioOutput( QObject* parent )
     : QObject( parent )
     , m_currentState( Stopped )
     , m_currentStream( nullptr )
+    , m_preloadedStream( nullptr )
     , m_seekable( true )
     , m_muted( false )
     , m_autoDelete( true )
+    , m_preloadedAutoDelete( true )
     , m_volume( 1.0 )
     , m_currentTime( 0 )
     , m_totalTime( 0 )
     , m_justSeeked( false )
+    , m_initialized( false )
     , dspPluginCallback( nullptr )
     , m_vlcInstance( nullptr )
     , m_vlcPlayer( nullptr )
     , m_vlcMedia( nullptr )
+    , m_vlcPreloadedPlayer( nullptr )
+    , m_vlcPreloadedMedia( nullptr )
 {
     tDebug() << Q_FUNC_INFO;
 
@@ -69,7 +79,7 @@ AudioOutput::AudioOutput( QObject* parent )
 
     qRegisterMetaType<AudioOutput::AudioState>("AudioOutput::AudioState");
 
-    const char* vlcArgs[] = {
+    QVector<const char*> vlcArgs = {
         "--ignore-config",
         "--extraintf=logger",
         qApp->arguments().contains( "--verbose" ) ? "--verbose=3" : "",
@@ -81,11 +91,28 @@ AudioOutput::AudioOutput( QObject* parent )
         // "--no-snapshot-preview",
         // "--services-discovery=''",
         "--no-video",
+        //"--network-caching=10000",
+        //"--file-caching=10000",
+        //"--clock-synchro=0",
+        //"--cr-average=10000",
+        //"--clock-jitter=1",
         "--no-xlib"
     };
+    TomahawkSettings* s = TomahawkSettings::instance();
+    //Save a list of Latin1 byte arrays for additional args
+    auto additionalVlcArgs = s->vlcArguments().split(",");
+    QVector<QByteArray> additionalArgsChar;
+
+    std::transform(additionalVlcArgs.begin(), additionalVlcArgs.end(),
+            std::back_inserter(additionalArgsChar), [](QString str) { return str.toLatin1(); });
+
+    for (auto&& str : additionalArgsChar)
+    {
+        vlcArgs.append(str.constData());
+    }
 
     // Create and initialize a libvlc instance (it should be done only once)
-    m_vlcInstance = libvlc_new( sizeof(vlcArgs) / sizeof(*vlcArgs), vlcArgs );
+    m_vlcInstance = libvlc_new( vlcArgs.size(), vlcArgs.constData() );
     if ( !m_vlcInstance )
     {
         tDebug() << Q_FUNC_INFO << "libVLC: could not initialize";
@@ -95,53 +122,133 @@ AudioOutput::AudioOutput( QObject* parent )
                            TOMAHAWK_APPLICATION_NAME "/" TOMAHAWK_VERSION );
     // FIXME: icon is named tomahawk, so we need the lowercase application name
 #if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 1, 0, 0))
-    libvlc_set_app_id( m_vlcInstance, "org.tomahawk-player.desktop",
-                       TOMAHAWK_VERSION, "tomahawk" );
+    libvlc_set_app_id( m_vlcInstance, TOMAHAWK_APPLICATION_PACKAGE_NAME,
+                       TOMAHAWK_VERSION, TOMAHAWK_TARGET_NAME );
 #endif
 
     m_vlcPlayer = libvlc_media_player_new( m_vlcInstance );
-    libvlc_event_manager_t* manager = libvlc_media_player_event_manager( m_vlcPlayer );
-    libvlc_event_type_t events[] = {
-        libvlc_MediaPlayerMediaChanged,
-        libvlc_MediaPlayerNothingSpecial,
-        libvlc_MediaPlayerOpening,
-        libvlc_MediaPlayerBuffering,
-        libvlc_MediaPlayerPlaying,
-        libvlc_MediaPlayerPaused,
-        libvlc_MediaPlayerStopped,
-        libvlc_MediaPlayerForward,
-        libvlc_MediaPlayerBackward,
-        libvlc_MediaPlayerEndReached,
-        libvlc_MediaPlayerEncounteredError,
-        libvlc_MediaPlayerTimeChanged,
-        libvlc_MediaPlayerPositionChanged,
-        libvlc_MediaPlayerSeekableChanged,
-        libvlc_MediaPlayerPausableChanged,
-        libvlc_MediaPlayerTitleChanged,
-        libvlc_MediaPlayerSnapshotTaken,
-        //libvlc_MediaPlayerLengthChanged,
-        libvlc_MediaPlayerVout
-    };
-    const int eventCount = sizeof(events) / sizeof( *events );
-    for ( int i = 0; i < eventCount; i++ )
+    m_vlcPreloadedPlayer = libvlc_media_player_new( m_vlcInstance );
+
+    for( auto player : { m_vlcPlayer, m_vlcPreloadedPlayer } ) 
     {
-        libvlc_event_attach( manager, events[ i ], &AudioOutput::vlcEventCallback, this );
+        libvlc_audio_set_mute( player, 0 );
+        {
+            libvlc_event_manager_t* current_manager = libvlc_media_player_event_manager( player );
+            libvlc_event_manager_t* new_manager = libvlc_media_player_event_manager( player );
+            static libvlc_event_type_t events[] = {
+                libvlc_MediaPlayerMediaChanged,
+                libvlc_MediaPlayerNothingSpecial,
+                libvlc_MediaPlayerOpening,
+                libvlc_MediaPlayerBuffering,
+                libvlc_MediaPlayerPlaying,
+                libvlc_MediaPlayerPaused,
+                libvlc_MediaPlayerStopped,
+                libvlc_MediaPlayerForward,
+                libvlc_MediaPlayerBackward,
+                libvlc_MediaPlayerEndReached,
+                libvlc_MediaPlayerEncounteredError,
+                libvlc_MediaPlayerTimeChanged,
+                libvlc_MediaPlayerPositionChanged,
+                libvlc_MediaPlayerSeekableChanged,
+                libvlc_MediaPlayerPausableChanged,
+                libvlc_MediaPlayerTitleChanged,
+                libvlc_MediaPlayerSnapshotTaken,
+                //libvlc_MediaPlayerLengthChanged,
+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 2, 0))
+                libvlc_MediaPlayerAudioVolume,
+                libvlc_MediaPlayerMuted,
+                libvlc_MediaPlayerUnmuted,
+#endif
+                libvlc_MediaPlayerVout
+            };
+            const int eventCount = sizeof(events) / sizeof( *events );
+            for ( int i = 0; i < eventCount; i++ )
+            {
+                libvlc_event_attach( new_manager, events[ i ], &AudioOutput::vlcEventCallback, this );
+            }
+        }
     }
 
-    tDebug() << Q_FUNC_INFO << "Init OK";
+    // HACK: play silent ogg file and set volume on that to workaround vlc not allowing to set volume before a file is played
+    m_silenceFile.setFileName( RESPATH "sounds/silence.ogg" );
+    Q_ASSERT( m_silenceFile.exists() );
+    Q_ASSERT( m_silenceFile.open( QIODevice::ReadOnly ) );
+
+    setCurrentSource( new MediaStream( &m_silenceFile, true ), false );
+    setCurrentSource( new MediaStream( &m_silenceFile, true ), true );
+
+    libvlc_media_player_play( m_vlcPlayer );
+
+    #if QT_VERSION >= QT_VERSION_CHECK(5,4,0)
+    // if the silence file did not play for 15 secs, we pretend the AudioOutput is initialized, to allow proper error reporting
+    QTimer::singleShot( 15000, [&]()
+    {
+        if ( !m_initialized ) {
+            m_initialized = 2;
+            emit initialized();
+        }
+    } );
+    #endif
 }
 
+void AudioOutput::switchToPreloadedMedia( void )
+{
+
+    //Swap
+    auto tempPlayer = m_vlcPreloadedPlayer;
+    m_vlcPreloadedPlayer = m_vlcPlayer;
+    m_vlcPlayer = tempPlayer;
+
+    libvlc_media_player_stop( m_vlcPreloadedPlayer );
+
+    if ( m_vlcMedia != nullptr )
+    {
+        libvlc_media_release( m_vlcMedia );
+    }
+    //Now Media
+    {
+        if ( m_autoDelete && m_currentStream != nullptr )
+        {
+            delete m_currentStream;
+        }
+
+        m_vlcMedia = m_vlcPreloadedMedia;
+        m_vlcPreloadedMedia = nullptr;
+        m_currentStream = m_preloadedStream;
+        m_preloadedStream = nullptr;
+        m_autoDelete = m_preloadedAutoDelete;
+
+        m_totalTime = libvlc_media_get_duration( m_vlcMedia );
+
+        m_currentTime = 0;
+        m_justSeeked = false;
+        m_seekable = true;
+    }
+
+    libvlc_media_player_set_position( m_vlcPlayer, 0.0 );
+}
 
 AudioOutput::~AudioOutput()
 {
     tDebug() << Q_FUNC_INFO;
 
+    if ( m_vlcPreloadedPlayer != nullptr )
+    {
+        libvlc_media_player_stop( m_vlcPreloadedPlayer );
+        libvlc_media_player_release( m_vlcPreloadedPlayer );
+        m_vlcPreloadedPlayer = nullptr;
+    }
     if ( m_vlcPlayer != nullptr )
     {
         libvlc_media_player_stop( m_vlcPlayer );
         libvlc_media_player_release( m_vlcPlayer );
         m_vlcPlayer = nullptr;
     }
+    if ( m_vlcPreloadedMedia != nullptr )
+    {
+        libvlc_media_release( m_vlcPreloadedMedia );
+        m_vlcPreloadedMedia = nullptr;
+    }
     if ( m_vlcMedia != nullptr )
     {
         libvlc_media_release( m_vlcMedia );
@@ -155,23 +262,56 @@ AudioOutput::~AudioOutput()
 
 
 void
-AudioOutput::setAutoDelete( bool ad )
+AudioOutput::onInitVlcEvent( const libvlc_event_t* event )
 {
-    m_autoDelete = ad;
+    switch ( event->type )
+    {
+        case libvlc_MediaPlayerTimeChanged:
+            setVolume( volume() );
+            setMuted( isMuted() );
+
+            m_initialized ++;
+
+            tDebug() << Q_FUNC_INFO << "Init OK";
+            if (m_initialized >=2)
+            {
+                m_silenceFile.close();
+                emit initialized();
+            }
+            else
+            {
+                switchToPreloadedMedia();
+                libvlc_media_player_play( m_vlcPlayer );
+            }
+            break;
+
+        default:
+            break;
+    }
 }
 
 
 void
-AudioOutput::setCurrentSource( const QUrl& stream )
+AudioOutput::setAutoDelete( bool ad, bool preload )
 {
-    setCurrentSource( new MediaStream( stream ) );
+    if (preload)
+        m_preloadedAutoDelete = ad;
+    else
+        m_autoDelete = ad;
 }
 
 
 void
-AudioOutput::setCurrentSource( QIODevice* stream )
+AudioOutput::setCurrentSource( const QUrl& stream, bool preload )
 {
-    setCurrentSource( new MediaStream( stream ) );
+    setCurrentSource( new MediaStream( stream ), preload );
+}
+
+
+void
+AudioOutput::setCurrentSource( QIODevice* stream, bool preload )
+{
+    setCurrentSource( new MediaStream( stream ), preload );
 }
 
 
@@ -191,29 +331,24 @@ readDoneCallback( void* data, const char* cookie, size_t bufferSize, void* buffe
 
 
 void
-AudioOutput::setCurrentSource( MediaStream* stream )
+AudioOutput::setCurrentSource( MediaStream* stream, bool preload )
 {
-    tDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO << ", preload = " << preload;
 
-    setState( Loading );
+    if ( !preload )
+        setState( Loading );
 
-    if ( m_vlcMedia != nullptr )
-    {
-        // Ensure playback is stopped, then release media
-        libvlc_media_player_stop( m_vlcPlayer );
-        libvlc_media_release( m_vlcMedia );
-        m_vlcMedia = nullptr;
+    if ( m_vlcPreloadedMedia ) {
+        libvlc_media_player_stop( m_vlcPreloadedPlayer );
+        libvlc_media_release( m_vlcPreloadedMedia );
+        m_vlcPreloadedMedia = nullptr;
     }
-    if ( m_autoDelete && m_currentStream != nullptr )
+    if ( m_preloadedAutoDelete && m_preloadedStream != nullptr )
     {
-        delete m_currentStream;
+        delete m_preloadedStream;
     }
 
-    m_currentStream = stream;
-    m_totalTime = 0;
-    m_currentTime = 0;
-    m_justSeeked = false;
-    m_seekable = true;
+    m_preloadedStream = stream;
 
     QByteArray url;
     switch ( stream->type() )
@@ -247,34 +382,19 @@ AudioOutput::setCurrentSource( MediaStream* stream )
 
     tDebug() << Q_FUNC_INFO << "MediaStream::Final Url:" << url;
 
-    m_vlcMedia = libvlc_media_new_location( m_vlcInstance, url.constData() );
-    libvlc_event_manager_t* manager = libvlc_media_event_manager( m_vlcMedia );
-    libvlc_event_type_t events[] = {
-        libvlc_MediaDurationChanged,
-    };
-    const int eventCount = sizeof(events) / sizeof( *events );
-    for ( int i = 0; i < eventCount; i++ )
+    m_vlcPreloadedMedia = libvlc_media_new_location( m_vlcInstance, url.constData() );
+    if ( stream->type() == MediaStream::Stream || stream->type() == MediaStream::IODevice )
     {
-        libvlc_event_attach( manager, events[ i ], &AudioOutput::vlcEventCallback, this );
-    }
-
-    libvlc_media_player_set_media( m_vlcPlayer, m_vlcMedia );
-
-    if ( stream->type() == MediaStream::Url )
-    {
-        m_totalTime = libvlc_media_get_duration( m_vlcMedia );
-    }
-    else if ( stream->type() == MediaStream::Stream || stream->type() == MediaStream::IODevice )
-    {
-        libvlc_media_add_option_flag(m_vlcMedia, "imem-cat=4", libvlc_media_option_trusted);
-        const char* imemData = QString( "imem-data=%1" ).arg( (uintptr_t)stream ).toLatin1().constData();
-        libvlc_media_add_option_flag(m_vlcMedia, imemData, libvlc_media_option_trusted);
-        const char* imemGet = QString( "imem-get=%1" ).arg( (uintptr_t)&readCallback ).toLatin1().constData();
-        libvlc_media_add_option_flag(m_vlcMedia, imemGet, libvlc_media_option_trusted);
-        const char* imemRelease = QString( "imem-release=%1" ).arg( (uintptr_t)&readDoneCallback ).toLatin1().constData();
-        libvlc_media_add_option_flag(m_vlcMedia, imemRelease, libvlc_media_option_trusted);
-        const char* imemSeek = QString( "imem-seek=%1" ).arg( (uintptr_t)&MediaStream::seekCallback ).toLatin1().constData();
-        libvlc_media_add_option_flag(m_vlcMedia, imemSeek, libvlc_media_option_trusted);
+        QString tempString;
+        libvlc_media_add_option_flag(m_vlcPreloadedMedia, "imem-cat=4", libvlc_media_option_trusted);
+        tempString = QString( "imem-data=%1" ).arg( (uintptr_t)stream );
+        libvlc_media_add_option_flag(m_vlcPreloadedMedia, tempString.toLatin1().constData(), libvlc_media_option_trusted);
+        tempString = QString( "imem-get=%1" ).arg( (uintptr_t)&readCallback );
+        libvlc_media_add_option_flag(m_vlcPreloadedMedia, tempString.toLatin1().constData(), libvlc_media_option_trusted);
+        tempString = QString( "imem-release=%1" ).arg( (uintptr_t)&readDoneCallback );
+        libvlc_media_add_option_flag(m_vlcPreloadedMedia, tempString.toLatin1().constData(), libvlc_media_option_trusted);
+        tempString = QString( "imem-seek=%1" ).arg( (uintptr_t)&MediaStream::seekCallback );
+        libvlc_media_add_option_flag(m_vlcPreloadedMedia, tempString.toLatin1().constData(), libvlc_media_option_trusted);
     }
     if ( qApp->arguments().contains( "--chromecast-ip" ) )
     {
@@ -290,7 +410,7 @@ AudioOutput::setCurrentSource( MediaStream* stream )
         {
             QString castIP = qApp->arguments().at( qApp->arguments().indexOf( "--chromecast-ip" ) + 1 );
             QString sout( ":sout=#transcode{vcodec=none,acodec=vorb,ab=320,channels=2,samplerate=44100}:chromecast{ip=%1,mux=webm}" );
-            libvlc_media_add_option( m_vlcMedia, sout.arg( castIP ).toLatin1().constData() );
+            libvlc_media_add_option( m_vlcPreloadedMedia, sout.arg( castIP ).toLatin1().constData() );
         }
         else
         {
@@ -298,10 +418,35 @@ AudioOutput::setCurrentSource( MediaStream* stream )
         }
     }
 
+    libvlc_event_manager_t* manager = libvlc_media_event_manager( m_vlcPreloadedMedia );
+    static libvlc_event_type_t events[] = {
+        libvlc_MediaDurationChanged,
+    };
+    const int eventCount = sizeof(events) / sizeof( *events );
+    for ( int i = 0; i < eventCount; i++ )
+    {
+        libvlc_event_attach( manager, events[ i ], &AudioOutput::vlcEventCallback, this );
+    }
+
+    libvlc_media_player_set_media( m_vlcPreloadedPlayer, m_vlcPreloadedMedia );
+
+    libvlc_audio_set_volume( m_vlcPreloadedPlayer, 0.0 );
+    libvlc_media_player_play( m_vlcPreloadedPlayer );
+
+    if ( !preload )
+        switchToPreloadedMedia();
+
 //    setState( Stopped );
 }
 
 
+bool
+AudioOutput::isInitialized() const
+{
+    return m_initialized > 1;
+}
+
+
 AudioOutput::AudioState
 AudioOutput::state() const
 {
@@ -427,16 +572,19 @@ AudioOutput::seek( qint64 milliseconds )
             return;
     }
 
+    qint64 duration = AudioEngine::instance()->currentTrackTotalTime();
+    // for some tracks, seeking to an end seems not to work correctly with libvlc
+    // (tracks enter a random and infinite loop) - this is a temporary fix for that
+    if (duration == milliseconds)
+        milliseconds -= 1;
+
     if ( m_seekable )
     {
-
-        //    tDebug() << Q_FUNC_INFO << "AudioOutput:: seeking" << milliseconds << "msec";
         libvlc_media_player_set_time( m_vlcPlayer, milliseconds );
         setCurrentTime( milliseconds );
     }
     else
     {
-        qint64 duration = AudioEngine::instance()->currentTrackTotalTime();
         float position = float(float(milliseconds) / duration);
         libvlc_media_player_set_position(m_vlcPlayer, position);
         tDebug() << Q_FUNC_INFO << "AudioOutput:: seeking via position" << position << "pos";
@@ -448,7 +596,7 @@ AudioOutput::seek( qint64 milliseconds )
 bool
 AudioOutput::isSeekable() const
 {
-    // tDebug() << Q_FUNC_INFO << m_seekable << m_havePosition << m_totalTime << libvlc_media_player_is_seekable( m_vlcPlayer );
+     tDebug() << Q_FUNC_INFO << m_seekable << m_havePosition << m_totalTime << libvlc_media_player_is_seekable( m_vlcPlayer );
     return m_havePosition || (libvlc_media_player_is_seekable( m_vlcPlayer ) && m_totalTime > 0 );
 }
 
@@ -466,11 +614,9 @@ AudioOutput::setMuted( bool m )
     tDebug() << Q_FUNC_INFO;
 
     m_muted = m;
-    if ( m_muted )
-    {
-        libvlc_audio_set_volume( m_vlcPlayer, 0 );
-    }
-    else
+    libvlc_audio_set_mute( m_vlcPlayer, m );
+
+    if ( !m_muted )
     {
         libvlc_audio_set_volume( m_vlcPlayer, m_volume * 100.0 );
     }
@@ -487,7 +633,7 @@ AudioOutput::volume() const
 void
 AudioOutput::setVolume( qreal vol )
 {
-    tDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO << vol << m_muted;
 
     m_volume = vol;
     if ( !m_muted )
@@ -500,50 +646,107 @@ AudioOutput::setVolume( qreal vol )
 void
 AudioOutput::onVlcEvent( const libvlc_event_t* event )
 {
-    switch ( event->type )
+    if ( event->p_obj == m_vlcPlayer || event->p_obj == m_vlcMedia )
     {
-        case libvlc_MediaPlayerTimeChanged:
-            setCurrentTime( event->u.media_player_time_changed.new_time );
-            break;
-        case libvlc_MediaPlayerPositionChanged:
-            setCurrentPosition( event->u.media_player_position_changed.new_position );
-            break;
-        case libvlc_MediaPlayerSeekableChanged:
-         //   tDebug() << Q_FUNC_INFO << " : seekable changed : " << event->u.media_player_seekable_changed.new_seekable;
-            break;
-        case libvlc_MediaDurationChanged:
-            setTotalTime( event->u.media_duration_changed.new_duration );
-            break;
-        case libvlc_MediaPlayerLengthChanged:
-        //    tDebug() << Q_FUNC_INFO << " : length changed : " << event->u.media_player_length_changed.new_length;
-            break;
-        case libvlc_MediaPlayerPlaying:
-            setState( Playing );
-            break;
-        case libvlc_MediaPlayerPaused:
-            setState( Paused );
-            break;
-        case libvlc_MediaPlayerEndReached:
-            setState( Stopped );
-            break;
-        case libvlc_MediaPlayerEncounteredError:
-            tDebug() << Q_FUNC_INFO << "LibVLC error: MediaPlayerEncounteredError. Stopping";
-            // Don't call stop() here - it will deadlock libvlc
-            setState( Error );
-            break;
-        case libvlc_MediaPlayerNothingSpecial:
-        case libvlc_MediaPlayerOpening:
-        case libvlc_MediaPlayerBuffering:
-        case libvlc_MediaPlayerStopped:
-        case libvlc_MediaPlayerVout:
-        case libvlc_MediaPlayerMediaChanged:
-        case libvlc_MediaPlayerForward:
-        case libvlc_MediaPlayerBackward:
-        case libvlc_MediaPlayerPausableChanged:
-        case libvlc_MediaPlayerTitleChanged:
-        case libvlc_MediaPlayerSnapshotTaken:
-        default:
-            break;
+        switch ( event->type )
+        {
+            case libvlc_MediaPlayerTimeChanged:
+                setCurrentTime( event->u.media_player_time_changed.new_time );
+                break;
+            case libvlc_MediaPlayerPositionChanged:
+                setCurrentPosition( event->u.media_player_position_changed.new_position );
+                break;
+            case libvlc_MediaPlayerSeekableChanged:
+                //   tDebug() << Q_FUNC_INFO << " : seekable changed : " << event->u.media_player_seekable_changed.new_seekable;
+                break;
+            case libvlc_MediaDurationChanged:
+                setTotalTime( event->u.media_duration_changed.new_duration );
+                break;
+            case libvlc_MediaPlayerLengthChanged:
+                //    tDebug() << Q_FUNC_INFO << " : length changed : " << event->u.media_player_length_changed.new_length;
+                break;
+            case libvlc_MediaPlayerPlaying:
+                setState( Playing );
+                break;
+            case libvlc_MediaPlayerPaused:
+                setState( Paused );
+                break;
+            case libvlc_MediaPlayerEndReached:
+                setState( Stopped );
+                break;
+            case libvlc_MediaPlayerEncounteredError:
+                tDebug() << Q_FUNC_INFO << "LibVLC error: MediaPlayerEncounteredError. Stopping";
+                // Don't call stop() here - it will deadlock libvlc
+                setState( Error );
+                break;
+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 2, 0))
+            case libvlc_MediaPlayerAudioVolume:
+                m_volume = event->u.media_player_audio_volume.volume;
+                tDebug() << Q_FUNC_INFO << "Got signal in current player that volume changed to:" << m_volume;
+                emit volumeChanged( volume() );
+                break;
+            case libvlc_MediaPlayerMuted:
+                m_muted = true;
+                emit mutedChanged( true );
+                break;
+            case libvlc_MediaPlayerUnmuted:
+                m_muted = false;
+                emit mutedChanged( false );
+                break;
+#endif
+            case libvlc_MediaPlayerNothingSpecial:
+            case libvlc_MediaPlayerOpening:
+            case libvlc_MediaPlayerBuffering:
+            case libvlc_MediaPlayerStopped:
+            case libvlc_MediaPlayerVout:
+            case libvlc_MediaPlayerMediaChanged:
+            case libvlc_MediaPlayerForward:
+            case libvlc_MediaPlayerBackward:
+            case libvlc_MediaPlayerPausableChanged:
+            case libvlc_MediaPlayerTitleChanged:
+            case libvlc_MediaPlayerSnapshotTaken:
+            default:
+                break;
+        }
+    }
+    else
+    {
+        tDebug() << "Event for preloaded: " << libvlc_event_type_name(event->type);
+        switch ( event->type )
+        {
+            case libvlc_MediaPlayerPausableChanged:
+            case libvlc_MediaPlayerPlaying:
+            case libvlc_MediaPlayerMediaChanged:
+            case libvlc_MediaPlayerTitleChanged:
+            case libvlc_MediaPlayerSeekableChanged:
+            case libvlc_MediaDurationChanged:
+            case libvlc_MediaPlayerPositionChanged:
+            case libvlc_MediaPlayerPaused:
+            case libvlc_MediaPlayerBuffering:
+                libvlc_media_player_set_pause( m_vlcPreloadedPlayer, 1 );
+                libvlc_audio_set_volume( m_vlcPreloadedPlayer, 0.0 );
+                libvlc_media_player_set_position( m_vlcPreloadedPlayer, 0.0 );
+                break;
+            case libvlc_MediaPlayerTimeChanged:
+            case libvlc_MediaPlayerLengthChanged:
+            case libvlc_MediaPlayerOpening:
+            case libvlc_MediaPlayerEndReached:
+            case libvlc_MediaPlayerEncounteredError:
+                //TODO
+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 2, 0))
+            case libvlc_MediaPlayerAudioVolume:
+            case libvlc_MediaPlayerMuted:
+            case libvlc_MediaPlayerUnmuted:
+#endif
+            case libvlc_MediaPlayerNothingSpecial:
+            case libvlc_MediaPlayerStopped:
+            case libvlc_MediaPlayerVout:
+            case libvlc_MediaPlayerForward:
+            case libvlc_MediaPlayerBackward:
+            case libvlc_MediaPlayerSnapshotTaken:
+            default:
+                break;
+        }
     }
 }
 
@@ -556,7 +759,14 @@ AudioOutput::vlcEventCallback( const libvlc_event_t* event, void* opaque )
     AudioOutput* that = reinterpret_cast < AudioOutput * > ( opaque );
     Q_ASSERT( that );
 
-    that->onVlcEvent( event );
+    if ( !that->isInitialized() )
+    {
+        that->onInitVlcEvent( event );
+    }
+    else
+    {
+        that->onVlcEvent( event );
+    }
 }
 
 

src/libtomahawk/audio/AudioOutput.h

@@ -25,6 +25,8 @@
 #include "DllMacro.h"
 #include "Typedefs.h"
 
+#include <QFile>
+
 #include <functional>
 
 struct libvlc_instance_t;
@@ -44,11 +46,13 @@ public:
     explicit AudioOutput( QObject* parent = nullptr );
     ~AudioOutput();
 
+    bool isInitialized() const;
     AudioState state() const;
 
-    void setCurrentSource( const QUrl& stream );
-    void setCurrentSource( QIODevice* stream );
-    void setCurrentSource( MediaStream* stream );
+    void setCurrentSource( const QUrl& stream, bool preload );
+    void setCurrentSource( QIODevice* stream, bool preload );
+    void setCurrentSource( MediaStream* stream, bool preload );
+    void setPreloadedSourceAsCurrent( void );
 
     void play();
     void pause();
@@ -62,26 +66,34 @@ public:
     qreal volume() const;
     qint64 currentTime() const;
     qint64 totalTime() const;
-    void setAutoDelete ( bool ad );
+    void setAutoDelete ( bool ad, bool preload );
 
     void setDspCallback( std::function< void( int, int, float*, int, int ) > cb );
 
     static AudioOutput* instance();
     libvlc_instance_t* vlcInstance() const;
 
+    void switchToPreloadedMedia( void );
+
 public slots:
 
 signals:
+    void initialized();
     void stateChanged( AudioOutput::AudioState, AudioOutput::AudioState );
     void tick( qint64 );
     void positionChanged( float );
+    void volumeChanged( qreal volume );
+    void mutedChanged( bool );
 
 private:
+    void onInitVlcEvent( const libvlc_event_t* event );
+
     void setState( AudioState state );
     void setCurrentTime( qint64 time );
     void setCurrentPosition( float position );
     void setTotalTime( qint64 time );
 
+
     void onVlcEvent( const libvlc_event_t* event );
     static void vlcEventCallback( const libvlc_event_t* event, void* opaque );
     static void s_dspCallback( int frameNumber, float* samples, int nb_channels, int nb_samples );
@@ -89,9 +101,11 @@ private:
     static AudioOutput* s_instance;
     AudioState m_currentState;
     MediaStream* m_currentStream;
+    MediaStream* m_preloadedStream;
     bool m_seekable;
     bool m_muted;
     bool m_autoDelete;
+    bool m_preloadedAutoDelete;
     bool m_havePosition;
     bool m_haveTiming;
     qreal m_volume;
@@ -99,11 +113,17 @@ private:
     qint64 m_totalTime;
     bool m_justSeeked;
 
+    int m_initialized;
+    QFile m_silenceFile;
+
     std::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > dspPluginCallback;
 
     libvlc_instance_t* m_vlcInstance;
     libvlc_media_player_t* m_vlcPlayer;
     libvlc_media_t* m_vlcMedia;
+    libvlc_media_player_t* m_vlcBackPlayer;
+    libvlc_media_player_t* m_vlcPreloadedPlayer;
+    libvlc_media_t* m_vlcPreloadedMedia;
 };
 
 #endif // AUDIOOUTPUT_H

src/libtomahawk/audio/MediaStream.cpp

@@ -41,12 +41,16 @@ MediaStream::MediaStream( const QUrl &url )
 }
 
 
-MediaStream::MediaStream( QIODevice* device )
+MediaStream::MediaStream( QIODevice* device, bool bufferingFinished )
     : QObject( nullptr )
     , m_type( IODevice )
     , m_ioDevice ( device )
+    , m_bufferingFinished( bufferingFinished )
 {
-    QObject::connect( m_ioDevice, SIGNAL( readChannelFinished() ), this, SLOT( bufferingFinished() ) );
+    if ( !bufferingFinished )
+    {
+        QObject::connect( m_ioDevice, SIGNAL( readChannelFinished() ), this, SLOT( bufferingFinished() ) );
+    }
 }
 
 
@@ -147,7 +151,6 @@ int
 MediaStream::readDoneCallback ( const char *cookie, size_t bufferSize, void *buffer )
 {
     Q_UNUSED(cookie);
-    Q_UNUSED(bufferSize);
 
     if ( ( m_type == Stream ) && buffer != nullptr && bufferSize > 0 ) {
         delete[] reinterpret_cast< char* >( buffer );

src/libtomahawk/audio/MediaStream.h

@@ -42,7 +42,7 @@ public:
 
     MediaStream( QObject* parent = nullptr );
     explicit MediaStream( const QUrl &url );
-    explicit MediaStream( QIODevice* device );
+    explicit MediaStream( QIODevice* device, bool bufferingFinished = false );
     virtual ~MediaStream();
 
     MediaType type() const;

src/libtomahawk/database/DatabaseCollection.cpp

@@ -128,10 +128,13 @@ DatabaseCollection::playlists()
 QList< dynplaylist_ptr >
 DatabaseCollection::autoPlaylists()
 {
+    // echonest is dead, disable all echonest code
+    /*
     if ( Collection::autoPlaylists().isEmpty() )
     {
         loadAutoPlaylists();
     }
+    */
 
     return Collection::autoPlaylists();
 }
@@ -140,10 +143,13 @@ DatabaseCollection::autoPlaylists()
 QList< dynplaylist_ptr >
 DatabaseCollection::stations()
 {
+    // echonest is dead, disable all echonest code
+    /*
     if ( Collection::stations().isEmpty() )
     {
         loadStations();
     }
+    */
 
     return Collection::stations();
 }

src/libtomahawk/database/DatabaseCommand_AllArtists.h

@@ -59,10 +59,10 @@ public:
     void setLimit( unsigned int amount ) { m_amount = amount; }
     void setSortOrder( DatabaseCommand_AllArtists::SortOrder order ) { m_sortOrder = order; }
     void setSortDescending( bool descending ) { m_sortDescending = descending; }
-    void setFilter( const QString& filter ) { m_filter = filter; }
+    void setFilter( const QString& filter ) override { m_filter = filter; }
 
 signals:
-    void artists( const QList<Tomahawk::artist_ptr>& );
+    void artists( const QList<Tomahawk::artist_ptr>& ) override;
     void done();
 
 private:

src/libtomahawk/database/DatabaseCommand_AllTracks.h

@@ -74,7 +74,7 @@ public:
 
 signals:
     void tracks( const QList<Tomahawk::query_ptr>&, const QVariant& data );
-    void tracks( const QList<Tomahawk::query_ptr>& );
+    void tracks( const QList<Tomahawk::query_ptr>& ) override;
     void done( const Tomahawk::collection_ptr& );
 
 private:

src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.cpp

@@ -21,7 +21,6 @@
 #include "Source.h"
 #include "network/Servent.h"
 #include "SourceList.h"
-#include "EchonestCatalogSynchronizer.h"
 
 namespace Tomahawk
 {
@@ -76,9 +75,11 @@ DatabaseCommand_SetCollectionAttributes::exec( DatabaseImpl *lib )
 void
 DatabaseCommand_SetCollectionAttributes::postCommitHook()
 {
+    /*
     if ( m_type == EchonestSongCatalog ||
          m_type == EchonestArtistCatalog )
         Tomahawk::EchonestCatalogSynchronizer::instance()->knownCatalogsChanged();
+    */
 
     if ( source()->isLocal() )
         Servent::instance()->triggerDBSync();

src/libtomahawk/database/DatabaseResolver.h

@@ -34,11 +34,11 @@ public:
     explicit DatabaseResolver( int weight );
 
     QString name() const override;
-    virtual unsigned int weight() const { return m_weight; }
-    virtual unsigned int timeout() const { return 0; }
+    virtual unsigned int weight() const override{ return m_weight; }
+    virtual unsigned int timeout() const override{ return 0; }
 
 public slots:
-    virtual void resolve( const Tomahawk::query_ptr& query );
+    virtual void resolve( const Tomahawk::query_ptr& query ) override;
 
 private slots:
     void gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results );

src/libtomahawk/database/LocalCollection.cpp

@@ -1,21 +1,20 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "LocalCollection.h"
 

src/libtomahawk/database/LocalCollection.h

@@ -1,21 +1,20 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef LOCALCOLLECTION_H
 #define LOCALCOLLECTION_H

src/libtomahawk/filemetadata/MetadataEditor.cpp

@@ -240,7 +240,7 @@ MetadataEditor::loadResult( const Tomahawk::result_ptr& result )
         return;
 
     m_result = result;
-    setEditable( result->resolvedByCollection() && result->resolvedByCollection()->isLocal() );
+    setEditable( result->isLocal() );
 
     setTitle( result->track()->track() );
     setArtist( result->track()->artist() );
@@ -250,7 +250,7 @@ MetadataEditor::loadResult( const Tomahawk::result_ptr& result )
     setYear( result->track()->year() );
     setBitrate( result->bitrate() );
 
-    if ( result->resolvedByCollection() && result->resolvedByCollection()->isLocal() )
+    if ( result->isLocal() )
     {
         QString furl = m_result->url();
         if ( furl.startsWith( "file://" ) )

src/libtomahawk/filemetadata/MusicScanner.cpp

@@ -40,6 +40,11 @@ using namespace Tomahawk;
 void
 DirLister::go()
 {
+    if ( m_dirs.isEmpty() )
+    {
+        emit finished();
+        return;
+    }
     foreach ( const QString& dir, m_dirs )
     {
         m_opcount++;

src/libtomahawk/infosystem/InfoSystem.cpp

@@ -277,8 +277,8 @@ InfoSystem::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
 
     if ( plugin.data()->thread() != m_infoSystemWorkerThreadController->worker()->thread() )
     {
+        tLog() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread(): " << plugin->friendlyName();
         Q_ASSERT( false );
-        tDebug() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread()";
         return;
     }
 

src/libtomahawk/infosystem/InfoSystemWorker.cpp

@@ -58,13 +58,7 @@ InfoSystemWorker::InfoSystemWorker()
 
 InfoSystemWorker::~InfoSystemWorker()
 {
-    tDebug() << Q_FUNC_INFO << " beginning";
-    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
-    {
-        if( plugin )
-            delete plugin.data();
-    }
-    tDebug() << Q_FUNC_INFO << " finished";
+    tDebug() << Q_FUNC_INFO;
 }
 
 
@@ -136,29 +130,6 @@ InfoSystemWorker::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
 
     emit updatedSupportedGetTypes( QSet< InfoType >::fromList( m_infoGetMap.keys() ) );
     emit updatedSupportedPushTypes( QSet< InfoType >::fromList( m_infoPushMap.keys() ) );
-
-    connect( plugin.data(), SIGNAL( destroyed( QObject* ) ), SLOT( onInfoPluginDeleted() ) );
-}
-
-
-void
-InfoSystemWorker::onInfoPluginDeleted()
-{
-    foreach( const InfoPluginPtr& plugin, m_plugins )
-    {
-        if ( plugin.isNull() )
-        {
-            m_plugins.removeOne( plugin );
-            foreach( InfoType type, m_infoGetMap.keys() )
-            {
-                m_infoGetMap[type].removeOne( plugin );
-            }
-            foreach( InfoType type, m_infoPushMap.keys() )
-            {
-                m_infoPushMap[type].removeOne( plugin );
-            }
-        }
-    }
 }
 
 

src/libtomahawk/infosystem/InfoSystemWorker.h

@@ -72,7 +72,6 @@ public slots:
 
 private slots:
     void checkTimeoutsTimerFired();
-    void onInfoPluginDeleted();
 
 private:
     void registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType > &getTypes, const QSet< InfoType > &pushTypes );

src/libtomahawk/jobview/JobStatusItem.cpp

@@ -33,6 +33,12 @@ JobStatusItem::~JobStatusItem()
 }
 
 
+void
+JobStatusItem::activated()
+{
+}
+
+
 bool
 JobStatusItem::allowMultiLine() const
 {

src/libtomahawk/jobview/JobStatusItem.h

@@ -53,6 +53,8 @@ public:
     virtual QString mainText() const = 0;
     virtual QString rightColumnText() const { return QString(); };
 
+    virtual void activated();
+
     /**
      * If collapse item is true, sending multiple items of the same type will "collapse" them into one
      * instead of showing each individually. In this case, the right column from the item will be ignored

src/libtomahawk/jobview/JobStatusView.cpp

@@ -118,6 +118,7 @@ JobStatusView::setModel( JobStatusSortModel* m )
     connect( m_view->model(), SIGNAL( customDelegateJobInserted( int, JobStatusItem* ) ), this, SLOT( customDelegateJobInserted( int, JobStatusItem* ) ) );
     connect( m_view->model(), SIGNAL( customDelegateJobRemoved( int ) ), this, SLOT( customDelegateJobRemoved( int ) ) );
     connect( m_view->model(), SIGNAL( refreshDelegates() ), this, SLOT( refreshDelegates() ) );
+    connect( m_view, SIGNAL( activated( QModelIndex ) ), this, SLOT( onItemActivated( QModelIndex ) ) );
 
     foreach ( const QPointer<JobStatusItem> item, s_jobItems )
     {
@@ -184,6 +185,21 @@ JobStatusView::refreshDelegates()
 }
 
 
+void
+JobStatusView::onItemActivated( const QModelIndex& index )
+{
+    QVariant itemVar = index.data( JobStatusModel::JobDataRole );
+    if ( !itemVar.canConvert< JobStatusItem* >() || !itemVar.value< JobStatusItem* >() )
+    {
+        tLog() << Q_FUNC_INFO << "unable to fetch JobStatusItem*";
+        return;
+    }
+
+    JobStatusItem* item = itemVar.value< JobStatusItem* >();
+    item->activated();
+}
+
+
 void
 JobStatusView::checkCount()
 {

src/libtomahawk/jobview/JobStatusView.h

@@ -59,6 +59,7 @@ private slots:
     void customDelegateJobInserted( int row, JobStatusItem* item );
     void customDelegateJobRemoved( int row );
     void refreshDelegates();
+    void onItemActivated( const QModelIndex& index );
 
 private:
     QListView* m_view;

src/libtomahawk/jobview/ScriptErrorStatusMessage.cpp

@@ -0,0 +1,37 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2016, Dominik Schmidt <domme@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptErrorStatusMessage.h"
+#include "../utils/Logger.h"
+
+ScriptErrorStatusMessage::ScriptErrorStatusMessage( const QString& message, Tomahawk::ScriptAccount* account )
+  : ErrorStatusMessage( tr( "Script Error: %1" ).arg( message ) )
+  , m_account( account )
+{
+}
+
+void
+ScriptErrorStatusMessage::activated()
+{
+    if ( m_account.isNull() )
+        return;
+
+    tDebug() << "ScriptErrorStatusMessage clicked: " << mainText() << m_account->name();
+    m_account->showDebugger();
+}
+

src/libtomahawk/jobview/ScriptErrorStatusMessage.h

@@ -0,0 +1,39 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2016, Dominik Schmidt <domme@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SCRIPTERRORSTATUSMESSAGE_H
+#define SCRIPTERRORSTATUSMESSAGE_H
+
+#include "ErrorStatusMessage.h"
+#include "../resolvers/ScriptAccount.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT ScriptErrorStatusMessage : public ErrorStatusMessage
+{
+    Q_OBJECT
+public:
+    explicit ScriptErrorStatusMessage( const QString& scriptErrorMessage, Tomahawk::ScriptAccount* );
+
+    void activated() override;
+
+private:
+    QPointer< Tomahawk::ScriptAccount > m_account;
+};
+
+#endif // SCRIPTERRORSTATUSMESSAGE_H

src/libtomahawk/network/DbSyncConnection.h

@@ -42,8 +42,8 @@ public:
     explicit DBSyncConnection( Servent* s, const Tomahawk::source_ptr& src );
     virtual ~DBSyncConnection();
 
-    void setup();
-    Connection* clone();
+    void setup() override;
+    Connection* clone() override;
 
 signals:
     void stateChanged( Tomahawk::DBSyncConnectionState newstate, Tomahawk::DBSyncConnectionState oldstate, const QString& info );

src/libtomahawk/network/Servent.cpp

@@ -1371,8 +1371,7 @@ Servent::isIPWhitelisted( QHostAddress ip )
         }
     }
 
-#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
-    // Qt4 cannot cope correctly with IPv4 addresses mapped into the IPv6
+    // Qt cannot cope correctly with IPv4 addresses mapped into the IPv6
     // address space
     if ( ip.protocol() == QAbstractSocket::IPv6Protocol )
     {
@@ -1397,7 +1396,6 @@ Servent::isIPWhitelisted( QHostAddress ip )
             return isIPWhitelisted( addr );
         }
     }
-#endif
 
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure";
     return false;