diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 8d2e7fed..b02dc940 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,557 +1,562 @@
 enable_testing()
 
 configure_file(mediaplaylisttestconfig.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/mediaplaylisttestconfig.h @ONLY)
 
 include_directories(${elisa_CURRENT_BINARY_DIR})
 include_directories(${elisa_BINARY_DIR})
 include_directories(${elisa_BINARY_DIR}/src)
 
 set(databaseInterfaceTest_SOURCES
     ../src/databaseinterface.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     databaseinterfacetest.cpp
 )
 
 ecm_add_test(${databaseInterfaceTest_SOURCES}
     TEST_NAME "databaseInterfaceTest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql KF5::I18n)
 
 target_include_directories(databaseInterfaceTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(managemediaplayercontrolTest_SOURCES
     ../src/managemediaplayercontrol.cpp
     ../src/mediaplaylist.cpp
     ../src/databaseinterface.cpp
     ../src/musiclistenersmanager.cpp
     ../src/elisaapplication.cpp
     ../src/manageaudioplayer.cpp
     ../src/models/allalbumsmodel.cpp
     ../src/models/allartistsmodel.cpp
     ../src/models/alltracksmodel.cpp
     ../src/models/albummodel.cpp
     ../src/models/abstractmediaproxymodel.cpp
     ../src/models/allalbumsproxymodel.cpp
     ../src/models/allartistsproxymodel.cpp
     ../src/models/alltracksproxymodel.cpp
     ../src/models/singleartistproxymodel.cpp
     ../src/models/singlealbumproxymodel.cpp
     ../src/notificationitem.cpp
     ../src/trackslistener.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
     ../src/file/filelistener.cpp
     ../src/file/localfilelisting.cpp
     ../src/abstractfile/abstractfilelistener.cpp
     ../src/abstractfile/abstractfilelisting.cpp
+    ../src/audiowrapper.cpp
     managemediaplayercontroltest.cpp
 )
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         qt5_add_dbus_interface(managemediaplayercontrolTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(managemediaplayercontrolTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         set(managemediaplayercontrolTest_SOURCES
             ${managemediaplayercontrolTest_SOURCES}
             ../src/baloo/baloolistener.cpp
             ../src/baloo/localbaloofilelisting.cpp
             )
     endif()
 endif()
 
 if (UPNPQT_FOUND)
     set(managemediaplayercontrolTest_SOURCES
         ${managemediaplayercontrolTest_SOURCES}
         ../src/upnp/upnpcontrolcontentdirectory.cpp
         ../src/upnp/upnpcontentdirectorymodel.cpp
         ../src/upnp/upnpcontrolconnectionmanager.cpp
         ../src/upnp/upnpcontrolmediaserver.cpp
         ../src/upnp/didlparser.cpp
         ../src/upnp/upnplistener.cpp
         ../src/upnp/upnpdiscoverallmusic.cpp
         )
 endif()
 
 kconfig_add_kcfg_files(managemediaplayercontrolTest_SOURCES ../src/elisa_settings.kcfgc )
 set(managemediaplayercontrolTest_SOURCES
     ${managemediaplayercontrolTest_SOURCES}
     ../src/elisa_core.kcfg
 )
 
 ecm_add_test(${managemediaplayercontrolTest_SOURCES}
     TEST_NAME "managemediaplayercontrolTest"
     LINK_LIBRARIES
         Qt5::Test Qt5::Core Qt5::Sql Qt5::Widgets KF5::I18n Qt5::Quick Qt5::Multimedia
         Qt5::Concurrent KF5::ConfigCore KF5::ConfigGui KF5::FileMetaData
 )
 
 if (KF5Baloo_FOUND)
     target_link_libraries(managemediaplayercontrolTest KF5::Baloo Qt5::DBus)
 endif()
 if (KF5KCMUtils_FOUND)
     target_link_libraries(managemediaplayercontrolTest KF5::KCMUtils)
 endif()
 if (UPNPQT_FOUND)
     target_link_libraries(managemediaplayercontrolTest Qt5::Xml UPNP::upnpQt Qt5::Network)
 endif()
 if (KF5XmlGui_FOUND)
     target_link_libraries(managemediaplayercontrolTest KF5::XmlGui)
 endif()
 
 target_include_directories(managemediaplayercontrolTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(manageheaderbarTest_SOURCES
     ../src/manageheaderbar.cpp
     ../src/mediaplaylist.cpp
     ../src/databaseinterface.cpp
     ../src/musiclistenersmanager.cpp
     ../src/elisaapplication.cpp
     ../src/manageaudioplayer.cpp
     ../src/models/allalbumsmodel.cpp
     ../src/models/allartistsmodel.cpp
     ../src/models/alltracksmodel.cpp
     ../src/models/albummodel.cpp
     ../src/models/abstractmediaproxymodel.cpp
     ../src/models/allalbumsproxymodel.cpp
     ../src/models/allartistsproxymodel.cpp
     ../src/models/alltracksproxymodel.cpp
     ../src/models/singleartistproxymodel.cpp
     ../src/models/singlealbumproxymodel.cpp
     ../src/notificationitem.cpp
     ../src/trackslistener.cpp
     ../src/trackslistener.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
     ../src/file/filelistener.cpp
     ../src/file/localfilelisting.cpp
     ../src/abstractfile/abstractfilelistener.cpp
     ../src/abstractfile/abstractfilelisting.cpp
+    ../src/audiowrapper.cpp
     manageheaderbartest.cpp
 )
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         qt5_add_dbus_interface(manageheaderbarTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(manageheaderbarTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         set(manageheaderbarTest_SOURCES
             ${manageheaderbarTest_SOURCES}
             ../src/baloo/baloolistener.cpp
             ../src/baloo/localbaloofilelisting.cpp
             )
     endif()
 endif()
 
 if (UPNPQT_FOUND)
     set(manageheaderbarTest_SOURCES
         ${manageheaderbarTest_SOURCES}
         ../src/upnp/upnpcontrolcontentdirectory.cpp
         ../src/upnp/upnpcontentdirectorymodel.cpp
         ../src/upnp/upnpcontrolconnectionmanager.cpp
         ../src/upnp/upnpcontrolmediaserver.cpp
         ../src/upnp/didlparser.cpp
         ../src/upnp/upnplistener.cpp
         ../src/upnp/upnpdiscoverallmusic.cpp
         )
 endif()
 
 kconfig_add_kcfg_files(manageheaderbarTest_SOURCES ../src/elisa_settings.kcfgc )
 set(manageheaderbarTest_SOURCES
     ${manageheaderbarTest_SOURCES}
     ../src/elisa_core.kcfg
 )
 
 ecm_add_test(${manageheaderbarTest_SOURCES}
     TEST_NAME "manageheaderbarTest"
     LINK_LIBRARIES
         Qt5::Test Qt5::Core Qt5::Sql Qt5::Gui Qt5::Widgets KF5::I18n Qt5::Quick Qt5::Multimedia
         Qt5::Concurrent KF5::ConfigCore KF5::ConfigGui KF5::FileMetaData
 )
 
 if (KF5Baloo_FOUND)
     target_link_libraries(manageheaderbarTest KF5::Baloo Qt5::DBus)
 endif()
 if (KF5KCMUtils_FOUND)
     target_link_libraries(manageheaderbarTest KF5::KCMUtils)
 endif()
 if (UPNPQT_FOUND)
     target_link_libraries(manageheaderbarTest Qt5::Xml UPNP::upnpQt Qt5::Network)
 endif()
 if (KF5XmlGui_FOUND)
     target_link_libraries(manageheaderbarTest KF5::XmlGui)
 endif()
 
 target_include_directories(manageheaderbarTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(manageaudioplayerTest_SOURCES
     ../src/manageaudioplayer.cpp
     manageaudioplayertest.cpp
 )
 
 ecm_add_test(${manageaudioplayerTest_SOURCES}
     TEST_NAME "manageaudioplayerTest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Gui Qt5::Multimedia KF5::FileMetaData)
 
 target_include_directories(manageaudioplayerTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(mediaplaylistTest_SOURCES
     ../src/mediaplaylist.cpp
     ../src/databaseinterface.cpp
     ../src/trackslistener.cpp
     ../src/musiclistenersmanager.cpp
     ../src/models/allalbumsmodel.cpp
     ../src/models/allartistsmodel.cpp
     ../src/models/alltracksmodel.cpp
     ../src/models/albummodel.cpp
     ../src/models/abstractmediaproxymodel.cpp
     ../src/models/allalbumsproxymodel.cpp
     ../src/models/allartistsproxymodel.cpp
     ../src/models/alltracksproxymodel.cpp
     ../src/models/singleartistproxymodel.cpp
     ../src/models/singlealbumproxymodel.cpp
     ../src/manageaudioplayer.cpp
     ../src/elisaapplication.cpp
     ../src/notificationitem.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
     ../src/file/filelistener.cpp
     ../src/file/localfilelisting.cpp
     ../src/abstractfile/abstractfilelistener.cpp
     ../src/abstractfile/abstractfilelisting.cpp
+    ../src/audiowrapper.cpp
     modeltest.cpp
     mediaplaylisttest.cpp
 )
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         qt5_add_dbus_interface(mediaplaylistTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(mediaplaylistTest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         set(mediaplaylistTest_SOURCES
             ${mediaplaylistTest_SOURCES}
             ../src/baloo/baloolistener.cpp
             ../src/baloo/localbaloofilelisting.cpp
             )
     endif()
 endif()
 
 if (UPNPQT_FOUND)
     set(mediaplaylistTest_SOURCES
         ${mediaplaylistTest_SOURCES}
         ../src/upnp/upnpcontrolcontentdirectory.cpp
         ../src/upnp/upnpcontentdirectorymodel.cpp
         ../src/upnp/upnpcontrolconnectionmanager.cpp
         ../src/upnp/upnpcontrolmediaserver.cpp
         ../src/upnp/didlparser.cpp
         ../src/upnp/upnplistener.cpp
         ../src/upnp/upnpdiscoverallmusic.cpp
         )
 endif()
 
 kconfig_add_kcfg_files(mediaplaylistTest_SOURCES ../src/elisa_settings.kcfgc )
 set(mediaplaylistTest_SOURCES
     ${mediaplaylistTest_SOURCES}
     ../src/elisa_core.kcfg
 )
 
 ecm_add_test(${mediaplaylistTest_SOURCES}
     TEST_NAME "mediaplaylistTest"
     LINK_LIBRARIES
         Qt5::Test Qt5::Core Qt5::Sql Qt5::Gui Qt5::Widgets KF5::I18n Qt5::Quick Qt5::Multimedia
         Qt5::Concurrent KF5::ConfigCore KF5::ConfigGui KF5::FileMetaData
 )
 
 if (KF5Baloo_FOUND)
     target_link_libraries(mediaplaylistTest KF5::Baloo Qt5::DBus)
 endif()
 if (KF5KCMUtils_FOUND)
     target_link_libraries(mediaplaylistTest KF5::KCMUtils)
 endif()
 if (UPNPQT_FOUND)
     target_link_libraries(mediaplaylistTest Qt5::Xml UPNP::upnpQt Qt5::Network)
 endif()
 if (KF5XmlGui_FOUND)
     target_link_libraries(mediaplaylistTest KF5::XmlGui)
 endif()
 
 target_include_directories(mediaplaylistTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(trackslistenertest_SOURCES
     ../src/mediaplaylist.cpp
     ../src/databaseinterface.cpp
     ../src/trackslistener.cpp
     ../src/musiclistenersmanager.cpp
     ../src/elisaapplication.cpp
     ../src/manageaudioplayer.cpp
     ../src/models/allalbumsmodel.cpp
     ../src/models/allartistsmodel.cpp
     ../src/models/alltracksmodel.cpp
     ../src/models/albummodel.cpp
     ../src/models/abstractmediaproxymodel.cpp
     ../src/models/allalbumsproxymodel.cpp
     ../src/models/allartistsproxymodel.cpp
     ../src/models/alltracksproxymodel.cpp
     ../src/models/singleartistproxymodel.cpp
     ../src/models/singlealbumproxymodel.cpp
     ../src/notificationitem.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
     ../src/file/filelistener.cpp
     ../src/file/localfilelisting.cpp
     ../src/abstractfile/abstractfilelistener.cpp
     ../src/abstractfile/abstractfilelisting.cpp
+    ../src/audiowrapper.cpp
     trackslistenertest.cpp
 )
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         qt5_add_dbus_interface(trackslistenertest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(trackslistenertest_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         set(trackslistenertest_SOURCES
             ${trackslistenertest_SOURCES}
             ../src/baloo/baloolistener.cpp
             ../src/baloo/localbaloofilelisting.cpp
             )
     endif()
 endif()
 
 if (UPNPQT_FOUND)
     set(trackslistenertest_SOURCES
         ${trackslistenertest_SOURCES}
         ../src/upnp/upnpcontrolcontentdirectory.cpp
         ../src/upnp/upnpcontentdirectorymodel.cpp
         ../src/upnp/upnpcontrolconnectionmanager.cpp
         ../src/upnp/upnpcontrolmediaserver.cpp
         ../src/upnp/didlparser.cpp
         ../src/upnp/upnplistener.cpp
         ../src/upnp/upnpdiscoverallmusic.cpp
         )
 endif()
 
 kconfig_add_kcfg_files(trackslistenertest_SOURCES ../src/elisa_settings.kcfgc )
 set(trackslistenertest_SOURCES
     ${trackslistenertest_SOURCES}
     ../src/elisa_core.kcfg
 )
 
 ecm_add_test(${trackslistenertest_SOURCES}
     TEST_NAME "trackslistenertest"
     LINK_LIBRARIES
         Qt5::Test Qt5::Core Qt5::Sql Qt5::Gui Qt5::Widgets KF5::I18n Qt5::Quick Qt5::Multimedia
         Qt5::Concurrent KF5::ConfigCore KF5::ConfigGui KF5::FileMetaData
 )
 
 if (KF5Baloo_FOUND)
     target_link_libraries(trackslistenertest KF5::Baloo Qt5::DBus)
 endif()
 if (KF5KCMUtils_FOUND)
     target_link_libraries(trackslistenertest KF5::KCMUtils)
 endif()
 if (UPNPQT_FOUND)
     target_link_libraries(trackslistenertest Qt5::Xml UPNP::upnpQt Qt5::Network)
 endif()
 if (KF5XmlGui_FOUND)
     target_link_libraries(trackslistenertest KF5::XmlGui)
 endif()
 
 target_include_directories(trackslistenertest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(allalbumsmodeltest_SOURCES
     ../src/databaseinterface.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/models/allalbumsmodel.cpp
     modeltest.cpp
     allalbumsmodeltest.cpp
 )
 
 ecm_add_test(${allalbumsmodeltest_SOURCES}
     TEST_NAME "allalbumsmodeltest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql Qt5::Concurrent KF5::I18n)
 
 target_include_directories(allalbumsmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(albummodeltest_SOURCES
     ../src/databaseinterface.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/models/albummodel.cpp
     modeltest.cpp
     albummodeltest.cpp
 )
 
 ecm_add_test(${albummodeltest_SOURCES}
     TEST_NAME "albummodeltest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql Qt5::Concurrent KF5::I18n)
 
 target_include_directories(albummodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(allartistsmodeltest_SOURCES
     ../src/databaseinterface.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/models/allartistsmodel.cpp
     modeltest.cpp
     allartistsmodeltest.cpp
 )
 
 ecm_add_test(${allartistsmodeltest_SOURCES}
     TEST_NAME "allartistsmodeltest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql KF5::I18n)
 
 target_include_directories(allartistsmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(alltracksmodeltest_SOURCES
     ../src/databaseinterface.cpp
     ../src/musicartist.cpp
     ../src/musicalbum.cpp
     ../src/musicaudiotrack.cpp
     ../src/models/alltracksmodel.cpp
     modeltest.cpp
     alltracksmodeltest.cpp
 )
 
 ecm_add_test(${alltracksmodeltest_SOURCES}
     TEST_NAME "alltracksmodeltest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql KF5::I18n)
 
 target_include_directories(alltracksmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(localfilelistingtest_SOURCES
     ../src/file/localfilelisting.cpp
     ../src/abstractfile/abstractfilelisting.cpp
     ../src/musicaudiotrack.cpp
     ../src/notificationitem.cpp
     ../src/elisautils.cpp
     localfilelistingtest.cpp
 )
 
 kconfig_add_kcfg_files(localfilelistingtest_SOURCES ../src/elisa_settings.kcfgc )
 set(localfilelistingtest_SOURCES
     ${localfilelistingtest_SOURCES}
     ../src/elisa_core.kcfg
 )
 
 ecm_add_test(${localfilelistingtest_SOURCES}
     TEST_NAME "localfilelistingtest"
     LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Sql KF5::I18n KF5::FileMetaData KF5::ConfigCore KF5::ConfigGui)
 
 target_include_directories(localfilelistingtest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 
 if (KF5XmlGui_FOUND AND KF5KCMUtils_FOUND)
     set(elisaapplicationtest_SOURCES
         ../src/elisaapplication.cpp
         ../src/musiclistenersmanager.cpp
         ../src/databaseinterface.cpp
         ../src/notificationitem.cpp
         ../src/trackslistener.cpp
         ../src/mediaplaylist.cpp
+        ../src/audiowrapper.cpp
         ../src/musicartist.cpp
         ../src/musicalbum.cpp
         ../src/musicaudiotrack.cpp
         ../src/elisautils.cpp
         ../src/manageaudioplayer.cpp
         ../src/models/allalbumsmodel.cpp
         ../src/models/allartistsmodel.cpp
         ../src/models/alltracksmodel.cpp
         ../src/models/albummodel.cpp
         ../src/models/abstractmediaproxymodel.cpp
         ../src/models/allalbumsproxymodel.cpp
         ../src/models/allartistsproxymodel.cpp
         ../src/models/alltracksproxymodel.cpp
         ../src/models/singleartistproxymodel.cpp
         ../src/models/singlealbumproxymodel.cpp
         ../src/file/filelistener.cpp
         ../src/file/localfilelisting.cpp
         ../src/abstractfile/abstractfilelistener.cpp
         ../src/abstractfile/abstractfilelisting.cpp
         elisaapplicationtest.cpp
     )
 
     if (KF5Baloo_FOUND)
         if (Qt5DBus_FOUND)
             qt5_add_dbus_interface(elisaapplicationtest_SOURCES
                 ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
                 baloo/fileindexer)
 
             qt5_add_dbus_interface(elisaapplicationtest_SOURCES
                 ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
                 baloo/scheduler)
 
             set(elisaapplicationtest_SOURCES
                 ${elisaapplicationtest_SOURCES}
                 ../src/baloo/baloolistener.cpp
                 ../src/baloo/localbaloofilelisting.cpp
                 )
         endif()
     endif()
 
     kconfig_add_kcfg_files(elisaapplicationtest_SOURCES ../src/elisa_settings.kcfgc )
     set(elisaapplicationtest_SOURCES
         ${elisaapplicationtest_SOURCES}
         ../src/elisa_core.kcfg
     )
 
     ecm_add_test(${elisaapplicationtest_SOURCES}
         TEST_NAME "elisaapplicationtest"
         LINK_LIBRARIES Qt5::Test Qt5::Core Qt5::Widgets Qt5::Multimedia Qt5::Sql Qt5::Concurrent
             KF5::FileMetaData KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::XmlGui KF5::KCMUtils)
 
     if (KF5Baloo_FOUND)
         target_link_libraries(elisaapplicationtest KF5::Baloo Qt5::DBus)
     endif()
 
     target_include_directories(elisaapplicationtest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 endif()
 
 if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
     set(elisaqmltests_SOURCES
         elisaqmltests.cpp
         qmltests/tst_GridBrowserDelegate.qml
     )
 
     ecm_add_test(${elisaqmltests_SOURCES}
         TEST_NAME "elisaqmltests"
         LINK_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Test Qt5::QuickTest
         GUI)
 
     target_compile_definitions(elisaqmltests PRIVATE QUICK_TEST_SOURCE_DIR="${CMAKE_SOURCE_DIR}/autotests/qmltests")
 
     target_include_directories(elisaqmltests PRIVATE ${CMAKE_SOURCE_DIR}/src)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 102e870e..6ed486da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,325 +1,326 @@
 include_directories(${elisa_BINARY_DIR})
 
 if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
     set(elisa_SOURCES
         main.cpp
         mediaplaylist.cpp
         musicstatistics.cpp
         musicalbum.cpp
         musicaudiotrack.cpp
         musicartist.cpp
         progressindicator.cpp
         databaseinterface.cpp
         musiclistenersmanager.cpp
         managemediaplayercontrol.cpp
         manageheaderbar.cpp
         manageaudioplayer.cpp
         trackslistener.cpp
         elisaapplication.cpp
         audiowrapper.cpp
         notificationitem.cpp
         topnotificationmanager.cpp
         elisautils.cpp
         trackdatahelper.cpp
         abstractfile/abstractfilelistener.cpp
         abstractfile/abstractfilelisting.cpp
         file/filelistener.cpp
         file/localfilelisting.cpp
         models/albummodel.cpp
         models/allalbumsmodel.cpp
         models/allartistsmodel.cpp
         models/alltracksmodel.cpp
         models/abstractmediaproxymodel.cpp
         models/allalbumsproxymodel.cpp
         models/allartistsproxymodel.cpp
         models/alltracksproxymodel.cpp
         models/singleartistproxymodel.cpp
         models/singlealbumproxymodel.cpp
 
         windows/WindowsTheme.qml
         windows/PlatformIntegration.qml
 
         android/ElisaMainWindow.qml
         android/AndroidTheme.qml
         android/PlatformIntegration.qml
 
         qml/ElisaMainWindow.qml
         qml/ApplicationMenu.qml
         qml/Theme.qml
         qml/PlatformIntegration.qml
         qml/LabelWithToolTip.qml
 
         qml/RatingStar.qml
         qml/PlayListEntry.qml
         qml/MediaBrowser.qml
         qml/DraggableItem.qml
         qml/PassiveNotification.qml
         qml/TopNotification.qml
         qml/TopNotificationItem.qml
         qml/TrackImportNotification.qml
 
         qml/HeaderBar.qml
         qml/NavigationActionBar.qml
         qml/MediaPlayerControl.qml
         qml/ContextView.qml
         qml/ViewSelector.qml
 
         qml/MediaPlayListView.qml
         qml/MediaAlbumView.qml
         qml/MediaAllTracksView.qml
         qml/MediaTrackDelegate.qml
         qml/MediaAlbumTrackDelegate.qml
         qml/MediaTrackMetadataView.qml
         qml/GridBrowserView.qml
         qml/GridBrowserDelegate.qml
         )
 
     if (KF5Baloo_FOUND)
         if (Qt5DBus_FOUND)
             set(elisa_SOURCES
                 ${elisa_SOURCES}
                 baloo/localbaloofilelisting.cpp
                 baloo/baloolistener.cpp
                 )
 
             qt5_add_dbus_interface(elisa_SOURCES
                 ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
                 baloo/fileindexer)
 
             qt5_add_dbus_interface(elisa_SOURCES
                 ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
                 baloo/scheduler)
         endif()
     endif()
 
     if (Qt5DBus_FOUND)
         set(elisa_SOURCES
             ${elisa_SOURCES}
             mpris2/mpris2.cpp
             mpris2/mediaplayer2.cpp
             mpris2/mediaplayer2player.cpp
         )
     endif()
 
     if (UPNPQT_FOUND)
         set(elisa_SOURCES
             ${elisa_SOURCES}
             upnp/upnpcontrolcontentdirectory.cpp
             upnp/upnpcontentdirectorymodel.cpp
             upnp/upnpcontrolconnectionmanager.cpp
             upnp/upnpcontrolmediaserver.cpp
             upnp/didlparser.cpp
             upnp/upnplistener.cpp
             upnp/upnpdiscoverallmusic.cpp
             )
     endif()
 
     kconfig_add_kcfg_files(elisa_SOURCES elisa_settings.kcfgc)
     set(elisa_SOURCES
         ${elisa_SOURCES}
         elisa_core.kcfg
     )
 
     qt5_add_resources(elisa_SOURCES resources.qrc)
      set_property(SOURCE qrc_resources.cpp PROPERTY SKIP_AUTOMOC ON)
 
     set(elisa_ICONS_PNG
         ../icons/128-apps-elisa.png
         ../icons/64-apps-elisa.png
         ../icons/48-apps-elisa.png
         ../icons/32-apps-elisa.png
         ../icons/22-apps-elisa.png
         ../icons/16-apps-elisa.png
     )
 
     # add icons to application sources, to have them bundled
     ecm_add_app_icon(elisa_SOURCES ICONS ${elisa_ICONS_PNG})
 
     add_executable(elisa ${elisa_SOURCES})
 
     set_target_properties(elisa PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
 
     target_include_directories(elisa PRIVATE ${KDSoap_INCLUDE_DIRS})
 
     target_link_libraries(elisa
         LINK_PRIVATE
             Qt5::Core
             Qt5::Quick
             Qt5::Gui
             Qt5::Widgets
             Qt5::Multimedia
             Qt5::Svg
             Qt5::Sql
             Qt5::Concurrent
             KF5::I18n
             KF5::ConfigCore
             KF5::ConfigGui
             KF5::FileMetaData
             KF5::CoreAddons
     )
 
     if (Qt5DBus_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 Qt5::DBus
         )
     endif()
 
     if (KF5KCMUtils_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::KCMUtils
         )
     endif()
 
     if (Qt5AndroidExtras_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 Qt5::AndroidExtras
         )
     endif()
 
     if (KF5Baloo_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::Baloo
         )
     endif()
 
     if (KF5Declarative_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::Declarative
         )
     endif()
 
     if (KF5XmlGui_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::XmlGui
         )
     endif()
 
     if (KF5Crash_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::Crash
         )
     endif()
 
     if (UPNPQT_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 UPNP::upnpQt
                 Qt5::Network
         )
     endif()
 
     if (KF5DBusAddons_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
                 KF5::DBusAddons
         )
     endif()
 endif()
 
 install(TARGETS elisa ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (KF5ConfigWidgets_FOUND)
     add_subdirectory(localFileConfiguration)
 endif()
 
 set(elisaImport_SOURCES
     elisaimport.cpp
     elisaimportapplication.cpp
     elisaapplication.cpp
     mediaplaylist.cpp
     musicstatistics.cpp
     musicalbum.cpp
     musicaudiotrack.cpp
     musicartist.cpp
     manageaudioplayer.cpp
     progressindicator.cpp
     models/albummodel.cpp
     models/allalbumsmodel.cpp
     models/allartistsmodel.cpp
     models/alltracksmodel.cpp
     models/abstractmediaproxymodel.cpp
     models/allalbumsproxymodel.cpp
     models/allartistsproxymodel.cpp
     models/alltracksproxymodel.cpp
     models/singleartistproxymodel.cpp
     models/singlealbumproxymodel.cpp
     databaseinterface.cpp
     musiclistenersmanager.cpp
     trackslistener.cpp
     notificationitem.cpp
     topnotificationmanager.cpp
     elisautils.cpp
     abstractfile/abstractfilelistener.cpp
     abstractfile/abstractfilelisting.cpp
     file/filelistener.cpp
     file/localfilelisting.cpp
+    audiowrapper.cpp
 )
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         set(elisaImport_SOURCES
             ${elisaImport_SOURCES}
             baloo/localbaloofilelisting.cpp
             baloo/baloolistener.cpp
             )
 
         qt5_add_dbus_interface(elisaImport_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(elisaImport_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
     endif()
 endif()
 
 kconfig_add_kcfg_files(elisaImport_SOURCES elisa_settings.kcfgc)
 set(elisaImport_SOURCES
     ${elisaImport_SOURCES}
     elisa_core.kcfg
 )
 
 add_executable(elisaImport ${elisaImport_SOURCES})
 
 set_target_properties(elisaImport PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
 
 target_link_libraries(elisaImport
     LINK_PRIVATE
         Qt5::Core
         Qt5::Sql
         Qt5::Multimedia
         Qt5::Widgets
         Qt5::Concurrent
         KF5::I18n
         KF5::ConfigCore
         KF5::ConfigGui
         KF5::FileMetaData
 )
 
 if (KF5XmlGui_FOUND)
     target_link_libraries(elisaImport
         LINK_PRIVATE
             KF5::XmlGui
     )
 endif()
 
 if (KF5KCMUtils_FOUND)
     target_link_libraries(elisaImport
         LINK_PRIVATE
             KF5::KCMUtils
     )
 endif()
 
 if (KF5Baloo_FOUND)
     target_link_libraries(elisaImport
         LINK_PRIVATE
             KF5::Baloo
     )
 endif()
diff --git a/src/elisaapplication.cpp b/src/elisaapplication.cpp
index 87663cae..6b644e12 100644
--- a/src/elisaapplication.cpp
+++ b/src/elisaapplication.cpp
@@ -1,365 +1,374 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  * Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "elisaapplication.h"
 
 #include "musiclistenersmanager.h"
 #include "models/allalbumsproxymodel.h"
 #include "models/alltracksproxymodel.h"
 #include "models/allartistsproxymodel.h"
 #include "models/singleartistproxymodel.h"
 #include "models/singlealbumproxymodel.h"
 #include "mediaplaylist.h"
+#include "audiowrapper.h"
 
 #include "elisa_settings.h"
 #include <KConfigCore/KAuthorized>
 
 #if defined KF5ConfigWidgets_FOUND && KF5ConfigWidgets_FOUND
 #include <KConfigWidgets/KStandardAction>
 #endif
 
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
 #include <KXmlGui/KActionCollection>
 #include <KXmlGui/KAboutApplicationDialog>
 #include <KXmlGui/KHelpMenu>
 #include <KXmlGui/KBugReport>
 #include <KXmlGui/KShortcutsDialog>
 #endif
 
 #if defined KF5KCMUtils_FOUND && KF5KCMUtils_FOUND
 #include <KCMUtils/KCMultiDialog>
 #endif
 
 #include <KCoreAddons/KAboutData>
 
 #include <QCoreApplication>
 #include <QDesktopServices>
 #include <QDialog>
 #include <QPointer>
 #include <QIcon>
 #include <QAction>
 #include <QUrl>
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
 
 #include <memory>
 
 class ElisaApplicationPrivate
 {
 public:
 
     explicit ElisaApplicationPrivate(QObject *parent)
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
           : mCollection(parent)
 #endif
     {
         Q_UNUSED(parent)
     }
 
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     KActionCollection mCollection;
 #endif
 
     QStringList mArguments;
 
     std::unique_ptr<MusicListenersManager> mMusicManager;
 
     std::unique_ptr<AllAlbumsProxyModel> mAllAlbumsProxyModel;
 
     std::unique_ptr<AllArtistsProxyModel> mAllArtistsProxyModel;
 
     std::unique_ptr<AllTracksProxyModel> mAllTracksProxyModel;
 
     std::unique_ptr<SingleArtistProxyModel> mSingleArtistProxyModel;
 
     std::unique_ptr<SingleAlbumProxyModel> mSingleAlbumProxyModel;
 
     std::unique_ptr<MediaPlayList> mMediaPlayList;
 
+    std::unique_ptr<AudioWrapper> mAudioWrapper;
+
 };
 
 ElisaApplication::ElisaApplication(QObject *parent) : QObject(parent), d(std::make_unique<ElisaApplicationPrivate>(this))
 {
 }
 
 ElisaApplication::~ElisaApplication()
 = default;
 
 void ElisaApplication::setupActions(const QString &actionName)
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     if (actionName == QStringLiteral("file_quit")) {
         auto quitAction = KStandardAction::quit(QCoreApplication::instance(), &QCoreApplication::quit, &d->mCollection);
         d->mCollection.addAction(actionName, quitAction);
     }
 
     if (actionName == QStringLiteral("help_contents") && KAuthorized::authorizeAction(actionName)) {
         auto handBookAction = KStandardAction::helpContents(this, &ElisaApplication::appHelpActivated, &d->mCollection);
         d->mCollection.addAction(handBookAction->objectName(), handBookAction);
     }
 
     if (actionName == QStringLiteral("help_report_bug") && KAuthorized::authorizeAction(actionName) && !KAboutData::applicationData().bugAddress().isEmpty()) {
         auto reportBugAction = KStandardAction::reportBug(this, &ElisaApplication::reportBug, &d->mCollection);
         d->mCollection.addAction(reportBugAction->objectName(), reportBugAction);
     }
 
     if (actionName == QStringLiteral("help_about_app") && KAuthorized::authorizeAction(actionName)) {
         auto aboutAppAction = KStandardAction::aboutApp(this, &ElisaApplication::aboutApplication, this);
         d->mCollection.addAction(aboutAppAction->objectName(), aboutAppAction);
     }
 
     if (actionName == QStringLiteral("options_configure") && KAuthorized::authorizeAction(actionName)) {
         auto preferencesAction = KStandardAction::preferences(this, &ElisaApplication::configureElisa, this);
         d->mCollection.addAction(preferencesAction->objectName(), preferencesAction);
     }
 
     if (actionName == QStringLiteral("options_configure_keybinding") && KAuthorized::authorizeAction(actionName)) {
         auto keyBindingsAction = KStandardAction::keyBindings(this, &ElisaApplication::configureShortcuts, this);
         d->mCollection.addAction(keyBindingsAction->objectName(), keyBindingsAction);
     }
 
     if (actionName == QStringLiteral("go_back") && KAuthorized::authorizeAction(actionName)) {
         auto goBackAction = KStandardAction::back(this, &ElisaApplication::goBack, this);
         d->mCollection.addAction(goBackAction->objectName(), goBackAction);
     }
 
     d->mCollection.readSettings();
 #endif
 }
 
 void ElisaApplication::setArguments(const QStringList &newArguments)
 {
     if (d->mArguments == newArguments) {
         return;
     }
 
     d->mArguments = checkFileListAndMakeAbsolute(newArguments, QDir::currentPath());
     Q_EMIT argumentsChanged();
 }
 
 void ElisaApplication::activateActionRequested(const QString &actionName, const QVariant &parameter)
 {
     Q_UNUSED(actionName)
     Q_UNUSED(parameter)
 }
 
 void ElisaApplication::activateRequested(const QStringList &arguments, const QString &workingDirectory)
 {
     auto realArguments = arguments;
     if (realArguments.size() > 1) {
         realArguments.removeFirst();
         Q_EMIT enqueue(checkFileListAndMakeAbsolute(realArguments, workingDirectory));
     }
 }
 
 void ElisaApplication::openRequested(const QList<QUrl> &uris)
 {
     Q_UNUSED(uris)
 }
 
 void ElisaApplication::appHelpActivated()
 {
     QDesktopServices::openUrl(QUrl(QStringLiteral("help:/")));
 }
 
 void ElisaApplication::aboutApplication()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     static QPointer<QDialog> dialog;
     if (!dialog) {
         dialog = new KAboutApplicationDialog(KAboutData::applicationData(), nullptr);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
     }
     dialog->show();
 #endif
 }
 
 void ElisaApplication::reportBug()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     static QPointer<QDialog> dialog;
     if (!dialog) {
         dialog = new KBugReport(KAboutData::applicationData(), nullptr);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
     }
     dialog->show();
 #endif
 }
 
 void ElisaApplication::configureShortcuts()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, nullptr);
     dlg.setModal(true);
     dlg.addCollection(&d->mCollection);
     dlg.configure();
 #endif
 }
 
 void ElisaApplication::configureElisa()
 {
 #if defined KF5KCMUtils_FOUND && KF5KCMUtils_FOUND
     KCMultiDialog configurationDialog;
 
     configurationDialog.addModule(QStringLiteral("kcm_elisa_local_file"));
     configurationDialog.setModal(true);
     configurationDialog.show();
 #endif
 }
 
 void ElisaApplication::goBack() {}
 
 QStringList ElisaApplication::checkFileListAndMakeAbsolute(const QStringList &filesList, const QString &workingDirectory) const
 {
     QStringList filesToOpen;
 
     for (const auto &oneFile : filesList) {
         auto newFile = QFileInfo(oneFile);
 
         if (newFile.isRelative()) {
             newFile = QFileInfo(workingDirectory + QStringLiteral("/") + oneFile);
         }
 
         if (newFile.exists()) {
             filesToOpen.push_back(newFile.canonicalFilePath());
         }
     }
 
     return filesToOpen;
 }
 
 void ElisaApplication::initialize()
 {
     d->mMusicManager = std::make_unique<MusicListenersManager>();
     Q_EMIT musicManagerChanged();
     d->mAllAlbumsProxyModel = std::make_unique<AllAlbumsProxyModel>();
     Q_EMIT allAlbumsProxyModelChanged();
     d->mAllArtistsProxyModel = std::make_unique<AllArtistsProxyModel>();
     Q_EMIT allArtistsProxyModelChanged();
     d->mAllTracksProxyModel = std::make_unique<AllTracksProxyModel>();
     Q_EMIT allTracksProxyModelChanged();
     d->mSingleArtistProxyModel = std::make_unique<SingleArtistProxyModel>();
     Q_EMIT singleArtistProxyModelChanged();
     d->mSingleAlbumProxyModel = std::make_unique<SingleAlbumProxyModel>();
     Q_EMIT singleAlbumProxyModelChanged();
     d->mMediaPlayList = std::make_unique<MediaPlayList>();
     Q_EMIT mediaPlayListChanged();
+    d->mAudioWrapper = std::make_unique<AudioWrapper>();
+    Q_EMIT audioPlayerChanged();
 
     d->mMusicManager->setElisaApplication(this);
 
     d->mMediaPlayList->setMusicListenersManager(d->mMusicManager.get());
     QObject::connect(this, &ElisaApplication::enqueue, d->mMediaPlayList.get(), &MediaPlayList::enqueueAndPlay);
 
     d->mAllAlbumsProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel());
     d->mAllArtistsProxyModel->setSourceModel(d->mMusicManager->allArtistsModel());
     d->mAllTracksProxyModel->setSourceModel(d->mMusicManager->allTracksModel());
     d->mSingleArtistProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel());
     d->mSingleAlbumProxyModel->setSourceModel(d->mMusicManager->albumModel());
 
     QObject::connect(d->mAllAlbumsProxyModel.get(), &AllAlbumsProxyModel::albumToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAlbum> &,
                                                                          ElisaUtils::PlayListEnqueueMode,
                                                                          ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mAllArtistsProxyModel.get(), &AllArtistsProxyModel::artistToEnqueue,
                      d->mMediaPlayList.get(), &MediaPlayList::enqueueArtists);
 
     QObject::connect(d->mAllTracksProxyModel.get(), &AllTracksProxyModel::trackToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &,
                                                                          ElisaUtils::PlayListEnqueueMode,
                                                                          ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mSingleArtistProxyModel.get(), &SingleArtistProxyModel::albumToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAlbum> &,
                                                                          ElisaUtils::PlayListEnqueueMode,
                                                                          ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mSingleAlbumProxyModel.get(), &SingleAlbumProxyModel::trackToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &,
                                                                          ElisaUtils::PlayListEnqueueMode,
                                                                          ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 }
 
 QAction * ElisaApplication::action(const QString& name)
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     auto resultAction = d->mCollection.action(name);
 
     if (!resultAction) {
         setupActions(name);
         resultAction = d->mCollection.action(name);
     }
 
     return resultAction;
 #else
     Q_UNUSED(name);
 
     return new QAction();
 #endif
 }
 
 QString ElisaApplication::iconName(const QIcon& icon)
 {
     return icon.name();
 }
 
 const QStringList &ElisaApplication::arguments() const
 {
     return d->mArguments;
 }
 
 MusicListenersManager *ElisaApplication::musicManager() const
 {
     return d->mMusicManager.get();
 }
 
 AllAlbumsProxyModel *ElisaApplication::allAlbumsProxyModel() const
 {
     return d->mAllAlbumsProxyModel.get();
 }
 
 AllArtistsProxyModel *ElisaApplication::allArtistsProxyModel() const
 {
     return d->mAllArtistsProxyModel.get();
 }
 
 AllTracksProxyModel *ElisaApplication::allTracksProxyModel() const
 {
     return d->mAllTracksProxyModel.get();
 }
 
 SingleArtistProxyModel *ElisaApplication::singleArtistProxyModel() const
 {
     return d->mSingleArtistProxyModel.get();
 }
 
 SingleAlbumProxyModel *ElisaApplication::singleAlbumProxyModel() const
 {
     return d->mSingleAlbumProxyModel.get();
 }
 
 MediaPlayList *ElisaApplication::mediaPlayList() const
 {
     return d->mMediaPlayList.get();
 }
 
+AudioWrapper *ElisaApplication::audioPlayer() const
+{
+    return d->mAudioWrapper.get();
+}
 
 #include "moc_elisaapplication.cpp"
diff --git a/src/elisaapplication.h b/src/elisaapplication.h
index 030b48f1..1674dbf1 100644
--- a/src/elisaapplication.h
+++ b/src/elisaapplication.h
@@ -1,160 +1,169 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef ELISAAPPLICATION_H
 #define ELISAAPPLICATION_H
 
 #include "config-upnp-qt.h"
 
 #include <QObject>
 #include <QString>
 
 #include <memory>
 
 class QIcon;
 class QAction;
 class MusicListenersManager;
 class AllAlbumsProxyModel;
 class AllArtistsProxyModel;
 class AllTracksProxyModel;
 class SingleArtistProxyModel;
 class SingleAlbumProxyModel;
 class MediaPlayList;
+class AudioWrapper;
 class ElisaApplicationPrivate;
 
 class ElisaApplication : public QObject
 {
 
     Q_OBJECT
 
     Q_PROPERTY(QStringList arguments
                READ arguments
                WRITE setArguments
                NOTIFY argumentsChanged)
 
     Q_PROPERTY(MusicListenersManager *musicManager
                READ musicManager
                NOTIFY musicManagerChanged)
 
     Q_PROPERTY(AllAlbumsProxyModel *allAlbumsProxyModel
                READ allAlbumsProxyModel
                NOTIFY allAlbumsProxyModelChanged)
 
     Q_PROPERTY(AllArtistsProxyModel *allArtistsProxyModel
                READ allArtistsProxyModel
                NOTIFY allArtistsProxyModelChanged)
 
     Q_PROPERTY(AllTracksProxyModel *allTracksProxyModel
                READ allTracksProxyModel
                NOTIFY allTracksProxyModelChanged)
 
     Q_PROPERTY(SingleArtistProxyModel *singleArtistProxyModel
                READ singleArtistProxyModel
                NOTIFY singleArtistProxyModelChanged)
 
     Q_PROPERTY(SingleAlbumProxyModel *singleAlbumProxyModel
                READ singleAlbumProxyModel
                NOTIFY singleAlbumProxyModelChanged)
 
     Q_PROPERTY(MediaPlayList *mediaPlayList
                READ mediaPlayList
                NOTIFY mediaPlayListChanged)
 
+    Q_PROPERTY(AudioWrapper *audioPlayer
+               READ audioPlayer
+               NOTIFY audioPlayerChanged)
+
 public:
     explicit ElisaApplication(QObject *parent = nullptr);
 
     ~ElisaApplication() override;
 
     Q_INVOKABLE QAction* action(const QString& name);
 
     Q_INVOKABLE QString iconName(const QIcon& icon);
 
     const QStringList &arguments() const;
 
     MusicListenersManager *musicManager() const;
 
     AllAlbumsProxyModel *allAlbumsProxyModel() const;
 
     AllArtistsProxyModel *allArtistsProxyModel() const;
 
     AllTracksProxyModel *allTracksProxyModel() const;
 
     SingleArtistProxyModel *singleArtistProxyModel() const;
 
     SingleAlbumProxyModel *singleAlbumProxyModel() const;
 
     MediaPlayList *mediaPlayList() const;
 
+    AudioWrapper *audioPlayer() const;
+
 Q_SIGNALS:
 
     void argumentsChanged();
 
     void musicManagerChanged();
 
     void allAlbumsProxyModelChanged();
 
     void allArtistsProxyModelChanged();
 
     void allTracksProxyModelChanged();
 
     void singleArtistProxyModelChanged();
 
     void singleAlbumProxyModelChanged();
 
     void mediaPlayListChanged();
 
+    void audioPlayerChanged();
+
     void enqueue(const QStringList &files);
 
 public Q_SLOTS:
 
     void appHelpActivated();
 
     void aboutApplication();
 
     void reportBug();
 
     void configureShortcuts();
 
     void configureElisa();
 
     void setArguments(const QStringList &newArguments);
 
     void activateActionRequested(const QString &actionName, const QVariant &parameter);
 
     void activateRequested(const QStringList &arguments, const QString &workingDirectory);
 
     void openRequested(const QList< QUrl > &uris);
 
     void initialize();
 
 private Q_SLOTS:
 
     void goBack();
 
 private:
 
     void setupActions(const QString &actionName);
 
     QStringList checkFileListAndMakeAbsolute(const QStringList &filesList, const QString &workingDirectory) const;
 
     std::unique_ptr<ElisaApplicationPrivate> d;
 
 };
 
 #endif // ELISAAPPLICATION_H
diff --git a/src/qml/ElisaMainWindow.qml b/src/qml/ElisaMainWindow.qml
index e199f3b3..df190fe8 100644
--- a/src/qml/ElisaMainWindow.qml
+++ b/src/qml/ElisaMainWindow.qml
@@ -1,941 +1,941 @@
 /*
  * Copyright 2016-2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Controls 1.4 as Controls1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 import org.kde.elisa 1.0
 import Qt.labs.settings 1.0
 
 ApplicationWindow {
     id: mainWindow
 
     visible: true
 
     minimumWidth: 1000
     minimumHeight: 600
 
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
     x: persistentSettings.x
     y: persistentSettings.y
     width: persistentSettings.width
     height: persistentSettings.height
 
     title: i18n("Elisa")
 
     property var goBackAction: elisa.action("go_back")
 
     Controls1.Action  {
         shortcut: goBackAction.shortcut
         onTriggered: {
             localAlbums.goBack()
             localArtists.goBack()
         }
     }
 
     Controls1.Action {
         id: applicationMenuAction
         text: i18nc("open application menu", "Application Menu")
         iconName: "application-menu"
         onTriggered: applicationMenu.popup()
     }
 
     ApplicationMenu {
         id: applicationMenu
     }
 
     SystemPalette {
         id: myPalette
         colorGroup: SystemPalette.Active
     }
 
     Theme {
         id: elisaTheme
     }
 
     Settings {
         id: persistentSettings
 
         property int x
         property int y
         property int width : 1000
         property int height : 600
 
         property var playListState
 
         property var playListControlerState
 
         property var audioPlayerState
 
         property double playControlItemVolume : 100.0
         property bool playControlItemMuted : false
 
         property string filterState
 
    }
 
     Connections {
         target: Qt.application
         onAboutToQuit:
         {
             persistentSettings.x = mainWindow.x;
             persistentSettings.y = mainWindow.y;
             persistentSettings.width = mainWindow.width;
             persistentSettings.height = mainWindow.height;
 
             persistentSettings.playListState = elisa.mediaPlayList.persistentState;
             persistentSettings.playListControlerState = elisa.mediaPlayList.persistentState;
             persistentSettings.audioPlayerState = manageAudioPlayer.persistentState
 
             persistentSettings.playControlItemVolume = headerBar.playerControl.volume
             persistentSettings.playControlItemMuted = headerBar.playerControl.muted
         }
     }
 
     PlatformIntegration {
         id: platformInterface
 
         playListModel: elisa.mediaPlayList
         playListControler: elisa.mediaPlayList
         audioPlayerManager: manageAudioPlayer
         headerBarManager: myHeaderBarManager
         manageMediaPlayerControl: myPlayControlManager
-        player: audioPlayer
+        player: elisa.audioPlayer
 
         onRaisePlayer:
         {
             mainWindow.show()
             mainWindow.raise()
             mainWindow.requestActivate()
         }
     }
 
-    AudioWrapper {
-        id: audioPlayer
-
-        muted: headerBar.playerControl.muted
-
-        volume: headerBar.playerControl.volume
+    Connections {
+        target: elisa.audioPlayer
 
         onVolumeChanged: headerBar.playerControl.volume = volume
         onMutedChanged: headerBar.playerControl.muted = muted
 
-        source: manageAudioPlayer.playerSource
-
         onPlaying: {
             myPlayControlManager.playerPlaying()
         }
 
         onPaused: {
             myPlayControlManager.playerPaused()
         }
 
         onStopped: {
             myPlayControlManager.playerStopped()
         }
     }
 
     Connections {
         target: elisa.mediaPlayList
 
         onPlayListLoadFailed: {
             messageNotification.showNotification(i18nc("message of passive notification when playlist load failed", "Load of playlist failed"), 3000)
         }
 
         onEnsurePlay: manageAudioPlayer.ensurePlay()
 
         onPlayListFinished: manageAudioPlayer.playListFinished()
     }
 
     ManageHeaderBar {
         id: myHeaderBarManager
 
         playListModel: elisa.mediaPlayList
         currentTrack: elisa.mediaPlayList.currentTrack
 
         artistRole: MediaPlayList.ArtistRole
         titleRole: MediaPlayList.TitleRole
         albumRole: MediaPlayList.AlbumRole
         imageRole: MediaPlayList.ImageRole
         isValidRole: MediaPlayList.IsValidRole
     }
 
     ManageAudioPlayer {
         id: manageAudioPlayer
 
         currentTrack: elisa.mediaPlayList.currentTrack
         playListModel: elisa.mediaPlayList
         urlRole: MediaPlayList.ResourceRole
         isPlayingRole: MediaPlayList.IsPlayingRole
         titleRole: MediaPlayList.TitleRole
         artistNameRole: MediaPlayList.ArtistRole
         albumNameRole: MediaPlayList.AlbumRole
 
-        playerStatus: audioPlayer.status
-        playerPlaybackState: audioPlayer.playbackState
-        playerError: audioPlayer.error
-        audioDuration: audioPlayer.duration
-        playerIsSeekable: audioPlayer.seekable
-        playerPosition: audioPlayer.position
+        playerStatus: elisa.audioPlayer.status
+        playerPlaybackState: elisa.audioPlayer.playbackState
+        playerError: elisa.audioPlayer.error
+        audioDuration: elisa.audioPlayer.duration
+        playerIsSeekable: elisa.audioPlayer.seekable
+        playerPosition: elisa.audioPlayer.position
 
         persistentState: persistentSettings.audioPlayerState
 
-        onPlayerPlay: audioPlayer.play()
-        onPlayerPause: audioPlayer.pause()
-        onPlayerStop: audioPlayer.stop()
+        onPlayerPlay: elisa.audioPlayer.play()
+        onPlayerPause: elisa.audioPlayer.pause()
+        onPlayerStop: elisa.audioPlayer.stop()
         onSkipNextTrack: elisa.mediaPlayList.skipNextTrack()
-        onSeek: audioPlayer.seek(position)
+        onSeek: elisa.audioPlayer.seek(position)
         onSourceInError:
         {
             elisa.mediaPlayList.trackInError(source, playerError)
             elisa.musicManager.playBackError(source, playerError)
         }
 
         onDisplayTrackError: messageNotification.showNotification(i18n("Error when playing %1", "" + fileName), 3000)
     }
 
     ManageMediaPlayerControl {
         id: myPlayControlManager
 
         playListModel: elisa.mediaPlayList
         currentTrack: elisa.mediaPlayList.currentTrack
     }
 
     PassiveNotification {
         id: messageNotification
     }
 
     Rectangle {
         color: myPalette.base
         anchors.fill: parent
 
         ColumnLayout {
             anchors.fill: parent
             spacing: 0
 
             Item {
                 Layout.preferredHeight: mainWindow.height * 0.2 + elisaTheme.mediaPlayerControlHeight
                 Layout.minimumHeight: mainWindow.height * 0.2 + elisaTheme.mediaPlayerControlHeight
                 Layout.maximumHeight: mainWindow.height * 0.2 + elisaTheme.mediaPlayerControlHeight
                 Layout.fillWidth: true
 
                 HeaderBar {
                     id: headerBar
 
                     focus: true
 
                     anchors.fill: parent
 
                     tracksCount: myHeaderBarManager.remainingTracks
                     album: myHeaderBarManager.album
                     title: myHeaderBarManager.title
                     artist: myHeaderBarManager.artist
                     image: myHeaderBarManager.image
 
                     ratingVisible: false
 
-                    playerControl.duration: audioPlayer.duration
-                    playerControl.seekable: audioPlayer.seekable
+                    playerControl.duration: elisa.audioPlayer.duration
+                    playerControl.seekable: elisa.audioPlayer.seekable
 
                     playerControl.volume: persistentSettings.playControlItemVolume
                     playerControl.muted: persistentSettings.playControlItemMuted
-                    playerControl.position: audioPlayer.position
+                    playerControl.position: elisa.audioPlayer.position
                     playerControl.skipBackwardEnabled: myPlayControlManager.skipBackwardControlEnabled
                     playerControl.skipForwardEnabled: myPlayControlManager.skipForwardControlEnabled
                     playerControl.playEnabled: myPlayControlManager.playControlEnabled
                     playerControl.isPlaying: myPlayControlManager.musicPlaying
 
-                    playerControl.onSeek: audioPlayer.seek(position)
+                    playerControl.onSeek: elisa.audioPlayer.seek(position)
 
                     playerControl.onPlay: manageAudioPlayer.playPause()
                     playerControl.onPause: manageAudioPlayer.playPause()
 
                     playerControl.onPlayPrevious: elisa.mediaPlayList.skipPreviousTrack()
                     playerControl.onPlayNext: elisa.mediaPlayList.skipNextTrack()
 
                     Controls1.ToolButton {
                         id: menuButton
 
                         action: applicationMenuAction
 
                         z: 2
 
                         anchors
                         {
                             right: parent.right
                             top: parent.top
                             rightMargin: elisaTheme.layoutHorizontalMargin * 3
                             topMargin: elisaTheme.layoutHorizontalMargin * 3
                         }
                     }
                     Rectangle {
                         anchors.fill: menuButton
 
                         z: 1
 
                         radius: width / 2
 
                         color: myPalette.window
                     }
 
                     TrackImportNotification {
                         id: importedTracksCountNotification
 
                         anchors
                         {
                             right: menuButton.left
                             top: menuButton.top
                             bottom: menuButton.bottom
                             rightMargin: elisaTheme.layoutHorizontalMargin * 3
                         }
                     }
 
                     Binding {
                         target: importedTracksCountNotification
                         property: 'musicManager'
                         value: elisa.musicManager
                         when: elisa.musicManager !== undefined
                     }
 
                     Loader {
                         sourceComponent: Binding {
                             target: importedTracksCountNotification
                             property: 'indexingRunning'
                             value: elisa.musicManager.indexingRunning
                         }
 
                         active: elisa.musicManager !== undefined
                     }
 
                     Loader {
                         sourceComponent: Binding {
                             target: importedTracksCountNotification
                             property: 'importedTracksCount'
                             value: elisa.musicManager.importedTracksCount
                         }
 
                         active: elisa.musicManager !== undefined
                     }
                 }
             }
 
             RowLayout {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 spacing: 0
 
                 ViewSelector {
                     id: listViews
 
                     Layout.fillHeight: true
                     Layout.preferredWidth: mainWindow.width * 0.15
                     Layout.maximumWidth: mainWindow.width * 0.15
                 }
 
                 ColumnLayout {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
 
                     spacing: 0
 
                     TopNotification {
                         id: invalidBalooConfiguration
 
                         Layout.fillWidth: true
 
                         musicManager: elisa.musicManager
 
                         focus: true
                     }
 
                     Item {
                         Layout.fillHeight: true
                         Layout.fillWidth: true
 
                         RowLayout {
                             anchors.fill: parent
 
                             spacing: 0
 
                             id: contentZone
 
                             FocusScope {
                                 id: mainContentView
 
                                 focus: true
 
                                 Layout.fillHeight: true
 
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
 
 
                                 visible: Layout.minimumWidth != 0
 
                                 Rectangle {
                                     border {
                                         color: (mainContentView.activeFocus ? myPalette.highlight : myPalette.base)
                                         width: 1
                                     }
 
                                     radius: 3
                                     color: myPalette.base
 
                                     anchors.fill: parent
 
                                     BusyIndicator {
                                         id: busyScanningMusic
                                         hoverEnabled: false
                                         anchors.fill: parent
 
                                         anchors.leftMargin: parent.width / 3
                                         anchors.rightMargin: parent.width / 3
                                         anchors.topMargin: parent.height / 3
                                         anchors.bottomMargin: parent.height / 3
 
                                         opacity: 0.8
 
                                         visible: running
 
                                         z: 2
                                     }
 
                                     Loader {
                                         sourceComponent: Binding {
                                             target: busyScanningMusic
                                             property: 'running'
                                             value: elisa.musicManager.indexerBusy
                                         }
 
                                         active: elisa.musicManager !== undefined
                                     }
 
                                     MediaBrowser {
                                         id: localAlbums
 
                                         focus: true
 
                                         anchors {
                                             fill: parent
 
                                             leftMargin: elisaTheme.layoutHorizontalMargin
                                             rightMargin: elisaTheme.layoutHorizontalMargin
                                         }
 
                                         firstPage: GridBrowserView {
                                             id: allAlbumsView
 
                                             focus: true
 
                                             contentModel: elisa.allAlbumsProxyModel
 
                                             image: elisaTheme.albumIcon
                                             mainTitle: i18nc("Title of the view of all albums", "Albums")
 
                                             onOpen: {
                                                 elisa.singleAlbumProxyModel.loadAlbumData(databaseId)
                                                 localAlbums.stackView.push(albumView, {
                                                                                stackView: localAlbums.stackView,
                                                                                albumName: innerMainTitle,
                                                                                artistName:  innerSecondaryTitle,
                                                                                albumArtUrl: innerImage,
                                                                            })
                                             }
                                             onGoBack: localAlbums.stackView.pop()
 
                                             Binding {
                                                 target: allAlbumsView
                                                 property: 'filterState'
                                                 value: persistentSettings.filterState
                                             }
 
                                             onFilterViewChanged: persistentSettings.filterState = filterState
                                         }
 
                                         visible: opacity > 0
                                     }
 
                                     MediaBrowser {
                                         id: localArtists
 
                                         focus: true
 
                                         anchors {
                                             fill: parent
 
                                             leftMargin: elisaTheme.layoutHorizontalMargin
                                             rightMargin: elisaTheme.layoutHorizontalMargin
                                         }
 
                                         firstPage: GridBrowserView {
                                             id: allArtistsView
                                             focus: true
 
                                             showRating: false
                                             delegateDisplaySecondaryText: false
 
                                             contentModel: elisa.allArtistsProxyModel
 
                                             image: elisaTheme.artistIcon
                                             mainTitle: i18nc("Title of the view of all artists", "Artists")
 
                                             onOpen: {
                                                 elisa.singleArtistProxyModel.setArtistFilterText(innerMainTitle)
                                                 localArtists.stackView.push(innerAlbumView, {
                                                                                 mainTitle: innerMainTitle,
                                                                                 secondaryTitle: innerSecondaryTitle,
                                                                                 image: innerImage,
                                                                                 stackView: localArtists.stackView
                                                                             })
 
                                             }
                                             onGoBack: localArtists.stackView.pop()
 
                                             Binding {
                                                 target: allArtistsView
                                                 property: 'filterState'
                                                 value: persistentSettings.filterState
                                             }
 
                                             onFilterViewChanged: persistentSettings.filterState = filterState
                                         }
 
                                         visible: opacity > 0
                                     }
 
                                     MediaBrowser {
                                         id: localTracks
 
                                         focus: true
 
                                         anchors {
                                             fill: parent
 
                                             leftMargin: elisaTheme.layoutHorizontalMargin
                                             rightMargin: elisaTheme.layoutHorizontalMargin
                                         }
 
                                         firstPage: MediaAllTracksView {
                                             id: allTracksView
                                             focus: true
                                             stackView: localTracks.stackView
 
                                             contentModel: elisa.allTracksProxyModel
 
                                             Binding {
                                                 target: allTracksView
                                                 property: 'filterState'
                                                 value: persistentSettings.filterState
                                             }
 
                                             onFilterViewChanged: persistentSettings.filterState = filterState
                                         }
 
                                         visible: opacity > 0
                                     }
 
                                     Behavior on border.color {
                                         ColorAnimation {
                                             duration: 300
                                         }
                                     }
                                 }
                             }
 
                             Rectangle {
                                 id: firstViewSeparatorItem
 
                                 border.width: 1
                                 border.color: myPalette.mid
                                 color: myPalette.mid
                                 visible: true
 
                                 Layout.bottomMargin: elisaTheme.layoutVerticalMargin
                                 Layout.topMargin: elisaTheme.layoutVerticalMargin
 
                                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                                 Layout.fillHeight: true
 
                                 Layout.preferredWidth: 1
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                             }
 
                             MediaPlayListView {
                                 id: playList
 
                                 playListModel: elisa.mediaPlayList
 
                                 randomPlayChecked: elisa.mediaPlayList.randomPlay
                                 repeatPlayChecked: elisa.mediaPlayList.repeatPlay
 
                                 Layout.fillHeight: true
                                 Layout.leftMargin: elisaTheme.layoutHorizontalMargin
                                 Layout.rightMargin: elisaTheme.layoutHorizontalMargin
 
                                 Layout.minimumWidth: contentZone.width
                                 Layout.maximumWidth: contentZone.width
                                 Layout.preferredWidth: contentZone.width
 
                                 onStartPlayback: manageAudioPlayer.ensurePlay()
 
                                 onPausePlayback: manageAudioPlayer.playPause()
 
                                 onDisplayError: messageNotification.showNotification(errorText)
                             }
 
                             Rectangle {
                                 id: viewSeparatorItem
 
                                 border.width: 1
                                 border.color: myPalette.mid
                                 color: myPalette.mid
                                 visible: Layout.minimumWidth != 0
 
                                 Layout.bottomMargin: elisaTheme.layoutVerticalMargin
                                 Layout.topMargin: elisaTheme.layoutVerticalMargin
 
                                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                                 Layout.fillHeight: true
 
                                 Layout.preferredWidth: 1
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                             }
 
                             ContextView {
                                 id: albumContext
 
                                 Layout.fillHeight: true
 
                                 Layout.minimumWidth: contentZone.width
                                 Layout.maximumWidth: contentZone.width
                                 Layout.preferredWidth: contentZone.width
 
                                 visible: Layout.minimumWidth != 0
 
                                 artistName: myHeaderBarManager.artist
                                 albumName: myHeaderBarManager.album
                                 albumArtUrl: myHeaderBarManager.image
                             }
                         }
                     }
 
                     states: [
                         State {
                             name: 'full'
                             when: listViews.currentIndex === 0
                             PropertyChanges {
                                 target: mainContentView
                                 Layout.fillWidth: false
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: firstViewSeparatorItem
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: playList
                                 Layout.minimumWidth: contentZone.width / 2
                                 Layout.maximumWidth: contentZone.width / 2
                                 Layout.preferredWidth: contentZone.width / 2
                             }
                             PropertyChanges {
                                 target: viewSeparatorItem
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                                 Layout.preferredWidth: 1
                             }
                             PropertyChanges {
                                 target: albumContext
                                 Layout.minimumWidth: contentZone.width / 2
                                 Layout.maximumWidth: contentZone.width / 2
                                 Layout.preferredWidth: contentZone.width / 2
                             }
                             PropertyChanges {
                                 target: localAlbums
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localArtists
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localTracks
                                 opacity: 0
                             }
                         },
                         State {
                             name: 'allAlbums'
                             when: listViews.currentIndex === 1
                             StateChangeScript {
                                 script: {
                                     localAlbums.stackView.pop({item: null, immediate: true})
                                 }
                             }
                             PropertyChanges {
                                 target: mainContentView
                                 Layout.fillWidth: true
                                 Layout.minimumWidth: contentZone.width * 0.66
                                 Layout.maximumWidth: contentZone.width * 0.68
                                 Layout.preferredWidth: contentZone.width * 0.68
                             }
                             PropertyChanges {
                                 target: firstViewSeparatorItem
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                                 Layout.preferredWidth: 1
                             }
                             PropertyChanges {
                                 target: playList
                                 Layout.minimumWidth: contentZone.width * 0.33
                                 Layout.maximumWidth: contentZone.width * 0.33
                                 Layout.preferredWidth: contentZone.width * 0.33
                             }
                             PropertyChanges {
                                 target: viewSeparatorItem
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: albumContext
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: localAlbums
                                 opacity: 1
                             }
                             PropertyChanges {
                                 target: localArtists
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localTracks
                                 opacity: 0
                             }
                         },
                         State {
                             name: 'allArtists'
                             when: listViews.currentIndex === 2
                             StateChangeScript {
                                 script: {
                                     localArtists.stackView.pop({item: null, immediate: true})
                                 }
                             }
                             PropertyChanges {
                                 target: mainContentView
                                 Layout.fillWidth: true
                                 Layout.minimumWidth: contentZone.width * 0.66
                                 Layout.maximumWidth: contentZone.width * 0.68
                                 Layout.preferredWidth: contentZone.width * 0.68
                             }
                             PropertyChanges {
                                 target: firstViewSeparatorItem
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                                 Layout.preferredWidth: 1
                             }
                             PropertyChanges {
                                 target: playList
                                 Layout.minimumWidth: contentZone.width * 0.33
                                 Layout.maximumWidth: contentZone.width * 0.33
                                 Layout.preferredWidth: contentZone.width * 0.33
                             }
                             PropertyChanges {
                                 target: viewSeparatorItem
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: albumContext
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: localAlbums
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localArtists
                                 opacity: 1
                             }
                             PropertyChanges {
                                 target: localTracks
                                 opacity: 0
                             }
                         },
                         State {
                             name: 'allTracks'
                             when: listViews.currentIndex === 3
                             PropertyChanges {
                                 target: mainContentView
                                 Layout.fillWidth: true
                                 Layout.minimumWidth: contentZone.width * 0.66
                                 Layout.maximumWidth: contentZone.width * 0.68
                                 Layout.preferredWidth: contentZone.width * 0.68
                             }
                             PropertyChanges {
                                 target: firstViewSeparatorItem
                                 Layout.minimumWidth: 1
                                 Layout.maximumWidth: 1
                                 Layout.preferredWidth: 1
                             }
                             PropertyChanges {
                                 target: playList
                                 Layout.minimumWidth: contentZone.width * 0.33
                                 Layout.maximumWidth: contentZone.width * 0.33
                                 Layout.preferredWidth: contentZone.width * 0.33
                             }
                             PropertyChanges {
                                 target: viewSeparatorItem
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: albumContext
                                 Layout.minimumWidth: 0
                                 Layout.maximumWidth: 0
                                 Layout.preferredWidth: 0
                             }
                             PropertyChanges {
                                 target: localAlbums
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localArtists
                                 opacity: 0
                             }
                             PropertyChanges {
                                 target: localTracks
                                 opacity: 1
                             }
                         }
                     ]
                     transitions: Transition {
                         NumberAnimation {
                             properties: "Layout.minimumWidth, Layout.maximumWidth, Layout.preferredWidth, opacity"
                             easing.type: Easing.InOutQuad
                             duration: 300
                         }
                     }
                 }
             }
         }
     }
 
     Component {
         id: innerAlbumView
 
         GridBrowserView {
             id: innerAlbumGridView
             property var stackView
 
             contentModel: elisa.singleArtistProxyModel
 
             isSubPage: true
 
             onOpen: {
                 elisa.singleAlbumProxyModel.loadAlbumData(databaseId)
                 localArtists.stackView.push(albumView, {
                                                 stackView: localArtists.stackView,
                                                 albumName: innerMainTitle,
                                                 artistName: innerSecondaryTitle,
                                                 albumArtUrl: innerImage,
                                             })
             }
             onGoBack: stackView.pop()
 
             Binding {
                 target: innerAlbumGridView
                 property: 'filterState'
                 value: persistentSettings.filterState
             }
 
             onFilterViewChanged: persistentSettings.filterState = filterState
         }
     }
 
     Component {
         id: albumView
 
         MediaAlbumView {
             id: albumGridView
             property var stackView
 
             contentModel: elisa.singleAlbumProxyModel
 
             onShowArtist: {
                 listViews.currentIndex = 2
                 if (localArtists.stackView.depth === 3) {
                     localArtists.stackView.pop()
                 }
                 if (localArtists.stackView.depth === 2) {
                     var artistPage = localArtists.stackView.get(1)
                     if (artistPage.mainTitle === name) {
                         return
                     } else {
                         localArtists.stackView.pop()
                     }
                 }
                 allArtistsView.open(name, name, elisaTheme.defaultArtistImage, '')
             }
             onGoBack: stackView.pop()
 
             Binding {
                 target: albumGridView
                 property: 'filterState'
                 value: persistentSettings.filterState
             }
 
             onFilterViewChanged: persistentSettings.filterState = filterState
         }
     }
 
     Component.onCompleted:
     {
         elisa.initialize()
 
         elisa.mediaPlayList.randomPlay = Qt.binding(function() { return playList.randomPlayChecked })
         elisa.mediaPlayList.repeatPlay = Qt.binding(function() { return playList.repeatPlayChecked })
         myPlayControlManager.randomOrContinuePlay = Qt.binding(function() { return playList.randomPlayChecked || playList.repeatPlayChecked })
 
         if (persistentSettings.playListState) {
             elisa.mediaPlayList.persistentState = persistentSettings.playListState
         }
 
+
+        elisa.audioPlayer.muted = Qt.binding(function() { return headerBar.playerControl.muted })
+        elisa.audioPlayer.volume = Qt.binding(function() { return headerBar.playerControl.volume })
+        elisa.audioPlayer.source = Qt.binding(function() { return manageAudioPlayer.playerSource })
+
         elisa.mediaPlayList.enqueue(elisa.arguments)
+        volume: headerBar.playerControl.volume
     }
 }