Move "core" directory to "musikcore". Windows build probably needs some

tweaks.

.gitignore

@@ -30,7 +30,7 @@ musikcube.core
 src/3rdparty/bin
 src/3rdparty/obj
 src/contrib
-src/core/obj
+src/musikcore/obj
 src/plugins/oggdecoder/obj
 src/plugins/server/libmicrohttpd-prefix
 src/plugins/server/microhttpd

CMakeLists.txt

@@ -65,7 +65,7 @@ message(STATUS "[build] link libraries are: ${musikcube_LINK_LIBS}")
 
 include_directories (
   "${musikcube_SOURCE_DIR}/src"
-  "${musikcube_SOURCE_DIR}/src/core"
+  "${musikcube_SOURCE_DIR}/src/musikcore"
   "${musikcube_SOURCE_DIR}/src/musikcube"
   "${musikcube_SOURCE_DIR}/src/musikcube/cursespp"
   "${musikcube_SOURCE_DIR}/src/3rdparty/include")
@@ -97,7 +97,7 @@ endif()
 # important bugfixes.
 set(USE_BUNDLED_TAGLIB "true")
 
-add_subdirectory(src/core)
+add_subdirectory(src/musikcore)
 add_subdirectory(src/core_c_demo)
 add_subdirectory(src/musikcube)
 add_subdirectory(src/musikcubed)
@@ -193,8 +193,8 @@ else ()
   install(FILES ${plugins} DESTINATION share/musikcube/plugins)
 endif ()
 
-file(GLOB sdk_headers "src/core/sdk/*.h")
-install(FILES ${sdk_headers} DESTINATION include/musikcube/core/sdk)
+file(GLOB sdk_headers "src/musikcore/sdk/*.h")
+install(FILES ${sdk_headers} DESTINATION include/musikcube/musikcore/sdk)
 
 file(GLOB themes "src/musikcube/data/themes/*.json")
 file(COPY ${themes} DESTINATION bin/themes)

README.md

@@ -76,7 +76,7 @@ if you're interested in writing your own frontend, [api documentation is availab
 
 # sdk
 
-the musikcube sdk is a set of small, pure-virtual c++ classes and a handful of enums and constants. they're still in the process of being slimmed down. you can see what they currently look like here: https://github.com/clangen/musikcube/tree/master/src/core/sdk
+the musikcube sdk is a set of small, pure-virtual c++ classes and a handful of enums and constants. they're still in the process of being slimmed down. you can see what they currently look like here: https://github.com/clangen/musikcube/tree/master/src/musikcore/sdk
 
 # dependencies
 

src/core_c_demo/main.c

@@ -5,7 +5,7 @@
 #endif
 
 #include <stdio.h>
-#include <core/musikcore_c.h>
+#include <musikcore/musikcore_c.h>
 
 #define ENCODER_TYPE ".opus"
 

src/musikcore/audio/Buffer.cpp

@@ -34,7 +34,7 @@
 
 #include "pch.hpp"
 
-#include <core/audio/Buffer.h>
+#include <musikcore/audio/Buffer.h>
 
 #define DEBUG 0
 

src/musikcore/audio/Buffer.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/IBuffer.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/IBuffer.h>
 
 namespace musik { namespace core { namespace audio {
 

src/musikcore/audio/CrossfadeTransport.cpp

@@ -34,10 +34,10 @@
 
 #include "pch.hpp"
 
-#include <core/debug.h>
-#include <core/audio/CrossfadeTransport.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/audio/Outputs.h>
+#include <musikcore/debug.h>
+#include <musikcore/audio/CrossfadeTransport.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/audio/Outputs.h>
 #include <algorithm>
 
 #define CROSSFADE_DURATION_MS 1500

src/musikcore/audio/CrossfadeTransport.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/audio/ITransport.h>
-#include <core/audio/Player.h>
-#include <core/audio/Crossfader.h>
-#include <core/runtime/MessageQueue.h>
-#include <core/sdk/IOutput.h>
-#include <core/sdk/constants.h>
+#include <musikcore/config.h>
+#include <musikcore/audio/ITransport.h>
+#include <musikcore/audio/Player.h>
+#include <musikcore/audio/Crossfader.h>
+#include <musikcore/runtime/MessageQueue.h>
+#include <musikcore/sdk/IOutput.h>
+#include <musikcore/sdk/constants.h>
 
 #include <thread>
 #include <mutex>

src/musikcore/audio/Crossfader.cpp

@@ -34,8 +34,8 @@
 
 #include "pch.hpp"
 
-#include <core/audio/Crossfader.h>
-#include <core/runtime/Message.h>
+#include <musikcore/audio/Crossfader.h>
+#include <musikcore/runtime/Message.h>
 
 #include <algorithm>
 #include <chrono>

src/musikcore/audio/Crossfader.h

@@ -34,12 +34,12 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/audio/ITransport.h>
-#include <core/audio/Player.h>
-#include <core/runtime/MessageQueue.h>
-#include <core/sdk/IOutput.h>
-#include <core/sdk/constants.h>
+#include <musikcore/config.h>
+#include <musikcore/audio/ITransport.h>
+#include <musikcore/audio/Player.h>
+#include <musikcore/runtime/MessageQueue.h>
+#include <musikcore/sdk/IOutput.h>
+#include <musikcore/sdk/constants.h>
 
 #include <thread>
 #include <mutex>

src/musikcore/audio/GaplessTransport.cpp

@@ -34,10 +34,10 @@
 
 #include "pch.hpp"
 
-#include <core/debug.h>
-#include <core/audio/GaplessTransport.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/audio/Outputs.h>
+#include <musikcore/debug.h>
+#include <musikcore/audio/GaplessTransport.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/audio/Outputs.h>
 #include <algorithm>
 
 using namespace musik::core::audio;

src/musikcore/audio/GaplessTransport.h

@@ -34,11 +34,11 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/audio/ITransport.h>
-#include <core/audio/Player.h>
-#include <core/sdk/IOutput.h>
-#include <core/sdk/constants.h>
+#include <musikcore/config.h>
+#include <musikcore/audio/ITransport.h>
+#include <musikcore/audio/Player.h>
+#include <musikcore/sdk/IOutput.h>
+#include <musikcore/sdk/constants.h>
 
 #include <thread>
 #include <mutex>

src/musikcore/audio/IStream.h

@@ -34,11 +34,11 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/IBuffer.h>
-#include <core/sdk/IDecoder.h>
-#include <core/sdk/IDSP.h>
-#include <core/sdk/IDecoderFactory.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/IBuffer.h>
+#include <musikcore/sdk/IDecoder.h>
+#include <musikcore/sdk/IDSP.h>
+#include <musikcore/sdk/IDecoderFactory.h>
 
 #include <list>
 

src/musikcore/audio/ITransport.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/constants.h>
-#include <core/audio/Player.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/constants.h>
+#include <musikcore/audio/Player.h>
 #include <sigslot/sigslot.h>
 
 namespace musik { namespace core { namespace audio {

src/musikcore/audio/MasterTransport.cpp

@@ -36,10 +36,10 @@
 
 #include "MasterTransport.h"
 
-#include <core/audio/GaplessTransport.h>
-#include <core/audio/CrossfadeTransport.h>
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
+#include <musikcore/audio/GaplessTransport.h>
+#include <musikcore/audio/CrossfadeTransport.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
 
 using namespace musik::core::audio;
 using namespace musik::core;

src/musikcore/audio/MasterTransport.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/sdk/constants.h>
-#include <core/audio/ITransport.h>
-#include <core/support/Preferences.h>
+#include <musikcore/sdk/constants.h>
+#include <musikcore/audio/ITransport.h>
+#include <musikcore/support/Preferences.h>
 
 namespace musik { namespace core { namespace audio {
     class MasterTransport :

src/musikcore/audio/Outputs.cpp

@@ -34,9 +34,9 @@
 
 #include "pch.hpp"
 #include "Outputs.h"
-#include <core/plugin/PluginFactory.h>
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
 
 #include <atomic>
 #include <algorithm>

src/musikcore/audio/Outputs.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/IOutput.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/IOutput.h>
 
 namespace musik { namespace core { namespace audio { namespace outputs {
 

src/musikcore/audio/PlaybackService.cpp

@@ -36,16 +36,16 @@
 
 #include "PlaybackService.h"
 
-#include <core/audio/MasterTransport.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/track/Track.h>
-#include <core/library/query/MarkTrackPlayedQuery.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/runtime/MessageQueue.h>
-#include <core/runtime/Message.h>
-#include <core/support/PreferenceKeys.h>
-#include <core/support/Playback.h>
-#include <core/support/LastFm.h>
+#include <musikcore/audio/MasterTransport.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/track/Track.h>
+#include <musikcore/library/query/MarkTrackPlayedQuery.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/runtime/MessageQueue.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/support/PreferenceKeys.h>
+#include <musikcore/support/Playback.h>
+#include <musikcore/support/LastFm.h>
 
 using namespace musik::core::library;
 using namespace musik::core;

src/musikcore/audio/PlaybackService.h

@@ -36,14 +36,14 @@
 
 #include <sigslot/sigslot.h>
 
-#include <core/sdk/IPlaybackService.h>
-#include <core/sdk/IPlaybackRemote.h>
-#include <core/library/track/Track.h>
-#include <core/library/track/TrackList.h>
-#include <core/library/ILibrary.h>
-#include <core/audio/MasterTransport.h>
-#include <core/support/Preferences.h>
-#include <core/runtime/IMessageQueue.h>
+#include <musikcore/sdk/IPlaybackService.h>
+#include <musikcore/sdk/IPlaybackRemote.h>
+#include <musikcore/library/track/Track.h>
+#include <musikcore/library/track/TrackList.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/audio/MasterTransport.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/runtime/IMessageQueue.h>
 
 #include <mutex>
 

src/musikcore/audio/Player.cpp

@@ -35,12 +35,12 @@
 #include "pch.hpp"
 
 #include <kiss_fftr.h>
-#include <core/debug.h>
-#include <core/audio/Stream.h>
-#include <core/audio/Player.h>
-#include <core/audio/Visualizer.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/sdk/constants.h>
+#include <musikcore/debug.h>
+#include <musikcore/audio/Stream.h>
+#include <musikcore/audio/Player.h>
+#include <musikcore/audio/Visualizer.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/sdk/constants.h>
 
 #include <algorithm>
 #include <math.h>

src/musikcore/audio/Player.h

@@ -34,11 +34,11 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/audio/IStream.h>
-#include <core/sdk/constants.h>
-#include <core/sdk/IOutput.h>
-#include <core/sdk/IBufferProvider.h>
+#include <musikcore/config.h>
+#include <musikcore/audio/IStream.h>
+#include <musikcore/sdk/constants.h>
+#include <musikcore/sdk/IOutput.h>
+#include <musikcore/sdk/IBufferProvider.h>
 
 #include <sigslot/sigslot.h>
 

src/musikcore/audio/Stream.cpp

@@ -36,7 +36,7 @@
 
 #include "Stream.h"
 #include "Streams.h"
-#include <core/debug.h>
+#include <musikcore/debug.h>
 
 using namespace musik::core::audio;
 using namespace musik::core::sdk;

src/musikcore/audio/Stream.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/io/DataStreamFactory.h>
-#include <core/audio/Buffer.h>
-#include <core/audio/IStream.h>
-#include <core/sdk/IDecoder.h>
-#include <core/sdk/IDSP.h>
-#include <core/sdk/constants.h>
+#include <musikcore/config.h>
+#include <musikcore/io/DataStreamFactory.h>
+#include <musikcore/audio/Buffer.h>
+#include <musikcore/audio/IStream.h>
+#include <musikcore/sdk/IDecoder.h>
+#include <musikcore/sdk/IDSP.h>
+#include <musikcore/sdk/constants.h>
 
 #include <deque>
 #include <list>

src/musikcore/audio/Streams.cpp

@@ -35,10 +35,10 @@
 #include "pch.hpp"
 
 #include "Streams.h"
-#include <core/debug.h>
-#include <core/sdk/IDecoderFactory.h>
-#include <core/sdk/IEncoderFactory.h>
-#include <core/plugin/PluginFactory.h>
+#include <musikcore/debug.h>
+#include <musikcore/sdk/IDecoderFactory.h>
+#include <musikcore/sdk/IEncoderFactory.h>
+#include <musikcore/plugin/PluginFactory.h>
 #include <mutex>
 
 #define TAG "Streams"

src/musikcore/audio/Streams.h

@@ -34,12 +34,12 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/io/DataStreamFactory.h>
-#include <core/sdk/IDecoder.h>
-#include <core/sdk/IEncoder.h>
-#include <core/sdk/IDSP.h>
-#include <core/sdk/IDecoderFactory.h>
+#include <musikcore/config.h>
+#include <musikcore/io/DataStreamFactory.h>
+#include <musikcore/sdk/IDecoder.h>
+#include <musikcore/sdk/IEncoder.h>
+#include <musikcore/sdk/IDSP.h>
+#include <musikcore/sdk/IDecoderFactory.h>
 
 #include <memory>
 #include <vector>

src/musikcore/audio/Visualizer.cpp

@@ -34,7 +34,7 @@
 
 #include "pch.hpp"
 #include "Visualizer.h"
-#include <core/plugin/PluginFactory.h>
+#include <musikcore/plugin/PluginFactory.h>
 
 #include <atomic>
 #include <algorithm>

src/musikcore/audio/Visualizer.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/ISpectrumVisualizer.h>
-#include <core/sdk/IPcmVisualizer.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/ISpectrumVisualizer.h>
+#include <musikcore/sdk/IPcmVisualizer.h>
 
 namespace musik { namespace core { namespace audio { namespace vis {
 

src/musikcore/c_context.cpp

@@ -34,17 +34,17 @@
 
 #include <pch.hpp>
 
-#include <core/musikcore_c.h>
-#include <core/c_context.h>
-#include <core/debug.h>
-#include <core/runtime/MessageQueue.h>
-#include <core/runtime/Message.h>
-#include <core/library/LibraryFactory.h>
-#include <core/library/LocalLibrary.h>
-#include <core/audio/PlaybackService.h>
-#include <core/plugin/Plugins.h>
-#include <core/library/LocalMetadataProxy.h>
-#include <core/support/PreferenceKeys.h>
+#include <musikcore/musikcore_c.h>
+#include <musikcore/c_context.h>
+#include <musikcore/debug.h>
+#include <musikcore/runtime/MessageQueue.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/library/LocalLibrary.h>
+#include <musikcore/audio/PlaybackService.h>
+#include <musikcore/plugin/Plugins.h>
+#include <musikcore/library/LocalMetadataProxy.h>
+#include <musikcore/support/PreferenceKeys.h>
 
 #include <boost/locale.hpp>
 #include <boost/filesystem/detail/utf8_codecvt_facet.hpp>

src/musikcore/c_context.h

@@ -32,12 +32,12 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <core/musikcore_c.h>
-#include <core/runtime/MessageQueue.h>
-#include <core/library/LibraryFactory.h>
-#include <core/audio/PlaybackService.h>
-#include <core/library/LocalMetadataProxy.h>
-#include <core/library/IIndexer.h>
+#include <musikcore/musikcore_c.h>
+#include <musikcore/runtime/MessageQueue.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/audio/PlaybackService.h>
+#include <musikcore/library/LocalMetadataProxy.h>
+#include <musikcore/library/IIndexer.h>
 
 #include <string>
 #include <thread>

src/musikcore/c_interface_wrappers.cpp

@@ -34,41 +34,41 @@
 
 #include <pch.hpp>
 
-#include <core/musikcore_c.h>
-#include <core/c_context.h>
+#include <musikcore/musikcore_c.h>
+#include <musikcore/c_context.h>
 
-#include <core/debug.h>
-#include <core/plugin/Plugins.h>
-#include <core/sdk/IResource.h>
-#include <core/sdk/IValue.h>
-#include <core/sdk/IValueList.h>
-#include <core/sdk/IMap.h>
-#include <core/sdk/IMapList.h>
-#include <core/sdk/ITrack.h>
-#include <core/sdk/ITrackList.h>
-#include <core/sdk/ITrackListEditor.h>
-#include <core/sdk/IMetadataProxy.h>
-#include <core/sdk/IPlaybackService.h>
-#include <core/sdk/IPreferences.h>
-#include <core/sdk/IDataStream.h>
-#include <core/sdk/IBuffer.h>
-#include <core/sdk/IBufferProvider.h>
-#include <core/sdk/IDecoder.h>
-#include <core/sdk/IEncoder.h>
-#include <core/sdk/IBlockingEncoder.h>
-#include <core/sdk/IStreamingEncoder.h>
-#include <core/sdk/IDevice.h>
-#include <core/sdk/IOutput.h>
-#include <core/library/QueryBase.h>
-#include <core/library/ILibrary.h>
-#include <core/library/IIndexer.h>
-#include <core/library/track/TrackList.h>
-#include <core/audio/Stream.h>
-#include <core/audio/Player.h>
-#include <core/db/ScopedTransaction.h>
-#include <core/db/Connection.h>
-#include <core/db/Statement.h>
-#include <core/support/Common.h>
+#include <musikcore/debug.h>
+#include <musikcore/plugin/Plugins.h>
+#include <musikcore/sdk/IResource.h>
+#include <musikcore/sdk/IValue.h>
+#include <musikcore/sdk/IValueList.h>
+#include <musikcore/sdk/IMap.h>
+#include <musikcore/sdk/IMapList.h>
+#include <musikcore/sdk/ITrack.h>
+#include <musikcore/sdk/ITrackList.h>
+#include <musikcore/sdk/ITrackListEditor.h>
+#include <musikcore/sdk/IMetadataProxy.h>
+#include <musikcore/sdk/IPlaybackService.h>
+#include <musikcore/sdk/IPreferences.h>
+#include <musikcore/sdk/IDataStream.h>
+#include <musikcore/sdk/IBuffer.h>
+#include <musikcore/sdk/IBufferProvider.h>
+#include <musikcore/sdk/IDecoder.h>
+#include <musikcore/sdk/IEncoder.h>
+#include <musikcore/sdk/IBlockingEncoder.h>
+#include <musikcore/sdk/IStreamingEncoder.h>
+#include <musikcore/sdk/IDevice.h>
+#include <musikcore/sdk/IOutput.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/library/track/TrackList.h>
+#include <musikcore/audio/Stream.h>
+#include <musikcore/audio/Player.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/support/Common.h>
 
 #include <string>
 

src/musikcore/db/Connection.cpp

@@ -34,7 +34,7 @@
 
 #include "pch.hpp"
 
-#include <core/db/Connection.h>
+#include <musikcore/db/Connection.h>
 #include <sqlite/sqlite3.h>
 
 static std::mutex globalMutex;

src/musikcore/db/Connection.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/db/Statement.h>
-#include <core/db/ScopedTransaction.h>
+#include <musikcore/config.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/db/ScopedTransaction.h>
 
 #include <map>
 #include <mutex>

src/musikcore/db/ScopedTransaction.cpp

@@ -34,8 +34,8 @@
 
 #include "pch.hpp"
 
-#include <core/db/ScopedTransaction.h>
-#include <core/db/Connection.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/db/Connection.h>
 
 using namespace musik::core::db;
 

src/musikcore/db/ScopedTransaction.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/config.h>
+#include <musikcore/config.h>
 #include <map>
 
 namespace musik { namespace core { namespace db {

src/musikcore/db/Statement.cpp

@@ -34,8 +34,8 @@
 
 #include "pch.hpp"
 
-#include <core/db/Statement.h>
-#include <core/db/Connection.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/db/Connection.h>
 #include <sqlite/sqlite3.h>
 
 using namespace musik::core::db;

src/musikcore/db/Statement.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/config.h>
+#include <musikcore/config.h>
 #include <map>
 
 struct sqlite3_stmt;

src/musikcore/debug.cpp

@@ -33,8 +33,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <pch.hpp>
-#include <core/debug.h>
-#include <core/support/Common.h>
+#include <musikcore/debug.h>
+#include <musikcore/support/Common.h>
 #include <functional>
 #include <string>
 #include <queue>

src/musikcore/i18n/Locale.cpp

@@ -35,8 +35,8 @@
 #include "pch.hpp"
 
 #include <boost/filesystem.hpp>
-#include <core/support/PreferenceKeys.h>
-#include <core/support/Common.h>
+#include <musikcore/support/PreferenceKeys.h>
+#include <musikcore/support/Common.h>
 
 #include "Locale.h"
 

src/musikcore/i18n/Locale.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/support/Preferences.h>
+#include <musikcore/config.h>
+#include <musikcore/support/Preferences.h>
 #include <unordered_map>
 #include <sigslot/sigslot.h>
 #include <nlohmann/json.hpp>

src/musikcore/io/DataStreamFactory.cpp

@@ -34,10 +34,10 @@
 
 #include "pch.hpp"
 
-#include <core/io/DataStreamFactory.h>
-#include <core/config.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/io/LocalFileStream.h>
+#include <musikcore/io/DataStreamFactory.h>
+#include <musikcore/config.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/io/LocalFileStream.h>
 
 using namespace musik::core::io;
 using namespace musik::core::sdk;

src/musikcore/io/DataStreamFactory.h

@@ -33,9 +33,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/IDataStream.h>
-#include <core/sdk/IDataStreamFactory.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/IDataStream.h>
+#include <musikcore/sdk/IDataStreamFactory.h>
 #include <vector>
 
 namespace musik { namespace core { namespace io {

src/musikcore/io/LocalFileStream.cpp

@@ -34,11 +34,11 @@
 
 #include "pch.hpp"
 
-#include <core/debug.h>
-#include <core/io/LocalFileStream.h>
-#include <core/config.h>
-#include <core/support/Common.h>
-#include <core/config.h>
+#include <musikcore/debug.h>
+#include <musikcore/io/LocalFileStream.h>
+#include <musikcore/config.h>
+#include <musikcore/support/Common.h>
+#include <musikcore/config.h>
 #include <cstdio>
 #include <iostream>
 

src/musikcore/io/LocalFileStream.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/sdk/IDataStream.h>
+#include <musikcore/config.h>
+#include <musikcore/sdk/IDataStream.h>
 #include <atomic>
 
 namespace musik { namespace core { namespace io {

src/musikcore/library/ILibrary.h

@@ -38,10 +38,10 @@
 #include <sigslot/sigslot.h>
 #include <functional>
 
-#include <core/library/IIndexer.h>
-#include <core/library/IQuery.h>
-#include <core/sdk/ITrack.h>
-#include <core/runtime/IMessageQueue.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/sdk/ITrack.h>
+#include <musikcore/runtime/IMessageQueue.h>
 
 namespace musik { namespace core {
 

src/musikcore/library/IQuery.h

@@ -38,8 +38,8 @@
 #include <vector>
 #include <sigslot/sigslot.h>
 
-#include <core/library/IIndexer.h>
-#include <core/db/Connection.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/db/Connection.h>
 
 namespace musik { namespace core { namespace db {
 

src/musikcore/library/Indexer.cpp

@@ -34,25 +34,25 @@
 
 #include "pch.hpp"
 
-#include <core/debug.h>
-#include <core/library/Indexer.h>
+#include <musikcore/debug.h>
+#include <musikcore/library/Indexer.h>
 
-#include <core/config.h>
-#include <core/debug.h>
-#include <core/library/track/IndexerTrack.h>
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/query/TrackMetadataQuery.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/LibraryFactory.h>
-#include <core/db/Connection.h>
-#include <core/db/Statement.h>
-#include <core/plugin/PluginFactory.h>
-#include <core/support/Common.h>
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
-#include <core/sdk/IAnalyzer.h>
-#include <core/sdk/IIndexerSource.h>
-#include <core/audio/Stream.h>
+#include <musikcore/config.h>
+#include <musikcore/debug.h>
+#include <musikcore/library/track/IndexerTrack.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/query/TrackMetadataQuery.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/plugin/PluginFactory.h>
+#include <musikcore/support/Common.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
+#include <musikcore/sdk/IAnalyzer.h>
+#include <musikcore/sdk/IIndexerSource.h>
+#include <musikcore/audio/Stream.h>
 
 #include <algorithm>
 

src/musikcore/library/Indexer.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/db/Connection.h>
-#include <core/sdk/ITagReader.h>
-#include <core/sdk/IDecoderFactory.h>
-#include <core/sdk/IIndexerWriter.h>
-#include <core/sdk/IIndexerNotifier.h>
-#include <core/library/IIndexer.h>
-#include <core/support/Preferences.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/sdk/ITagReader.h>
+#include <musikcore/sdk/IDecoderFactory.h>
+#include <musikcore/sdk/IIndexerWriter.h>
+#include <musikcore/sdk/IIndexerNotifier.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/support/Preferences.h>
 
 #include <sigslot/sigslot.h>
 

src/musikcore/library/LibraryFactory.cpp

@@ -33,13 +33,13 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include <core/library/LibraryFactory.h>
-#include <core/library/LocalLibrary.h>
-#include <core/library/RemoteLibrary.h>
-#include <core/db/Connection.h>
-#include <core/support/Common.h>
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/library/LocalLibrary.h>
+#include <musikcore/library/RemoteLibrary.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/support/Common.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
 
 using namespace musik::core;
 

src/musikcore/library/LibraryFactory.h

@@ -34,10 +34,10 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/library/LocalLibrary.h>
-#include <core/library/RemoteLibrary.h>
-#include <core/runtime/IMessageQueue.h>
+#include <musikcore/config.h>
+#include <musikcore/library/LocalLibrary.h>
+#include <musikcore/library/RemoteLibrary.h>
+#include <musikcore/runtime/IMessageQueue.h>
 #include <sigslot/sigslot.h>
 #include <map>
 #include <vector>

src/musikcore/library/LocalLibrary.cpp

@@ -34,14 +34,14 @@
 
 #include "pch.hpp"
 
-#include <core/library/LocalLibrary.h>
-#include <core/config.h>
-#include <core/library/QueryBase.h>
-#include <core/support/Common.h>
-#include <core/support/Preferences.h>
-#include <core/library/Indexer.h>
-#include <core/runtime/Message.h>
-#include <core/debug.h>
+#include <musikcore/library/LocalLibrary.h>
+#include <musikcore/config.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/support/Common.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/library/Indexer.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/debug.h>
 
 static const std::string TAG = "LocalLibrary";
 static bool scheduleSyncDueToDbUpgrade = false;

src/musikcore/library/LocalLibrary.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/db/Connection.h>
+#include <musikcore/config.h>
+#include <musikcore/db/Connection.h>
 
-#include <core/library/ILibrary.h>
-#include <core/library/IIndexer.h>
-#include <core/library/IQuery.h>
-#include <core/library/QueryBase.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/library/QueryBase.h>
 
 #include <thread>
 #include <mutex>

src/musikcore/library/LocalMetadataProxy.cpp

@@ -35,26 +35,26 @@
 #include "pch.hpp"
 #include "LocalMetadataProxy.h"
 
-#include <core/debug.h>
-#include <core/db/ScopedTransaction.h>
-#include <core/library/query/AlbumListQuery.h>
-#include <core/library/query/AllCategoriesQuery.h>
-#include <core/library/query/AppendPlaylistQuery.h>
-#include <core/library/query/CategoryListQuery.h>
-#include <core/library/query/CategoryTrackListQuery.h>
-#include <core/library/query/DeletePlaylistQuery.h>
-#include <core/library/query/SearchTrackListQuery.h>
-#include <core/library/query/GetPlaylistQuery.h>
-#include <core/library/query/SavePlaylistQuery.h>
-#include <core/library/query/TrackMetadataQuery.h>
-#include <core/library/query/TrackListQueryBase.h>
-#include <core/library/QueryRegistry.h>
-#include <core/library/LibraryFactory.h>
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/runtime/Message.h>
-#include <core/support/Messages.h>
-#include <core/support/Common.h>
+#include <musikcore/debug.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/library/query/AlbumListQuery.h>
+#include <musikcore/library/query/AllCategoriesQuery.h>
+#include <musikcore/library/query/AppendPlaylistQuery.h>
+#include <musikcore/library/query/CategoryListQuery.h>
+#include <musikcore/library/query/CategoryTrackListQuery.h>
+#include <musikcore/library/query/DeletePlaylistQuery.h>
+#include <musikcore/library/query/SearchTrackListQuery.h>
+#include <musikcore/library/query/GetPlaylistQuery.h>
+#include <musikcore/library/query/SavePlaylistQuery.h>
+#include <musikcore/library/query/TrackMetadataQuery.h>
+#include <musikcore/library/query/TrackListQueryBase.h>
+#include <musikcore/library/QueryRegistry.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/support/Messages.h>
+#include <musikcore/support/Common.h>
 #include <vector>
 #include <map>
 #include <nlohmann/json.hpp>

src/musikcore/library/LocalMetadataProxy.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/library/ILibrary.h>
-#include <core/sdk/IMetadataProxy.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/sdk/IMetadataProxy.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/MasterLibrary.cpp

@@ -36,8 +36,8 @@
 
 #include "MasterLibrary.h"
 #include "LibraryFactory.h"
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
 
 using namespace musik::core;
 using namespace musik::core::library;

src/musikcore/library/MasterLibrary.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/db/Connection.h>
+#include <musikcore/config.h>
+#include <musikcore/db/Connection.h>
 
-#include <core/library/ILibrary.h>
-#include <core/library/IIndexer.h>
-#include <core/library/IQuery.h>
-#include <core/library/QueryBase.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/library/QueryBase.h>
 
 #include <mutex>
 

src/musikcore/library/QueryBase.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/library/IQuery.h>
-#include <core/db/Connection.h>
+#include <musikcore/config.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/db/Connection.h>
 
 #include <sigslot/sigslot.h>
 

src/musikcore/library/QueryRegistry.cpp

@@ -35,23 +35,23 @@
 #include "pch.hpp"
 
 #include "QueryRegistry.h"
-#include <core/library/query/AlbumListQuery.h>
-#include <core/library/query/AllCategoriesQuery.h>
-#include <core/library/query/AppendPlaylistQuery.h>
-#include <core/library/query/GetPlaylistQuery.h>
-#include <core/library/query/CategoryListQuery.h>
-#include <core/library/query/CategoryTrackListQuery.h>
-#include <core/library/query/DeletePlaylistQuery.h>
-#include <core/library/query/DirectoryTrackListQuery.h>
-#include <core/library/query/LyricsQuery.h>
-#include <core/library/query/MarkTrackPlayedQuery.h>
-#include <core/library/query/NowPlayingTrackListQuery.h>
-#include <core/library/query/PersistedPlayQueueQuery.h>
-#include <core/library/query/SavePlaylistQuery.h>
-#include <core/library/query/SearchTrackListQuery.h>
-#include <core/library/query/SetTrackRatingQuery.h>
-#include <core/library/query/TrackMetadataBatchQuery.h>
-#include <core/library/query/TrackMetadataQuery.h>
+#include <musikcore/library/query/AlbumListQuery.h>
+#include <musikcore/library/query/AllCategoriesQuery.h>
+#include <musikcore/library/query/AppendPlaylistQuery.h>
+#include <musikcore/library/query/GetPlaylistQuery.h>
+#include <musikcore/library/query/CategoryListQuery.h>
+#include <musikcore/library/query/CategoryTrackListQuery.h>
+#include <musikcore/library/query/DeletePlaylistQuery.h>
+#include <musikcore/library/query/DirectoryTrackListQuery.h>
+#include <musikcore/library/query/LyricsQuery.h>
+#include <musikcore/library/query/MarkTrackPlayedQuery.h>
+#include <musikcore/library/query/NowPlayingTrackListQuery.h>
+#include <musikcore/library/query/PersistedPlayQueueQuery.h>
+#include <musikcore/library/query/SavePlaylistQuery.h>
+#include <musikcore/library/query/SearchTrackListQuery.h>
+#include <musikcore/library/query/SetTrackRatingQuery.h>
+#include <musikcore/library/query/TrackMetadataBatchQuery.h>
+#include <musikcore/library/query/TrackMetadataQuery.h>
 
 using namespace musik::core;
 using namespace musik::core::db;

src/musikcore/library/QueryRegistry.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/library/IQuery.h>
-#include <core/library/ILibrary.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/library/ILibrary.h>
 #include <string>
 #include <memory>
 

src/musikcore/library/RemoteLibrary.cpp

@@ -34,17 +34,17 @@
 
 #include "pch.hpp"
 
-#include <core/library/RemoteLibrary.h>
-#include <core/config.h>
-#include <core/support/Common.h>
-#include <core/support/Preferences.h>
-#include <core/support/PreferenceKeys.h>
-#include <core/library/Indexer.h>
-#include <core/library/IQuery.h>
-#include <core/library/LibraryFactory.h>
-#include <core/library/QueryRegistry.h>
-#include <core/runtime/Message.h>
-#include <core/debug.h>
+#include <musikcore/library/RemoteLibrary.h>
+#include <musikcore/config.h>
+#include <musikcore/support/Common.h>
+#include <musikcore/support/Preferences.h>
+#include <musikcore/support/PreferenceKeys.h>
+#include <musikcore/library/Indexer.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/library/LibraryFactory.h>
+#include <musikcore/library/QueryRegistry.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/debug.h>
 #include <nlohmann/json.hpp>
 
 static const std::string TAG = "RemoteLibrary";

src/musikcore/library/RemoteLibrary.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/config.h>
-#include <core/db/Connection.h>
+#include <musikcore/config.h>
+#include <musikcore/db/Connection.h>
 
-#include <core/library/ILibrary.h>
-#include <core/library/IIndexer.h>
-#include <core/library/IQuery.h>
-#include <core/net/WebSocketClient.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/library/IIndexer.h>
+#include <musikcore/library/IQuery.h>
+#include <musikcore/net/WebSocketClient.h>
 
 #include <thread>
 #include <mutex>

src/musikcore/library/metadata/MetadataMap.cpp

@@ -35,11 +35,11 @@
 #include "pch.hpp"
 #include "MetadataMap.h"
 
-#include <core/library/QueryBase.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/db/Connection.h>
-#include <core/db/Statement.h>
-#include <core/support/Common.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/support/Common.h>
 
 using namespace musik::core;
 using namespace musik::core::db;

src/musikcore/library/metadata/MetadataMap.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/sdk/IMap.h>
+#include <musikcore/sdk/IMap.h>
 #include <string>
 #include <unordered_map>
 #include <memory>

src/musikcore/library/metadata/MetadataMapList.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/sdk/IMapList.h>
+#include <musikcore/sdk/IMapList.h>
 #include "MetadataMap.h"
 #include <vector>
 #include <memory>

src/musikcore/library/query/AlbumListQuery.cpp

@@ -35,9 +35,9 @@
 #include "pch.hpp"
 #include "AlbumListQuery.h"
 
-#include <core/library/LocalLibraryConstants.h>
-#include <core/db/Statement.h>
-#include <core/library/query/util/Serialization.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/library/query/util/Serialization.h>
 #include <nlohmann/json.hpp>
 
 using namespace musik::core;

src/musikcore/library/query/AlbumListQuery.h

@@ -34,10 +34,10 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/library/query/util/CategoryQueryUtil.h>
-#include <core/library/metadata/MetadataMapList.h>
-#include <core/db/Connection.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/query/util/CategoryQueryUtil.h>
+#include <musikcore/library/metadata/MetadataMapList.h>
+#include <musikcore/db/Connection.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/AllCategoriesQuery.cpp

@@ -34,8 +34,8 @@
 
 #include "pch.hpp"
 #include "AllCategoriesQuery.h"
-#include <core/library/query/util/Serialization.h>
-#include <core/db/Statement.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/db/Statement.h>
 #include <nlohmann/json.hpp>
 
 using musik::core::db::Statement;

src/musikcore/library/query/AllCategoriesQuery.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/library/query/util/SdkWrappers.h>
-#include <core/sdk/IValueList.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/query/util/SdkWrappers.h>
+#include <musikcore/sdk/IValueList.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/AppendPlaylistQuery.cpp

@@ -34,13 +34,13 @@
 
 #include "pch.hpp"
 #include "AppendPlaylistQuery.h"
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/query/TrackMetadataQuery.h>
-#include <core/library/query/util/Serialization.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/runtime/Message.h>
-#include <core/support/Messages.h>
-#include <core/db/Statement.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/query/TrackMetadataQuery.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/support/Messages.h>
+#include <musikcore/db/Statement.h>
 #include <nlohmann/json.hpp>
 
 using musik::core::db::Statement;

src/musikcore/library/query/AppendPlaylistQuery.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/library/track/TrackList.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/track/TrackList.h>
 #include <stdint.h>
 #include <vector>
 

src/musikcore/library/query/CategoryListQuery.cpp

@@ -34,11 +34,11 @@
 
 #include "pch.hpp"
 #include "CategoryListQuery.h"
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/query/util/Serialization.h>
-#include <core/db/Statement.h>
-#include <core/i18n/Locale.h>
-#include <core/utfutil.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/i18n/Locale.h>
+#include <musikcore/utfutil.h>
 
 using musik::core::db::Statement;
 using musik::core::db::Row;

src/musikcore/library/query/CategoryListQuery.h

@@ -34,13 +34,13 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/library/query/util/CategoryQueryUtil.h>
-#include <core/library/query/util/SdkWrappers.h>
-#include <core/db/Statement.h>
-#include <core/db/Connection.h>
-#include <core/sdk/IValueList.h>
-#include <core/support/Common.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/query/util/CategoryQueryUtil.h>
+#include <musikcore/library/query/util/SdkWrappers.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/sdk/IValueList.h>
+#include <musikcore/support/Common.h>
 #include <memory>
 
 namespace musik { namespace core { namespace library { namespace query {

src/musikcore/library/query/CategoryTrackListQuery.cpp

@@ -37,9 +37,9 @@
 #include "CategoryTrackListQuery.h"
 #include "GetPlaylistQuery.h"
 
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/query/util/Serialization.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/query/util/Serialization.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string.hpp>

src/musikcore/library/query/CategoryTrackListQuery.h

@@ -34,12 +34,12 @@
 
 #pragma once
 
-#include <core/db/Connection.h>
-#include <core/library/track/Track.h>
-#include <core/library/QueryBase.h>
-#include <core/library/query/util/CategoryQueryUtil.h>
-#include <core/library/query/util/TrackSort.h>
-#include <core/db/Statement.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/library/track/Track.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/query/util/CategoryQueryUtil.h>
+#include <musikcore/library/query/util/TrackSort.h>
+#include <musikcore/db/Statement.h>
 
 #include "TrackListQueryBase.h"
 

src/musikcore/library/query/DeletePlaylistQuery.cpp

@@ -35,10 +35,10 @@
 #include "pch.hpp"
 #include "DeletePlaylistQuery.h"
 
-#include <core/db/ScopedTransaction.h>
-#include <core/db/Statement.h>
-#include <core/support/Messages.h>
-#include <core/runtime/Message.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/support/Messages.h>
+#include <musikcore/runtime/Message.h>
 
 #include <nlohmann/json.hpp>
 

src/musikcore/library/query/DeletePlaylistQuery.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/library/ILibrary.h>
-#include <core/library/QueryBase.h>
-#include <core/db/Connection.h>
+#include <musikcore/library/ILibrary.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/db/Connection.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/DirectoryTrackListQuery.cpp

@@ -33,9 +33,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/query/util/Serialization.h>
-#include <core/i18n/Locale.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/i18n/Locale.h>
 #include "DirectoryTrackListQuery.h"
 #include "CategoryTrackListQuery.h"
 

src/musikcore/library/query/DirectoryTrackListQuery.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/library/query/TrackListQueryBase.h>
+#include <musikcore/library/query/TrackListQueryBase.h>
 #include "TrackListQueryBase.h"
 
 namespace musik { namespace core { namespace library { namespace query {

src/musikcore/library/query/GetPlaylistQuery.cpp

@@ -35,10 +35,10 @@
 #include "pch.hpp"
 #include "GetPlaylistQuery.h"
 
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/library/query/util/Serialization.h>
-#include <core/db/Statement.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/db/Statement.h>
 
 #include <nlohmann/json.hpp>
 

src/musikcore/library/query/GetPlaylistQuery.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-#include <core/db/Connection.h>
-#include <core/library/track/Track.h>
-#include <core/library/QueryBase.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/library/track/Track.h>
+#include <musikcore/library/QueryBase.h>
 
 #include "TrackListQueryBase.h"
 

src/musikcore/library/query/LyricsQuery.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
+#include <musikcore/library/QueryBase.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/MarkTrackPlayedQuery.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
+#include <musikcore/library/QueryBase.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/NowPlayingTrackListQuery.cpp

@@ -35,9 +35,9 @@
 #include "pch.hpp"
 #include "NowPlayingTrackListQuery.h"
 
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/db/Statement.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/db/Statement.h>
 
 using musik::core::db::Statement;
 using musik::core::db::Row;

src/musikcore/library/query/NowPlayingTrackListQuery.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/audio/PlaybackService.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/audio/PlaybackService.h>
 
 #include "TrackListQueryBase.h"
 

src/musikcore/library/query/PersistedPlayQueueQuery.cpp

@@ -34,9 +34,9 @@
 
 #include "pch.hpp"
 #include "PersistedPlayQueueQuery.h"
-#include <core/db/Statement.h>
-#include <core/db/ScopedTransaction.h>
-#include <core/library/track/TrackList.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/library/track/TrackList.h>
 
 using namespace musik::core;
 using namespace musik::core::db;

src/musikcore/library/query/PersistedPlayQueueQuery.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/audio/PlaybackService.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/audio/PlaybackService.h>
 
 namespace musik { namespace core { namespace library { namespace query {
 

src/musikcore/library/query/SavePlaylistQuery.cpp

@@ -36,14 +36,14 @@
 #include "SavePlaylistQuery.h"
 #include "CategoryTrackListQuery.h"
 
-#include <core/library/track/LibraryTrack.h>
-#include <core/library/query/TrackMetadataQuery.h>
-#include <core/library/query/util/Serialization.h>
-#include <core/library/LocalLibraryConstants.h>
-#include <core/db/ScopedTransaction.h>
-#include <core/db/Statement.h>
-#include <core/runtime/Message.h>
-#include <core/support/Messages.h>
+#include <musikcore/library/track/LibraryTrack.h>
+#include <musikcore/library/query/TrackMetadataQuery.h>
+#include <musikcore/library/query/util/Serialization.h>
+#include <musikcore/library/LocalLibraryConstants.h>
+#include <musikcore/db/ScopedTransaction.h>
+#include <musikcore/db/Statement.h>
+#include <musikcore/runtime/Message.h>
+#include <musikcore/support/Messages.h>
 
 using namespace musik::core;
 using namespace musik::core::sdk;
@@ -419,7 +419,7 @@ void SavePlaylistQuery::SendPlaylistMutationBroadcast() {
             break;
         case Operation::Append:
             this->library->GetMessageQueue().Broadcast(
-                Message::Create(nullptr, message::PlaylistModified, playlistId)); 
+                Message::Create(nullptr, message::PlaylistModified, playlistId));
             break;
     }
 }

src/musikcore/library/query/SavePlaylistQuery.h

@@ -34,10 +34,10 @@
 
 #pragma once
 
-#include <core/library/QueryBase.h>
-#include <core/library/track/TrackList.h>
-#include <core/db/Connection.h>
-#include <core/library/ILibrary.h>
+#include <musikcore/library/QueryBase.h>
+#include <musikcore/library/track/TrackList.h>
+#include <musikcore/db/Connection.h>
+#include <musikcore/library/ILibrary.h>
 #include <memory>
 
 namespace musik { namespace core { namespace library { namespace query {