Split into separate libraries

src/CMakeLists.txt

@@ -1,2 +1,71 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+add_subdirectory(utilities)
+add_subdirectory(core)
+add_subdirectory(mimedata)
+add_subdirectory(osd)
+add_subdirectory(tagreader)
+add_subdirectory(widgets)
+add_subdirectory(dialogs)
+add_subdirectory(engine)
+add_subdirectory(lyrics)
+add_subdirectory(filterparser)
+add_subdirectory(analyzer)
+add_subdirectory(transcoder)
+add_subdirectory(collection)
+add_subdirectory(playlist)
+add_subdirectory(playlistparsers)
+add_subdirectory(equalizer)
+add_subdirectory(edittagdialog)
+add_subdirectory(smartplaylists)
+add_subdirectory(settings)
+add_subdirectory(device)
+add_subdirectory(covermanager)
+add_subdirectory(fileview)
+add_subdirectory(player)
+add_subdirectory(radios)
+add_subdirectory(streaming)
+add_subdirectory(scrobbler)
+add_subdirectory(organize)
+add_subdirectory(context)
+add_subdirectory(queue)
+add_subdirectory(providers)
+add_subdirectory(songloader)
+add_subdirectory(systemtrayicon)
+
+if(HAVE_MUSICBRAINZ)
+  add_subdirectory(musicbrainz)
+endif()
+
+if(HAVE_GLOBALSHORTCUTS)
+  add_subdirectory(globalshortcuts)
+endif()
+
+if(HAVE_MOODBAR)
+  add_subdirectory(moodbar)
+endif()
+
+if(HAVE_MPRIS2)
+  add_subdirectory(mpris2)
+endif()
+
+if(HAVE_SUBSONIC)
+  add_subdirectory(subsonic)
+endif()
+
+if(HAVE_TIDAL)
+  add_subdirectory(tidal)
+endif()
+
+if(HAVE_SPOTIFY)
+  add_subdirectory(spotify)
+endif()
+
+if(HAVE_QOBUZ)
+  add_subdirectory(qobuz)
+endif()
+
+if(APPLE)
+  add_subdirectory(macstartup)
+endif()

src/analyzer/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(ANALYZER_SOURCES
+  fht.cpp
+  analyzerbase.cpp
+  analyzercontainer.cpp
+  blockanalyzer.cpp
+  boomanalyzer.cpp
+  turbineanalyzer.cpp
+  sonogramanalyzer.cpp
+  waverubberanalyzer.cpp
+  rainbowanalyzer.cpp
+)
+
+set(ANALYZER_HEADERS
+  analyzerbase.h
+  analyzercontainer.h
+  blockanalyzer.h
+  boomanalyzer.h
+  turbineanalyzer.h
+  sonogramanalyzer.h
+  waverubberanalyzer.h
+  rainbowanalyzer.h
+)
+
+qt_wrap_cpp(ANALYZER_SOURCES ${ANALYZER_HEADERS})
+
+add_library(strawberry_analyzer STATIC ${ANALYZER_SOURCES})
+
+target_include_directories(strawberry_analyzer PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_analyzer PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_engine
+)

src/collection/CMakeLists.txt

@@ -0,0 +1,82 @@
+set(COLLECTION_SOURCES
+  collectionlibrary.cpp
+  collectionmodel.cpp
+  collectionbackend.cpp
+  collectionwatcher.cpp
+  collectionview.cpp
+  collectionitemdelegate.cpp
+  collectionviewcontainer.cpp
+  collectiondirectorymodel.cpp
+  collectionfilteroptions.cpp
+  collectionfilterwidget.cpp
+  collectionfilter.cpp
+  collectionplaylistitem.cpp
+  collectionquery.cpp
+  savedgroupingmanager.cpp
+  groupbydialog.cpp
+  collectiontask.cpp
+  collectionmodelupdate.cpp
+  collectionitem.cpp
+)
+
+set(COLLECTION_HEADERS
+  collectionlibrary.h
+  collectionmodel.h
+  collectionbackend.h
+  collectionwatcher.h
+  collectionview.h
+  collectionitemdelegate.h
+  collectionviewcontainer.h
+  collectiondirectorymodel.h
+  collectionfilterwidget.h
+  collectionfilter.h
+  savedgroupingmanager.h
+  groupbydialog.h
+)
+
+set(COLLECTION_UI
+  groupbydialog.ui
+  collectionfilterwidget.ui
+  collectionviewcontainer.ui
+  savedgroupingmanager.ui
+)
+
+qt_wrap_cpp(COLLECTION_SOURCES ${COLLECTION_HEADERS})
+qt_wrap_ui(COLLECTION_SOURCES ${COLLECTION_UI})
+
+add_library(strawberry_collection STATIC ${COLLECTION_SOURCES})
+
+target_include_directories(strawberry_collection PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_collection PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_mimedata
+  strawberry_engine
+  strawberry_tagreader
+  strawberry_covermanager
+  strawberry_filterparser
+  strawberry_dialogs
+  strawberry_edittagdialog
+  strawberry_organize
+  strawberry_playlistparsers
+)

src/collection/collectionfilter.cpp

@@ -28,7 +28,7 @@
 #include <QUrl>
 
 #include "core/song.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "filterparser/filterparser.h"
 #include "filterparser/filtertree.h"
 #include "collectionbackend.h"

src/collection/collectionfilterwidget.cpp

@@ -53,7 +53,7 @@
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
-#include "ui_collectionfilterwidget.h"
+#include "collection/ui_collectionfilterwidget.h"
 #include "widgets/searchfield.h"
 #include "constants/collectionsettings.h"
 #include "constants/appearancesettings.h"

src/collection/collectionmodel.cpp

@@ -59,7 +59,7 @@
 #include "core/database.h"
 #include "core/iconloader.h"
 #include "core/settings.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectionbackend.h"

src/collection/collectionview.cpp

@@ -51,7 +51,7 @@
 #include <QContextMenuEvent>
 
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/musicstorage.h"
 #include "core/deletefiles.h"
 #include "core/settings.h"
@@ -69,7 +69,7 @@
 #  include "device/devicemanager.h"
 #  include "device/devicestatefiltermodel.h"
 #endif
-#include "dialogs/edittagdialog.h"
+#include "edittagdialog/edittagdialog.h"
 #include "dialogs/deleteconfirmationdialog.h"
 #include "organize/organizedialog.h"
 #include "organize/organizeerrordialog.h"

src/collection/collectionviewcontainer.cpp

@@ -26,7 +26,7 @@
 #include "collectionfilterwidget.h"
 #include "collectionview.h"
 #include "collectionviewcontainer.h"
-#include "ui_collectionviewcontainer.h"
+#include "collection/ui_collectionviewcontainer.h"
 
 CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(parent), ui_(new Ui_CollectionViewContainer) {
 

src/context/CMakeLists.txt

@@ -0,0 +1,32 @@
+set(CONTEXT_SOURCES
+  contextview.cpp
+  contextalbum.cpp
+)
+
+set(CONTEXT_HEADERS
+  contextview.h
+  contextalbum.h
+)
+
+qt_wrap_cpp(CONTEXT_SOURCES ${CONTEXT_HEADERS})
+
+add_library(strawberry_context STATIC ${CONTEXT_SOURCES})
+
+target_include_directories(strawberry_context PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_context PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_collection
+  strawberry_covermanager
+  strawberry_lyrics
+  strawberry_widgets
+)

src/core/CMakeLists.txt

@@ -0,0 +1,95 @@
+set(CORE_SOURCES
+  logging.cpp
+  commandlineoptions.cpp
+  database.cpp
+  memorydatabase.cpp
+  sqlquery.cpp
+  sqlrow.cpp
+  deletefiles.cpp
+  filesystemmusicstorage.cpp
+  filesystemwatcherinterface.cpp
+  mergedproxymodel.cpp
+  multisortfilterproxy.cpp
+  musicstorage.cpp
+  networkaccessmanager.cpp
+  threadsafenetworkdiskcache.cpp
+  networktimeouts.cpp
+  networkproxyfactory.cpp
+  qtfslistener.cpp
+  settings.cpp
+  settingsprovider.cpp
+  signalchecker.cpp
+  song.cpp
+  stylehelper.cpp
+  stylesheetloader.cpp
+  taskmanager.cpp
+  thread.cpp
+  urlhandlers.cpp
+  urlhandler.cpp
+  iconloader.cpp
+  standarditemiconloader.cpp
+  scopedtransaction.cpp
+  localredirectserver.cpp
+  temporaryfile.cpp
+  enginemetadata.cpp
+  platforminterface.cpp
+)
+
+set(CORE_HEADERS
+  logging.h
+  database.h
+  memorydatabase.h
+  deletefiles.h
+  filesystemwatcherinterface.h
+  mergedproxymodel.h
+  multisortfilterproxy.h
+  networkaccessmanager.h
+  threadsafenetworkdiskcache.h
+  networktimeouts.h
+  qtfslistener.h
+  settings.h
+  taskmanager.h
+  thread.h
+  urlhandlers.h
+  urlhandler.h
+  standarditemiconloader.h
+  stylesheetloader.h
+  localredirectserver.h
+)
+
+if(APPLE)
+  list(APPEND CORE_SOURCES scoped_nsautorelease_pool.mm)
+endif()
+
+if(WIN32)
+  list(APPEND CORE_SOURCES windows7thumbbar.cpp)
+  list(APPEND CORE_HEADERS windows7thumbbar.h)
+endif()
+
+qt_wrap_cpp(CORE_SOURCES ${CORE_HEADERS})
+
+add_library(strawberry_core STATIC ${CORE_SOURCES})
+
+target_include_directories(strawberry_core PRIVATE
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_core PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::SQLITE
+  ${TAGLIB_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  $<$<BOOL:${HAVE_GPOD}>:PkgConfig::LIBGPOD PkgConfig::GDK_PIXBUF>
+  $<$<BOOL:${WIN32}>:getopt-win::getopt>
+  strawberry_utilities
+)

src/covermanager/CMakeLists.txt

@@ -0,0 +1,119 @@
+set(COVERMANAGER_SOURCES
+  albumcovermanager.cpp
+  albumcovermanagerlist.cpp
+  albumcoverloader.cpp
+  albumcoverloaderoptions.cpp
+  albumcoverfetcher.cpp
+  albumcoverfetchersearch.cpp
+  albumcoversearcher.cpp
+  albumcoverexport.cpp
+  albumcoverexporter.cpp
+  albumcoverchoicecontroller.cpp
+  coverprovider.cpp
+  coverproviders.cpp
+  coversearchstatistics.cpp
+  coversearchstatisticsdialog.cpp
+  coverexportrunnable.cpp
+  currentalbumcoverloader.cpp
+  coverfromurldialog.cpp
+  jsoncoverprovider.cpp
+  lastfmcoverprovider.cpp
+  musicbrainzcoverprovider.cpp
+  discogscoverprovider.cpp
+  deezercoverprovider.cpp
+  musixmatchcoverprovider.cpp
+  opentidalcoverprovider.cpp
+)
+
+set(COVERMANAGER_HEADERS
+  albumcovermanager.h
+  albumcovermanagerlist.h
+  albumcoverloader.h
+  albumcoverfetcher.h
+  albumcoverfetchersearch.h
+  albumcoversearcher.h
+  albumcoverexport.h
+  albumcoverexporter.h
+  albumcoverchoicecontroller.h
+  coverprovider.h
+  coverproviders.h
+  coversearchstatisticsdialog.h
+  coverexportrunnable.h
+  currentalbumcoverloader.h
+  coverfromurldialog.h
+  jsoncoverprovider.h
+  lastfmcoverprovider.h
+  musicbrainzcoverprovider.h
+  discogscoverprovider.h
+  deezercoverprovider.h
+  musixmatchcoverprovider.h
+  opentidalcoverprovider.h
+)
+
+set(COVERMANAGER_UI
+  albumcoverexport.ui
+  albumcovermanager.ui
+  albumcoversearcher.ui
+  coversearchstatisticsdialog.ui
+  coverfromurldialog.ui
+)
+
+if(HAVE_TIDAL)
+  list(APPEND COVERMANAGER_SOURCES tidalcoverprovider.cpp)
+  list(APPEND COVERMANAGER_HEADERS tidalcoverprovider.h)
+endif()
+
+if(HAVE_SPOTIFY)
+  list(APPEND COVERMANAGER_SOURCES spotifycoverprovider.cpp)
+  list(APPEND COVERMANAGER_HEADERS spotifycoverprovider.h)
+endif()
+
+if(HAVE_QOBUZ)
+  list(APPEND COVERMANAGER_SOURCES qobuzcoverprovider.cpp)
+  list(APPEND COVERMANAGER_HEADERS qobuzcoverprovider.h)
+endif()
+
+qt_wrap_cpp(COVERMANAGER_SOURCES ${COVERMANAGER_HEADERS})
+qt_wrap_ui(COVERMANAGER_SOURCES ${COVERMANAGER_UI})
+
+add_library(strawberry_covermanager STATIC ${COVERMANAGER_SOURCES})
+
+target_include_directories(strawberry_covermanager PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_covermanager PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_tagreader
+  strawberry_collection
+  strawberry_streaming
+  strawberry_widgets
+)
+
+if(HAVE_SUBSONIC)
+  target_link_libraries(strawberry_covermanager PRIVATE strawberry_subsonic)
+endif()
+
+if(HAVE_TIDAL)
+  target_link_libraries(strawberry_covermanager PRIVATE strawberry_tidal)
+endif()
+
+if(HAVE_SPOTIFY)
+  target_link_libraries(strawberry_covermanager PRIVATE strawberry_spotify)
+endif()
+
+if(HAVE_QOBUZ)
+  target_link_libraries(strawberry_covermanager PRIVATE strawberry_qobuz)
+endif()

src/covermanager/albumcovermanager.cpp

@@ -69,7 +69,7 @@
 #include "core/settings.h"
 #include "core/database.h"
 #include "core/networkaccessmanager.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "utilities/strutils.h"
 #include "utilities/fileutils.h"
 #include "utilities/imageutils.h"

src/covermanager/albumcovermanagerlist.cpp

@@ -35,7 +35,7 @@
 
 #include "includes/scoped_ptr.h"
 #include "core/song.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "collection/collectionbackend.h"
 #include "albumcovermanager.h"
 #include "albumcovermanagerlist.h"

src/device/CMakeLists.txt

@@ -0,0 +1,115 @@
+set(DEVICE_SOURCES
+  connecteddevice.cpp
+  devicedatabasebackend.cpp
+  devicelister.cpp
+  devicemanager.cpp
+  devicestatefiltermodel.cpp
+  filesystemdevice.cpp
+  deviceviewcontainer.cpp
+  deviceview.cpp
+  deviceproperties.cpp
+  deviceinfo.cpp
+)
+
+set(DEVICE_HEADERS
+  connecteddevice.h
+  devicedatabasebackend.h
+  devicelister.h
+  devicemanager.h
+  devicestatefiltermodel.h
+  filesystemdevice.h
+  deviceviewcontainer.h
+  deviceview.h
+  deviceproperties.h
+)
+
+set(DEVICE_UI
+  deviceproperties.ui
+  deviceviewcontainer.ui
+)
+
+if(APPLE)
+  list(APPEND DEVICE_SOURCES macosdevicelister.mm)
+  list(APPEND DEVICE_HEADERS macosdevicelister.h)
+endif()
+
+if(UNIX)
+  list(APPEND DEVICE_SOURCES giolister.cpp)
+  list(APPEND DEVICE_HEADERS giolister.h)
+endif()
+
+if(HAVE_UDISKS2)
+  list(APPEND DEVICE_SOURCES udisks2lister.cpp)
+  list(APPEND DEVICE_HEADERS udisks2lister.h)
+  set_source_files_properties(org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE objectmanager INCLUDE includes/dbus_metatypes.h)
+  set_source_files_properties(org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE udisks2filesystem INCLUDE includes/dbus_metatypes.h)
+  set_source_files_properties(org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE udisks2block INCLUDE includes/dbus_metatypes.h)
+  set_source_files_properties(org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE udisks2drive INCLUDE includes/dbus_metatypes.h)
+  set_source_files_properties(org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE udisks2job INCLUDE includes/dbus_metatypes.h)
+  qt_add_dbus_interface(DEVICE_SOURCES org.freedesktop.DBus.ObjectManager.xml objectmanager)
+  qt_add_dbus_interface(DEVICE_SOURCES org.freedesktop.UDisks2.Filesystem.xml udisks2filesystem)
+  qt_add_dbus_interface(DEVICE_SOURCES org.freedesktop.UDisks2.Block.xml udisks2block)
+  qt_add_dbus_interface(DEVICE_SOURCES org.freedesktop.UDisks2.Drive.xml udisks2drive)
+  qt_add_dbus_interface(DEVICE_SOURCES org.freedesktop.UDisks2.Job.xml udisks2job)
+endif()
+
+if(HAVE_MTP)
+  list(APPEND DEVICE_SOURCES mtpconnection.cpp mtpdevice.cpp mtploader.cpp)
+  list(APPEND DEVICE_HEADERS mtpconnection.h mtpdevice.h mtploader.h)
+endif()
+
+if(HAVE_AUDIOCD)
+  list(APPEND DEVICE_SOURCES cddadevice.cpp cddalister.cpp cddasongloader.cpp)
+  list(APPEND DEVICE_HEADERS cddadevice.h cddalister.h cddasongloader.h)
+endif()
+
+if(HAVE_GPOD)
+  list(APPEND DEVICE_SOURCES gpoddevice.cpp gpodloader.cpp)
+  list(APPEND DEVICE_HEADERS gpoddevice.h gpodloader.h)
+endif()
+
+qt_wrap_cpp(DEVICE_SOURCES ${DEVICE_HEADERS})
+qt_wrap_ui(DEVICE_SOURCES ${DEVICE_UI})
+
+add_library(strawberry_device STATIC ${DEVICE_SOURCES})
+
+target_include_directories(strawberry_device PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_device PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  $<$<BOOL:${HAVE_GIO}>:PkgConfig::GIO>
+  $<$<BOOL:${HAVE_GIO_UNIX}>:PkgConfig::GIO_UNIX>
+  $<$<BOOL:${HAVE_AUDIOCD}>:PkgConfig::LIBCDIO>
+  $<$<BOOL:${HAVE_MTP}>:PkgConfig::LIBMTP>
+  $<$<BOOL:${HAVE_GPOD}>:PkgConfig::LIBGPOD PkgConfig::GDK_PIXBUF>
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_collection
+  strawberry_widgets
+  strawberry_musicbrainz
+)
+
+if(APPLE)
+  target_link_libraries(strawberry_device PRIVATE
+    "-framework IOKit"
+    "-framework DiskArbitration"
+  )
+endif()

src/device/deviceview.cpp

@@ -53,7 +53,7 @@
 #include "core/iconloader.h"
 #include "core/deletefiles.h"
 #include "core/mergedproxymodel.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/musicstorage.h"
 #include "utilities/colorutils.h"
 #include "organize/organizedialog.h"

src/dialogs/CMakeLists.txt

@@ -0,0 +1,59 @@
+set(DIALOGS_SOURCES
+  about.cpp
+  console.cpp
+  errordialog.cpp
+  addstreamdialog.cpp
+  userpassdialog.cpp
+  deleteconfirmationdialog.cpp
+  lastfmimportdialog.cpp
+  messagedialog.cpp
+  snapdialog.cpp
+  saveplaylistsdialog.cpp
+)
+
+set(DIALOGS_HEADERS
+  about.h
+  errordialog.h
+  console.h
+  addstreamdialog.h
+  userpassdialog.h
+  deleteconfirmationdialog.h
+  lastfmimportdialog.h
+  messagedialog.h
+  snapdialog.h
+  saveplaylistsdialog.h
+)
+
+set(DIALOGS_UI
+  about.ui
+  errordialog.ui
+  console.ui
+  addstreamdialog.ui
+  userpassdialog.ui
+  lastfmimportdialog.ui
+  messagedialog.ui
+  saveplaylistsdialog.ui
+)
+
+qt_wrap_cpp(DIALOGS_SOURCES ${DIALOGS_HEADERS})
+qt_wrap_ui(DIALOGS_SOURCES ${DIALOGS_UI})
+
+add_library(strawberry_dialogs STATIC ${DIALOGS_SOURCES})
+
+target_include_directories(strawberry_dialogs PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_dialogs PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+)

src/dialogs/about.h

@@ -29,7 +29,7 @@
 #include <QList>
 #include <QString>
 
-#include "ui_about.h"
+#include "dialogs/ui_about.h"
 
 class QWidget;
 

src/dialogs/addstreamdialog.h

@@ -25,7 +25,7 @@
 #include <QUrl>
 #include <QLineEdit>
 
-#include "ui_addstreamdialog.h"
+#include "dialogs/ui_addstreamdialog.h"
 
 class AddStreamDialog : public QDialog {
   Q_OBJECT

src/dialogs/console.h

@@ -29,7 +29,7 @@
 #include <QDialog>
 #include <QString>
 
-#include "ui_console.h"
+#include "dialogs/ui_console.h"
 
 #include "includes/shared_ptr.h"
 

src/dialogs/lastfmimportdialog.h

@@ -28,7 +28,7 @@
 
 #include "includes/shared_ptr.h"
 
-#include "ui_lastfmimportdialog.h"
+#include "dialogs/ui_lastfmimportdialog.h"
 
 class QCloseEvent;
 class LastFMImport;

src/dialogs/saveplaylistsdialog.h

@@ -25,7 +25,7 @@
 #include <QLineEdit>
 #include <QComboBox>
 
-#include "ui_saveplaylistsdialog.h"
+#include "dialogs/ui_saveplaylistsdialog.h"
 
 class SavePlaylistsDialog : public QDialog {
  Q_OBJECT

src/edittagdialog/CMakeLists.txt

@@ -0,0 +1,44 @@
+set(EDITTAGDIALOG_SOURCES
+  edittagdialog.cpp
+  trackselectiondialog.cpp
+)
+
+set(EDITTAGDIALOG_HEADERS
+  edittagdialog.h
+  trackselectiondialog.h
+)
+
+set(EDITTAGDIALOG_UI
+  edittagdialog.ui
+  trackselectiondialog.ui
+)
+
+qt_wrap_cpp(EDITTAGDIALOG_SOURCES ${EDITTAGDIALOG_HEADERS})
+qt_wrap_ui(EDITTAGDIALOG_SOURCES ${EDITTAGDIALOG_UI})
+
+add_library(strawberry_edittagdialog STATIC ${EDITTAGDIALOG_SOURCES})
+
+target_include_directories(strawberry_edittagdialog PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_edittagdialog PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_utilities
+  strawberry_tagreader
+  strawberry_covermanager
+  strawberry_widgets
+  strawberry_collection
+  strawberry_lyrics
+)

src/engine/CMakeLists.txt

@@ -0,0 +1,89 @@
+set(ENGINE_SOURCES
+  enginebase.cpp
+  enginedevice.cpp
+  devicefinders.cpp
+  devicefinder.cpp
+  gststartup.cpp
+  gstengine.cpp
+  gstenginepipeline.cpp
+)
+
+set(ENGINE_HEADERS
+  enginebase.h
+  devicefinders.h
+  gststartup.h
+  gstengine.h
+  gstenginepipeline.h
+)
+
+if(HAVE_ALSA)
+  list(APPEND ENGINE_SOURCES alsadevicefinder.cpp alsapcmdevicefinder.cpp)
+endif()
+
+if(HAVE_PULSE)
+  list(APPEND ENGINE_SOURCES pulsedevicefinder.cpp)
+endif()
+
+if(MSVC)
+  list(APPEND ENGINE_SOURCES uwpdevicefinder.cpp asiodevicefinder.cpp)
+endif()
+
+if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
+  list(APPEND ENGINE_SOURCES chromaprinter.cpp)
+endif()
+
+if(HAVE_EBUR128)
+  list(APPEND ENGINE_SOURCES ebur128analysis.cpp)
+endif()
+
+if(HAVE_MOODBAR)
+  list(APPEND ENGINE_SOURCES gstfastspectrumplugin.cpp gstfastspectrum.cpp)
+endif()
+
+if(APPLE)
+  list(APPEND ENGINE_SOURCES macosdevicefinder.cpp)
+endif()
+
+if(WIN32)
+  list(APPEND ENGINE_SOURCES directsounddevicefinder.cpp mmdevicefinder.cpp)
+endif()
+
+qt_wrap_cpp(ENGINE_SOURCES ${ENGINE_HEADERS})
+
+add_library(strawberry_engine STATIC ${ENGINE_SOURCES})
+
+target_include_directories(strawberry_engine PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_engine PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  $<$<BOOL:${HAVE_ALSA}>:ALSA::ALSA>
+  $<$<BOOL:${HAVE_PULSE}>:PkgConfig::LIBPULSE>
+  $<$<BOOL:${WIN32}>:dsound>
+  $<$<BOOL:${MSVC}>:WindowsApp>
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  $<$<BOOL:${HAVE_SONGFINGERPRINTING} OR ${HAVE_MUSICBRAINZ}>:PkgConfig::CHROMAPRINT>
+  $<$<BOOL:${HAVE_EBUR128}>:PkgConfig::LIBEBUR128>
+  $<$<BOOL:${HAVE_MOODBAR}>:PkgConfig::FFTW3>
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  strawberry_core
+)
+
+if(APPLE)
+  target_link_libraries(strawberry_engine PRIVATE
+    "-framework CoreAudio"
+  )
+endif()

src/equalizer/CMakeLists.txt

@@ -0,0 +1,36 @@
+set(EQUALIZER_SOURCES
+  equalizer.cpp
+  equalizerslider.cpp
+)
+
+set(EQUALIZER_HEADERS
+  equalizer.h
+  equalizerslider.h
+)
+
+set(EQUALIZER_UI
+  equalizer.ui
+  equalizerslider.ui
+)
+
+qt_wrap_cpp(EQUALIZER_SOURCES ${EQUALIZER_HEADERS})
+qt_wrap_ui(EQUALIZER_SOURCES ${EQUALIZER_UI})
+
+add_library(strawberry_equalizer STATIC ${EQUALIZER_SOURCES})
+
+target_include_directories(strawberry_equalizer PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_equalizer PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_widgets
+)

src/fileview/CMakeLists.txt

@@ -0,0 +1,35 @@
+set(FILEVIEW_SOURCES
+  fileview.cpp
+  fileviewlist.cpp
+)
+
+set(FILEVIEW_HEADERS
+  fileview.h
+  fileviewlist.h
+)
+
+set(FILEVIEW_UI
+  fileview.ui
+)
+
+qt_wrap_cpp(FILEVIEW_SOURCES ${FILEVIEW_HEADERS})
+qt_wrap_ui(FILEVIEW_SOURCES ${FILEVIEW_UI})
+
+add_library(strawberry_fileview STATIC ${FILEVIEW_SOURCES})
+
+target_include_directories(strawberry_fileview PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_fileview PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_mimedata
+  strawberry_dialogs
+  strawberry_organize
+)

src/fileview/fileview.cpp

@@ -41,7 +41,7 @@
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/settings.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "dialogs/deleteconfirmationdialog.h"
 #include "fileview.h"
 #include "fileviewlist.h"

src/fileview/fileviewlist.cpp

@@ -32,7 +32,7 @@
 #include <QtEvents>
 
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "utilities/filemanagerutils.h"
 #include "fileviewlist.h"
 

src/filterparser/CMakeLists.txt

@@ -0,0 +1,52 @@
+set(SOURCES
+  filterparser.cpp
+  filtertree.cpp
+  filtertreeand.cpp
+  filtertreecolumnterm.cpp
+  filtertreenop.cpp
+  filtertreenot.cpp
+  filtertreeor.cpp
+  filtertreeterm.cpp
+  filterparserfloateqcomparator.cpp
+  filterparserfloatgecomparator.cpp
+  filterparserfloatgtcomparator.cpp
+  filterparserfloatlecomparator.cpp
+  filterparserfloatltcomparator.cpp
+  filterparserfloatnecomparator.cpp
+  filterparserint64eqcomparator.cpp
+  filterparserint64gecomparator.cpp
+  filterparserint64gtcomparator.cpp
+  filterparserint64lecomparator.cpp
+  filterparserint64ltcomparator.cpp
+  filterparserint64necomparator.cpp
+  filterparserinteqcomparator.cpp
+  filterparserintgecomparator.cpp
+  filterparserintgtcomparator.cpp
+  filterparserintlecomparator.cpp
+  filterparserintltcomparator.cpp
+  filterparserintnecomparator.cpp
+  filterparsersearchtermcomparator.cpp
+  filterparsertextcontainscomparator.cpp
+  filterparsertexteqcomparator.cpp
+  filterparsertextnecomparator.cpp
+  filterparseruinteqcomparator.cpp
+  filterparseruintgecomparator.cpp
+  filterparseruintgtcomparator.cpp
+  filterparseruintlecomparator.cpp
+  filterparseruintltcomparator.cpp
+  filterparseruintnecomparator.cpp
+)
+
+add_library(strawberry_filterparser STATIC ${SOURCES})
+
+target_include_directories(strawberry_filterparser PRIVATE
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_filterparser PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+)

src/globalshortcuts/CMakeLists.txt

@@ -0,0 +1,64 @@
+set(GLOBALSHORTCUTS_SOURCES globalshortcutsmanager.cpp globalshortcutsbackend.cpp globalshortcutgrabber.cpp)
+set(GLOBALSHORTCUTS_HEADERS globalshortcutsmanager.h globalshortcutsbackend.h globalshortcutgrabber.h)
+set(GLOBALSHORTCUTS_UI globalshortcutgrabber.ui)
+
+if(HAVE_KDE_GLOBALSHORTCUTS)
+  list(APPEND GLOBALSHORTCUTS_SOURCES globalshortcutsbackend-kde.cpp globalshortcutsbackend-gnome.cpp globalshortcutsbackend-mate.cpp)
+  list(APPEND GLOBALSHORTCUTS_HEADERS globalshortcutsbackend-kde.h globalshortcutsbackend-gnome.h globalshortcutsbackend-mate.h)
+endif()
+
+if(HAVE_X11_GLOBALSHORTCUTS)
+  list(APPEND GLOBALSHORTCUTS_SOURCES globalshortcutsbackend-x11.cpp globalshortcut.cpp globalshortcut-x11.cpp)
+  list(APPEND GLOBALSHORTCUTS_HEADERS globalshortcutsbackend-x11.h globalshortcut.h)
+endif()
+
+if(APPLE)
+  list(APPEND GLOBALSHORTCUTS_SOURCES globalshortcutsbackend-macos.mm globalshortcutgrabber.mm)
+  list(APPEND GLOBALSHORTCUTS_HEADERS globalshortcutsbackend-macos.h globalshortcutgrabber.h)
+endif()
+
+if(WIN32)
+  list(APPEND GLOBALSHORTCUTS_SOURCES globalshortcutsbackend-win.cpp globalshortcut.cpp globalshortcut-win.cpp)
+  list(APPEND GLOBALSHORTCUTS_HEADERS globalshortcutsbackend-win.h globalshortcut.h)
+endif()
+
+if(HAVE_KDE_GLOBALSHORTCUTS)
+  qt_add_dbus_interface(GLOBALSHORTCUTS_SOURCES org.kde.KGlobalAccel.xml kglobalaccel)
+  qt_add_dbus_interface(GLOBALSHORTCUTS_SOURCES org.kde.KGlobalAccel.Component.xml kglobalaccelcomponent)
+endif()
+
+if(HAVE_GNOME_GLOBALSHORTCUTS)
+  qt_add_dbus_interface(GLOBALSHORTCUTS_SOURCES org.gnome.SettingsDaemon.MediaKeys.xml gnomesettingsdaemon)
+endif()
+
+if(HAVE_MATE_GLOBALSHORTCUTS)
+  qt_add_dbus_interface(GLOBALSHORTCUTS_SOURCES org.mate.SettingsDaemon.MediaKeys.xml matesettingsdaemon)
+endif()
+
+qt_wrap_cpp(GLOBALSHORTCUTS_SOURCES ${GLOBALSHORTCUTS_HEADERS})
+qt_wrap_ui(GLOBALSHORTCUTS_SOURCES ${GLOBALSHORTCUTS_UI})
+
+add_library(strawberry_globalshortcuts STATIC ${GLOBALSHORTCUTS_SOURCES})
+
+target_include_directories(strawberry_globalshortcuts PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_globalshortcuts PRIVATE
+  $<$<BOOL:${HAVE_X11_GLOBALSHORTCUTS}>:X11::X11_xcb>
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
+  strawberry_core
+)
+
+if(APPLE)
+  target_link_libraries(strawberry_globalshortcuts PRIVATE
+    "-framework ScriptingBridge"
+    strawberry_macstartup
+  )
+endif()

src/globalshortcuts/globalshortcutgrabber.cpp

@@ -32,7 +32,7 @@
 #include <QKeyEvent>
 
 #include "globalshortcutgrabber.h"
-#include "ui_globalshortcutgrabber.h"
+#include "globalshortcuts/ui_globalshortcutgrabber.h"
 
 using namespace Qt::Literals::StringLiterals;
 

src/globalshortcuts/globalshortcutgrabber.mm

@@ -29,7 +29,7 @@
 
 #include <QKeySequence>
 
-#import "core/mac_startup.h"
+#import "macstartup/mac_startup.h"
 
 class MacMonitorWrapper {
  public:

src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp

@@ -35,8 +35,8 @@
 
 #include "globalshortcutsbackend-kglobalaccel.h"
 
-#include "kglobalaccel.h"
+#include "globalshortcuts/kglobalaccel.h"
-#include "kglobalaccelcomponent.h"
+#include "globalshortcuts/kglobalaccelcomponent.h"
 
 using namespace Qt::Literals::StringLiterals;
 

src/globalshortcuts/globalshortcutsbackend-macos.mm

@@ -38,7 +38,7 @@
 
 #include "globalshortcutsmanager.h"
 #include "core/logging.h"
-#include "core/mac_startup.h"
+#include "macstartup/mac_startup.h"
 
 #import "includes/SBSystemPreferences.h"
 

src/lyrics/CMakeLists.txt

@@ -0,0 +1,60 @@
+set(LYRICS_SOURCES
+  lyricsproviders.cpp
+  lyricsprovider.cpp
+  lyricssearchrequest.h
+  lyricssearchresult.h
+  lyricsfetcher.cpp
+  lyricsfetchersearch.cpp
+  jsonlyricsprovider.cpp
+  htmllyricsprovider.cpp
+  ovhlyricsprovider.cpp
+  lololyricsprovider.cpp
+  geniuslyricsprovider.cpp
+  musixmatchlyricsprovider.cpp
+  chartlyricsprovider.cpp
+  songlyricscomlyricsprovider.cpp
+  azlyricscomlyricsprovider.cpp
+  elyricsnetlyricsprovider.cpp
+  letraslyricsprovider.cpp
+  lyricfindlyricsprovider.cpp
+)
+
+set(LYRICS_HEADERS
+  lyricsproviders.h
+  lyricsprovider.h
+  lyricsfetcher.h
+  lyricsfetchersearch.h
+  jsonlyricsprovider.h
+  htmllyricsprovider.h
+  ovhlyricsprovider.h
+  lololyricsprovider.h
+  geniuslyricsprovider.h
+  musixmatchlyricsprovider.h
+  chartlyricsprovider.h
+  songlyricscomlyricsprovider.h
+  azlyricscomlyricsprovider.h
+  elyricsnetlyricsprovider.h
+  letraslyricsprovider.h
+  lyricfindlyricsprovider.h
+)
+
+qt_wrap_cpp(LYRICS_SOURCES ${LYRICS_HEADERS})
+
+add_library(strawberry_lyrics STATIC ${LYRICS_SOURCES})
+
+target_include_directories(strawberry_lyrics PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_lyrics PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_providers
+)

src/macstartup/CMakeLists.txt

@@ -0,0 +1,22 @@
+set(MACSTARTUP_SOURCES mac_startup.mm)
+
+add_library(strawberry_macstartup STATIC ${MACSTARTUP_SOURCES})
+
+target_include_directories(strawberry_macstartup PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_macstartup PRIVATE
+  "-framework Foundation"
+  "-framework AppKit"
+  "-framework IOKit"
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Widgets
+  SPMediaKeyTap
+  strawberry_utilities
+  strawberry_core
+  strawberry_globalshortcuts
+)

src/main/application.cpp

@@ -44,7 +44,7 @@
 #include "core/database.h"
 #include "core/taskmanager.h"
 #include "core/networkaccessmanager.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "tagreader/tagreaderclient.h"
 #include "engine/devicefinders.h"
 #include "core/urlhandlers.h"

src/main/main.cpp

@@ -82,7 +82,7 @@
 
 #ifdef Q_OS_MACOS
 #  include "utilities/macosutils.h"
-#  include "core/mac_startup.h"
+#  include "macstartup/mac_startup.h"
 #endif
 
 #ifdef HAVE_MPRIS2
@@ -93,9 +93,9 @@
 #include "core/commandlineoptions.h"
 #include "core/networkproxyfactory.h"
 
-#include "core/application.h"
+#include "main/application.h"
-#include "core/metatypes.h"
+#include "main/metatypes.h"
-#include "core/mainwindow.h"
+#include "main/mainwindow.h"
 
 #ifdef Q_OS_MACOS
 #  include "systemtrayicon/macsystemtrayicon.h"
@@ -104,7 +104,7 @@
 #endif
 
 #ifdef HAVE_TRANSLATIONS
-#  include "core/translations.h"
+#  include "main/translations.h"
 #endif
 
 #include "constants/behavioursettings.h"

src/main/mainwindow.cpp

@@ -89,7 +89,7 @@
 #include "constants/mainwindowsettings.h"
 #include "includes/shared_ptr.h"
 #include "core/commandlineoptions.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/iconloader.h"
 #include "core/taskmanager.h"
 #include "core/song.h"
@@ -100,10 +100,10 @@
 #include "core/filesystemmusicstorage.h"
 #include "core/deletefiles.h"
 #include "core/settings.h"
-#include "core/player.h"
 #include "utilities/envutils.h"
 #include "utilities/filemanagerutils.h"
 #include "utilities/screenutils.h"
+#include "player/player.h"
 #include "engine/enginebase.h"
 #include "dialogs/errordialog.h"
 #include "dialogs/about.h"
@@ -112,8 +112,8 @@
 #include "dialogs/deleteconfirmationdialog.h"
 #include "dialogs/lastfmimportdialog.h"
 #include "dialogs/snapdialog.h"
-#include "dialogs/edittagdialog.h"
+#include "edittagdialog/edittagdialog.h"
-#include "dialogs/trackselectiondialog.h"
+#include "edittagdialog/trackselectiondialog.h"
 #include "organize/organizedialog.h"
 #include "widgets/fancytabwidget.h"
 #include "widgets/playingwidget.h"
@@ -213,7 +213,7 @@
 #endif
 
 #ifdef Q_OS_MACOS
-#  include "core/mac_startup.h"
+#  include "macstartup/mac_startup.h"
 #  include "systemtrayicon/macsystemtrayicon.h"
 #  include "utilities/macosutils.h"
 #else

src/mimedata/CMakeLists.txt

@@ -0,0 +1,27 @@
+set(MIMEDATA_SOURCES
+  mimedata.cpp
+  songmimedata.cpp
+)
+
+set(MIMEDATA_HEADERS
+  mimedata.h
+  songmimedata.h
+)
+
+qt_wrap_cpp(MIMEDATA_SOURCES ${MIMEDATA_HEADERS})
+
+add_library(strawberry_mimedata STATIC ${MIMEDATA_SOURCES})
+
+target_include_directories(strawberry_mimedata PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_mimedata PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+  strawberry_core
+  strawberry_collection
+)

src/moodbar/CMakeLists.txt

@@ -0,0 +1,44 @@
+set(MOODBAR_SOURCES
+  moodbarbuilder.cpp
+  moodbarcontroller.cpp
+  moodbaritemdelegate.cpp
+  moodbarloader.cpp
+  moodbarpipeline.cpp
+  moodbarproxystyle.cpp
+  moodbarrenderer.cpp
+)
+
+set(MOODBAR_HEADERS
+  moodbarcontroller.h
+  moodbaritemdelegate.h
+  moodbarloader.h
+  moodbarpipeline.h
+  moodbarproxystyle.h
+)
+
+qt_wrap_cpp(MOODBAR_SOURCES ${MOODBAR_HEADERS})
+
+add_library(strawberry_moodbar STATIC ${MOODBAR_SOURCES})
+
+target_include_directories(strawberry_moodbar PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_moodbar PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+)

src/moodbar/moodbarcontroller.cpp

@@ -26,7 +26,7 @@
 #include "includes/shared_ptr.h"
 #include "core/song.h"
 #include "core/settings.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "engine/enginebase.h"
 #include "constants/moodbarsettings.h"
 

src/mpris2/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(MPRIS2_SOURCES
+  mpris2.cpp
+)
+
+set(MPRIS2_HEADERS
+  mpris2.h
+)
+
+qt_wrap_cpp(MPRIS2_SOURCES ${MPRIS2_HEADERS})
+
+qt_add_dbus_adaptor(MPRIS2_SOURCES org.mpris.MediaPlayer2.xml mpris2.h mpris::Mpris2 mpris2_root Mpris2Root)
+qt_add_dbus_adaptor(MPRIS2_SOURCES org.mpris.MediaPlayer2.Player.xml mpris2.h mpris::Mpris2 mpris2_player Mpris2Player)
+qt_add_dbus_adaptor(MPRIS2_SOURCES org.mpris.MediaPlayer2.TrackList.xml mpris2.h mpris::Mpris2 mpris2_tracklist Mpris2TrackList)
+qt_add_dbus_adaptor(MPRIS2_SOURCES org.mpris.MediaPlayer2.Playlists.xml mpris2.h mpris::Mpris2 mpris2_playlists Mpris2Playlists)
+
+add_library(strawberry_mpris2 STATIC ${MPRIS2_SOURCES})
+
+target_include_directories(strawberry_mpris2 PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_mpris2 PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::DBus
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_engine
+  strawberry_player
+)

src/mpris2/mpris2.cpp

@@ -48,7 +48,7 @@
 
 #include "constants/timeconstants.h"
 #include "core/song.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "engine/enginebase.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistitem.h"

src/musicbrainz/CMakeLists.txt

@@ -0,0 +1,40 @@
+set(MUSICBRAINZ_SOURCES
+  acoustidclient.cpp
+  musicbrainzclient.cpp
+  tagfetcher.cpp
+)
+
+set(MUSICBRAINZ_HEADERS
+  acoustidclient.h
+  musicbrainzclient.h
+  tagfetcher.h
+)
+
+qt_wrap_cpp(MUSICBRAINZ_SOURCES ${MUSICBRAINZ_HEADERS})
+
+add_library(strawberry_musicbrainz STATIC ${MUSICBRAINZ_SOURCES})
+
+target_include_directories(strawberry_musicbrainz PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_musicbrainz PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  strawberry_utilities
+  strawberry_core
+  strawberry_engine
+)

src/organize/CMakeLists.txt

@@ -0,0 +1,55 @@
+set(ORGANIZE_SOURCES
+  organize.cpp
+  organizeformat.cpp
+  organizeformatvalidator.cpp
+  organizesyntaxhighlighter.cpp
+  organizedialog.cpp
+  organizeerrordialog.cpp
+)
+
+set(ORGANIZE_HEADERS
+  organize.h
+  organizeformatvalidator.h
+  organizesyntaxhighlighter.h
+  organizedialog.h
+  organizeerrordialog.h
+)
+
+set(ORGANIZE_UI
+  organizedialog.ui
+  organizeerrordialog.ui
+)
+
+qt_wrap_cpp(ORGANIZE_SOURCES ${ORGANIZE_HEADERS})
+qt_wrap_ui(ORGANIZE_SOURCES ${ORGANIZE_UI})
+
+add_library(strawberry_organize STATIC ${ORGANIZE_SOURCES})
+
+target_include_directories(strawberry_organize PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_organize PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_tagreader
+  strawberry_widgets
+  strawberry_collection
+)

src/osd/CMakeLists.txt

@@ -0,0 +1,46 @@
+set(OSD_SOURCES osdbase.cpp osdpretty.cpp)
+set(OSD_HEADERS osdbase.h osdpretty.h)
+set(OSD_UI osdpretty.ui)
+
+if(APPLE)
+  list(APPEND OSD_SOURCES osdmac.mm)
+  list(APPEND OSD_HEADERS osdmac.h)
+endif()
+
+if(HAVE_DBUS)
+  list(APPEND OSD_SOURCES osddbus.cpp)
+  list(APPEND OSD_HEADERS osddbus.h)
+  qt_add_dbus_interface(OSD_SOURCES org.freedesktop.Notifications.xml notification)
+endif()
+
+qt_wrap_cpp(OSD_SOURCES ${OSD_HEADERS})
+qt_wrap_ui(OSD_SOURCES ${OSD_UI})
+
+add_library(strawberry_osd STATIC ${OSD_SOURCES})
+
+target_include_directories(strawberry_osd PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+if(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+  target_include_directories(strawberry_osd SYSTEM PRIVATE ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
+endif()
+
+target_link_libraries(strawberry_osd PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::SQLITE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_systemtrayicon
+)

src/osd/osdpretty.cpp

@@ -59,7 +59,7 @@
 #include "constants/notificationssettings.h"
 
 #include "osdpretty.h"
-#include "ui_osdpretty.h"
+#include "osd/ui_osdpretty.h"
 
 #ifdef Q_OS_WIN
 #  include <windows.h>

src/player/CMakeLists.txt

@@ -0,0 +1,42 @@
+set(PLAYER_SOURCES
+  playerinterface.cpp
+  player.cpp
+)
+
+set(PLAYER_HEADERS
+  playerinterface.h
+  player.h
+)
+
+qt_wrap_cpp(PLAYER_SOURCES ${PLAYER_HEADERS})
+
+add_library(strawberry_player STATIC ${PLAYER_SOURCES})
+
+target_include_directories(strawberry_player PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_player PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_engine
+  strawberry_collection
+  strawberry_playlist
+  strawberry_equalizer
+  strawberry_analyzer
+)

src/playlist/CMakeLists.txt

@@ -0,0 +1,110 @@
+set(PLAYLIST_SOURCES
+  playlist.cpp
+  playlistbackend.cpp
+  playlistcontainer.cpp
+  playlistdelegates.cpp
+  playlistfilter.cpp
+  playlistheader.cpp
+  playlistitem.cpp
+  playlistitemmimedata.cpp
+  playlistlistcontainer.cpp
+  playlistlistmodel.cpp
+  playlistlistsortfiltermodel.cpp
+  playlistlistview.cpp
+  playlistmanagerinterface.cpp
+  playlistmanager.cpp
+  playlistsaveoptionsdialog.cpp
+  playlistsequence.cpp
+  playlisttabbar.cpp
+  playlistview.cpp
+  playlistproxystyle.cpp
+  songloaderinserter.cpp
+  songplaylistitem.cpp
+  dynamicplaylistcontrols.cpp
+  playlistundocommandbase.cpp
+  playlistundocommandinsertitems.cpp
+  playlistundocommandremoveitems.cpp
+  playlistundocommandmoveitems.cpp
+  playlistundocommandreorderitems.cpp
+  playlistundocommandsortitems.cpp
+  playlistundocommandshuffleitems.cpp
+)
+
+set(PLAYLIST_HEADERS
+  playlist.h
+  playlistbackend.h
+  playlistcontainer.h
+  playlistdelegates.h
+  playlistfilter.h
+  playlistheader.h
+  playlistlistcontainer.h
+  playlistlistmodel.h
+  playlistlistview.h
+  playlistlistsortfiltermodel.h
+  playlistmanagerinterface.h
+  playlistmanager.h
+  playlistsaveoptionsdialog.h
+  playlistsequence.h
+  playlisttabbar.h
+  playlistview.h
+  playlistproxystyle.h
+  playlistitemmimedata.h
+  songloaderinserter.h
+  dynamicplaylistcontrols.h
+)
+
+set(PLAYLIST_UI
+  playlistcontainer.ui
+  playlistlistcontainer.ui
+  playlistsaveoptionsdialog.ui
+  playlistsequence.ui
+  dynamicplaylistcontrols.ui
+)
+
+qt_wrap_cpp(PLAYLIST_SOURCES ${PLAYLIST_HEADERS})
+qt_wrap_ui(PLAYLIST_SOURCES ${PLAYLIST_UI})
+
+add_library(strawberry_playlist STATIC ${PLAYLIST_SOURCES})
+
+target_include_directories(strawberry_playlist PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_playlist PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_mimedata
+  strawberry_songloader
+  strawberry_tagreader
+  strawberry_collection
+  strawberry_dialogs
+  strawberry_queue
+  strawberry_filterparser
+  strawberry_covermanager
+  strawberry_widgets
+  strawberry_player
+  strawberry_smartplaylists
+  strawberry_radios
+  strawberry_device
+)
+
+if(HAVE_MOODBAR)
+  target_link_libraries(strawberry_playlist PRIVATE strawberry_moodbar)
+endif()

src/playlist/playlist.cpp

@@ -60,10 +60,10 @@
 
 #include "includes/shared_ptr.h"
 #include "core/logging.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/song.h"
 #include "core/settings.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "constants/timeconstants.h"
 #include "constants/playlistsettings.h"
 #include "tagreader/tagreaderclient.h"

src/playlist/playlistitemmimedata.h

@@ -26,7 +26,7 @@
 
 #include <QObject>
 
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "playlistitem.h"
 
 class PlaylistItemMimeData : public MimeData {

src/playlist/playlisttabbar.cpp

@@ -46,7 +46,7 @@
 #include "includes/shared_ptr.h"
 #include "core/logging.h"
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/settings.h"
 #include "widgets/favoritewidget.h"
 #include "widgets/renametablineedit.h"

src/playlist/playlistview.cpp

@@ -62,7 +62,7 @@
 #include "includes/qt_blurimage.h"
 #include "core/song.h"
 #include "core/settings.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "playlistmanager.h"
 #include "playlist.h"
 #include "playlistdelegates.h"

src/playlist/songloaderinserter.cpp

@@ -32,7 +32,7 @@
 #include "core/logging.h"
 #include "core/urlhandlers.h"
 #include "core/taskmanager.h"
-#include "core/songloader.h"
+#include "songloader/songloader.h"
 #include "playlist.h"
 #include "songloaderinserter.h"
 

src/playlistparsers/CMakeLists.txt

@@ -0,0 +1,47 @@
+set(PLAYLISTPARSERS_SOURCES
+  parserbase.cpp
+  playlistparser.cpp
+  asxiniparser.cpp
+  asxparser.cpp
+  cueparser.cpp
+  m3uparser.cpp
+  plsparser.cpp
+  wplparser.cpp
+  xmlparser.cpp
+  xspfparser.cpp
+)
+
+set(PLAYLISTPARSERS_HEADERS
+  parserbase.h
+  playlistparser.h
+  asxiniparser.h
+  asxparser.h
+  cueparser.h
+  m3uparser.h
+  plsparser.h
+  wplparser.h
+  xmlparser.h
+  xspfparser.h
+)
+
+qt_wrap_cpp(PLAYLISTPARSERS_SOURCES ${PLAYLISTPARSERS_HEADERS})
+
+add_library(strawberry_playlistparsers STATIC ${PLAYLISTPARSERS_SOURCES})
+
+target_include_directories(strawberry_playlistparsers PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_playlistparsers PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  strawberry_utilities
+  strawberry_core
+  strawberry_tagreader
+  strawberry_collection
+)

src/providers/CMakeLists.txt

@@ -0,0 +1,16 @@
+set(PROVIDERS_SOURCES
+  musixmatchprovider.cpp
+)
+
+add_library(strawberry_providers STATIC ${PROVIDERS_SOURCES})
+
+target_include_directories(strawberry_providers PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_providers PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+)

src/qobuz/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(QOBUZ_SOURCES
+  qobuzservice.cpp
+  qobuzurlhandler.cpp
+  qobuzbaserequest.cpp
+  qobuzrequest.cpp
+  qobuzstreamurlrequest.cpp
+  qobuzfavoriterequest.cpp
+)
+
+set(QOBUZ_HEADERS
+  qobuzservice.h
+  qobuzurlhandler.h
+  qobuzbaserequest.h
+  qobuzrequest.h
+  qobuzstreamurlrequest.h
+  qobuzfavoriterequest.h
+)
+
+qt_wrap_cpp(QOBUZ_SOURCES ${QOBUZ_HEADERS})
+qt_wrap_ui(QOBUZ_SOURCES ${QOBUZ_UI})
+
+add_library(strawberry_qobuz STATIC ${QOBUZ_SOURCES})
+
+target_include_directories(strawberry_qobuz PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_qobuz PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_collection
+  strawberry_streaming
+)

src/queue/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(QUEUE_SOURCES
+  queue.cpp
+  queueview.cpp
+)
+
+set(QUEUE_HEADERS
+  queue.h
+  queueview.h
+)
+
+set(QUEUE_UI
+  queueview.ui
+)
+
+qt_wrap_cpp(QUEUE_SOURCES ${QUEUE_HEADERS})
+qt_wrap_ui(QUEUE_SOURCES ${QUEUE_UI})
+
+add_library(strawberry_queue STATIC ${QUEUE_SOURCES})
+
+target_include_directories(strawberry_queue PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_queue PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_playlist
+)

src/radios/CMakeLists.txt

@@ -0,0 +1,54 @@
+set(RADIOS_SOURCES
+  radioservices.cpp
+  radiobackend.cpp
+  radiomodel.cpp
+  radioview.cpp
+  radioviewcontainer.cpp
+  radioservice.cpp
+  radioplaylistitem.cpp
+  radiochannel.cpp
+  somafmservice.cpp
+  radioparadiseservice.cpp
+  radiomimedata.cpp
+)
+
+set(RADIOS_HEADERS
+  radioservices.h
+  radiobackend.h
+  radiomodel.h
+  radioview.h
+  radioviewcontainer.h
+  radioservice.h
+  radiomimedata.h
+  somafmservice.h
+  radioparadiseservice.h
+)
+
+set(RADIOS_UI
+  radioviewcontainer.ui
+)
+
+qt_wrap_cpp(RADIOS_SOURCES ${RADIOS_HEADERS})
+qt_wrap_ui(RADIOS_SOURCES ${RADIOS_UI})
+
+add_library(strawberry_radios STATIC ${RADIOS_SOURCES})
+
+target_include_directories(strawberry_radios PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_radios PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_collection
+)

src/radios/radiomimedata.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/song.h"
 
 class RadioMimeData : public MimeData {

src/radios/radioview.cpp

@@ -27,7 +27,7 @@
 #include <QShowEvent>
 #include <QContextMenuEvent>
 
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/iconloader.h"
 #include "radiomodel.h"
 #include "radioview.h"

src/radios/radioviewcontainer.h

@@ -22,7 +22,7 @@
 
 #include <QWidget>
 
-#include "ui_radioviewcontainer.h"
+#include "radios/ui_radioviewcontainer.h"
 
 class RadioView;
 

src/scrobbler/CMakeLists.txt

@@ -0,0 +1,53 @@
+set(SCROBBLER_SOURCES
+  audioscrobbler.cpp
+  scrobblersettingsservice.cpp
+  scrobblerservice.cpp
+  scrobblercache.cpp
+  scrobblercacheitem.cpp
+  scrobblemetadata.cpp
+  scrobblingapi20.cpp
+  lastfmscrobbler.cpp
+  librefmscrobbler.cpp
+  listenbrainzscrobbler.cpp
+  lastfmimport.cpp
+)
+
+set(SCROBBLER_HEADERS
+  audioscrobbler.h
+  scrobblersettingsservice.h
+  scrobblerservice.h
+  scrobblercache.h
+  scrobblingapi20.h
+  lastfmscrobbler.h
+  librefmscrobbler.h
+  listenbrainzscrobbler.h
+  lastfmimport.h
+)
+
+if(HAVE_SUBSONIC)
+  list(APPEND SCROBBLER_SOURCES subsonicscrobbler.cpp)
+  list(APPEND SCROBBLER_HEADERS subsonicscrobbler.h)
+endif()
+
+qt_wrap_cpp(SCROBBLER_SOURCES ${SCROBBLER_HEADERS})
+
+add_library(strawberry_scrobbler STATIC ${SCROBBLER_SOURCES})
+
+target_include_directories(strawberry_scrobbler PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_scrobbler PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+)
+
+if(HAVE_SUBSONIC)
+  target_link_libraries(strawberry_scrobbler PRIVATE strawberry_subsonic)
+endif()

src/settings/CMakeLists.txt

@@ -0,0 +1,135 @@
+set(SETTINGS_SOURCES
+  settingsdialog.cpp
+  settingspage.cpp
+  settingsitemdelegate.cpp
+  behavioursettingspage.cpp
+  collectionsettingspage.cpp
+  collectionsettingsdirectorymodel.cpp
+  backendsettingspage.cpp
+  playlistsettingspage.cpp
+  scrobblersettingspage.cpp
+  coverssettingspage.cpp
+  lyricssettingspage.cpp
+  networkproxysettingspage.cpp
+  appearancesettingspage.cpp
+  contextsettingspage.cpp
+  notificationssettingspage.cpp
+  transcodersettingspage.cpp
+)
+
+set(SETTINGS_HEADERS
+  settingsdialog.h
+  settingspage.h
+  settingsitemdelegate.h
+  behavioursettingspage.h
+  collectionsettingspage.h
+  collectionsettingsdirectorymodel.h
+  backendsettingspage.h
+  playlistsettingspage.h
+  scrobblersettingspage.h
+  coverssettingspage.h
+  lyricssettingspage.h
+  networkproxysettingspage.h
+  appearancesettingspage.h
+  contextsettingspage.h
+  notificationssettingspage.h
+  transcodersettingspage.h
+)
+
+set(SETTINGS_UI
+  settingsdialog.ui
+  behavioursettingspage.ui
+  collectionsettingspage.ui
+  backendsettingspage.ui
+  contextsettingspage.ui
+  playlistsettingspage.ui
+  scrobblersettingspage.ui
+  coverssettingspage.ui
+  lyricssettingspage.ui
+  networkproxysettingspage.ui
+  appearancesettingspage.ui
+  notificationssettingspage.ui
+  transcodersettingspage.ui
+)
+
+if(HAVE_MOODBAR)
+  list(APPEND SETTINGS_SOURCES moodbarsettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS moodbarsettingspage.h)
+  list(APPEND SETTINGS_UI moodbarsettingspage.ui)
+endif()
+
+if(HAVE_SUBSONIC)
+  list(APPEND SETTINGS_SOURCES subsonicsettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS subsonicsettingspage.h)
+  list(APPEND SETTINGS_UI subsonicsettingspage.ui)
+endif()
+
+if(HAVE_TIDAL)
+  list(APPEND SETTINGS_SOURCES tidalsettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS tidalsettingspage.h)
+  list(APPEND SETTINGS_UI tidalsettingspage.ui)
+endif()
+
+if(HAVE_SPOTIFY)
+  list(APPEND SETTINGS_SOURCES spotifysettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS spotifysettingspage.h)
+  list(APPEND SETTINGS_UI spotifysettingspage.ui)
+endif()
+
+if(HAVE_QOBUZ)
+  list(APPEND SETTINGS_SOURCES qobuzsettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS qobuzsettingspage.h)
+  list(APPEND SETTINGS_UI qobuzsettingspage.ui)
+endif()
+
+if(HAVE_GLOBALSHORTCUTS)
+  list(APPEND SETTINGS_SOURCES globalshortcutssettingspage.cpp)
+  list(APPEND SETTINGS_HEADERS globalshortcutssettingspage.h)
+  list(APPEND SETTINGS_UI globalshortcutssettingspage.ui)
+endif()
+
+qt_wrap_cpp(SETTINGS_SOURCES ${SETTINGS_HEADERS})
+qt_wrap_ui(SETTINGS_SOURCES ${SETTINGS_UI})
+
+add_library(strawberry_settings STATIC ${SETTINGS_SOURCES})
+
+target_include_directories(strawberry_settings PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_settings PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_engine
+  strawberry_covermanager
+  strawberry_lyrics
+  strawberry_widgets
+  strawberry_osd
+  strawberry_transcoder
+  strawberry_streaming
+)
+
+if(HAVE_MOODBAR)
+  target_link_libraries(strawberry_settings PRIVATE strawberry_moodbar)
+endif()
+
+if(HAVE_GLOBALSHORTCUTS)
+  target_link_libraries(strawberry_settings PRIVATE strawberry_globalshortcuts)
+endif()

src/settings/backendsettingspage.cpp

@@ -45,7 +45,7 @@
 #include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/settings.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "engine/enginebase.h"
 #include "engine/enginedevice.h"
 #include "engine/devicefinders.h"

src/settings/settingsdialog.cpp

@@ -48,7 +48,7 @@
 #include <QCloseEvent>
 
 #include "core/settings.h"
-#include "core/player.h"
+#include "player/player.h"
 #include "utilities/screenutils.h"
 #include "widgets/groupediconview.h"
 #include "collection/collectionlibrary.h"

src/smartplaylists/CMakeLists.txt

@@ -0,0 +1,77 @@
+set(SMARTPLAYLISTS_SOURCES
+  playlistgenerator.cpp
+  playlistgeneratorinserter.cpp
+  playlistgeneratormimedata.cpp
+  playlistquerygenerator.cpp
+  smartplaylistquerywizardplugin.cpp
+  smartplaylistquerywizardpluginsortpage.cpp
+  smartplaylistquerywizardpluginsearchpage.cpp
+  smartplaylistsearch.cpp
+  smartplaylistsearchpreview.cpp
+  smartplaylistsearchterm.cpp
+  smartplaylistsearchtermwidget.cpp
+  smartplaylistsearchtermwidgetoverlay.cpp
+  smartplaylistsmodel.cpp
+  smartplaylistsviewcontainer.cpp
+  smartplaylistsview.cpp
+  smartplaylistwizard.cpp
+  smartplaylistwizardplugin.cpp
+  smartplaylistwizardtypepage.cpp
+  smartplaylistwizardfinishpage.cpp
+)
+
+set(SMARTPLAYLISTS_HEADERS
+  playlistgenerator.h
+  playlistgeneratorinserter.h
+  playlistquerygenerator.h
+  playlistgeneratormimedata.h
+  smartplaylistquerywizardplugin.h
+  smartplaylistquerywizardpluginsortpage.h
+  smartplaylistquerywizardpluginsearchpage.h
+  smartplaylistsearchpreview.h
+  smartplaylistsearchtermwidget.h
+  smartplaylistsearchtermwidgetoverlay.h
+  smartplaylistsmodel.h
+  smartplaylistsviewcontainer.h
+  smartplaylistsview.h
+  smartplaylistwizard.h
+  smartplaylistwizardplugin.h
+  smartplaylistwizardtypepage.h
+  smartplaylistwizardfinishpage.h
+)
+
+set(SMARTPLAYLISTS_UI
+  smartplaylistquerysearchpage.ui
+  smartplaylistquerysortpage.ui
+  smartplaylistsearchpreview.ui
+  smartplaylistsearchtermwidget.ui
+  smartplaylistsviewcontainer.ui
+  smartplaylistwizardfinishpage.ui
+)
+
+qt_wrap_cpp(SMARTPLAYLISTS_SOURCES ${SMARTPLAYLISTS_HEADERS})
+qt_wrap_ui(SMARTPLAYLISTS_SOURCES ${SMARTPLAYLISTS_UI})
+
+add_library(strawberry_smartplaylists STATIC ${SMARTPLAYLISTS_SOURCES})
+
+target_include_directories(strawberry_smartplaylists PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_smartplaylists PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_filterparser
+  strawberry_collection
+  strawberry_playlist
+)

src/smartplaylists/playlistgeneratormimedata.h

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "playlistgenerator_fwd.h"
 
 class PlaylistGeneratorMimeData : public MimeData {

src/smartplaylists/smartplaylistsview.cpp

@@ -23,7 +23,7 @@
 #include <QContextMenuEvent>
 
 #include "core/logging.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "smartplaylistsmodel.h"
 #include "smartplaylistsview.h"
 #include "smartplaylistwizard.h"

src/smartplaylists/smartplaylistsviewcontainer.cpp

@@ -25,7 +25,7 @@
 #include <QShowEvent>
 
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/settings.h"
 #include "constants/appearancesettings.h"
 

src/songloader/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(SONGLOADER_SOURCES songloader.cpp)
+set(SONGLOADER_HEADERS songloader.h)
+
+qt_wrap_cpp(SONGLOADER_SOURCES ${SONGLOADER_HEADERS})
+
+add_library(strawberry_songloader STATIC ${SONGLOADER_SOURCES})
+
+target_include_directories(strawberry_songloader PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_songloader PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_collection
+  strawberry_tagreader
+  strawberry_playlistparsers
+)

src/spotify/CMakeLists.txt

@@ -0,0 +1,36 @@
+set(SPOTIFY_SOURCES
+  spotifyservice.cpp
+  spotifybaserequest.cpp
+  spotifyrequest.cpp
+  spotifyfavoriterequest.cpp
+)
+
+set(SPOTIFY_HEADERS
+  spotifyservice.h
+  spotifybaserequest.h
+  spotifyrequest.h
+  spotifyfavoriterequest.h
+)
+
+qt_wrap_cpp(SPOTIFY_SOURCES ${SPOTIFY_HEADERS})
+
+add_library(strawberry_spotify STATIC ${SPOTIFY_SOURCES})
+
+target_include_directories(strawberry_spotify PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_spotify PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_streaming
+  strawberry_collection
+)

src/streaming/CMakeLists.txt

@@ -0,0 +1,59 @@
+set(STREAMING_SOURCES
+  streamingservices.cpp
+  streamingservice.cpp
+  streamplaylistitem.cpp
+  streamingsearchview.cpp
+  streamingsearchmodel.cpp
+  streamingsearchsortmodel.cpp
+  streamingsearchitemdelegate.cpp
+  streamingsongsview.cpp
+  streamingtabsview.cpp
+  streamingcollectionview.cpp
+  streamingcollectionviewcontainer.cpp
+  streamingsearchview.cpp
+  streamsongmimedata.cpp
+)
+
+set(STREAMING_HEADERS
+  streamingservices.h
+  streamingservice.h
+  streamsongmimedata.h
+  streamingsearchmodel.h
+  streamingsearchsortmodel.h
+  streamingsearchitemdelegate.h
+  streamingsearchview.h
+  streamingsongsview.h
+  streamingtabsview.h
+  streamingcollectionview.h
+  streamingcollectionviewcontainer.h
+)
+
+set(STREAMING_UI
+  streamingtabsview.ui
+  streamingcollectionviewcontainer.ui
+  streamingsearchview.ui
+)
+
+qt_wrap_cpp(STREAMING_SOURCES ${STREAMING_HEADERS})
+qt_wrap_ui(STREAMING_SOURCES ${STREAMING_UI})
+
+add_library(strawberry_streaming STATIC ${STREAMING_SOURCES})
+
+target_include_directories(strawberry_streaming PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_streaming PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_mimedata
+  strawberry_collection
+  strawberry_covermanager
+)

src/streaming/streamingcollectionview.cpp

@@ -40,7 +40,7 @@
 
 #include "includes/shared_ptr.h"
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionmodel.h"
 #include "collection/collectionfilterwidget.h"

src/streaming/streamingcollectionviewcontainer.h

@@ -35,7 +35,7 @@ class QProgressBar;
 class QContextMenuEvent;
 class CollectionFilterWidget;
 
-#include "ui_streamingcollectionviewcontainer.h"
+#include "streaming/ui_streamingcollectionviewcontainer.h"
 
 class StreamingCollectionViewContainer : public QWidget {
   Q_OBJECT