Remove miniupnpc from tree and use external one

CMakeLists.txt

@@ -179,7 +179,7 @@ if( NOT BUILD_WITH_QT4 )
             set(HAVE_X11 FALSE)
         endif()
 
-        message(STATUS "Found Qt5!")
+        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
 
         if( UNIX AND NOT APPLE )
             # We need this to find the paths to qdbusxml2cpp and co
@@ -228,10 +228,6 @@ 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")
@@ -311,10 +307,11 @@ else()
     message(STATUS "${CMAKE_CXX_COMPILER} does not support C++11, please use a
     different compiler")
 endif()
-if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR APPLE) AND LIBCPP_FOUND)
+if(LIBCPP_FOUND AND APPLE)
     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")
 
@@ -341,6 +338,12 @@ macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
     "Sparsehash is needed for reading metadata of mediastreams and fast
     forward/backward seeking in HTTP streams")
 
+macro_optional_find_package(MiniUPnPc)
+macro_log_feature(LIBMINIUPNPC_FOUND "MiniUPnPc"
+    " The aim of the MiniUPnP project is to bring a free software solution to support the \"Internet Gateway Device\" part of the protocol."
+    "http://miniupnp.free.fr/" TRUE ""
+    "MiniUPnPc is used to setup portforwarding automatically")
+
 macro_optional_find_package(GnuTLS)
 macro_log_feature(GNUTLS_FOUND "GnuTLS"
     "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them."
@@ -407,7 +410,7 @@ if( WIN32 )
 endif( WIN32 )
 
 if( WIN32 OR APPLE )
-    macro_optional_find_package(LibsnoreQt5 0.6.0 QUIET)
+    macro_optional_find_package(LibsnoreQt5 0.5.70 QUIET)
     macro_log_feature(LibsnoreQt5_FOUND "Libsnore" "Library for notifications" "https://projects.kde.org/projects/playground/libs/snorenotify" FALSE "" "")
 endif()
 

CMakeModules/FindLIBVLC.cmake

@@ -6,16 +6,19 @@ 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})
 
@@ -29,6 +32,8 @@ int main(int argc, char *argv[]) {
 HAVE_VLC_ALBUMARTIST)
 
 find_package_handle_standard_args(LibVLC
-    REQUIRED_VARS LIBVLC_LIBRARY LIBVLC_INCLUDE_DIR
+    REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR
     VERSION_VAR LIBVLC_VERSION
 )
+
+ 

CMakeModules/FindMiniUPnPc.cmake

@@ -0,0 +1,22 @@
+# Try to find miniupnpc (https://github.com/miniupnp/miniupnp/)
+#
+# This will define
+# LIBMINIUPNPC_FOUND
+# LIBMINIUPNPC_INCLUDE_DIRS
+# LIBMINIUPNPC_LIBRARIES
+
+find_path(LIBMINIUPNPC_INCLUDE_DIR miniupnpc/miniupnpc.h
+    PATH_SUFFIXES miniupnpc
+)
+
+find_library(LIBMINIUPNPC_LIBRARY
+    NAMES miniupnpc
+)
+
+set(LIBMINIUPNPC_INCLUDE_DIRS ${LIBMINIUPNPC_INCLUDE_DIR})
+set(LIBMINIUPNPC_LIBRARIES ${LIBMINIUPNPC_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(libminiupnpc DEFAULT_MSG LIBMINIUPNPC_LIBRARY LIBMINIUPNPC_INCLUDE_DIR)
+
+mark_as_advanced(LIBMINIUPNPC_INCLUDE_DIR LIBMINIUPNPC_LIBRARY)

CMakeModules/NSIS.template.in

@@ -18,10 +18,11 @@
 !ifndef MINGW_ROOT
     !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw"
 !endif
-!define APPLICATION_NAME "@CPACK_PACKAGE_NAME@"
-!define TARGET_NAME "@CPACK_PACKAGE_TARGET_NAME@"
+
+!define APPLICATION_NAME "Tomahawk"
+!define TARGET_NAME "tomahawk"
 ;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"
@@ -346,108 +347,101 @@ 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"
 
-    ; ANGLE
-    File "${MINGW_BIN}\D3DCompiler_43.dll"
+   File "${MINGW_BIN}\libechonest5.dll"
+   File "${MINGW_BIN}\liblastfm5.dll"
+   File "${MINGW_BIN}\libquazip5.dll"
+   File "${MINGW_BIN}\libqt5keychain.dll"
 
-    File "${MINGW_BIN}\libechonest5.dll"
-    File "${MINGW_BIN}\liblastfm5.dll"
-    File "${MINGW_BIN}\libquazip5.dll"
-    File "${MINGW_BIN}\libqt5keychain.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"
 
-    ; 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"
+   ; 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"
 
-    ; 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"
+   ; 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,7 +1,6 @@
 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

@@ -86,6 +86,7 @@ Required dependencies:
 * [QtKeychain 0.1](https://github.com/frankosterfeld/qtkeychain/)
 * [Sparsehash](https://code.google.com/p/sparsehash/)
 * [GnuTLS](http://gnutls.org/)
+* [MiniUPnP 1.6](http://miniupnp.free.fr/)
 
 The following dependencies are optional (but *recommended*):
 
@@ -94,7 +95,6 @@ The following dependencies are optional (but *recommended*):
 
 Third party libraries that we ship with our source:
 
-* [MiniUPnP 1.6](http://miniupnp.free.fr/)
 * [Qocoa](https://github.com/mikemcquaid/Qocoa/)
 * [libqnetwm](https://code.google.com/p/libqnetwm/)
 * [libqxt](http://libqxt.org/) (QxtWeb module)

TomahawkCPack.cmake

@@ -2,7 +2,7 @@ INCLUDE( InstallRequiredSystemLibraries )
 
 SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-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
+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
 
 # 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,9 +13,7 @@ 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,6 +3,8 @@
 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_APPLICATION_NAME@</string>
+	<string>Tomahawk</string>
 	<key>CFBundleIdentifier</key>
-	<string>@TOMAHAWK_APPLICATION_PACKAGE_NAME@</string>
+	<string>org.tomahawk-player.Tomahawk</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_BASE_TARGET_NAME@</string>
+	<string>tomahawk</string>
 	<key>CFBundleIconFile</key>
-	<string>@TOMAHAWK_APPLICATION_NAME@.icns</string>
+	<string>Tomahawk.icns</string>
 	<key>CFBundleName</key>
-	<string>@TOMAHAWK_APPLICATION_NAME@</string>
+	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.7.0</string>
 	<key>NSPrincipalClass</key>
@@ -29,7 +29,7 @@
 	<key>NSHighResolutionCapable</key>
 	<true />
 	<key>SUFeedURL</key>
-	<string>@TOMAHAWK_SPARKLE_UPDATE_URL@</string>
+	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>sparkle_pub.pem</string>
 	<key>SUEnableSystemProfiling</key>

admin/mac/build-release-osx.sh

@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-TARGET_NAME="Tomahawk"
-
 set -e
 
+
 function header {
     echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
 }
@@ -32,28 +31,30 @@ CERT_SIGNER=$2
 ################################################################################
 
     header "Fixing and copying libraries"
-    $ROOT/../admin/mac/macdeploy.py "${TARGET_NAME}.app" quiet
+    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
 
-    cd "${TARGET_NAME}.app"
+    cd Tomahawk.app
 
     cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
-    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"
-    cd ..
-    if [ -f ~/sign_step.sh ];
-    then
-        ~/sign_step.sh "$CERT_SIGNER" "${TARGET_NAME}.app"
-    fi
+#    header "Copying Sparkle framework"
+#    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
 
     header "Creating DMG"
-    $ROOT/../admin/mac/create-dmg.sh "${TARGET_NAME}.app"
-    mv "${TARGET_NAME}.dmg" "${TARGET_NAME}-$VERSION.dmg"
+    cd ..
+
+    header "Signing bundle"
+#    codesign -s "Developer ID Application: $CERT_SIGNER" -f -v ./Tomahawk.app
+
+    if [ -f ~/sign_step.sh ];
+    then
+        ~/sign_step.sh "$CERT_SIGNER" "Tomahawk.app" || true
+    fi
+
+    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
+    mv Tomahawk.dmg Tomahawk-$VERSION.dmg
 
     header "Creating signed Sparkle update"
-#     $ROOT/../admin/mac/sign_bundle.rb "${TARGET_NAME}" $VERSION ~/tomahawk_sparkle_privkey.pem
+    $ROOT/../admin/mac/sign_bundle.rb $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 "$NAME" -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
+hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -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,170 +22,171 @@ 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/opt/vlc/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
 
 VLC_PLUGINS=[
-  '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',
+  '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',
   #'libconverter_fixed_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',
+  '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',
   #'libspdif_mixer_plugin.dylib',
   #'libtrivial_mixer_plugin.dylib',
   #'libaout_file_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',
+  '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',
   #'libfake_plugin.dylib',
-  'libflac_plugin.dylib',
+  'codec/libflac_plugin.dylib',
   #'libfluidsynth_plugin.dylib',
   #'libinvmem_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',
+  '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',
   #'libhotkeys_plugin.dylib',
   #'libmotion_plugin.dylib',
   #'libnetsync_plugin.dylib',
   #'libsignals_plugin.dylib',
-  'libaiff_plugin.dylib',
-  'libasf_plugin.dylib',
-  'libau_plugin.dylib',
+  'demux/libaiff_plugin.dylib',
+  'demux/libasf_plugin.dylib',
+  'demux/libau_plugin.dylib',
   #'libavformat_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',
+  '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',
   #'libaudioscrobbler_plugin.dylib',
-  'libdummy_plugin.dylib',
-  'libexport_plugin.dylib',
+  'control/libdummy_plugin.dylib',
+  'misc/libexport_plugin.dylib',
   #'libfreetype_plugin.dylib',
   #'libgnutls_plugin.dylib',
-  'liblogger_plugin.dylib',
-  'liblua_plugin.dylib',
+  'misc/liblogger_plugin.dylib',
+  'lua/liblua_plugin.dylib',
   #'libosd_parser_plugin.dylib',
   #'libquartztext_plugin.dylib',
   #'libstats_plugin.dylib',
-  'libvod_rtsp_plugin.dylib',
-  'libxml_plugin.dylib',
+  'misc/libvod_rtsp_plugin.dylib',
+  'misc/libxml_plugin.dylib',
   #'libxtag_plugin.dylib',
-  'libi420_rgb_mmx_plugin.dylib',
-  'libi420_yuy2_mmx_plugin.dylib',
-  'libi422_yuy2_mmx_plugin.dylib',
+  'video_chroma/libi420_rgb_mmx_plugin.dylib',
+  'video_chroma/libi420_yuy2_mmx_plugin.dylib',
+  'video_chroma/libi422_yuy2_mmx_plugin.dylib',
   #'libmemcpymmx_plugin.dylib',
   #'libmemcpymmxext_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',
+  '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',
   #'libvisual_plugin.dylib',
-  'libsecuretransport_plugin.dylib'
 ]
 
 VLC_SEARCH_PATH=[
-    '/usr/local/opt/vlc/lib/vlc/plugins/',
+    '/usr/local/lib/vlc/plugins/',
 ]
 
 QT_PLUGINS = [
@@ -200,39 +201,39 @@ QT_PLUGINS = [
 ]
 
 SNORE_PLUGINS = [
-    'libsnore_backend_growl.so',
-    'libsnore_backend_osxnotificationcenter.so',
+#    'libsnore_backend_growl.so',
+#    'libsnore_backend_osxnotificationcenter.so',
 ]
 
 TOMAHAWK_PLUGINS = [
-  '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,
+  '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',
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/qt5/plugins',
+    '/usr/local/Cellar/qt5/5.4.0/plugins',
 ]
 
 SNORE_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5',
+    '/usr/local/Cellar/snorenotify/HEAD/lib/libsnore',
 ]
 
 class Error(Exception):
@@ -246,8 +247,6 @@ class CouldNotFindQtPluginErrorFindFrameworkError(Error):
 class InstallNameToolError(Error):
   pass
 
-class CouldNotFindFrameworkError(Error):
-  pass
 
 class CouldNotFindQtPluginError(Error):
   pass
@@ -309,7 +308,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) and not re.match(r'^\s*@loader_path/../lib', line):
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
       # Potentially already fixed library
       if '.framework' in line:
         relative_path = os.path.join(*line.split('/')[3:])
@@ -333,11 +332,6 @@ 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):
@@ -582,12 +576,12 @@ for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
 for plugin in SNORE_PLUGINS:
-  FixPlugin(FindSnorePlugin(plugin), '../lib/plugins/libsnore-qt5')
+  FixPlugin(FindSnorePlugin(plugin), '../MacOS/libsnore')
 
 try:
-  FixPlugin('%s_crash_reporter' % TARGET_NAME, '../MacOS')
+  FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
-  print 'Failed to find %s_crash_reporter' % TARGET_NAME
+  print 'Failed to find tomahawk_crash_reporter'
 
 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 = "#{ARGV[0].downcase}-#{ARGV[1]}.tar.bz2"
+tarball = "tomahawk-#{ARGV[0]}.tar.bz2"
 puts "Zipping: #{tarball}..."
-`tar jcvf "#{tarball}" #{ARGV[0]}.app`
+`tar jcvf "#{tarball}" Tomahawk.app`
 
 puts "Signing..."
-puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[2]}" | openssl enc -base64`
+puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64`

admin/win/update-vlc.sh

@@ -9,20 +9,19 @@ 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_TARBALL"
+wget -c http://download.tomahawk-player.org/test/vlc.tar.bz2
 
 echo "Extract binary..."
 # 7z x phonon*.7z
 # mv -v vlc-*/ vlc/
 # unzip tomahawk-vlc-0.1.zip
-tar xvjf "$VLC_TARBALL"
+tar xvjf vlc.tar.bz2
 
 # echo "Download phonon_vlc_no_video.dll..."
 # wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
@@ -73,9 +72,7 @@ rm -rvf \
     **/libi420* \
     **/libi422* \
     mux/ \
-    stream_filter/*dash* \
-    stream_filter/*smooth* \
-    stream_filter/*record* \
+    stream_filter/ \
     **/libtheora_plugin* \
     **/liblibbluray_plugin* \
     **/libdtv_plugin* \

data/images/folder.svg

@@ -1,13 +0,0 @@
-<?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

@@ -1,55 +0,0 @@
-<?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

@@ -1,55 +0,0 @@
-<?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,8 +42,6 @@ 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 = "";
@@ -51,9 +49,9 @@ RSVP.on('error', function (reason) {
         resolverName = Tomahawk.resolver.instance.settings.name + " - ";
     }
     if (reason) {
-        Tomahawk.error(resolverName + 'Uncaught error:', reason);
+        console.error(resolverName + 'Uncaught error:', reason);
     } else {
-        Tomahawk.error(resolverName + 'Uncaught error: error thrown from RSVP but it was empty');
+        console.error(resolverName + 'Uncaught error: error thrown from RSVP but it was empty');
     }
 });
 
@@ -275,42 +273,30 @@ Tomahawk.Resolver = {
     getStreamUrl: function (params) {
         return params;
     },
-    resolve: function() {
-    },
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
-            if(Array.isArray(results)) {
-                return {
-                    'tracks': results
-                };
-            }
-
-            return results;
+            return {
+                'tracks': results
+            };
         });
     },
 
     _adapter_search: function (params) {
         return RSVP.Promise.resolve(this.search(params)).then(function (results) {
-            if(Array.isArray(results)) {
-                return {
-                    'tracks': results
-                };
-            }
-
-            return results;
+            return {
+                'tracks': results
+            };
         });
     },
 
     _adapter_testConfig: function (config) {
-        return RSVP.Promise.resolve(this.testConfig(config)).then(function (results) {
-            results = results || Tomahawk.ConfigTestResultType.Success;
-            return results;
-        }, function (error) {
-            return error;
+        return RSVP.Promise.resolve(this.testConfig(config)).then(function () {
+            return {result: Tomahawk.ConfigTestResultType.Success};
         });
     }
 };
 
+
 // help functions
 
 Tomahawk.valueForSubNode = function (node, tag) {
@@ -381,6 +367,48 @@ 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
@@ -395,9 +423,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
@@ -415,12 +443,7 @@ var doRequest = function(options) {
                 return this.responseHeaders;
             };
             xhr.getResponseHeader = function (header) {
-                for(key in xhr.responseHeaders) {
-                    if(key.toLowerCase() === header.toLowerCase()) {
-                        return xhr.responseHeaders[key];
-                    }
-                }
-                return null;
+                return this.responseHeaders[header];
             };
 
             return xhr;
@@ -712,6 +735,7 @@ Tomahawk.base64Encode = function (b) {
     return window.btoa(b);
 };
 
+
 Tomahawk.PluginManager = {
     wrapperPrefix: '_adapter_',
     objects: {},
@@ -742,6 +766,8 @@ Tomahawk.PluginManager = {
             methodName = this.wrapperPrefix + methodName;
         }
 
+
+        var pluginManager = this;
         if (!this.objects[objectId]) {
             Tomahawk.log("Object not found! objectId: " + objectId + " methodName: " + methodName);
         } else {
@@ -762,21 +788,20 @@ Tomahawk.PluginManager = {
     invoke: function (requestId, objectId, methodName, params) {
         RSVP.Promise.resolve(this.invokeSync(requestId, objectId, methodName, params))
             .then(function (result) {
-                var params = {
+                Tomahawk.reportScriptJobResults({
                     requestId: requestId,
                     data: result
-                };
-                Tomahawk.reportScriptJobResults(encodeParamsToNativeFunctions(params));
+                });
             }, function (error) {
-                var params = {
+                Tomahawk.reportScriptJobResults({
                     requestId: requestId,
                     error: error
-                };
-                Tomahawk.reportScriptJobResults(encodeParamsToNativeFunctions(params));
+                });
             });
     }
 };
 
+
 var encodeParamsToNativeFunctions = function(param) {
   return param;
 };
@@ -790,7 +815,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) {
@@ -1459,7 +1484,9 @@ Tomahawk.Collection = {
             return new RSVP.Promise(function (resolve, reject) {
                 that.cachedDbs[id].changeVersion(that.cachedDbs[id].version, "", null,
                     function (err) {
-                        Tomahawk.error("Error trying to change db version!", err);
+                        if (console.error) {
+                            console.error("Error!: %o", err);
+                        }
                         reject();
                     }, function () {
                         delete that.cachedDbs[id];

resources.qrc

@@ -3,7 +3,6 @@
         <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>
@@ -168,8 +167,5 @@
         <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,6 +24,13 @@ 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,13 +69,6 @@ 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,8 +38,6 @@ namespace Tomahawk {
             XmppInfoPlugin(XmppSipPlugin* parent);
             virtual ~XmppInfoPlugin();
 
-            const QString friendlyName() const override;
-
         signals:
             void publishTune( QUrl url, Tomahawk::InfoSystem::InfoStringHash trackInfo );
 

src/accounts/xmpp/sip/XmppSip.cpp

@@ -194,9 +194,9 @@ InfoSystem::InfoPluginPtr
 XmppSipPlugin::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-        m_infoPlugin = QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
+        m_infoPlugin = QPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
 
-    return m_infoPlugin;
+    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
 }
 
 
@@ -285,7 +285,7 @@ XmppSipPlugin::onConnect()
     // load XmppInfoPlugin
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 
@@ -359,6 +359,7 @@ 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;
 
-    QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
+    QPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
     Tomahawk::Accounts::Account::ConnectionState m_state;
 
     // sort out

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><p>Can you tell us what you were doing when this happened?</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></body></html>");
 
     reporter.setReportData( "BuildID", CRASHREPORTER_BUILD_ID );
     reporter.setReportData( "ProductName",  CRASHREPORTER_PRODUCT_NAME );

src/infoplugins/generic/snorenotify/SnoreNotifyPlugin.cpp

@@ -36,6 +36,19 @@
 #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
 {
 
@@ -50,8 +63,8 @@ SnoreNotifyPlugin::SnoreNotifyPlugin()
     m_supportedPushTypes << InfoNotifyUser << InfoNowPlaying << InfoTrackUnresolved << InfoNowStopped << InfoInboxReceived;
 
     Snore::SnoreCore &snore = Snore::SnoreCore::instance();
-    snore.loadPlugins( Snore::SnorePlugin::Backend | Snore::SnorePlugin::SecondaryBackend );
-    snore.setDefaultSettingsValue("Silent", true, Snore::LocalSetting );
+    snore.loadPlugins( Snore::SnorePlugin::BACKEND | Snore::SnorePlugin::SECONDARY_BACKEND );
+    snore.setDefaultSettingsValue("Silent", true, Snore::LOCAL_SETTING);
 
     m_application = Snore::Application( qApp->applicationName(), m_defaultIcon );
     m_application.hints().setValue( "use-markup", true );
@@ -161,11 +174,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( hash[ "album" ].toHtmlEscaped() );
+        album = QString( "<br><i>%1</i> %2" ).arg( tr( "on", "'on' is followed by an album name" ) ).arg( Qt::escape( hash[ "album" ] ) );
 
     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( hash[ "title" ].toHtmlEscaped() )
-            .arg( hash[ "artist" ].toHtmlEscaped() )
+            .arg( Qt::escape( hash[ "title" ] ) )
+            .arg( Qt::escape( hash[ "artist" ] ) )
             .arg( album )
             .arg( QString( "<br><i>%1</i>" ).arg( tr( "by", "preposition to link track and artist" ) ) );
 
@@ -211,9 +224,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( src["friendlyname"].toHtmlEscaped() )
-            .arg( hash[ "title" ].toHtmlEscaped() )
-            .arg( hash[ "artist" ].toHtmlEscaped() )
+            .arg( Qt::escape( src["friendlyname"] ) )
+            .arg( Qt::escape( hash[ "title" ] ) )
+            .arg( Qt::escape( hash[ "artist" ] ) )
             .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/libtomahawk-playdarapi/CMakeLists.txt

@@ -24,7 +24,6 @@ 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_WIDGETS_EXPORT_PRO)
+# if defined (tomahawk_playdarapi_EXPORTS)
 #  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 Port to listen on with HTTPS
+     * @param sport Pot to listen on with HTTPS
      * @param parent
      */
     explicit PlaydarApi( QHostAddress ha, qint16 port, qint16 sport, QObject *parent = 0 );

src/libtomahawk-widgets/CMakeLists.txt

@@ -13,6 +13,5 @@ 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_EXPORT_PRO)
+# if defined (tomahawk_widgets_EXPORTS)
 #  define TOMAHAWK_WIDGETS_EXPORT Q_DECL_EXPORT
 # else
 #  define TOMAHAWK_WIDGETS_EXPORT Q_DECL_IMPORT

src/libtomahawk/ActionCollection.cpp

@@ -62,8 +62,6 @@ 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;
@@ -149,6 +147,7 @@ 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 );

src/libtomahawk/Album.cpp

@@ -33,7 +33,6 @@
 
 #include <QReadWriteLock>
 #include <QPixmapCache>
-#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -76,7 +75,6 @@ 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,7 +36,6 @@
 
 #include <QReadWriteLock>
 #include <QPixmapCache>
-#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -110,7 +109,6 @@ 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://v09.bakery.tomahawk-player.org/resolvers/providers.xml" ) );
+//    m_manager.addProviderFile( QUrl( "http://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://v09.bakery.tomahawk-player.org";
+    return "http://bakery.tomahawk-player.org";
 }
 
 

src/libtomahawk/CMakeLists.txt

@@ -37,7 +37,6 @@ set( libGuiSources
     jobview/ErrorStatusMessage.cpp
     jobview/IndexingJobItem.cpp
     jobview/InboxJobItem.cpp
-    jobview/ScriptErrorStatusMessage.cpp
 
     playlist/InboxModel.cpp
     playlist/InboxView.cpp
@@ -146,7 +145,6 @@ set( libGuiSources
     widgets/ClickableLabel.cpp
     widgets/ComboBox.cpp
     widgets/DropDownButton.cpp
-    widgets/DownloadButton.cpp
     widgets/ElidedLabel.cpp
     widgets/FilterHeader.cpp
     widgets/CaptionLabel.cpp
@@ -419,7 +417,7 @@ include_directories(
     ${Boost_INCLUDE_DIR}
 
     ${LIBPORTFWD_INCLUDE_DIR}
-    ${QUAZIP_INCLUDE_DIRS}
+    ${QUAZIP_INCLUDE_DIR}
     ${QTKEYCHAIN_INCLUDE_DIRS}
 )
 
@@ -502,7 +500,7 @@ set_target_properties(
             AUTOMOC TRUE
             VERSION ${TOMAHAWK_VERSION_SHORT}
             SOVERSION ${TOMAHAWK_VERSION_SHORT}
-            OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME}
+            OUTPUT_NAME ${TOMAHAWK_TARGET_NAME}
 )
 
 
@@ -525,6 +523,7 @@ ENDIF( UNIX AND NOT APPLE )
 TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}
     LINK_PRIVATE
     ${LIBVLC_LIBRARY}
+    ${LIBVLCCORE_LIBRARY}
 
     # Thirdparty shipped with tomahawk
     ${LIBPORTFWD_LIBRARIES}

src/libtomahawk/ContextMenu.cpp

@@ -37,9 +37,6 @@
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 
-#include <QDesktopServices>
-#include <QFileInfo>
-
 using namespace Tomahawk;
 
 
@@ -54,7 +51,7 @@ ContextMenu::ContextMenu( QWidget* parent )
     m_sigmap = new QSignalMapper( this );
     connect( m_sigmap, SIGNAL( mapped( int ) ), SLOT( onTriggered( int ) ) );
 
-    clear();
+    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend;
 }
 
 
@@ -72,7 +69,7 @@ ContextMenu::clear()
     m_albums.clear();
     m_artists.clear();
 
-    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend | ActionOpenFileManager;
+    m_supportedActions = ActionPlay | ActionQueue | ActionPlaylist | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage | ActionEditMetadata | ActionSend;
 }
 
 
@@ -219,23 +216,10 @@ 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();
 
@@ -255,8 +239,6 @@ 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 );
 
@@ -412,15 +394,6 @@ 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,22 +37,21 @@ 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,
-        ActionOpenFileManager = 32768
+        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
     };
 
     explicit ContextMenu( QWidget* parent = 0 );

src/libtomahawk/DownloadJob.cpp

@@ -118,7 +118,7 @@ DownloadJob::localFile() const
 
 
 QString
-DownloadJob::localPath( const Tomahawk::album_ptr& album )
+DownloadJob::localPath() const
 {
     QDir dir = TomahawkSettings::instance()->downloadsPath();
 
@@ -127,7 +127,7 @@ DownloadJob::localPath( const Tomahawk::album_ptr& album )
         dir.mkpath( "." );
     }
 
-    QString path = QString( "%1/%2" ).arg( safeEncode( album->artist()->name(), true ) ).arg( safeEncode( album->name(), true ) );
+    QString path = QString( "%1/%2" ).arg( safeEncode( m_track->artist(), true ) ).arg( safeEncode( m_track->album(), 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( m_track->albumPtr() );
+    QString path = localPath();
     QString localFile = QString( path + "/" + filename );
 
     if ( !m_tryResuming )
@@ -444,7 +444,7 @@ DownloadJob::checkForResumedFile()
 
 
 QString
-DownloadJob::safeEncode( const QString& filename, bool removeTrailingDots )
+DownloadJob::safeEncode( const QString& filename, bool removeTrailingDots ) const
 {
     //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; }
 
-    static QString localPath( const Tomahawk::album_ptr& album );
+    QString localPath() const;
     QString localFile() const;
     DownloadFormat format() const;
 
@@ -90,7 +90,7 @@ private slots:
 
 private:
     void storeState();
-    static QString safeEncode( const QString& filename, bool removeTrailingDots = false );
+    QString safeEncode( const QString& filename, bool removeTrailingDots = false ) const;
     bool checkForResumedFile();
     QUrl prepareFilename();
 

src/libtomahawk/DownloadManager.cpp

@@ -24,8 +24,6 @@
 #include "TomahawkSettings.h"
 #include "infosystem/InfoSystem.h"
 #include "utils/Logger.h"
-#include "Result.h"
-#include "Query.h"
 
 DownloadManager* DownloadManager::s_instance = 0;
 
@@ -87,36 +85,6 @@ 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,8 +45,6 @@ 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,14 +263,9 @@ bool
 DropJob::validateLocalFiles(const QString &paths, const QString &suffix)
 {
     QStringList filePaths = paths.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    QStringList::iterator it = filePaths.begin();
-    while ( it != filePaths.end() )
-    {
+    for ( QStringList::iterator it = filePaths.begin(); it != filePaths.end(); ++it )
         if ( !validateLocalFile( *it, suffix ) )
-            it = filePaths.erase( it );
-        else
-            ++it;
-    }
+            filePaths.erase( it );
     return !filePaths.isEmpty();
 }
 
@@ -980,7 +975,7 @@ DropJob::removeRemoteSources()
 
         foreach ( const Tomahawk::result_ptr& result, item->results() )
         {
-            if ( !result->isLocal() )
+            if ( !result->resolvedByCollection().isNull() && !result->resolvedByCollection()->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 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>
+ *   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>
  *
  *   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
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   Tomahawk is distributed in the hope that it will be useful,
@@ -20,6 +20,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "GlobalActionManager.h"
 
 #include "accounts/AccountManager.h"

src/libtomahawk/GlobalActionManager.h

@@ -1,21 +1,21 @@
-/* === 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/>.
- */
+/*
+    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.
+*/
+
 
 #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,15 +149,6 @@ Pipeline::removeResolver( Resolver* r )
 }
 
 
-QList< Tomahawk::Resolver* >
-Pipeline::resolvers() const
-{
-    Q_D( const Pipeline );
-
-    return d->resolvers;
-}
-
-
 void
 Pipeline::addResolver( Resolver* r )
 {
@@ -542,12 +533,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 );
 }
@@ -595,8 +586,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;
     }
@@ -636,7 +627,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() ) )
     {
@@ -673,7 +664,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,7 +66,6 @@ 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,7 +33,6 @@
 
 #include <QtAlgorithms>
 #include <QDebug>
-#include <QCoreApplication>
 
 using namespace Tomahawk;
 
@@ -48,7 +47,6 @@ 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 )
@@ -401,21 +399,16 @@ Query::resultSorter( const result_ptr& left, const result_ptr& right )
 
     if ( ls == rs )
     {
-        if ( right->isLocal() )
+        if ( right->resolvedByCollection() && right->resolvedByCollection()->isLocal() )
         {
             return false;
         }
-        if ( left->isPreview() != right->isPreview() )
+        if ( !right->isPreview() )
         {
-            return !left->isPreview();
+            return false;
         }
 
-        if ( left->resolvedBy() != nullptr && right->resolvedBy() != nullptr )
-        {
-            return left->resolvedBy()->weight() > right->resolvedBy()->weight();
-        }
-
-        return left->id() > right->id();
+        return true;
     }
 
     if ( left->isPreview() != right->isPreview() )
@@ -643,11 +636,6 @@ Query::howSimilar( const Tomahawk::result_ptr& r )
         qTrackname  = queryTrack()->trackSortname();
     }
 
-    //Cleanup symbols for minor naming differences
-    qArtistname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
-    qTrackname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
-    qAlbumname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
-
     // normal edit distance
     const int artdist = TomahawkUtils::levenshtein( qArtistname, rArtistname );
     const int trkdist = TomahawkUtils::levenshtein( qTrackname, rTrackname );

src/libtomahawk/Result.cpp

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

src/libtomahawk/Result.h

@@ -31,7 +31,6 @@
 #include <QPixmap>
 #include <QPointer>
 #include <QVariant>
-#include <QMutex>
 
 class MetadataEditor;
 
@@ -94,12 +93,6 @@ 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.
@@ -138,7 +131,7 @@ public:
 
     track_ptr track() const;
 
-    QList< DownloadFormat > downloadFormats() const;
+    QList<DownloadFormat> downloadFormats() const { return m_formats; }
     void setDownloadFormats( const QList<DownloadFormat>& formats );
 
     downloadjob_ptr downloadJob() const { return m_downloadJob; }
@@ -168,8 +161,6 @@ 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,20 +929,6 @@ 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
 {

src/libtomahawk/TomahawkSettings.h

@@ -107,9 +107,6 @@ 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 );

src/libtomahawk/Track.cpp

@@ -37,7 +37,6 @@
 #include <QtAlgorithms>
 #include <QDateTime>
 #include <QReadWriteLock>
-#include <QCoreApplication>
 
 
 using namespace Tomahawk;
@@ -93,7 +92,6 @@ 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,7 +19,8 @@
 
 #include "TrackData.h"
 
-
+#include <QtAlgorithms>
+#include <QReadWriteLock>
 
 #include "audio/AudioEngine.h"
 #include "collection/Collection.h"
@@ -40,10 +41,6 @@
 #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 >();
@@ -87,7 +84,6 @@ 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 QSharedPointer< InfoPlugin > InfoPluginPtr;
+        typedef QPointer< InfoPlugin > InfoPluginPtr;
     }
 
     namespace Network

src/libtomahawk/ViewPage.h

@@ -76,8 +76,6 @@ 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( int, const QString& = QString() );
+    void configTestResult( Tomahawk::Accounts::ConfigTestResultType );
 
 protected:
     virtual void loadFromConfig( const QString &accountId );

src/libtomahawk/accounts/DelegateConfigWrapper.cpp

@@ -68,7 +68,6 @@ 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 );
@@ -82,7 +81,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( int, const QString& ) ), SLOT( onConfigTestResult( int, const QString& ) ) );
+    connect( m_account, SIGNAL( configTestResult( Tomahawk::Accounts::ConfigTestResultType ) ), SLOT( onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType ) ) );
 }
 
 
@@ -193,11 +192,11 @@ DelegateConfigWrapper::aboutClicked( bool )
 
 
 void
-DelegateConfigWrapper::onConfigTestResult( int code, const QString& message )
+DelegateConfigWrapper::onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType result )
 {
-    tLog() << Q_FUNC_INFO << code << ": " << message;
+    tLog() << Q_FUNC_INFO << result;
 
-    if( code == Tomahawk::Accounts::ConfigTestResultSuccess )
+    if( result == Tomahawk::Accounts::ConfigTestResultSuccess )
     {
         m_invalidData = QVariantMap();
         closeDialog( QDialog::Accepted );
@@ -227,25 +226,8 @@ DelegateConfigWrapper::onConfigTestResult( int code, const QString& message )
 
         m_invalidData = m_widget->readData();
 
-	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." );
+        // TODO: generate message based on status code
+        m_errorLabel->setText( QString( "<font color='red'>%1</font>" ).arg( tr( "Your config is invalid." ) ) );
     }
 }
 

src/libtomahawk/accounts/DelegateConfigWrapper.h

@@ -60,11 +60,10 @@ protected:
 
 private slots:
     void aboutClicked( bool );
-    void onConfigTestResult( int, const QString& );
+    void onConfigTestResult( Tomahawk::Accounts::ConfigTestResultType );
 
 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 )
 }
 
 
-ResolverAccount*
+Account*
 ResolverAccountFactory::createFromPath( const QString& path, const QString& factory,  bool isAttica )
 {
     qDebug() << "Creating ResolverAccount from path:" << path << "is attica" << isAttica;
@@ -110,8 +110,57 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
 
         if ( pathInfo.suffix() == "axe" )
         {
-            if ( !installAxe( realPath, configuration ) )
+            QString uniqueName = uuid();
+            QDir dir( TomahawkUtils::extractScriptPayload( pathInfo.filePath(),
+                                                           uniqueName,
+                                                           MANUALRESOLVERS_DIR ) );
+            if ( !( dir.exists() && dir.isReadable() ) ) //decompression fubar
             {
+                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;
             }
         }
@@ -172,71 +221,6 @@ 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 )
 {
@@ -533,8 +517,7 @@ 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 );
@@ -542,7 +525,7 @@ ResolverAccount::testConfig()
     {
         QVariantMap data = resolver->loadDataFromWidgets();
         ScriptJob* job = resolver->scriptObject()->invoke( "testConfig", data );
-        connect( job, SIGNAL( done( QVariant ) ), SLOT( onTestConfig( QVariant ) ) );
+        connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onTestConfig( QVariantMap ) ) );
         job->start();
     }
     else
@@ -552,25 +535,19 @@ ResolverAccount::testConfig()
 }
 
 
-ExternalResolverGui*
-ResolverAccount::resolver() const
-{
-    return m_resolver;
-}
-
-
 void
-ResolverAccount::onTestConfig( const QVariant& result )
+ResolverAccount::onTestConfig( const QVariantMap& result )
 {
     tLog() << Q_FUNC_INFO << result;
 
-    if ( result.type() == QVariant::String )
+    int resultCode = result[ "result" ].toInt();
+    if ( resultCode == 1 )
     {
-        emit configTestResult( Accounts::ConfigTestResultOther, result.toString() ); 
+        emit configTestResult( Accounts::ConfigTestResultSuccess );
     }
     else
     {
-        emit configTestResult( result.toInt() );       
+        emit configTestResult( Accounts::ConfigTestResultOther );
     }
 
     sender()->deleteLater();
@@ -589,7 +566,6 @@ 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 )
@@ -619,6 +595,8 @@ AtticaResolverAccount::init()
         loadIcon();
     else
         connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) );
+
+
 }
 
 

src/libtomahawk/accounts/ResolverAccount.h

@@ -33,8 +33,6 @@ class ExternalResolverGui;
 
 namespace Accounts {
 
-class ResolverAccount;
-
 class DLLEXPORT ResolverAccountFactory : public AccountFactory
 {
     Q_OBJECT
@@ -55,10 +53,7 @@ public:
     Account* createFromPath( const QString& path ) override;
 
     // Internal use
-    static ResolverAccount* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
-    // YES, non const parameters!
-    static bool installAxe( QString& realPath, QVariantHash& configuration );
-
+    static Account* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
 
 private:
     static void displayError( const QString& error );
@@ -106,11 +101,9 @@ public:
 
     void testConfig() override;
 
-    ExternalResolverGui* resolver() const;
-
 private slots:
     void resolverChanged();
-    void onTestConfig( const QVariant& result );
+    void onTestConfig( const QVariantMap& 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()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 }
@@ -82,6 +82,7 @@ LastFmAccount::~LastFmAccount()
     if ( m_infoPlugin )
     {
         Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
+        delete m_infoPlugin;
     }
 
     delete m_resolver.data();
@@ -167,11 +168,9 @@ InfoPluginPtr
 LastFmAccount::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-    {
-        m_infoPlugin = QSharedPointer< LastFmInfoPlugin>( new LastFmInfoPlugin( this ) );
-    }
+        m_infoPlugin = QPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) );
 
-    return m_infoPlugin;
+    return InfoPluginPtr( m_infoPlugin.data() );
 }
 
 bool

src/libtomahawk/accounts/lastfm/LastFmAccount.h

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

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp

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

src/libtomahawk/accounts/spotify/SpotifyAccount.h

@@ -170,7 +170,7 @@ private:
     QPointer<SpotifyAccountConfig> m_configWidget;
     QPointer<QWidget> m_aboutWidget;
     QPointer<ScriptResolver> m_spotifyResolver;
-    QSharedPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
+    QPointer< 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 with username:" << m_verifiedUsername;
+    qDebug() << "Showing logged in withuserame:" << 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-2016, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *   Copyright 2013,      Teo Mrnjavac <teo@kde.org>
  *
@@ -165,19 +165,12 @@ 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");
@@ -190,7 +183,6 @@ AudioEngine::~AudioEngine()
     tDebug() << Q_FUNC_INFO;
 
     TomahawkSettings::instance()->setVolume( volume() );
-    TomahawkSettings::instance()->setMuted( isMuted() );
 
     delete d_ptr;
 }
@@ -297,11 +289,8 @@ AudioEngine::stop( AudioErrorCode errorCode )
     if ( d->waitingOnNewTrack )
         sendWaitingNotification();
 
-    if ( d->audioOutput->isInitialized() )
-    {
-        Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag );
-        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
-    }
+    Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag );
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
 }
 
 
@@ -466,8 +455,6 @@ AudioEngine::mute()
 {
     Q_D( AudioEngine );
     d->audioOutput->setMuted( true );
-
-    emit volumeChanged( volume() );
 }
 
 
@@ -476,8 +463,6 @@ AudioEngine::toggleMute()
 {
     Q_D( AudioEngine );
     d->audioOutput->setMuted( !d->audioOutput->isMuted() );
-
-    emit volumeChanged( volume() );
 }
 
 
@@ -577,12 +562,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
     Q_D( AudioEngine );
     tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
 
-
-    if ( !d->audioOutput->isInitialized() )
-    {
-        return;
-    }
-
     if ( !result )
     {
         stop();
@@ -604,7 +583,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
     job->start();
 }
 
-
 void
 AudioEngine::gotStreamUrl( const QVariantMap& data )
 {
@@ -612,17 +590,14 @@ AudioEngine::gotStreamUrl( const QVariantMap& data )
     QVariantMap headers = data[ "headers" ].toMap();
     Tomahawk::result_ptr result = sender()->property( "result" ).value<result_ptr>();
 
-    if ( streamUrl.isEmpty() || headers.isEmpty() ||
-         !( TomahawkUtils::isHttpResult( streamUrl ) || TomahawkUtils::isHttpsResult( streamUrl ) ) )
+    if ( streamUrl.isEmpty() || !( TomahawkUtils::isHttpResult( streamUrl ) || TomahawkUtils::isHttpsResult( streamUrl ) || TomahawkUtils::isRtmpResult( streamUrl ) ) )
     {
-        // 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
+        // Not an http(s) or RTMP URL, get IO device
         QSharedPointer< QIODevice > sp;
         performLoadIODevice( result, streamUrl );
     }
     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 );
@@ -644,13 +619,12 @@ 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 )
 {
@@ -695,7 +669,7 @@ AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url )
 
 
 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 )
 {
     if ( QThread::currentThread() != thread() )
     {
@@ -977,9 +951,9 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
 void
 AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query )
 {
-    if ( query->resolvingFinished() || query->numResults( true ) )
+    if ( query->resolvingFinished() )
     {
-        if ( query->numResults( true ) )
+        if ( query->numResults() && query->results().first()->isOnline() )
         {
             playItem( playlist, query->results().first(), query );
             return;
@@ -995,7 +969,7 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
     {
         Pipeline::instance()->resolve( query );
 
-        NewClosure( query.data(), SIGNAL( resultsChanged() ),
+        NewClosure( query.data(), SIGNAL( resolvingFinished( bool ) ),
                     const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::playlistinterface_ptr, Tomahawk::query_ptr ) ), playlist, query );
     }
 }

src/libtomahawk/audio/AudioEngine.h

@@ -149,8 +149,6 @@ 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 );
@@ -188,7 +186,7 @@ private slots:
 
 
     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 performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi
     void loadPreviousTrack();
     void loadNextTrack();
 

src/libtomahawk/audio/AudioOutput.cpp

@@ -25,13 +25,11 @@
 
 #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>
@@ -60,7 +58,6 @@ AudioOutput::AudioOutput( QObject* parent )
     , m_currentTime( 0 )
     , m_totalTime( 0 )
     , m_justSeeked( false )
-    , m_initialized( false )
     , dspPluginCallback( nullptr )
     , m_vlcInstance( nullptr )
     , m_vlcPlayer( nullptr )
@@ -98,8 +95,8 @@ 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, TOMAHAWK_APPLICATION_PACKAGE_NAME,
-                       TOMAHAWK_VERSION, TOMAHAWK_TARGET_NAME );
+    libvlc_set_app_id( m_vlcInstance, "org.tomahawk-player.desktop",
+                       TOMAHAWK_VERSION, "tomahawk" );
 #endif
 
     m_vlcPlayer = libvlc_media_player_new( m_vlcInstance );
@@ -123,11 +120,6 @@ AudioOutput::AudioOutput( QObject* parent )
         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 );
@@ -136,24 +128,7 @@ AudioOutput::AudioOutput( QObject* parent )
         libvlc_event_attach( manager, events[ i ], &AudioOutput::vlcEventCallback, this );
     }
 
-    // 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 ) );
-    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 = true;
-            emit initialized();
-        }
-    } );
-    #endif
+    tDebug() << Q_FUNC_INFO << "Init OK";
 }
 
 
@@ -179,28 +154,6 @@ AudioOutput::~AudioOutput()
 }
 
 
-void
-AudioOutput::onInitVlcEvent( const libvlc_event_t* event )
-{
-    switch ( event->type )
-    {
-        case libvlc_MediaPlayerTimeChanged:
-            setVolume( volume() );
-            setMuted( isMuted() );
-
-            m_initialized = true;
-            m_silenceFile.close();
-
-            tDebug() << Q_FUNC_INFO << "Init OK";
-            emit initialized();
-            break;
-
-        default:
-            break;
-    }
-}
-
-
 void
 AudioOutput::setAutoDelete( bool ad )
 {
@@ -349,13 +302,6 @@ AudioOutput::setCurrentSource( MediaStream* stream )
 }
 
 
-bool
-AudioOutput::isInitialized() const
-{
-    return m_initialized;
-}
-
-
 AudioOutput::AudioState
 AudioOutput::state() const
 {
@@ -481,19 +427,16 @@ 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";
@@ -523,9 +466,11 @@ AudioOutput::setMuted( bool m )
     tDebug() << Q_FUNC_INFO;
 
     m_muted = m;
-    libvlc_audio_set_mute( m_vlcPlayer, m );
-
-    if ( !m_muted )
+    if ( m_muted )
+    {
+        libvlc_audio_set_volume( m_vlcPlayer, 0 );
+    }
+    else
     {
         libvlc_audio_set_volume( m_vlcPlayer, m_volume * 100.0 );
     }
@@ -542,7 +487,7 @@ AudioOutput::volume() const
 void
 AudioOutput::setVolume( qreal vol )
 {
-    tDebug() << Q_FUNC_INFO << vol << m_muted;
+    tDebug() << Q_FUNC_INFO;
 
     m_volume = vol;
     if ( !m_muted )
@@ -586,20 +531,6 @@ AudioOutput::onVlcEvent( const libvlc_event_t* event )
             // 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;
-            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:
@@ -625,14 +556,7 @@ AudioOutput::vlcEventCallback( const libvlc_event_t* event, void* opaque )
     AudioOutput* that = reinterpret_cast < AudioOutput * > ( opaque );
     Q_ASSERT( that );
 
-    if ( !that->isInitialized() )
-    {
-        that->onInitVlcEvent( event );
-    }
-    else
-    {
-        that->onVlcEvent( event );
-    }
+    that->onVlcEvent( event );
 }
 
 

src/libtomahawk/audio/AudioOutput.h

@@ -25,8 +25,6 @@
 #include "DllMacro.h"
 #include "Typedefs.h"
 
-#include <QFile>
-
 #include <functional>
 
 struct libvlc_instance_t;
@@ -46,7 +44,6 @@ public:
     explicit AudioOutput( QObject* parent = nullptr );
     ~AudioOutput();
 
-    bool isInitialized() const;
     AudioState state() const;
 
     void setCurrentSource( const QUrl& stream );
@@ -75,16 +72,11 @@ public:
 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 );
@@ -107,9 +99,6 @@ private:
     qint64 m_totalTime;
     bool m_justSeeked;
 
-    bool 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;

src/libtomahawk/audio/MediaStream.cpp

@@ -41,16 +41,12 @@ MediaStream::MediaStream( const QUrl &url )
 }
 
 
-MediaStream::MediaStream( QIODevice* device, bool bufferingFinished )
+MediaStream::MediaStream( QIODevice* device )
     : QObject( nullptr )
     , m_type( IODevice )
     , m_ioDevice ( device )
-    , m_bufferingFinished( bufferingFinished )
 {
-    if ( !bufferingFinished )
-    {
-        QObject::connect( m_ioDevice, SIGNAL( readChannelFinished() ), this, SLOT( bufferingFinished() ) );
-    }
+    QObject::connect( m_ioDevice, SIGNAL( readChannelFinished() ), this, SLOT( bufferingFinished() ) );
 }
 
 

src/libtomahawk/audio/MediaStream.h

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

src/libtomahawk/database/LocalCollection.cpp

@@ -1,20 +1,21 @@
-/* === 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/>.
- */
+/*
+    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.
+*/
+
 
 #include "LocalCollection.h"
 

src/libtomahawk/database/LocalCollection.h

@@ -1,20 +1,21 @@
-/* === 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/>.
- */
+/*
+    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.
+*/
+
 
 #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->isLocal() );
+    setEditable( result->resolvedByCollection() && result->resolvedByCollection()->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->isLocal() )
+    if ( result->resolvedByCollection() && result->resolvedByCollection()->isLocal() )
     {
         QString furl = m_result->url();
         if ( furl.startsWith( "file://" ) )

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,7 +58,13 @@ InfoSystemWorker::InfoSystemWorker()
 
 InfoSystemWorker::~InfoSystemWorker()
 {
-    tDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO << " beginning";
+    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
+    {
+        if( plugin )
+            delete plugin.data();
+    }
+    tDebug() << Q_FUNC_INFO << " finished";
 }
 
 
@@ -130,6 +136,29 @@ 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,6 +72,7 @@ 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,12 +33,6 @@ JobStatusItem::~JobStatusItem()
 }
 
 
-void
-JobStatusItem::activated()
-{
-}
-
-
 bool
 JobStatusItem::allowMultiLine() const
 {

src/libtomahawk/jobview/JobStatusItem.h

@@ -53,8 +53,6 @@ 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,7 +118,6 @@ 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 )
     {
@@ -185,21 +184,6 @@ 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,7 +59,6 @@ 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

@@ -1,37 +0,0 @@
-/* === 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

@@ -1,39 +0,0 @@
-/* === 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/Servent.cpp

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

src/libtomahawk/playlist/ColumnView.cpp

@@ -118,10 +118,6 @@ ColumnView::setModel( QAbstractItemModel* model )
 void
 ColumnView::setTreeModel( TreeModel* model )
 {
-    // HACK: without setting a new preview widget, the old preview widget is shown in the first column while loading the artists.
-    m_previewWidget = new ColumnViewPreviewWidget( this );
-    setPreviewWidget( m_previewWidget );
-
     m_model = model;
 
     if ( m_proxyModel )

src/libtomahawk/playlist/ColumnViewPreviewWidget.cpp

@@ -28,7 +28,6 @@
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/DpiScaler.h"
 #include "ViewManager.h"
-#include "widgets/DownloadButton.h"
 
 #include <QLabel>
 #include <QVBoxLayout>
@@ -165,10 +164,6 @@ ColumnViewPreviewWidget::ColumnViewPreviewWidget( ColumnView* parent )
     m_ageValue->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
     gridLayout->addWidget( m_ageValue, 4, 1 );
 
-
-    m_downloadButton = new DownloadButton( this );
-    mainLayout->addWidget( m_downloadButton );
-
     mainLayout->addStretch();
 
     TomahawkUtils::unmarginLayout( mainLayout );
@@ -222,7 +217,6 @@ ColumnViewPreviewWidget::setQuery( const Tomahawk::query_ptr& query )
         m_bitrateValue->setText( tr( "%1 kbps" ).arg( query->results().first()->bitrate() ) );
         m_durationValue->setText( TomahawkUtils::timeToString( query->track()->duration() ) );
         m_ageValue->setText( TomahawkUtils::ageToString( QDateTime::fromTime_t( query->results().first()->modificationTime() ) ) );
-        m_downloadButton->setQuery( query );
 
         m_yearValue->setVisible( query->track()->year() > 0 );
         m_yearLabel->setVisible( query->track()->year() > 0 );
@@ -232,7 +226,6 @@ ColumnViewPreviewWidget::setQuery( const Tomahawk::query_ptr& query )
         m_durationValue->setVisible( query->track()->duration() > 0 );
         m_ageLabel->setVisible( query->results().first()->modificationTime() > 0 );
         m_ageValue->setVisible( query->results().first()->modificationTime() > 0 );
-        m_downloadButton->setVisible( true );
     }
     else
     {
@@ -244,7 +237,6 @@ ColumnViewPreviewWidget::setQuery( const Tomahawk::query_ptr& query )
         m_durationValue->setVisible( false );
         m_ageLabel->setVisible( false );
         m_ageValue->setVisible( false );
-        m_downloadButton->setVisible( false );
     }
 
     setMinimumHeight( sizeHint().height() );

src/libtomahawk/playlist/ColumnViewPreviewWidget.h

@@ -30,7 +30,6 @@ class QueryLabel;
 class PlayableCover;
 class QLabel;
 class ScrollingLabel;
-class DownloadButton;
 
 class DLLEXPORT ColumnViewPreviewWidget : public QWidget
 {
@@ -72,8 +71,6 @@ private:
     ScrollingLabel* m_trackLabel;
 
     QueryLabel* m_artistLabel;
-
-    DownloadButton* m_downloadButton;
 };
 
 #endif // COLUMNVIEWPREVIEWWIDGET_H

src/libtomahawk/playlist/ContextView.cpp

@@ -96,10 +96,8 @@ ContextView::ContextView( QWidget* parent, const QString& caption )
 
     connect( m_captionLabel, SIGNAL( clicked() ), SIGNAL( closeClicked() ) );
     connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), SLOT( onQuerySelected( Tomahawk::query_ptr ) ) );
-    connect( m_trackView, SIGNAL( modelChanged() ), SLOT( onModelChanged() ) );
     connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), m_detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) );
-    connect( m_detailView, SIGNAL( downloadAll() ), SLOT( onDownloadAll() ) );
-    connect( m_detailView, SIGNAL( downloadCancel() ), SLOT( onDownloadCancel() ) );
+    connect( m_trackView, SIGNAL( modelChanged() ), SLOT( onModelChanged() ) );
 
     TomahawkUtils::fixMargins( this );
 }

src/libtomahawk/playlist/GridItemDelegate.cpp

@@ -19,6 +19,12 @@
 
 #include "GridItemDelegate.h"
 
+#include <QApplication>
+#include <QPainter>
+#include <QAbstractItemView>
+#include <QMouseEvent>
+#include <QTimeLine>
+
 #include "Artist.h"
 #include "Query.h"
 #include "Result.h"
@@ -29,7 +35,6 @@
 #include "playlist/PlayableItem.h"
 #include "playlist/PlayableProxyModel.h"
 #include "widgets/HoverControls.h"
-#include "widgets/DownloadButton.h"
 #include "widgets/ImageButton.h"
 #include "utils/TomahawkStyle.h"
 #include "utils/TomahawkUtilsGui.h"
@@ -39,12 +44,6 @@
 #include "utils/DpiScaler.h"
 #include "utils/Logger.h"
 
-#include <QApplication>
-#include <QPainter>
-#include <QAbstractItemView>
-#include <QMouseEvent>
-#include <QTimeLine>
-
 namespace {
     static const int FADE_DURATION = 400;
 };
@@ -56,7 +55,6 @@ GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyMode
     , m_model( proxy )
     , m_itemWidth( 0 )
     , m_showPosition( false )
-    , m_showBuyButtons( false )
     , m_wordWrapping( false )
     , m_margin( TomahawkUtils::DpiScaler::scaledY( parent, 32 ) )
 {
@@ -95,8 +93,7 @@ GridItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelInde
         if ( !m_wordWrapping )
             return QSize( m_itemWidth, m_itemWidth + fm.height() + m_margin * 0.8 );
 
-        const int buyButtonHeight = m_showBuyButtons ? 40 : 0;
-        return QSize( m_itemWidth, m_itemWidth + fm.height() + fms.height() + buyButtonHeight + m_margin * 0.8 );
+        return QSize( m_itemWidth, m_itemWidth + fm.height() + fms.height() + m_margin * 0.8 );
     }
 }
 
@@ -278,11 +275,6 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
             painter->setFont( f );
         }
 
-        if ( m_showBuyButtons && !item->query().isNull() )
-        {
-            textRect.adjust( 0, 0, 0, -40 );
-        }
-
         to.setAlignment( Qt::AlignLeft | Qt::AlignTop );
         text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - m_margin / 4 );
         painter->drawText( textRect, text, to );
@@ -294,7 +286,6 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
         }
         painter->restore();
 
-        painter->save();
         painter->setOpacity( 0.6 );
         painter->setFont( m_smallFont );
 
@@ -313,19 +304,6 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
 
         // Calculate rect of artist on-hover button click area
         m_artistNameRects[ index ] = painter->fontMetrics().boundingRect( textRect, Qt::AlignLeft | Qt::AlignBottom, text );
-        painter->restore();
-
-        if ( m_showBuyButtons && !item->query().isNull() )
-        {
-            QRect r = textRect;
-            r.setY( textRect.y() + textRect.height() + 8 );
-            r.setHeight( 32 );
-
-            if( DownloadButton::drawPrimitive(painter, r, item->query(), m_hoveringOverBuyButton == index ) )
-            {
-                m_buyButtonRects[ index ] = r;
-            }
-        }
     }
 
     painter->restore();
@@ -384,7 +362,6 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
     const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
     bool hoveringArtist = false;
     bool hoveringAlbum = false;
-    bool hoveringBuyButton = false;
     if ( m_artistNameRects.contains( index ) )
     {
         const QRect artistNameRect = m_artistNameRects[ index ];
@@ -395,11 +372,6 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
         const QRect albumNameRect = m_albumNameRects[ index ];
         hoveringAlbum = albumNameRect.contains( ev->pos() );
     }
-    if ( m_buyButtonRects.contains( index ) )
-    {
-        const QRect buyButtonRect = m_buyButtonRects[ index ];
-        hoveringBuyButton = buyButtonRect.contains( ev->pos() );
-    }
 
     QRect coverRect = m_view->visualRect( index );
     coverRect.setHeight( coverRect.width() );
@@ -407,7 +379,7 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
 
     if ( event->type() == QEvent::MouseMove )
     {
-        if ( hoveringArtist || hoveringAlbum || hoveringBuyButton )
+        if ( hoveringArtist || hoveringAlbum )
             m_view->setCursor( Qt::PointingHandCursor );
         else
             m_view->setCursor( Qt::ArrowCursor );
@@ -463,17 +435,6 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
 
             emit updateIndex( index );
         }
-        if ( m_hoveringOverBuyButton != index || ( !hoveringBuyButton && m_hoveringOverBuyButton.isValid() ) )
-        {
-            emit updateIndex( m_hoveringOverBuyButton );
-
-            if ( hoveringBuyButton )
-                m_hoveringOverBuyButton = index;
-            else
-                m_hoveringOverBuyButton = QPersistentModelIndex();
-
-            emit updateIndex( index );
-        }
 
         if ( m_hoverIndex != index || !hoveringCover )
         {
@@ -583,11 +544,6 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
         }
     }
 
-    if ( hoveringBuyButton )
-    {
-        return DownloadButton::handleEditorEvent( event, m_view, m_model, index );
-    }
-
     return false;
 }
 
@@ -599,7 +555,6 @@ GridItemDelegate::modelChanged()
     m_albumNameRects.clear();
     m_hoveringOverArtist = QPersistentModelIndex();
     m_hoveringOverAlbum = QPersistentModelIndex();
-    m_hoveringOverBuyButton = QPersistentModelIndex();
     m_hoverIndex = QPersistentModelIndex();
 
     clearButtons();
@@ -732,10 +687,6 @@ GridItemDelegate::resetHoverIndex()
     idx = m_hoveringOverAlbum;
     m_hoveringOverAlbum = QPersistentModelIndex();
     doUpdateIndex( idx );
-
-    idx = m_hoveringOverBuyButton;
-    m_hoveringOverBuyButton = QPersistentModelIndex();
-    doUpdateIndex( idx );
 }
 
 
@@ -807,41 +758,3 @@ GridItemDelegate::eventFilter( QObject* obj, QEvent* event )
     else
         return QObject::eventFilter( obj, event );
 }
-
-
-QWidget*
-GridItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
-    Q_ASSERT( item );
-
-    return DownloadButton::handleCreateEditor( parent, item->query(), m_view, index );
-}
-
-
-void
-GridItemDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyledItemDelegate::updateEditorGeometry( editor, option, index );
-
-    DownloadButton* comboBox = static_cast<DownloadButton*>(editor);
-    comboBox->resize( option.rect.size() - QSize( 8, 0 ) );
-    comboBox->move( option.rect.x() + 4, option.rect.y() );
-
-    if ( m_buyButtonRects.contains( index ) )
-    {
-        editor->setGeometry( m_buyButtonRects.value( index ) );
-    }
-
-    if ( !comboBox->property( "shownPopup" ).toBool() )
-    {
-        comboBox->showPopup();
-        comboBox->setProperty( "shownPopup", true );
-    }
-}
-
-
-void
-GridItemDelegate::setModelData( QWidget* editor, QAbstractItemModel* model, const QModelIndex& index ) const
-{
-}

src/libtomahawk/playlist/GridItemDelegate.h

@@ -48,7 +48,6 @@ public:
 
     QSize itemSize() const;
     void setItemWidth( int width ) { m_itemWidth = width; }
-    void setShowBuyButtons( bool enabled ) { m_showBuyButtons = enabled; }
 
 public slots:
     void resetHoverIndex();
@@ -62,10 +61,6 @@ protected:
     bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
     bool eventFilter( QObject* obj, QEvent* event );
 
-    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void setModelData( QWidget* editor, QAbstractItemModel* model, const QModelIndex& index ) const;
-
 signals:
     void updateIndex( const QModelIndex& idx );
 
@@ -95,18 +90,15 @@ private:
     PlayableProxyModel* m_model;
     int m_itemWidth;
     bool m_showPosition;
-    bool m_showBuyButtons;
     bool m_wordWrapping;
 
     mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects;
     mutable QHash< QPersistentModelIndex, QRect > m_albumNameRects;
-    mutable QHash< QPersistentModelIndex, QRect > m_buyButtonRects;
     mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_covers;
 
     QPersistentModelIndex m_hoverIndex;
     QPersistentModelIndex m_hoveringOverArtist;
     QPersistentModelIndex m_hoveringOverAlbum;
-    QPersistentModelIndex m_hoveringOverBuyButton;
 
     mutable QHash< QPersistentModelIndex, QWidget* > m_spinner;
     mutable QHash< QPersistentModelIndex, HoverControls* > m_hoverControls;

src/libtomahawk/playlist/GridView.cpp

@@ -255,8 +255,6 @@ void GridView::wheelEvent( QWheelEvent* e )
                                      // ^ scroll step is 1/8 of the estimated row height
 
     QListView::wheelEvent( e );
-
-    m_delegate->resetHoverIndex();
 }
 
 

src/libtomahawk/playlist/PlayableModel.cpp

@@ -119,9 +119,8 @@ int
 PlayableModel::columnCount( const QModelIndex& parent ) const
 {
     Q_UNUSED( parent );
-    Q_D( const PlayableModel );
 
-    return d->header.length();
+    return 13;
 }
 
 
@@ -445,21 +444,14 @@ PlayableModel::flags( const QModelIndex& index ) const
 
     if ( index.isValid() )
     {
-        Qt::ItemFlags returnFlags = defaultFlags;
         if ( index.column() == 0 )
         {
-            returnFlags |= Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+            return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
         }
         else if ( index.column() == PlayableModel::Download )
         {
-            returnFlags |= Qt::ItemIsEditable | defaultFlags;
+            return Qt::ItemIsEditable | defaultFlags;
         }
-
-        if ( areAllColumnsEditable() ) {
-            returnFlags |= Qt::ItemIsEditable;
-        }
-
-        return returnFlags;
     }
 
     return Qt::ItemIsDropEnabled | defaultFlags;
@@ -1027,7 +1019,7 @@ PlayableModel::appendAlbums( const QList< Tomahawk::album_ptr >& albums )
 void
 PlayableModel::appendAlbums( const Tomahawk::collection_ptr& collection )
 {
-    startLoading();
+    emit loadingStarted();
     insertAlbums( collection, rowCount( QModelIndex() ) );
 }
 
@@ -1042,7 +1034,7 @@ PlayableModel::appendQueries( const QList< Tomahawk::query_ptr >& queries )
 void
 PlayableModel::appendTracks( const QList< Tomahawk::track_ptr >& tracks, const QList< Tomahawk::PlaybackLog >& logs )
 {
-    startLoading();
+    emit loadingStarted();
     QList< Tomahawk::query_ptr > queries;
     foreach ( const track_ptr& track, tracks )
     {
@@ -1056,7 +1048,7 @@ PlayableModel::appendTracks( const QList< Tomahawk::track_ptr >& tracks, const Q
 void
 PlayableModel::appendTracks( const Tomahawk::collection_ptr& collection )
 {
-    startLoading();
+    emit loadingStarted();
     insertTracks( collection, rowCount( QModelIndex() ) );
 }
 
@@ -1179,22 +1171,6 @@ PlayableModel::setIcon( const QPixmap& pixmap )
 }
 
 
-void
-PlayableModel::setAllColumnsEditable( bool editable )
-{
-    Q_D( PlayableModel );
-    d->areAllColumnsEditable = editable;
-}
-
-
-bool
-PlayableModel::areAllColumnsEditable() const
-{
-    Q_D( const PlayableModel );
-    return d->areAllColumnsEditable;
-}
-
-
 int
 PlayableModel::trackCount() const
 {

src/libtomahawk/playlist/PlayableModel.h

@@ -96,11 +96,6 @@ public:
     virtual QPixmap icon() const;
     virtual void setIcon( const QPixmap& pixmap );
 
-
-    // HACK: we need to set column 0 editable for DropDownButton in TrackView
-    void setAllColumnsEditable( bool editable );
-    bool areAllColumnsEditable() const;
-
     virtual int trackCount() const;
     virtual int itemCount() const;
 

src/libtomahawk/playlist/PlayableModel_p.h

@@ -38,7 +38,6 @@ public:
         , rootItem( new PlayableItem( 0 ) )
         , readOnly( true )
         , loading( _loading )
-        , areAllColumnsEditable( false )
     {
     }
 
@@ -59,7 +58,6 @@ private:
     QStringList header;
 
     bool loading;
-    bool areAllColumnsEditable;
 };
 
 #endif // PLAYABLEMODEL_P_H

src/libtomahawk/playlist/PlayableProxyModel.cpp

@@ -607,7 +607,25 @@ PlayableProxyModel::columnCount( const QModelIndex& parent ) const
 {
     Q_UNUSED( parent );
 
-    return m_headerStyle[ m_style ].length();
+    switch ( m_style )
+    {
+        case SingleColumn:
+            return 1;
+            break;
+
+        case Collection:
+            return 10;
+            break;
+
+        case Locker:
+            return 11;
+            break;
+
+        case Detailed:
+        default:
+            return 12;
+            break;
+    }
 }
 
 
@@ -715,13 +733,6 @@ PlayableProxyModel::setFilter( const QString& pattern )
 }
 
 
-int
-PlayableProxyModel::mapSourceColumnToColumn( PlayableModel::Columns column )
-{
-    return m_headerStyle[ m_style ].indexOf( column );
-}
-
-
 void
 PlayableProxyModel::setCurrentIndex( const QModelIndex& index )
 {

src/libtomahawk/playlist/PlayableProxyModel.h

@@ -98,8 +98,6 @@ public:
     virtual void setFilter( const QString& pattern );
     virtual void updateDetailedInfo( const QModelIndex& index );
 
-    int mapSourceColumnToColumn( PlayableModel::Columns column );
-
 signals:
     void filterChanged( const QString& filter );
 

src/libtomahawk/playlist/PlaylistItemDelegate.cpp

@@ -20,6 +20,14 @@
 
 #include "PlaylistItemDelegate.h"
 
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
+#include <QDateTime>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QDesktopServices>
+#include <QToolTip>
+
 #include "Query.h"
 #include "Result.h"
 #include "Artist.h"
@@ -27,6 +35,8 @@
 #include "Source.h"
 #include "SourceList.h"
 
+#include "DownloadManager.h"
+#include "DownloadJob.h"
 #include "PlayableModel.h"
 #include "PlayableItem.h"
 #include "PlayableProxyModel.h"
@@ -34,7 +44,7 @@
 #include "ViewHeader.h"
 #include "ViewManager.h"
 
-#include "widgets/DownloadButton.h"
+#include "widgets/DropDownButton.h"
 #include "audio/AudioEngine.h"
 #include "utils/ImageRegistry.h"
 #include "utils/PixmapDelegateFader.h"
@@ -43,13 +53,6 @@
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
-#include <QAbstractTextDocumentLayout>
-#include <QApplication>
-#include <QDateTime>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QToolTip>
-
 using namespace Tomahawk;
 
 
@@ -120,7 +123,63 @@ PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem&
     PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
     Q_ASSERT( item );
 
-    return DownloadButton::handleCreateEditor( parent, item->query(), m_view, index );
+    if ( index.column() == PlayableModel::Download && item->result() && !item->result()->downloadFormats().isEmpty() &&
+         !DownloadManager::instance()->localFileForDownload( item->result()->downloadFormats().first().url.toString() ).isEmpty() )
+    {
+        QDesktopServices::openUrl( QUrl::fromLocalFile( QFileInfo( DownloadManager::instance()->localFileForDownload( item->result()->downloadFormats().first().url.toString() ) ).absolutePath() ) );
+    }
+    else if ( index.column() == PlayableModel::Download && item->result() && item->result()->downloadJob() && item->result()->downloadJob()->state() == DownloadJob::Finished )
+    {
+        QDesktopServices::openUrl( QUrl::fromLocalFile( QFileInfo( item->result()->downloadJob()->localFile() ).absolutePath() ) );
+    }
+    else if ( index.column() == PlayableModel::Download && item->result() &&
+              !item->result()->downloadFormats().isEmpty() && !item->result()->downloadJob() )
+    {
+        QStringList formats;
+        foreach ( const DownloadFormat& format, item->result()->downloadFormats() )
+        {
+            formats << tr( "Download %1" ).arg( format.extension );
+        }
+
+        DropDownButton* editor = new DropDownButton( parent );
+        editor->addItems( formats );
+
+        NewClosure( editor, SIGNAL( clicked() ),
+                    const_cast<PlaylistItemDelegate*>(this), SLOT( addDownloadJob( const QModelIndex&, QWidget* ) ), index, (QWidget*)editor );
+
+        NewClosure( editor, SIGNAL( activated( int ) ),
+                    const_cast<PlaylistItemDelegate*>(this), SLOT( addDownloadJob( const QModelIndex&, QWidget* ) ), index, (QWidget*)editor );
+        return editor;
+    }
+
+    return 0;
+}
+
+
+void
+PlaylistItemDelegate::addDownloadJob( const QModelIndex& index, QWidget* editor )
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    m_view->closePersistentEditor( index );
+
+    DropDownButton* cb = static_cast< DropDownButton* >(editor);
+    if ( !item->result()->downloadFormats().isEmpty() )
+        DownloadManager::instance()->addJob( item->result()->toDownloadJob( item->result()->downloadFormats().at( cb->currentIndex() ) ) );
+}
+
+
+void
+PlaylistItemDelegate::closeEditor( const QModelIndex& index, QWidget* editor )
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    m_view->closePersistentEditor( index );
+
+    DropDownButton* cb = static_cast< DropDownButton* >(editor);
+    editor->deleteLater();
 }
 
 
@@ -129,18 +188,13 @@ PlaylistItemDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionV
 {
     QStyledItemDelegate::updateEditorGeometry( editor, option, index );
 
-    DownloadButton* comboBox = static_cast<DownloadButton*>(editor);
+    DropDownButton* comboBox = static_cast<DropDownButton*>(editor);
     comboBox->resize( option.rect.size() - QSize( 8, 0 ) );
     comboBox->move( option.rect.x() + 4, option.rect.y() );
 
-    if ( m_downloadDropDownRects.contains( index ) )
-    {
-        editor->setGeometry( m_downloadDropDownRects.value( index ) );
-    }
-
     if ( !comboBox->property( "shownPopup" ).toBool() )
     {
-        comboBox->showPopup();
+//        comboBox->showPopup();
         comboBox->setProperty( "shownPopup", true );
     }
 }
@@ -216,7 +270,68 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt
     else */
     if ( m_view->proxyModel()->style() == PlayableProxyModel::Locker && index.column() == PlayableModel::Download )
     {
-        DownloadButton::drawPrimitive( painter, opt.rect.adjusted( 4, 0, -4, 0 ), item->query(), hoveringOver() == index );
+        if ( item->result() && !item->result()->downloadFormats().isEmpty() )
+        {
+            QStyleOptionComboBox optc;
+            optc.rect = opt.rect.adjusted( 4, 0, -4, 0 );
+            optc.editable = false;
+            optc.currentText = tr( "Download %1" ).arg( item->result()->downloadFormats().first().extension );
+            optc.palette = m_view->palette();
+
+            if ( option.state & QStyle::State_Selected && option.state & QStyle::State_Active )
+                optc.state = QStyle::State_Active | QStyle::State_Selected | QStyle::State_Enabled;
+            else
+                optc.state = QStyle::State_Active | QStyle::State_Enabled;
+
+            if ( !DownloadManager::instance()->localFileForDownload( item->result()->downloadFormats().first().url.toString() ).isEmpty() )
+            {
+                painter->setPen( opt.palette.text().color() );
+                const QString text = painter->fontMetrics().elidedText( tr( "View in Finder" ), Qt::ElideRight, opt.rect.width() - 3 );
+                painter->drawText( opt.rect, text, textOption );
+            }
+            else if ( !item->result()->downloadJob() )
+            {
+                DropDownButton::drawPrimitive( painter, optc.rect, optc.currentText );
+/*                QApplication::style()->drawComplexControl( QStyle::CC_ComboBox, &optc, painter, 0 );
+                optc.rect.adjust( 4, 0, 0, 0 );
+                QApplication::style()->drawControl( QStyle::CE_ComboBoxLabel, &optc, painter, 0 );*/
+            }
+            else
+            {
+                if ( item->result()->downloadJob()->state() == DownloadJob::Finished )
+                {
+                    painter->setPen( opt.palette.text().color() );
+                    const QString text = painter->fontMetrics().elidedText( tr( "View in Finder" ), Qt::ElideRight, opt.rect.width() - 3 );
+                    painter->drawText( opt.rect, text, textOption );
+                }
+                else
+                {
+                    painter->setPen( TomahawkStyle::PLAYLIST_PROGRESS_FOREGROUND.darker() );
+                    painter->setBrush( TomahawkStyle::PLAYLIST_PROGRESS_BACKGROUND );
+                    painter->drawRect( optc.rect.adjusted( 2, 2, -2, -2 ) );
+                    painter->setPen( TomahawkStyle::PLAYLIST_PROGRESS_FOREGROUND );
+                    painter->setBrush( TomahawkStyle::PLAYLIST_PROGRESS_FOREGROUND );
+                    QRect fillp = optc.rect.adjusted( 3, 3, -3, -3 );
+                    fillp.setWidth( float(fillp.width()) * ( float(item->result()->downloadJob()->progressPercentage()) / 100.0 ) );
+                    painter->drawRect( fillp );
+
+/*                    QStyleOptionProgressBarV2 optp;
+                    optp.rect = optc.rect;
+                    optp.minimum = 0;
+                    optp.maximum = 100;
+                    optp.progress = item->result()->downloadJob()->progressPercentage();
+                    optp.palette = m_view->palette();
+                    optp.palette.setColor( QPalette::Highlight, QColor( "#E61878" ) );
+
+                    if ( option.state & QStyle::State_Selected && option.state & QStyle::State_Active )
+                        optp.state = QStyle::State_Active | QStyle::State_Selected | QStyle::State_Enabled;
+                    else
+                        optp.state = QStyle::State_Active | QStyle::State_Enabled;
+
+                    QApplication::style()->drawControl( QStyle::CE_ProgressBar, &optp, painter, 0 );*/
+                }
+            }
+        }
     }
     else if ( item->isPlaying() )
     {
@@ -489,7 +604,6 @@ QRect
 PlaylistItemDelegate::drawTrack( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, const QRect& rect, PlayableItem* item ) const
 {
     const track_ptr track = item->query()->track();
-    const bool hasOnlineResults = ( item->query()->numResults( true ) > 0 );
 
     painter->save();
     painter->setRenderHint( QPainter::TextAntialiasing );
@@ -516,34 +630,21 @@ PlaylistItemDelegate::drawTrack( QPainter* painter, const QStyleOptionViewItem&
 
     QRect numberRect = QRect( r.x(), r.y(), numberWidth, r.height() );
     QRect extraRect = QRect( r.x() + r.width() - durationWidth, r.y(), durationWidth, r.height() );
-    QRect stateRect = extraRect.adjusted( 0, 0, 0, 0 );
-
-   if ( option.state & QStyle::State_Selected || hoveringOver() == index )
+    QRect stateRect;
+    if ( option.state & QStyle::State_Selected || hoveringOver() == index )
     {
-        int h = extraRect.height() / 3;
-
         if ( track->loved() )
         {
-            painter->save();
             painter->setOpacity( 0.5 );
-            QRect r = stateRect.adjusted( -16, extraRect.height() / 2 - h / 2, 0, 0 );
-            r.setHeight( h );
-            r.setWidth( r.height() );
-            painter->drawPixmap( r, ImageRegistry::instance()->pixmap( RESPATH "images/love.svg", r.size() ) );
-            painter->restore();
+            int h = extraRect.height() / 3;
+            stateRect = extraRect.adjusted( -16, extraRect.height() / 2  - h / 2, 0, 0 );
+            stateRect.setHeight( h );
+            stateRect.setWidth( stateRect.height() );
+            painter->drawPixmap( stateRect, ImageRegistry::instance()->pixmap( RESPATH "images/love.svg", stateRect.size() ) );
 
-            stateWidth += r.width() + 16;
+            stateWidth = stateRect.width() + 16;
         }
     }
-
-    QRect downloadButtonRect = stateRect.adjusted( -stateWidth -144, 6, 0, -6 );
-    downloadButtonRect.setWidth( 144 );
-    stateWidth += downloadButtonRect.width() + 16;
-    if ( DownloadButton::drawPrimitive( painter, downloadButtonRect, item->query(), m_hoveringOverDownloadButton == index ) )
-    {
-        m_downloadDropDownRects[ index ] = downloadButtonRect;
-    }
-
     const int remWidth = r.width() - numberWidth - durationWidth;
 
     QRect titleRect = QRect( numberRect.x() + numberRect.width(), r.y(), (double)remWidth * 0.5, r.height() );
@@ -607,7 +708,6 @@ PlaylistItemDelegate::drawTrack( QPainter* painter, const QStyleOptionViewItem&
 
         int h = extraRect.height() / 2;
         QRect playIconRect = extraRect.adjusted( extraRect.width() - h - 8, h / 2, -8, -h / 2 );
-        playIconRect.setWidth( playIconRect.height() );
         painter->drawPixmap( playIconRect, ImageRegistry::instance()->pixmap( RESPATH "images/play.svg", playIconRect.size() ) );
 
         double duration = (double)AudioEngine::instance()->currentTrackTotalTime();
@@ -659,10 +759,8 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
     bool hoveringArtist = false;
     bool hoveringInfo = false;
     bool hoveringLove = false;
-    bool hoveringDownloadDropDown = false;
     Tomahawk::source_ptr hoveredAvatar;
     QRect hoveredAvatarRect;
-
     if ( m_infoButtonRects.contains( index ) )
     {
         const QRect infoRect = m_infoButtonRects[ index ];
@@ -681,12 +779,6 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
         const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
         hoveringLove = loveRect.contains( ev->pos() );
     }
-    if ( m_downloadDropDownRects.contains( index ) )
-    {
-        const QRect downloadDropDownRect = m_downloadDropDownRects[ index ];
-        const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
-        hoveringDownloadDropDown = downloadDropDownRect.contains( ev->pos() );
-    }
     if ( m_avatarBoxRects.contains( index ) )
     {
         const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
@@ -704,7 +796,7 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
 
     if ( event->type() == QEvent::MouseMove )
     {
-        if ( hoveringInfo || hoveringLove || hoveringArtist || hoveringDownloadDropDown )
+        if ( hoveringInfo || hoveringLove || hoveringArtist )
             m_view->setCursor( Qt::PointingHandCursor );
         else
             m_view->setCursor( Qt::ArrowCursor );
@@ -728,23 +820,6 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
             emit updateIndex( m_hoveringOverArtist );
             m_hoveringOverArtist = QModelIndex();
         }
-        if ( hoveringDownloadDropDown && m_hoveringOverDownloadButton != index )
-        {
-            QPersistentModelIndex ti = m_hoveringOverDownloadButton;
-            m_hoveringOverDownloadButton = index;
-
-            PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( ti ) );
-            item->requestRepaint();
-            emit updateIndex( m_hoveringOverDownloadButton );
-        }
-        if ( !hoveringDownloadDropDown && m_hoveringOverDownloadButton.isValid() )
-        {
-            QPersistentModelIndex ti = m_hoveringOverDownloadButton;
-            m_hoveringOverDownloadButton = QModelIndex();
-
-            PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( ti ) );
-            item->requestRepaint();
-        }
 
         if ( m_hoveringOver != index )
         {
@@ -774,11 +849,6 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
         {
             item->query()->queryTrack()->setLoved( !item->query()->queryTrack()->loved() );
         }
-        else if ( hoveringDownloadDropDown || ( m_view->proxyModel()->style() == PlayableProxyModel::Locker && index.column() == PlayableModel::Download ) )
-        {
-            if ( DownloadButton::handleEditorEvent( event , m_view, m_model, index ) )
-                return true;
-        }
         else if ( hoveringInfo )
         {
             if ( m_model->style() == PlayableProxyModel::SingleColumn )
@@ -813,6 +883,11 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
                 }
             }
         }
+        else if ( m_view->proxyModel()->style() == PlayableProxyModel::Locker && index.column() == PlayableModel::Download )
+        {
+            m_view->edit( index );
+            return true;
+        }
 
         event->accept();
         return true;
@@ -825,14 +900,13 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
 void
 PlaylistItemDelegate::resetHoverIndex()
 {
-    if ( !m_model || !m_hoveringOver.isValid() )
+    if ( !m_model )
         return;
 
     QPersistentModelIndex idx = m_hoveringOver;
 
     m_hoveringOver = QModelIndex();
     m_hoveringOverArtist = QModelIndex();
-    m_hoveringOverDownloadButton = QModelIndex();
     m_infoButtonRects.clear();
     m_loveButtonRects.clear();
     m_artistNameRects.clear();
@@ -846,6 +920,7 @@ PlaylistItemDelegate::resetHoverIndex()
     }
 
     emit updateIndex( idx );
+    m_view->repaint();
 }